Index: artistsC01-6.x-1.1/themes/artistsC01/theme-settings.php
===================================================================
--- artistsC01-6.x-1.1/themes/artistsC01/theme-settings.php	(revision 119)
+++ artistsC01-6.x-1.1/themes/artistsC01/theme-settings.php	(working copy)
@@ -8,6 +8,7 @@ function artistsC01_settings($saved_sett
     'artistsC01_customHeaderColor' => 0,
     'artistsC01_showBreadcrumbs' => 0,
     'artistsC01_includeIEPngFix' => 0,
+    'artistsC01_suckerfishMenuSource' => 'primary-links'
   );
 
   $saved_settings = array_merge($defaults, $saved_settings);
@@ -69,11 +70,20 @@ function artistsC01_settings($saved_sett
 
   $form['artistsC01_useSuckerfish'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Suckerfish menu'),
-    '#description' => t('Turn on or off suckerfish based menu. When turned on, it will generate menu using primary and secondary links.'),
+    '#title' => t('Use Suckerfish menu'),
+    '#description' => t('Turn on or off suckerfish based menu. When turned on, it will generate a drop down menu from the menu source selected below.'),
     '#default_value' => $saved_settings['artistsC01_useSuckerfish'],
   );
 
+  $all_menus = array_unique(array_merge(menu_list_system_menus(), menu_get_names()));
+  $form['artistsC01_suckerfishMenuSource'] = array(
+    '#type' => 'select',
+    '#title' => t('Suckerfish menu source'),
+    '#description' => t('The menu source from which the suckerfish menu will be generated.'),
+    '#options' => array_combine($all_menus, $all_menus),
+    '#default_value' => $saved_settings['artistsC01_suckerfishMenuSource']
+  );
+
   $form['artistsC01_showBreadcrumbs'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show breadcrumbs'),
Index: artistsC01-6.x-1.1/themes/artistsC01/artistsC01.theme
===================================================================
--- artistsC01-6.x-1.1/themes/artistsC01/artistsC01.theme	(revision 119)
+++ artistsC01-6.x-1.1/themes/artistsC01/artistsC01.theme	(working copy)
@@ -10,6 +10,7 @@ function artistsC01_settings() {
     'artistsC01_customHeaderColor' => 0,
     'artistsC01_showBreadcrumbs' => 0,
     'artistsC01_includeIEPngFix' => 0,
+    'artistsC01_suckerfishMenuSource' => 'primary-links'
   );
 
   $variables = array_merge($defaults, $variables);
@@ -71,11 +72,20 @@ function artistsC01_settings() {
 
   $form['artistsC01_useSuckerfish'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Suckerfish menu'),
-    '#description' => t('Turn on or off suckerfish based menu. When turned on, it will generate menu using primary and secondary links.'),
+    '#title' => t('Use Suckerfish menu'),
+    '#description' => t('Turn on or off suckerfish based menu. When turned on, it will generate a drop down menu from the menu source selected below.'),
     '#default_value' => $variables['artistsC01_useSuckerfish'],
   );
 
+  $all_menus = array_unique(array_merge(menu_list_system_menus(), menu_get_names()));
+  $form['artistsC01_suckerfishMenuSource'] = array(
+    '#type' => 'select',
+    '#title' => t('Suckerfish menu source'),
+    '#description' => t('The menu source from which the suckerfish menu will be generated.'),
+    '#options' => array_combine($all_menus, $all_menus),
+    '#default_value' => $variables['artistsC01_suckerfishMenuSource']
+  );
+
   $form['artistsC01_showBreadcrumbs'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show breadcrumbs'),
Index: artistsC01-6.x-1.1/themes/artistsC01/page.tpl.php
===================================================================
--- artistsC01-6.x-1.1/themes/artistsC01/page.tpl.php	(revision 119)
+++ artistsC01-6.x-1.1/themes/artistsC01/page.tpl.php	(working copy)
@@ -44,7 +44,7 @@
           </table>
         <?php endif; ?>
       </div>
-      <?php if (!isset($suckerfishPrimary) && isset($primary_links)) : ?>
+      <?php if (!isset($useSuckerfish) && isset($primary_links)) : ?>
         <div id="idPrimaryLinks">
           <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
         </div>
@@ -52,16 +52,15 @@
     </div>
     <div id="idSegmentLower">
       <div class="container">
-        <?php if (isset($suckerfishPrimary)) : ?>
+        <?php if (isset($suckerfishMenu)) : ?>
           <div id="idSuckerfish">
-            <?php print $suckerfishPrimary; ?>
+            <?php print $suckerfishMenu; ?>
           </div>
-        <?php else : if (isset($secondary_links)) : ?>
+        <?php elseif (!isset($useSuckerfish) && isset($secondary_links)) : ?>
           <div id="idSecondaryLinks">
             <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')) ?>
           </div>
         <?php endif; ?>
-        <?php endif; ?>
         <?php if ($breadcrumb): ?>
           <?php print $breadcrumb; ?>
           <?php if (!$banner_upper && !$highlight_left && !$highlight_right && !$banner_middle_1): ?>
Index: artistsC01-6.x-1.1/themes/artistsC01/template.php
===================================================================
--- artistsC01-6.x-1.1/themes/artistsC01/template.php	(revision 119)
+++ artistsC01-6.x-1.1/themes/artistsC01/template.php	(working copy)
@@ -40,7 +40,8 @@ function phptemplate_preprocess_page(&$v
     else { $arBodyClass[] = 'default'; }
 
     if (theme_get_setting('artistsC01_useSuckerfish')) {
-      $vars['suckerfishPrimary'] = artistsC01_suckerfish_menu_tree(menu_tree_all_data('primary-links'));
+      $vars['useSuckerfish'] = 1;
+      $vars['suckerfishMenu'] = artistsC01_suckerfish_menu_tree(menu_tree_all_data(theme_get_setting('artistsC01_suckerfishMenuSource')));
     }
 
     // get color scheme