Index: contrib/views_slideshow_cycle/views-slideshow-cycle.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views-slideshow-cycle.tpl.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views-slideshow-cycle.tpl.php
--- contrib/views_slideshow_cycle/views-slideshow-cycle.tpl.php	24 Jul 2010 04:25:46 -0000	1.1.2.1
+++ contrib/views_slideshow_cycle/views-slideshow-cycle.tpl.php	28 Jul 2010 06:32:32 -0000
@@ -7,20 +7,36 @@
  */
 ?>
 
-<?php if ($controls_top || $pager_top || $image_count_top): ?>
+<?php if ($controls_location == 'top' || $pager_location == 'top' || $slide_counter_location == 'top'): ?>
   <div class="views-slideshow-controls-top clear-block">
-    <?php print $controls_top; ?>
-    <?php print $pager_top; ?>
-    <?php print $image_count_top; ?>
+    <?php if ($slide_counter_location == 'top') { ?>
+      <?php print $slide_counter; ?>
+    <?php } ?>
+    
+    <?php if ($controls_location == 'top') { ?>
+      <?php print $controls; ?>
+    <?php } ?>
+    
+    <?php if ($pager_location == 'top') { ?>
+      <?php print $pager; ?>
+    <?php } ?>
   </div>
 <?php endif; ?>
 
 <?php print $slideshow; ?>
 
-<?php if ($controls_bottom || $pager_bottom || $image_count_bottom): ?>
+<?php if ($controls_location == 'bottom' || $pager_location == 'bottom' || $slide_counter_location == 'bottom'): ?>
   <div class="views-slideshow-controls-bottom clear-block">
