Index: views_slideshow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.module,v
retrieving revision 1.11.2.2.2.11
diff -u -p -r1.11.2.2.2.11 views_slideshow.module
--- views_slideshow.module	27 Mar 2010 03:06:19 -0000	1.11.2.2.2.11
+++ views_slideshow.module	13 Apr 2010 06:17:36 -0000
@@ -48,6 +48,8 @@ function views_slideshow_help($path, $ar
  */
 function template_preprocess_views_slideshow(&$vars) {
   $options = $vars['options'];
-
-  $vars['slideshow'] = theme('views_slideshow_' . $options['mode'], $vars['view'], $options, $vars['rows'], $vars['title']);
+  if (in_array($options['mode'], array('singleframe', 'thumbnailhover', 'menu', 'ddblock', 'slider'))) {
+    $options['mode'] = 'views_slideshow_' . $options['mode'];
+  }
+  $vars['slideshow'] = theme($options['mode'], $vars['view'], $options, $vars['rows'], $vars['title']);
 }
Index: views_slideshow.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/Attic/views_slideshow.theme.inc,v
retrieving revision 1.1.2.2.2.5
diff -u -p -r1.1.2.2.2.5 views_slideshow.theme.inc
--- views_slideshow.theme.inc	23 Feb 2010 22:31:11 -0000	1.1.2.2.2.5
+++ views_slideshow.theme.inc	13 Apr 2010 06:17:36 -0000
@@ -7,8 +7,8 @@
  * @ingroup themeable
  */
 function theme_views_slideshow_main_section($id, $hidden_elements, $plugin) {
-  $attributes['id'] = "views_slideshow_${plugin}_main_${id}";
-  $attributes['class'] = "views_slideshow_${plugin}_main views_slideshow_main";
+  $attributes['id'] = "${plugin}_main_${id}";
+  $attributes['class'] = "${plugin}_main views_slideshow_main";
   $attributes = drupal_attributes($attributes);
 
   return "<div$attributes>$hidden_elements</div>";
Index: views_slideshow_plugin_style_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/Attic/views_slideshow_plugin_style_slideshow.inc,v
retrieving revision 1.1.2.1.2.7
diff -u -p -r1.1.2.1.2.7 views_slideshow_plugin_style_slideshow.inc
--- views_slideshow_plugin_style_slideshow.inc	31 Mar 2010 03:37:58 -0000	1.1.2.1.2.7
+++ views_slideshow_plugin_style_slideshow.inc	13 Apr 2010 06:17:36 -0000
@@ -12,6 +12,27 @@
  * @ingroup views_style_plugins
  */
 class views_slideshow_plugin_style_slideshow extends views_plugin_style_list {
+  // if the view is still using the old variables replace with the new ones.
+  function init(&$view, &$display, $options = NULL) {
+    // These are required for the view to continue to work.
+    $this->view = &$view;
+    $this->display = &$display;
+
+    // Overlay incoming options on top of defaults
+    $this->unpack_options($this->options, isset($options) ? $options : $display->handler->get_option('style_options'));
+
+    if ($this->uses_row_plugin() && $display->handler->get_option('row_plugin')) {
+      $this->row_plugin = $display->handler->get_plugin('row');
+    }
+
+    // Eveything below here is what's needed for views slideshow.
+    if (isset($options['singleframe']) && is_array($options['singleframe'])) {
+      foreach($options['singleframe'] as $index => $value) {
+        $this->options['views_slideshow_singleframe'][$index] = $value;
+      }
+    }
+  }
+
   // Set default options
   function option_definition() {
     module_load_all_includes('views_slideshow.inc');
@@ -58,6 +79,12 @@ class views_slideshow_plugin_style_slide
         '#default_value' => $this->options['mode'],
       );
       foreach (module_implements('views_slideshow_options_form') as $module) {
+        $form[$module] = array(
+          '#type' => 'fieldset',
+          '#title' => t( $modules[$module] . ' options'),
+          '#collapsible' => TRUE,
+          '#attributes' => array('class' => $module),
+        );
         $function = $module .'_views_slideshow_options_form';
         call_user_func_array($function, array(&$form, &$form_state, &$this));
       }
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.theme.inc,v
retrieving revision 1.1.2.1.2.20
diff -u -p -r1.1.2.1.2.20 views_slideshow_singleframe.theme.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	8 Apr 2010 06:54:51 -0000	1.1.2.1.2.20
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc	13 Apr 2010 06:17:36 -0000
@@ -22,14 +22,15 @@ function template_preprocess_views_slide
       'div_prefix' => '#views_slideshow_singleframe_div_',
       'id' => $vars['id'],
     ),
-    $options['singleframe']
+    $options['views_slideshow_singleframe']
   );
+
   drupal_add_js(array('viewsSlideshowSingleFrame' => array('#views_slideshow_singleframe_main_'. $vars['id'] => $settings)), 'setting');
 
   $hidden_elements = theme('views_slideshow_singleframe_no_display_section', $view, $rows, $id, $options['mode']);
-  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'singleframe');
+  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'views_slideshow_singleframe');
 
