Index: modules/panels.skinr.inc
=========================================================
--- modules/panels.skinr.inc	(revision 1.18)
+++ modules/panels.skinr.inc	Fri Dec 17 18:20:06 EST 2010
@@ -89,8 +89,8 @@
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - 'access skinr': access to edit Skinr's settings.
- *   - 'access skinr classes': access to edit Skinr's additional classes.
+ *   - edit skin settings
+ *   - edit advanced skin settings
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
Index: modules/views.skinr.inc
=========================================================
--- modules/views.skinr.inc	(revision 1.14)
+++ modules/views.skinr.inc	Fri Dec 17 18:20:29 EST 2010
@@ -88,8 +88,8 @@
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - 'access skinr': access to edit skinr's settings.
- *   - 'access skinr classes': access to edit skinr's additional classes.
+ *   - edit skin settings
+ *   - edit advanced skin settings
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
Index: skinr.handlers.inc
=========================================================
--- skinr.handlers.inc	(revision 1.8)
+++ skinr.handlers.inc	Fri Dec 17 18:32:55 EST 2010
@@ -22,10 +22,10 @@
  */
 function skinr_access_handler($op, &$form, $form_state) {
   switch ($op) {
-    case 'access skinr':
-      return user_access('access skinr') || user_access('administer skinr');
-    case 'access skinr classes':
-      return user_access('access skinr classes') || user_access('administer skinr');
+    case 'edit skin settings':
+      return user_access('edit skin settings') || user_access('administer skinr');
+    case 'edit advanced skin settings':
+      return user_access('edit advanced skin settings') || user_access('administer skinr');
   }
 }
 
Index: skinr.module
=========================================================
--- skinr.module	(revision 1.36)
+++ skinr.module	Fri Dec 17 18:24:45 EST 2010
@@ -994,8 +994,8 @@
  *   - 'preprocess_hook_callback':
  *   - 'submit_handler':
  * @param $op
- *   For 'access_handler' the possible values are 'access skinr'
- *     and 'access skinr classes'.
+ *   For 'access_handler' the possible values are 'edit skin settings'
+ *     and 'edit advanced skin settings'.
  *   For 'contextual_links' an empty string is passed.
  *   For 'data_handler' the possible values are 'form' and 'submit'.
  *   For 'form_index_handler' the possible values are 'form' and 'submit'.
Index: skinr_ui.module
=========================================================
--- skinr_ui.module	(revision 1.23)
+++ skinr_ui.module	Fri Dec 17 18:32:25 EST 2010
@@ -13,15 +13,13 @@
   return array(
     'administer skinr' => array(
       'title' => t('Administer Skinr'),
-      'description' => t('Administer Skinr\'s settings.'),
     ),
-    'access skinr' => array(
-      'title' => t('Access Skinr\'s settings'),
-      'description' => t('Set Skinr options for individual themes.'),
+    'edit skin settings' => array(
+      'title' => t('Edit skin settings.'),
     ),
-    'access skinr classes' => array(
-      'title' => t('Access Skinr\'s advanced settings'),
-      'description' => t('Set advanced Skinr options, such as custom CSS classes.'),
+    'edit advanced skin settings' => array(
+      'title' => t('Edit advanced skin settings'),
+      'description' => t('Edit advanced skin settings, such as custom CSS classes.'),
     ),
   );
 }
@@ -158,7 +156,7 @@
     'page arguments' => array(4, 5, 6), // js|nojs, module, sid
     'type' => MENU_CALLBACK,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
-    'access arguments' => array('access skinr'),
+    'access arguments' => array('edit skin settings'),
   );
   $items['admin/appearance/skinr/edit/%skinr_js/%/%/configure'] = array(
     'title' => 'Edit skin',
@@ -377,7 +375,7 @@
       $form_settings = array_merge(skinr_config_info_default(), $module_settings['form'][$form_id]);
 
       // Check for access.
-      if (!skinr_handler('access_handler', 'access skinr', $form_settings['access_handler'], $form, $form_state)) {
+      if (!skinr_handler('access_handler', 'edit skin settings', $form_settings['access_handler'], $form, $form_state)) {
         // Deny access.
         break;
       }
@@ -530,7 +528,7 @@
         }
 
         // Check for access.
-        if (skinr_handler('access_handler', 'access skinr classes', $form_settings['access_handler'], $form, $form_state)) {
+        if (skinr_handler('access_handler', 'edit advanced skin settings', $form_settings['access_handler'], $form, $form_state)) {
           $form['skinr_settings'][$module . '_group'][$theme->name]['_additional'] = array(
             '#type' => 'textfield',
             '#title' => t('CSS classes'),