-    <?php print $controls_bottom; ?>
-    <?php print $pager_bottom; ?>
-    <?php print $image_count_bottom; ?>
+    <?php if ($pager_location == 'bottom') { ?>
+      <?php print $pager; ?>
+    <?php } ?>
+    
+    <?php if ($controls_location == 'bottom') { ?>
+      <?php print $controls; ?>
+    <?php } ?>
+    
+    <?php if ($slide_counter_location == 'bottom') { ?>
+      <?php print $slide_counter; ?>
+    <?php } ?>
   </div>
 <?php endif; ?>
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.js,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 views_slideshow_cycle.js
--- contrib/views_slideshow_cycle/views_slideshow_cycle.js	27 Jul 2010 05:21:37 -0000	1.1.2.3
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.js	28 Jul 2010 06:32:32 -0000
@@ -46,10 +46,10 @@ Drupal.behaviors.viewsSlideshowCycle = f
       pager:(settings.pager > 0)?'#views_slideshow_cycle_pager_' + settings.vss_id:null,
       nowrap:settings.nowrap,
       after:function(curr, next, opts) {
-        // Used for Image Counter.
-        if (settings.image_count) {
-          $('#views_slideshow_cycle_image_count_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
-          $('#views_slideshow_cycle_image_count_' + settings.vss_id + ' span.total').html(opts.slideCount);
+        // Used for Slide Counter.
+        if (settings.slide_counter) {
+          $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
+          $('#views_slideshow_cycle_slide_counter_' + settings.vss_id + ' span.total').html(opts.slideCount);
         }
       },
       before:function(curr, next, opts) {
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 views_slideshow_cycle.module
--- contrib/views_slideshow_cycle/views_slideshow_cycle.module	27 Jul 2010 05:21:37 -0000	1.1.2.2
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.module	28 Jul 2010 06:32:32 -0000
@@ -64,7 +64,7 @@ function views_slideshow_cycle_theme($ex
       'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_cycle.theme.inc',
     ),
-    'views_slideshow_cycle_image_count' => array(
+    'views_slideshow_cycle_slide_counter' => array(
       'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_cycle.theme.inc',
     ),
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.theme.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 views_slideshow_cycle.theme.inc
--- contrib/views_slideshow_cycle/views_slideshow_cycle.theme.inc	27 Jul 2010 05:21:37 -0000	1.1.2.2
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.theme.inc	28 Jul 2010 06:32:32 -0000
@@ -52,27 +52,22 @@ function template_preprocess_views_slide
   $cycle = $vars['options']['views_slideshow_cycle'];
 
   // Only show controls when there is more than one result.
+  $vars['controls_location'] = 0;
   if ($settings['num_divs'] > 1) {
-    if ($cycle['controls'] == 1) {
-      $vars['controls_top'] = theme('views_slideshow_cycle_controls', $vss_id, $view, $options);
-    }
-    elseif ($cycle['controls'] == 2) {
-      $vars['controls_bottom'] = theme('views_slideshow_cycle_controls', $vss_id, $view, $options);
+    $vars['controls_location'] = $cycle['controls'];
+    if ($cycle['controls']) {
+      $vars['controls'] = theme('views_slideshow_cycle_controls', $vss_id, $view, $options);
     }
   }
 
-  if ($cycle['pager'] == 1) {
-    $vars['pager_top'] = theme('views_slideshow_cycle_pager', $vss_id, $view, $options);
-  }
-  elseif ($cycle['pager'] == 2) {
-    $vars['pager_bottom'] = theme('views_slideshow_cycle_pager', $vss_id, $view, $options);
+  $vars['pager_location'] = $cycle['pager'];
+  if ($cycle['pager']) {
+    $vars['pager'] = theme('views_slideshow_cycle_pager', $vss_id, $view, $options);
   }
   
-  if ($cycle['image_count'] == 1) {
-    $vars['image_count_top'] = theme('views_slideshow_cycle_image_count', $vss_id, $view, $options);
-  }
-  elseif ($cycle['image_count'] == 2) {
-    $vars['image_count_bottom'] = theme('views_slideshow_cycle_image_count', $vss_id, $view, $options);
+  $vars['slide_counter_location'] = $cycle['slide_counter'];
+  if ($cycle['slide_counter']) {
+    $vars['slide_counter'] = theme('views_slideshow_cycle_slide_counter', $vss_id, $view, $options);
   }
 }
 
@@ -295,13 +290,13 @@ function theme_views_slideshow_cycle_pag
 }
 
 /**
- * Views Slideshow: image counter.
+ * Views Slideshow: slide counter.
  *
  * @ingroup themeable
  */
-function theme_views_slideshow_cycle_image_count($vss_id, $view, $options) {
-  $attributes['class'] = 'views_slideshow_cycle_image_count views_slideshow_image_count';
-  $attributes['id'] = "views_slideshow_cycle_image_count_" . $vss_id;
+function theme_views_slideshow_cycle_slide_counter($vss_id, $view, $options) {
+  $attributes['class'] = 'views_slideshow_cycle_slide_counter views_slideshow_slide_counter';
+  $attributes['id'] = "views_slideshow_cycle_slide_counter_" . $vss_id;
   $attributes = drupal_attributes($attributes);
 
   $counter = '<span class="num">1</span> ' . t('of') . ' <span class="total">1</span>';
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.views_slideshow.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 views_slideshow_cycle.views_slideshow.inc
--- contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	27 Jul 2010 05:21:37 -0000	1.1.2.3
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	28 Jul 2010 06:32:32 -0000
@@ -46,7 +46,7 @@ function views_slideshow_cycle_views_sli
       'pager_hover' => array('default' => 0),
       'pager_click_to_page' => array('default' => 0),
       'controls' => array('default' => 0),
-      'image_count' => array('default' => 0),
+      'slide_counter' => array('default' => 0),
 
       // Internet Explorer Tweaks
       'cleartype' => array('default' => 'true'),
@@ -273,8 +273,6 @@ function views_slideshow_cycle_views_sli
     '#dependency' => array('edit-style-options-views-slideshow-cycle-action-advanced' => array(1)),
   );
   
-  
-  
   // Pager and Controls
   $form['views_slideshow_cycle']['pager_and_controls'] = array(
     '#value' => '<h2>' . t('Pager and Controls') . '</h2>',
@@ -282,7 +280,11 @@ function views_slideshow_cycle_views_sli
   $form['views_slideshow_cycle']['pager'] = array(
     '#type' => 'select',
     '#title' => t('Pager'),
-    '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
+    '#options' => array(
+      0 => t('None'),
+      'top' => t('Top'),
+      'bottom' => t('Bottom'),
+    ),
     '#default_value' => $view->options['views_slideshow_cycle']['pager'],
     '#description' => t('Determine if a pager for the slideshow (1|2|3) should appear, and if so whether they should appear before or after the slideshow.'),
   );
@@ -350,20 +352,27 @@ function views_slideshow_cycle_views_sli
     '#process' => array('views_process_dependency'),
     '#dependency' => array('edit-style-options-views-slideshow-cycle-pager' => array(1, 2)),
   );
-  
   $form['views_slideshow_cycle']['controls'] = array(
     '#type' => 'select',
     '#title' => t('Controls'),
-    '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
+    '#options' => array(
+      0 => t('None'),
+      'top' => t('Top'),
+      'bottom' => t('Bottom'),
+    ),
     '#default_value' => $view->options['views_slideshow_cycle']['controls'],
     '#description' => t('Determine if controls for the slideshow (start/stop/next/previous) should appear, and if so whether they should appear before or after the slideshow.'),
   );
-  $form['views_slideshow_cycle']['image_count'] = array(
+  $form['views_slideshow_cycle']['slide_counter'] = array(
     '#type' => 'select',
-    '#title' => t('Image Counter'),
-    '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['views_slideshow_cycle']['image_count'],
-    '#description' => t('Determine if the Image Counter (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'),
+    '#title' => t('Slide Counter'),
+    '#options' => array(
+      0 => t('None'),
+      'top' => t('Top'),
+      'bottom' => t('Bottom'),
+    ),
+    '#default_value' => $view->options['views_slideshow_cycle']['slide_counter'],
+    '#description' => t('Determine if the Slide Counter (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'),
   );
   
   // Internet Explorer Tweaks