-  $singleframe = $vars['options']['singleframe'];
+  $singleframe = $vars['options']['views_slideshow_singleframe'];
 
   if ($singleframe['controls'] == 1) {
     $vars['controls_top'] = theme('views_slideshow_singleframe_controls', $id, $view, $options);
@@ -113,7 +114,7 @@ function theme_views_slideshow_singlefra
 
   $output = "<div$attributes>";
   $output .= theme('views_slideshow_singleframe_control_previous', $id, $view, $options);
-  if ($options['singleframe']['timeout']) {
+  if ($options['views_slideshow_singleframe']['timeout']) {
     $output .= theme('views_slideshow_singleframe_control_pause', $id, $view, $options);
   }
   $output .= theme('views_slideshow_singleframe_control_next', $id, $view, $options);
@@ -163,7 +164,7 @@ function theme_views_slideshow_singlefra
  * @ingroup themeable
  */
 function theme_views_slideshow_singleframe_pager($id, $view, $options) {
-  $pager_type = $options['singleframe']['pager_type'];
+  $pager_type = $options['views_slideshow_singleframe']['pager_type'];
 
   $attributes['class'] = "views_slideshow_singleframe_pager views_slideshow_pager$pager_type";
   $attributes['id'] = "views_slideshow_singleframe_pager_$id";
Index: contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_singleframe/Attic/views_slideshow_singleframe.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.14
diff -u -p -r1.1.2.1.2.14 views_slideshow_singleframe.views_slideshow.inc
--- contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc	3 Apr 2010 05:00:24 -0000	1.1.2.1.2.14
+++ contrib/views_slideshow_singleframe/views_slideshow_singleframe.views_slideshow.inc	13 Apr 2010 06:17:36 -0000
@@ -8,13 +8,13 @@
 
 function views_slideshow_singleframe_views_slideshow_modes() {
   $options = array(
-    'singleframe' => t('SingleFrame'),
+    'views_slideshow_singleframe' => t('SingleFrame'),
   );
   return $options;
 }
 
 function views_slideshow_singleframe_views_slideshow_option_definition() {
-  $options['singleframe'] =array(
+  $options['views_slideshow_singleframe'] = array(
     'contains' => array(
       'timeout' => array('default' => 5000),
       'sort' => array('default' => 1),
@@ -44,103 +44,97 @@ function views_slideshow_singleframe_vie
 }
 
 function views_slideshow_singleframe_views_slideshow_options_form(&$form, &$form_state, &$view) {
-  $form['singleframe'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('SingleFrame rotator options'),
-    '#collapsible' => TRUE,
-    '#attributes' => array('class' => 'singleframe'),
-  );
-  $form['singleframe']['js'] = array(
+  $form['views_slideshow_singleframe']['js'] = array(
     '#value' => "<script type='text/javascript'>
                   viewsSlideshowSingleframePagerToggle();
-                  $('#edit-style-options-singleframe-pager').change(function() {
+                  $('#edit-style-options-views-slideshow-singleframe-pager').change(function() {
                     viewsSlideshowSingleframePagerToggle();
                   });
                   
                   function viewsSlideshowSingleframePagerToggle() {
-                    if ($('#edit-style-options-singleframe-pager').val() > 0) {
-                      $('#edit-style-options-singleframe-pager-type-wrapper').show('normal');
-                      $('#edit-style-options-singleframe-pager-hover-wrapper').show('normal');
+                    if ($('#edit-style-options-views-slideshow-singleframe-pager').val() > 0) {
+                      $('#edit-style-options-views-slideshow-singleframe-pager-type-wrapper').show('normal');
+                      $('#edit-style-options-views-slideshow-singleframe-pager-hover-wrapper').show('normal');
                     }
                     else {
-                      $('#edit-style-options-singleframe-pager-type-wrapper').hide('normal');
-                      $('#edit-style-options-singleframe-pager-hover-wrapper').hide('normal');
+                      $('#edit-style-options-views-slideshow-singleframe-pager-type-wrapper').hide('normal');
+                      $('#edit-style-options-views-slideshow-singleframe-pager-hover-wrapper').hide('normal');
                     }
                   }
                 </script>",
   );
-  $form['singleframe']['timeout'] = array(
+  $form['views_slideshow_singleframe']['timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('Timer delay'),
-    '#default_value' => $view->options['singleframe']['timeout'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['timeout'],
     '#description' => t('Amount of time in milliseconds between transitions.')
   );
-  $form['singleframe']['delay'] = array(
+  $form['views_slideshow_singleframe']['delay'] = array(
     '#type' => 'textfield',
     '#title' => t('Initial slide delay offset'),
-    '#default_value' => $view->options['singleframe']['delay'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['delay'],
     '#description' => t('Amount of time in milliseconds for the first slide to transition. This number will be added to Timer delay to create the initial delay.  For example if Timer delay is 4000 and Initial delay is 2000 then the first slide will change at 6000ms (6 seconds).  If Initial delay is -2000 then the first slide will change at 2000ms (2 seconds).')
   );
-  $form['singleframe']['speed'] = array(
+  $form['views_slideshow_singleframe']['speed'] = array(
     '#type' => 'textfield',
     '#title' => t('Speed'),
-    '#default_value' => $view->options['singleframe']['speed'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['speed'],
     '#description' => t('Time in milliseconds that each transition lasts. Numeric only!'),  
   );
-  $form['singleframe']['random'] = array(
+  $form['views_slideshow_singleframe']['random'] = array(
     '#type' => 'radios',
     '#title' => t('Random'),
     '#description' => t('This option controls the order items are displayed. The default setting, False, uses the views ordering. True will cause the images to display in a random order.'),
     '#options' => array(0 => t('False'), 1 => t('True')),
-    '#default_value' => $view->options['singleframe']['random'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['random'],
   );
-  $form['singleframe']['pause'] = array(
+  $form['views_slideshow_singleframe']['pause'] = array(
     '#type' => 'radios',
     '#title' => t('Pause'),
     '#options' => array(1 => t('Yes'),2 => t('No')),
-    '#default_value' => $view->options['singleframe']['pause'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['pause'],
     '#description' => t('Pause when hovering on the slideshow image.'),
   );
-  $form['singleframe']['pause_on_click'] = array(
+  $form['views_slideshow_singleframe']['pause_on_click'] = array(
     '#type' => 'radios',
     '#title' => t('Pause On Click'),
     '#options' => array(1 => t('Yes'), 0 => t('No')),
-    '#default_value' => $view->options['singleframe']['pause_on_click'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['pause_on_click'],
     '#description' => t('Pause when the slide is clicked.'),
   );
-  $form['singleframe']['controls'] = array(
+  $form['views_slideshow_singleframe']['controls'] = array(
     '#type' => 'select',
     '#title' => t('Controls'),
     '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['singleframe']['controls'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['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['singleframe']['pager'] = array(
+  $form['views_slideshow_singleframe']['pager'] = array(
     '#type' => 'select',
     '#title' => t('Pager'),
     '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['singleframe']['pager'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['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.'),
   );
-  $form['singleframe']['pager_type'] = array(
+  $form['views_slideshow_singleframe']['pager_type'] = array(
     '#type' => 'select',
     '#title' => t('Pager Type'),
     '#options' => array('Numbered' => t('Numbered'),'Thumbnails' => t('Thumbnails')),
-    '#default_value' => $view->options['singleframe']['pager_type'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['pager_type'],
     '#description' => t('What the pager should look like.  Thumbnails grabs the first image in each slideshow item.'),
   );
-  $form['singleframe']['pager_hover'] = array(
+  $form['views_slideshow_singleframe']['pager_hover'] = array(
     '#type' => 'select',
     '#title' => t('Activate Slide and Pause on Pager Hover'),
     '#options' => array(1 => t('Yes'),2 => t('No')),
-    '#default_value' => $view->options['singleframe']['pager_hover'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['pager_hover'],
     '#description' => t('Should the slide be activated and paused when hovering over a pager item.'),
   );
-  $form['singleframe']['image_count'] = array(
+  $form['views_slideshow_singleframe']['image_count'] = array(
     '#type' => 'select',
     '#title' => t('Image Counter'),
     '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['singleframe']['image_count'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['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.'),
   );
   $options = array(
@@ -173,53 +167,53 @@ function views_slideshow_singleframe_vie
     'wipe' => 'wipe',
     'zoom' => 'zoom' 
   );
-  $form['singleframe']['effect'] = array(
+  $form['views_slideshow_singleframe']['effect'] = array(
     '#type' => 'select',
     '#title' => t('Effect'),
     '#options' => $options,
-    '#default_value' => $view->options['singleframe']['effect'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['effect'],
     '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect.'),
   );
-  $form['singleframe']['sync'] = array(
+  $form['views_slideshow_singleframe']['sync'] = array(
     '#type' => 'radios',
     '#title' => t('Sync'),
     '#options' => array(1 => t('Yes'), 2 => t('No')),
-    '#default_value' => $view->options['singleframe']['sync'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['sync'],
     '#description' => t('The sync option controls whether the slide transitions occur simultaneously. The default is yes which means that the current slide transitions out as the next slide transitions in. By setting the sync option to no you can get some interesting twists on your transitions.'),  
   );
-  $form['singleframe']['advanced'] = array(
+  $form['views_slideshow_singleframe']['advanced'] = array(
     '#type' => 'textarea',
     '#title' => t('Advanced Options'),
-    '#default_value' => $view->options['singleframe']['advanced'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['advanced'],
     '#description' => t('Add other jQuery cycle options one per line.  Ex. height: 350  !url', array('!url' => l('Click here for the additional options to add.', 'http://malsup.com/jquery/cycle/options.html'))),
   );
-  $form['singleframe']['ie'] = array(
+  $form['views_slideshow_singleframe']['ie'] = array(
     '#type' => 'fieldset',
     '#title' => t('Internet Explorer Options'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  $form['singleframe']['ie']['cleartype'] = array(
+  $form['views_slideshow_singleframe']['ie']['cleartype'] = array(
     '#type' => 'radios',
     '#title' => t('ClearType'),
     '#options' => array('true' => t('True'), 'false' => t('False')),
-    '#default_value' => $view->options['singleframe']['ie']['cleartype'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['ie']['cleartype'],
     '#description' => t('True if clearType corrections should be applied (for IE).  Some background issues could be fixed by setting this to false.'),
   );
-  $form['singleframe']['ie']['cleartypenobg'] = array(
+  $form['views_slideshow_singleframe']['ie']['cleartypenobg'] = array(
     '#type' => 'radios',
     '#title' => t('ClearType Background'),
     '#options' => array('true' => t('True'), 'false' => t('False')),
-    '#default_value' => $view->options['singleframe']['ie']['cleartypenobg'],
+    '#default_value' => $view->options['views_slideshow_singleframe']['ie']['cleartypenobg'],
     '#description' => t('Set to true to disable extra cleartype fixing (leave false to force background color setting on slides)'),
   );
 }
 
 function views_slideshow_singleframe_views_slideshow_options_form_validate(&$form, &$form_state, &$view) {
-  if (!is_numeric($form_state['values']['style_options']['singleframe']['speed'])) {
-    form_error($form['singleframe']['speed'], t('!setting must be numeric!',array('Speed')));
+  if (!is_numeric($form_state['values']['style_options']['views_slideshow_singleframe']['speed'])) {
+    form_error($form['views_slideshow_singleframe']['speed'], t('!setting must be numeric!',array('Speed')));
   }
-  if (!is_numeric($form_state['values']['style_options']['singleframe']['timeout'])) {
-    form_error($form['singleframe']['speed'], t('!setting must be numeric!',array('timeout')));
+  if (!is_numeric($form_state['values']['style_options']['views_slideshow_singleframe']['timeout'])) {
+    form_error($form['views_slideshow_singleframe']['speed'], t('!setting must be numeric!',array('timeout')));
   }
 }
\ No newline at end of file
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.theme.inc,v
retrieving revision 1.1.2.1.2.21
diff -u -p -r1.1.2.1.2.21 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	8 Apr 2010 06:54:51 -0000	1.1.2.1.2.21
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	13 Apr 2010 06:17:36 -0000
@@ -23,7 +23,7 @@ function template_preprocess_views_slide
       'div_prefix' => '#views_slideshow_thumbnailhover_div_',
       'id' => $vars['id'],
     ),
-    $options['thumbnailhover']
+    $options['views_slideshow_thumbnailhover']
   );
 
   drupal_add_js(array('viewsSlideshowThumbnailHover' => array(
@@ -42,11 +42,11 @@ function template_preprocess_views_slide
     }
   }
 
-  $teaser = ($options['thumbnailhover']['hover_breakout'] == 'teaser') ? TRUE : FALSE;
+  $teaser = ($options['views_slideshow_thumbnailhover']['hover_breakout'] == 'teaser') ? TRUE : FALSE;
   $hidden_elements = theme('views_slideshow_thumbnailhover_no_display_section', $view, $rows, $id, $options, $teaser);
-  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'thumbnailhover');
+  $vars['slideshow'] = theme('views_slideshow_main_section', $id, $hidden_elements, 'views_slideshow_thumbnailhover');
 
-  $thumbnailhover = $vars['options']['thumbnailhover'];
+  $thumbnailhover = $vars['options']['views_slideshow_thumbnailhover'];
 
   if ($thumbnailhover['controls'] == 1) {
     $vars['controls_top'] = theme('views_slideshow_thumbnailhover_controls', $id, $view, $options);
@@ -85,7 +85,7 @@ function theme_views_slideshow_thumbnail
   foreach ($view->result as $count => $node) {
     if ($view->display_handler->uses_fields()) {
       $rendered = '';
-      foreach ($options['thumbnailhover']['main_fields'] as $field => $use) {
+      foreach ($options['views_slideshow_thumbnailhover']['main_fields'] as $field => $use) {
         $rendered_field = $view->field[$field]->theme($node);
         if (($use !== 0) && !empty($rendered_field)) {
           $rendered .= '<div class="views-field-'. views_css_safe($view->field[$field]->field) .'">';
@@ -142,7 +142,7 @@ function theme_views_slideshow_thumbnail
   if ($view->display_handler->uses_fields()) {
     foreach ($view->result as $count => $node) {
       $rendered_fields = '';
-      foreach ($options['thumbnailhover']['breakout_fields'] as $field => $use) {
+      foreach ($options['views_slideshow_thumbnailhover']['breakout_fields'] as $field => $use) {
         $rendered_field = $view->field[$field]->theme($node);
         if (($use !== 0) && !empty($rendered_field)) {
           $rendered_fields .= '<div class="views-field-'. views_css_safe($view->field[$field]->field) .'">';
@@ -203,7 +203,7 @@ function theme_views_slideshow_thumbnail
 
   $output = "<div$attributes>";
   $output .= theme('views_slideshow_thumbnailhover_control_previous', $id, $view, $options);
-  if ($options['thumbnailhover']['timeout']) {
+  if ($options['views_slideshow_thumbnailhover']['timeout']) {
     $output .= theme('views_slideshow_thumbnailhover_control_pause', $id, $view, $options);
   }
   $output .= theme('views_slideshow_thumbnailhover_control_next', $id, $view, $options);
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.views_slideshow.inc,v
retrieving revision 1.1.2.1.2.13
diff -u -p -r1.1.2.1.2.13 views_slideshow_thumbnailhover.views_slideshow.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc	3 Apr 2010 05:00:25 -0000	1.1.2.1.2.13
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.views_slideshow.inc	13 Apr 2010 06:17:36 -0000
@@ -8,13 +8,13 @@
 
 function views_slideshow_thumbnailhover_views_slideshow_modes() {
   $options = array(
-    'thumbnailhover' => t('ThumbnailHover'),
+    'views_slideshow_thumbnailhover' => t('ThumbnailHover'),
   );
   return $options;
 }
 
 function views_slideshow_thumbnailhover_views_slideshow_option_definition() {
-  $options['thumbnailhover'] = array(
+  $options['views_slideshow_thumbnailhover'] = array(
     'contains' => array (
       'timeout' => array('default' => 5000),
       'sort' => array('default' => 1),
@@ -48,21 +48,14 @@ function views_slideshow_thumbnailhover_
 }
 
 function views_slideshow_thumbnailhover_views_slideshow_options_form(&$form, &$form_state, &$view) {
-  $form['thumbnailhover'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('ThumbnailHover rotator options'),
-    '#collapsible' => TRUE,
-    '#attributes' => array('class' => 'thumbnailhover'),
-  );
-  
   if (module_exists('hoverintent')) {
     $options = array('hover' => t('Hover'));
     $options['hoverIntent'] = t('HoverIntent');
-    $form['thumbnailhover']['hover'] = array(
+    $form['views_slideshow_thumbnailhover']['hover'] = array(
       '#type' => 'radios',
       '#title' => t('Mouse hover'),
       '#options' => $options,
-      '#default_value' => $view->options['thumbnailhover']['hover'],
+      '#default_value' => $view->options['views_slideshow_thumbnailhover']['hover'],
       '#description' => t('The !hoverintent, if installed, adds the %hoverintent option here. Selecting it causes a delay when the mouse hovers, to stop quick flybys from triggering the behavior. Selecting %hoverdefault chooses the default mouse behavior.', array('!hoverintent' => l(t('HoverIntent module'), 'http://drupal.org/project/hoverintent'), '%hoverintent' => t('HoverIntent'), '%hoverdefault' => t('Hover'))),
     );
   }  
@@ -75,66 +68,66 @@ function views_slideshow_thumbnailhover_
     foreach ($view->display->handler->get_handlers('field') as $field => $handler) {
       $options[$field] = $handler->ui_name();
     }
-    $form['thumbnailhover']['main_fields'] = array(
+    $form['views_slideshow_thumbnailhover']['main_fields'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Main frame fields'),
       '#options' => $options,
-      '#default_value' => $view->options['thumbnailhover']['main_fields'],
+      '#default_value' => $view->options['views_slideshow_thumbnailhover']['main_fields'],
       '#description' => t("Choose the fields that will appear in the main slide."),
     );
-    $form['thumbnailhover']['breakout_fields'] = array(
+    $form['views_slideshow_thumbnailhover']['breakout_fields'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Breakout fields'),
       '#options' => $options,
-      '#default_value' => $view->options['thumbnailhover']['breakout_fields'],
+      '#default_value' => $view->options['views_slideshow_thumbnailhover']['breakout_fields'],
       '#description' => t("Choose the fields that will appear in the breakout thumbnails."),
     );
   } 
   else {
-    $form['thumbnailhover']['hover_breakout'] = array(
+    $form['views_slideshow_thumbnailhover']['hover_breakout'] = array(
       '#type' => 'radios',
       '#title' => t('Hover breakout'),
       '#options' => $options,
-      '#default_value' => $view->options['thumbnailhover']['hover_breakout'],
+      '#default_value' => $view->options['views_slideshow_thumbnailhover']['hover_breakout'],
       '#description' => t("Hover breakout determines how to display the breakout element of the %thumbnail mode, either as a teaser or full node when the row style is node.", array('%thumbnail' => t('Thumbnail hover'))),
     );
   }
-  $form['thumbnailhover']['teasers_last'] = array(
+  $form['views_slideshow_thumbnailhover']['teasers_last'] = array(
     '#type' => 'checkbox',
     '#title' => t('Display teasers last'),
-    '#default_value' => $view->options['thumbnailhover']['teasers_last'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['teasers_last'],
     '#description' => t('When the mode is thumbnail hover, this determines whether to print the teasers first or second.'),
   );
-  $form['thumbnailhover']['timeout'] = array(
+  $form['views_slideshow_thumbnailhover']['timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('Timer delay'),
-    '#default_value' => $view->options['thumbnailhover']['timeout'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['timeout'],
     '#description' => t('Amount of time in milliseconds between transitions.'),
   );
-  $form['thumbnailhover']['delay'] = array(
+  $form['views_slideshow_thumbnailhover']['delay'] = array(
     '#type' => 'textfield',
     '#title' => t('Initial slide delay offset'),
-    '#default_value' => $view->options['thumbnailhover']['delay'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['delay'],
     '#description' => t('Amount of time in milliseconds for the first slide to transition. This number will be added to Timer delay to create the initial delay.  For example if Timer delay is 4000 and Initial delay is 2000 then the first slide will change at 6000ms (6 seconds).  If Initial delay is -2000 then the first slide will change at 2000ms (2 seconds).')
   );
-  $form['thumbnailhover']['speed'] = array(
+  $form['views_slideshow_thumbnailhover']['speed'] = array(
     '#type' => 'textfield',
     '#title' => t('Speed'),
-    '#default_value' => $view->options['thumbnailhover']['speed'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['speed'],
     '#description' => t('Time in milliseconds that each transition lasts. Numeric only!'),  
   );
-  $form['thumbnailhover']['random'] = array(
+  $form['views_slideshow_thumbnailhover']['random'] = array(
     '#type' => 'radios',
     '#title' => t('Random'),
     '#description' => t('This option controls the order items are displayed. The default setting, False, uses the views ordering. True will cause the images to display in a random order.'),
     '#options' => array(0 => t('False'), 1 => t('True')),
-    '#default_value' => $view->options['thumbnailhover']['random'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['random'],
   );
-  $form['thumbnailhover']['pause'] = array(
+  $form['views_slideshow_thumbnailhover']['pause'] = array(
     '#type' => 'radios',
     '#title' => t('Pause'),
     '#options' => array(1 => t('Yes'),2 => t('No')),
-    '#default_value' => $view->options['thumbnailhover']['pause'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['pause'],
     '#description' => t('Pause when hovering on the slideshow image.'),
   );
   $form['singleframe']['pause_on_click'] = array(
@@ -148,25 +141,25 @@ function views_slideshow_thumbnailhover_
   if ((module_exists('jq') && jq_add('hoverIntent')) || (module_exists('hoverintent') && hoverintent_add())) {
     $options['hoverIntent'] = 'hoverIntent';
   }
-  $form['thumbnailhover']['pager_event'] = array(
+  $form['views_slideshow_thumbnailhover']['pager_event'] = array(
     '#type' => 'select',
     '#title' => t('Pager Event'),
     '#options' => $options,
-    '#default_value' => $view->options['thumbnailhover']['pager_event'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['pager_event'],
     '#description' => t('Which event should be used to select an image from the breakout list.'),
   );
-  $form['thumbnailhover']['controls'] = array(
+  $form['views_slideshow_thumbnailhover']['controls'] = array(
     '#type' => 'select',
     '#title' => t('Controls'),
     '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['thumbnailhover']['controls'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['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['thumbnailhover']['image_count'] = array(
+  $form['views_slideshow_thumbnailhover']['image_count'] = array(
     '#type' => 'select',
     '#title' => t('Image Counter'),
     '#options' => array(0 => t('None'),1 => t('Top'),2 => t('Bottom')),
-    '#default_value' => $view->options['thumbnailhover']['image_count'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['image_count'],
     '#description' => t('Determine if Image Counter (1 of 4) should be displayed and if so whether they should appear before or after the slideshow.'),
   );
   $options = array(
@@ -199,52 +192,52 @@ function views_slideshow_thumbnailhover_
     'wipe' => 'wipe',
     'zoom' => 'zoom',
   );
-  $form['thumbnailhover']['effect'] = array(
+  $form['views_slideshow_thumbnailhover']['effect'] = array(
     '#type' => 'select',
     '#title' => t('Effect'),
     '#options' => $options,
-    '#default_value' => $view->options['thumbnailhover']['effect'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['effect'],
     '#description' => t('The transition effect that will be used to change between images. Not all options below may be relevant depending on the effect.'),
   );
-  $form['thumbnailhover']['sync'] = array(
+  $form['views_slideshow_thumbnailhover']['sync'] = array(
     '#type' => 'radios',
     '#title' => t('Sync'),
     '#options' => array(1 => t('Yes'), 2 => t('No')),
-    '#default_value' => $view->options['thumbnailhover']['sync'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['sync'],
     '#description' => t('The sync option controls whether the slide transitions occur simultaneously. The default is yes which means that the current slide transitions out as the next slide transitions in. By setting the sync option to no you can get some interesting twists on your transitions.'),  
   );
-  $form['thumbnailhover']['advanced'] = array(
+  $form['views_slideshow_thumbnailhover']['advanced'] = array(
     '#type' => 'textarea',
     '#title' => t('Advanced Options'),
-    '#default_value' => $view->options['thumbnailhover']['advanced'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['advanced'],
     '#description' => t('Add other jQuery cycle options one per line.  Ex. height: 350  !url', array('!url' => l('Click here for the additional options to add.', 'http://malsup.com/jquery/cycle/options.html'))),
   );
-  $form['thumbnailhover']['ie'] = array(
+  $form['views_slideshow_thumbnailhover']['ie'] = array(
     '#type' => 'fieldset',
     '#title' => t('Internet Explorer Options'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  $form['thumbnailhover']['ie']['cleartype'] = array(
+  $form['views_slideshow_thumbnailhover']['ie']['cleartype'] = array(
     '#type' => 'radios',
     '#title' => t('ClearType'),
     '#options' => array('true' => t('True'), 'false' => t('False')),
-    '#default_value' => $view->options['thumbnailhover']['ie']['cleartype'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['ie']['cleartype'],
     '#description' => t('True if clearType corrections should be applied (for IE).  Some background issues could be fixed by setting this to false.'),
   );
-  $form['thumbnailhover']['ie']['cleartypenobg'] = array(
+  $form['views_slideshow_thumbnailhover']['ie']['cleartypenobg'] = array(
     '#type' => 'radios',
     '#title' => t('ClearType Background'),
     '#options' => array('true' => t('True'), 'false' => t('False')),
-    '#default_value' => $view->options['thumbnailhover']['ie']['cleartypenobg'],
+    '#default_value' => $view->options['views_slideshow_thumbnailhover']['ie']['cleartypenobg'],
     '#description' => t('Set to true to disable extra cleartype fixing (leave false to force background color setting on slides)'),
   );
 }
 function views_slideshow_thumbnailhover_views_slideshow_options_form_validate(&$form, &$form_state, &$view) {
-  if (!is_numeric($form_state['values']['style_options']['thumbnailhover']['speed'])) {
-    form_error($form['thumbnailhover']['speed'], t('!setting must be numeric!',array('!setting' => 'Speed')));
+  if (!is_numeric($form_state['values']['style_options']['views_slideshow_thumbnailhover']['speed'])) {
+    form_error($form['views_slideshow_thumbnailhover']['speed'], t('!setting must be numeric!',array('!setting' => 'Speed')));
   }
-  if (!is_numeric($form_state['values']['style_options']['thumbnailhover']['timeout'])) {
-    form_error($form['thumbnailhover']['timeout'],t('!setting must be numeric!',array('!setting' => 'Timeout')));
+  if (!is_numeric($form_state['values']['style_options']['views_slideshow_thumbnailhover']['timeout'])) {
+    form_error($form['views_slideshow_thumbnailhover']['timeout'],t('!setting must be numeric!',array('!setting' => 'Timeout')));
   }
 }
\ No newline at end of file