=== modified file 'uc_product/uc_product.admin.inc'
--- uc_product/uc_product.admin.inc	2009-02-10 21:51:13 +0000
+++ uc_product/uc_product.admin.inc	2009-02-18 04:57:37 +0000
@@ -41,19 +41,6 @@
  * Display a list of image widgets, and allow the user to select one.
  */
 function uc_product_image_widgets() {
-  $widgets = module_invoke_all('uc_image_widget');
-
-  foreach ($widgets as $key => $widget) {
-    $options[$key] = $widget['name'];
-  }
-  $options[NULL] = 'None';
-
-  $form['uc_product_image_widget'] = array(
-    '#type' => 'radios',
-    '#title' => t('Image widget to use when a customer clicks on a product image'),
-    '#options' => $options,
-    '#default_value' => variable_get('uc_product_image_widget', NULL),
-  );
 
   return system_settings_form($form);
 }
@@ -110,6 +97,25 @@
  * @see uc_product_settings_overview()
  */
 function uc_product_settings_form() {
+  $form = array();
+
+  // Loop through all the integrated image widgets and build an options array.
+  $options = array();
+
+  foreach (module_invoke_all('uc_image_widget') as $key => $widget) {
+    $options[$key] = check_plain($widget['name']);
+  }
+
+  $options[NULL] = 'None';
+
+  $form['uc_product_image_widget'] = array(
+    '#type' => 'radios',
+    '#title' => t('Product image widget'),
+    '#description' => t('The selected widget will be used to display a zoomed version of product images when they are clicked.'),
+    '#options' => $options,
+    '#default_value' => variable_get('uc_product_image_widget', NULL),
+  );
+
   $form['uc_product_add_to_cart_qty'] = array(
     '#type' => 'checkbox',
     '#title' => t('Display an optional quantity field in the <em>Add to Cart</em> form.'),

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-02-13 21:58:06 +0000
+++ uc_product/uc_product.module	2009-02-18 04:57:48 +0000
@@ -92,16 +92,6 @@
     'type' => MENU_LOCAL_TASK,
     'file' => 'uc_product.admin.inc',
   );
-  $items['admin/store/settings/products/edit/image-widgets'] = array(
-    'title' => 'Product images',
-    'description' => 'Choose and enable an existing image widget.',
-    'access arguments' => array('administer products'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('uc_product_image_widgets'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 1,
-    'file' => 'uc_product.admin.inc',
-  );
 
   // Insert subitems into the edit node page for product types.
   $items['node/%node/edit/product'] = array(

=== added file 'uc_product_kit/uc_product_kit.admin.inc'
--- uc_product_kit/uc_product_kit.admin.inc	1970-01-01 00:00:00 +0000
+++ uc_product_kit/uc_product_kit.admin.inc	2009-02-18 04:45:33 +0000
@@ -0,0 +1,28 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Defines administrative pages and form for the product kit module.
+ */
+
+
+// Defines the product kit settings form.
+function uc_product_kit_settings_form() {
+  $form = array();
+
+  $form['uc_product_kit_mutable'] = array(
+    '#type' => 'radios',
+    '#title' => t('Product kit cart display'),
+    '#options' => array(
+      UC_PRODUCT_KIT_UNMUTABLE_NO_LIST => t('As a unit. Customers may only change how many kits they are buying. Do not list component products.'),
+      UC_PRODUCT_KIT_UNMUTABLE_WITH_LIST => t('As a unit. Customers may only change how many kits they are buying. List component products.'),
+      UC_PRODUCT_KIT_MUTABLE => t('As individual products. Customers may add or remove kit components at will.'),
+    ),
+    '#default_value' => variable_get('uc_product_kit_mutable', 0),
+    '#weight' => -5,
+  );
+
+  return system_settings_form($form);
+}
+

=== modified file 'uc_product_kit/uc_product_kit.module'
--- uc_product_kit/uc_product_kit.module	2009-02-10 21:51:13 +0000
+++ uc_product_kit/uc_product_kit.module	2009-02-18 04:43:45 +0000
@@ -17,6 +17,33 @@
  ******************************************************************************/
 
 /**
+ * Implementation of hook_menu().
+ */
+function uc_product_kit_menu() {
+  $items = array();
+
+  $items['admin/store/settings/products/edit/product-kits'] = array(
+    'title' => 'Product kits',
+    'description' => 'Configure the product kit settings.',
+    'access arguments' => array('administer product kits'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_product_kit_settings_form'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 1,
+    'file' => 'uc_product_kit.admin.inc',
+  );
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function uc_product_kit_perm() {
+  return array('administer product kits');
+}
+
+/**
  * Implementation of hook_access().
  */
 function uc_product_kit_access($op, $node, $account) {
@@ -298,25 +325,6 @@
 }
 
 /**
- * Add product kit settings to the product settings form.
- */
-function uc_product_kit_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'uc_product_settings_form') {
-    $form['uc_product_kit_mutable'] = array(
-      '#type' => 'radios',
-      '#title' => t('How are product kits handled by the cart?'),
-      '#options' => array(
-        UC_PRODUCT_KIT_UNMUTABLE_NO_LIST => t('As a unit. Customers may only change how many kits they are buying. Do not list component products.'),
-        UC_PRODUCT_KIT_UNMUTABLE_WITH_LIST => t('As a unit. Customers may only change how many kits they are buying. List component products.'),
-        UC_PRODUCT_KIT_MUTABLE => t('As individual products. Customers may add or remove kit components at will.'),
-      ),
-      '#default_value' => variable_get('uc_product_kit_mutable', 0),
-      '#weight' => -5,
-    );
-  }
-}
-
-/**
  * Implementation of hook_form().
  *
  * @ingroup forms