diff --git modules/block.skinr.inc modules/block.skinr.inc
index 56691ca..2bf9263 100644
--- modules/block.skinr.inc
+++ modules/block.skinr.inc
@@ -12,7 +12,7 @@
  */
 
 /**
- * Implementation of hook_skinr_config().
+ * Implements hook_skinr_config().
  */
 function block_skinr_config() {
   $data['block']['form']['block_admin_configure'] = array(
@@ -49,14 +49,15 @@ function block_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
+ *
  * @return
  *   The index where we can find our values in Skinrs data structure.
  */
@@ -71,14 +72,15 @@ function block_skinr_form_index_handler($op, &$form, $form_state) {
 }
 
 /**
- * Skinr preprocess_hook_callback.
+ * Skinr preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function block_skinr_preprocess_hook_callback(&$form, $form_state) {
   $preprocess_hooks = array();
@@ -107,8 +109,9 @@ function block_skinr_preprocess_hook_callback(&$form, $form_state) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from module_preprocess().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure. If an
+ *   The index where we can find our values in Skinr's data structure. If an
  *   array is returned, it will loop through each index in Skinr's data
  *   structure and merge the returned classes.
  */
@@ -121,6 +124,7 @@ function block_skinr_preprocess_index_handler(&$variables) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from skinr_preprocess().
+ *
  * @return
  *   An array. Each value is an array that forms the function arguments for
  *   menu_contextual_links(). For example:
diff --git modules/comment.skinr.inc modules/comment.skinr.inc
index 7151326..2ac4db3 100644
--- modules/comment.skinr.inc
+++ modules/comment.skinr.inc
@@ -12,7 +12,7 @@
  */
 
 /**
- * Implementation of hook_skinr_config().
+ * Implements hook_skinr_config().
  */
 function comment_skinr_config() {
   $data['comment']['form']['node_type_form'] = array(
@@ -42,16 +42,17 @@ function comment_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure.
+ *   The index where we can find our values in Skinr's data structure.
  */
 function comment_skinr_form_index_handler($op, &$form, &$form_state) {
   switch ($op) {
@@ -76,14 +77,15 @@ function comment_skinr_form_index_handler($op, &$form, &$form_state) {
 }
 
 /**
- * Skinr preprocess_hook_callback.
+ * Skinr preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function comment_skinr_preprocess_hook_callback(&$form, $form_state) {
   $preprocess_hooks = array();
@@ -104,8 +106,9 @@ function comment_skinr_preprocess_hook_callback(&$form, $form_state) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from skinr_preprocess().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure. If an
+ *   The index where we can find our values in Skinr's data structure. If an
  *   array is returned, it will loop through each index in Skinr's data
  *   structure and merge the returned classes.
  */
@@ -118,6 +121,7 @@ function comment_skinr_preprocess_index_handler(&$variables) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from skinr_preprocess().
+ *
  * @return
  *   An array. Each value is an array that forms the function arguments for
  *   menu_contextual_links(). For example:
diff --git modules/node.skinr.inc modules/node.skinr.inc
index f6a768e..0862e08 100644
--- modules/node.skinr.inc
+++ modules/node.skinr.inc
@@ -12,7 +12,7 @@
  */
 
 /**
- * Implementation of hook_skinr_config().
+ * Implements hook_skinr_config().
  */
 function node_skinr_config() {
   $data['node']['form']['node_type_form'] = array(
@@ -40,16 +40,17 @@ function node_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure.
+ *   The index where we can find our values in Skinr's data structure.
  */
 function node_skinr_form_index_handler($op, &$form, $form_state) {
   switch ($op) {
@@ -74,14 +75,15 @@ function node_skinr_form_index_handler($op, &$form, $form_state) {
 }
 
 /**
- * Skinr preprocess_hook_callback.
+ * Skinr preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function node_skinr_preprocess_hook_callback(&$form, $form_state) {
   $preprocess_hooks = array();
@@ -102,8 +104,9 @@ function node_skinr_preprocess_hook_callback(&$form, $form_state) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from module_preprocess().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure. If an
+ *   The index where we can find our values in Skinr's data structure. If an
  *   array is returned, it will loop through each index in Skinr's data
  *   structure and merge the returned classes.
  */
diff --git modules/panels.skinr.inc modules/panels.skinr.inc
index e5aa3c1..99a6969 100644
--- modules/panels.skinr.inc
+++ modules/panels.skinr.inc
@@ -12,7 +12,7 @@
  */
 
 /**
- * Implementation of hook_skinr_config().
+ * Implements hook_skinr_config().
  */
 function panels_skinr_config() {
   $data['panels']['form']['panels_edit_style_settings_form'] = array(
@@ -57,16 +57,17 @@ function panels_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure.
+ *   The index where we can find our values in Skinr's data structure.
  */
 function panels_skinr_form_index_handler($op, &$form, $form_state) {
   switch ($op) {
@@ -88,14 +89,15 @@ function panels_skinr_form_index_handler($op, &$form, $form_state) {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "access skinr": access to edit skinr's selector
- *   - "access skinr classes": access to edit skinr's additional classes
+ *   - 'access skinr': access to edit Skinr's settings.
+ *   - 'access skinr classes': access to edit Skinr's additional classes.
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   TRUE if we get access, FALSE otherwise.
  */
 function panels_skinr_access_handler_display($op, &$form, $form_state) {
   // We don't want the skinr settings form to appear on this form. We only want
@@ -171,8 +173,9 @@ function panels_skinr_access_handler_display($op, &$form, $form_state) {
  * @param $form_settings
  *   The settings from hook_skinr_config() for the form that's currently being
  *   processed.
+ *
  * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   A skinr settings object.
  */
 function panels_skinr_data_handler(&$form, $form_state, $theme, $module, $form_settings) {
   // Ensure we have the required index_handler.
@@ -200,16 +203,15 @@ function panels_skinr_data_handler(&$form, $form_state, $theme, $module, $form_s
 /**
  * Skinr submit handler.
  *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - "access skinr": access to edit skinr's selector
- *   - "access skinr classes": access to edit skinr's additional classes
  * @param &$form
- *   Passes in the $form parameter from hook_form_alter().
+ *   Passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   Passes in the $form_state parameter from hook_form_alter().
- * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   Passes in the $form_state parameter from hook_form_submit().
+ * @param $module
+ *   The module that is currently being processed.
+ * @param $form_settings
+ *   The settings from hook_skinr_config() for the form that's currently being
+ *   processed.
  */
 function panels_skinr_submit_handler_settings(&$form, $form_state, $module, $form_settings) {
   foreach ($form_state['values']['skinr_settings'][$module . '_group'] as $theme_name => $theme) {
@@ -261,7 +263,7 @@ function panels_skinr_submit_handler_settings(&$form, $form_state, $module, $for
 }
 
 /**
- * @todo remove values from skinr if a display is deleted
+ * @todo Remove values from skinr if a display is deleted.
  */
 function panels_skinr_submit_handler_display(&$form, $form_state, $module, $form_settings) {
   $form_id = $form_state['values']['form_id'];
@@ -324,14 +326,15 @@ function _panels_skinr_save_and_clear_cache($did) {
 }
 
 /**
- * Skinr preprocess_hook_callback.
+ * Skinr preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function panels_skinr_preprocess_hook_callback(&$form, $form_state) {
   switch ($form_state['type']) {
@@ -345,14 +348,15 @@ function panels_skinr_preprocess_hook_callback(&$form, $form_state) {
 }
 
 /**
- * Skinr preprocess_hook_callback.
+ * Skinr preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function panels_skinr_ajax_preprocess_hook_callback(&$form, $form_state) {
   if (strpos($form['skinr']['sid']['#value'], '-region-') !== FALSE) {
@@ -371,8 +375,9 @@ function panels_skinr_ajax_preprocess_hook_callback(&$form, $form_state) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from module_preprocess().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure. If an
+ *   The index where we can find our values in Skinr's data structure. If an
  *   array is returned, it will loop through each index in Skinr's data
  *   structure and merge the returned classes.
  */
@@ -388,7 +393,7 @@ function panels_skinr_preprocess_index_handler(&$variables) {
 // Panels hooks.
 
 /**
- * Implementation of hook_ctools_plugin_directory() to let the system know
+ * Implements hook_ctools_plugin_directory() to let the system know
  * we implement panels plugins.
  */
 function skinr_ctools_plugin_directory($module, $plugin) {
diff --git modules/skinr.skinr.inc modules/skinr.skinr.inc
index 106caeb..0150856 100644
--- modules/skinr.skinr.inc
+++ modules/skinr.skinr.inc
@@ -48,14 +48,14 @@ function skinr_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
  * @return
  *   The index where we can find our values in Skinr's data structure.
  */
@@ -86,7 +86,7 @@ function rules_skinr_form_index_handler($op, &$form, $form_state) {
  */
 function rules_skinr_preprocess_hook_callback(&$form, $form_state) {
   $preprocess_hooks = array();
-  
+
   if (!empty($form['rule'])) {
     $hooks = explode('__', $form['rule']['rule_type']['#value']);
   }
@@ -98,7 +98,7 @@ function rules_skinr_preprocess_hook_callback(&$form, $form_state) {
     $preprocess_hooks[] = implode('__', $hooks);
     array_pop($hooks);
   }
-  
+
   return $preprocess_hooks;
 }
 
diff --git modules/views.skinr.inc modules/views.skinr.inc
index 4936d65..a8dc4b4 100644
--- modules/views.skinr.inc
+++ modules/views.skinr.inc
@@ -13,7 +13,7 @@
  */
 
 /**
- * Implementation of hook_skinr_config().
+ * Implements hook_skinr_config().
  */
 function views_skinr_config() {
   $data['views']['form']['views_ui_edit_display_form'] = array(
@@ -48,16 +48,17 @@ function views_skinr_config() {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - 'form': the form elements for Skinr are being inserted in a form
+ *   - 'submit': the form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
+ *
  * @return
- *   The index where we can find our values in Skinrs data structure.
+ *   The index where we can find our values in Skinr's data structure.
  */
 function views_skinr_form_index_handler($op, &$form, $form_state) {
   switch ($op) {
@@ -87,14 +88,15 @@ function views_skinr_form_index_handler($op, &$form, $form_state) {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "access skinr": access to edit skinr's selector
- *   - "access skinr classes": access to edit skinr's additional classes
+ *   - 'access skinr': access to edit skinr's settings.
+ *   - 'access skinr classes': access to edit skinr's additional classes.
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   TRUE if we get access, FALSE otherwise.
  */
 function views_skinr_access_handler_display($op, &$form, $form_state) {
   if ($access = skinr_access_handler($op, $form, $form_state)) {
@@ -147,8 +149,9 @@ function views_skinr_access_handler_view($op, &$form, $form_state) {
  * @param $form_settings
  *   The settings from hook_skinr_config() for the form that's currently being
  *   processed.
+ *
  * @return
- *   A skinr object.
+ *   A skinr settings object.
  */
 function views_skinr_data_handler(&$form, $form_state, $theme, $module, $form_settings) {
   // Ensure we have the required index_handler
@@ -182,16 +185,15 @@ function views_skinr_data_handler(&$form, $form_state, $theme, $module, $form_se
 /**
  * Skinr submit handler.
  *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - "access skinr": access to edit skinr's selector
- *   - "access skinr classes": access to edit skinr's additional classes
  * @param &$form
- *   Passes in the $form parameter from hook_form_alter().
+ *   Passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   Passes in the $form_state parameter from hook_form_alter().
- * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   Passes in the $form_state parameter from hook_form_submit().
+ * @param $module
+ *   The module that is currently being processed.
+ * @param $form_settings
+ *   The settings from hook_skinr_config() for the form that's currently being
+ *   processed.
  */
 function views_skinr_submit_handler_display(&$form, $form_state, $module, $form_settings) {
   foreach ($form_state['values']['skinr_settings'][$module .'_group'] as $theme_name => $theme) {
@@ -268,14 +270,15 @@ function views_skinr_submit_handler_view(&$form, $form_state, $module, $form_set
 }
 
 /**
- * Skinr form preprocess_hook callback.
+ * Skinr form preprocess hook callback.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   The preprocess_hook we wish to use.
+ *   An array of preprocess hooks we wish to use.
  */
 function views_skinr_preprocess_hook_callback(&$form, $form_state) {
   $preprocess_hooks = array('views_view');
@@ -323,6 +326,7 @@ function _views_skinr_sidinfo($sid) {
  *
  * @param &$variables
  *   Passes in the $variables parameter from module_preprocess().
+ *
  * @return
  *   The index where we can find our values in Skinrs data structure. If an
  *   array is returned, it will loop through each index in Skinr's data
diff --git skinr.handlers.inc skinr.handlers.inc
index e58f91e..cde7ce2 100644
--- skinr.handlers.inc
+++ skinr.handlers.inc
@@ -2,7 +2,7 @@
 // $Id$
 /**
  * @file
- * Defines the various handler objects to support Skinr.
+ * Defines the various default handler functions to support Skinr.
  */
 
 /*
@@ -10,14 +10,15 @@
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "access skinr": access to edit skinr's selector
- *   - "access skinr classes": access to edit skinr's additional classes
+ *   - access skinr: Access to edit Skinr's settings.
+ *   - access skinr classes: Access to edit Skinr's additional classes.
  * @param &$form
  *   Passes in the $form parameter from hook_form_alter().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_alter().
+ *
  * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   TRUE if we get access, FALSE otherwise.
  */
 function skinr_access_handler($op, &$form, $form_state) {
   switch ($op) {
@@ -33,14 +34,16 @@ function skinr_access_handler($op, &$form, $form_state) {
  *
  * @param $op
  *   What kind of action is being performed. Possible values:
- *   - "form": the form elements for Skinr are being inserted in a form
- *   - "submit": the form has been submitted.
+ *   - form: The form elements for Skinr are being inserted in a form
+ *   - submit: The form has been submitted.
  * @param &$form
- *   - For "form", passes in the $form parameter from hook_form_alter().
- *   - For "submit", passes in the $form parameter from hook_form_submit().
+ *   - For 'form', passes in the $form parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form parameter from hook_form_submit().
  * @param $form_state
- *   - For "form", passes in the $form_state parameter from hook_form_alter().
- *   - For "submit", passes in the $form_state parameter from hook_form_submit().
+ *   - For 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For 'submit', passes in the $form_state parameter from
+ *     hook_form_submit().
+ *
  * @return
  *   The index where we can find our values in Skinrs data structure.
  */
@@ -62,20 +65,23 @@ function skinr_index_handler($op, &$form, $form_state) {
   }
 }
 
-/*
+/**
  * Skinr data handler.
  *
  * @param &$form
  *   Passes in the $form parameter from hook_form_submit().
  * @param $form_state
  *   Passes in the $form_state parameter from hook_form_submit().
+ * @param $theme
+ *   The theme that is currently being processed.
  * @param $module
  *   The module that is currently being processed.
  * @param $form_settings
  *   The settings from hook_skinr_config() for the form that's currently being
  *   processed.
+ *
  * @return
- *   TRUE if we get access, FALSE if we don't.
+ *   A skinr settings object.
  */
 function skinr_data_handler(&$form, $form_state, $theme, $module, $form_settings) {
   // Ensure we have the required index_handler
@@ -99,8 +105,6 @@ function skinr_data_handler(&$form, $form_state, $theme, $module, $form_settings
  * @param $form_settings
  *   The settings from hook_skinr_config() for the form that's currently being
  *   processed.
- * @return
- *   TRUE if we get access, FALSE if we don't.
  */
 function skinr_submit_handler(&$form, $form_state, $module, $form_settings) {
   if (isset($form_state['values']['skinr_settings'][$module . '_group'])) {
@@ -139,7 +143,7 @@ function skinr_submit_handler(&$form, $form_state, $module, $form_settings) {
 // Declare API compatibility on behalf of core modules:
 
 /**
- * Implementation of hook_skinr_api().
+ * Implements hook_skinr_api().
  *
  * This one is used as the base to reduce errors when updating.
  */
diff --git skinr.install skinr.install
index 97443c0..6508c65 100644
--- skinr.install
+++ skinr.install
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implementation of hook_schema.
+ * Implements hook_schema().
  */
 function skinr_schema() {
   $schema['skinr'] = array(
@@ -181,7 +181,7 @@ function skinr_schema() {
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function skinr_uninstall() {
   // Remove all skinr variables.
diff --git skinr.module skinr.module
index 250a34a..a1450c6 100644
--- skinr.module
+++ skinr.module
@@ -2,7 +2,12 @@
 // $Id$
 
 /**
- * Implementation of hook_help().
+ * @file
+ * Handles core Skinr functionality.
+ */
+
+/**
+ * Implements hook_help().
  */
 function skinr_help($path, $arg) {
   switch ($path) {
@@ -30,7 +35,7 @@ function skinr_module_implements_alter(&$implementations, $hook) {
 }
 
 /**
- * Implementation of hook_init().
+ * Implements hook_init().
  */
 function skinr_init() {
   module_load_include('inc', 'skinr', 'skinr.handlers');
@@ -38,7 +43,7 @@ function skinr_init() {
 }
 
 /**
- * Implementation of hook_preprocess().
+ * Implements hook_preprocess().
  */
 function skinr_preprocess(&$variables, $hook) {
   // Fix for update script.
@@ -73,7 +78,7 @@ function skinr_preprocess(&$variables, $hook) {
         }
         $variables['classes_array'] = array_merge($variables['classes_array'], $extracted['classes']);
 
-        // Need to add a hook for skinr_ui to plug into.
+        // Add a hook for skinr_ui to plug into: hook_skinr_preprocess_alter().
         $data = array(
           'hook' => $hook,
           'variables' => &$variables,
@@ -85,6 +90,23 @@ function skinr_preprocess(&$variables, $hook) {
   }
 }
 
+/**
+ * Helper function to extract classes, JS and CSS files, and templates.
+ *
+ * @param $module
+ *   The module these settings applies to.
+ * @param $sids
+ *   The settings ID, or an array of settings IDs.
+ * @param $settings
+ *   Skinr configuration data for the desired module.
+ * @param $theme
+ *   The theme these settings apply to. If no theme name is provided, the
+ *   current theme will be used.
+ *
+ * @return
+ *   An array containing the module, sids, classes, CSS, JS, template to be
+ *   applied.
+ */
 function skinr_skin_extract($module, $sids, $settings, $theme = NULL) {
   if (empty($sids)) {
     return FALSE;
@@ -124,7 +146,7 @@ function skinr_skin_extract($module, $sids, $settings, $theme = NULL) {
 }
 
 /**
- * Helper function to fetch all css or js files from an array of skins.
+ * Helper function to fetch all CSS or JS files from an array of skins.
  *
  * @param $skins
  *   A an array of available skins.
@@ -242,9 +264,17 @@ function skinr_skin_get_files($skins, $type, $theme = NULL) {
 }
 
 /**
- * Helper fuction to add CSS and JS files.
+ * Helper function to add CSS and JS files to a page.
  *
- * The function checks an array of paths for the existence of the file to account for base themes.
+ * This function uses drupal_add_css() and drupal_add_js() to add the files.
+ *
+ * @param $filename
+ *   The name of the file to add.
+ * @param $type
+ *   The type of file. Options include: 'css' and 'js'.
+ * @param $media
+ *   (optional) The media type for the stylesheet, e.g., 'all', 'print',
+ *   'screen'. Only required if $type is set to 'css'.
  */
 function _skinr_add_file($filename, $type, $media = NULL) {
   if ($type == 'css') {
@@ -257,6 +287,12 @@ function _skinr_add_file($filename, $type, $media = NULL) {
 
 /**
  * Helper function to flatten an array of classes settings.
+ *
+ * @param $skins
+ *   The array of skins to flatten.
+ *
+ * @return
+ *   An array of classes.
  */
 function skinr_flatten_skins_array($skins) {
   $return = array();
@@ -277,10 +313,16 @@ function skinr_flatten_skins_array($skins) {
 }
 
 // ------------------------------------------------------------------
-// Page rule functions.
+// Rule functions.
 
 /**
- * Save a skinr page rule object.
+ * Save a skinr rule object.
+ *
+ * @param $rule
+ *   A rule object.
+ *
+ * @return
+ *   The rule ID.
  */
 function skinr_rule_save($rule) {
   drupal_write_record('skinr_rules', $rule, !empty($rule->rid) ? array('rid') : array());
@@ -288,7 +330,14 @@ function skinr_rule_save($rule) {
 }
 
 /**
- * Load a skinr page rule object.
+ * Load a skinr rule object.
+ *
+ * @param $rid
+ *   (optional) The rule ID.
+ *
+ * @return
+ *   A rule object. If no $rid is specified an array of all rules will be
+ *   returned.
  */
 function skinr_rule_load($rid = NULL) {
   $rids = (isset($rid) ? array($rid) : array());
@@ -297,7 +346,16 @@ function skinr_rule_load($rid = NULL) {
 }
 
 /**
- * Loads multiple skinr page rule objects.
+ * Loads multiple skinr rule objects.
+ *
+ * @param $rids
+ *   An array of rule IDs. Optional.
+ * @param $conditions
+ *   An array of conditions on the {skinr_rules} table in the form 'field' => $value.
+ *
+ * @return
+ *   An array of rule objects indexed by rid. If $rids is not provided, all
+ *   rules are returned.
  */
 function skinr_rule_load_multiple($rids = array(), $conditions = array()) {
   $rules = array();
@@ -316,7 +374,10 @@ function skinr_rule_load_multiple($rids = array(), $conditions = array()) {
 }
 
 /**
- * Delete a skinr page rule object.
+ * Delete a skinr rule object.
+ *
+ * @param $rid
+ *   The rule ID.
  */
 function skinr_rule_delete($rid) {
   if ($rule = skinr_rule_load($rid)) {
@@ -330,6 +391,11 @@ function skinr_rule_delete($rid) {
   }
 }
 
+/**
+ * Determine whether a rule is applies to the current page or not.
+ *
+ * @todo Rename this function to skinr_rule_is_visible().
+ */
 function skinr_rule_visible($rid) {
   global $user;
 
@@ -370,7 +436,12 @@ function skinr_rule_visible($rid) {
 // Include file helpers.
 
 /**
- * Load skinr files on behalf of modules.
+ * Include files as necessary.
+ *
+ * @param $file
+ *   The file to include. The filename needs to be prefixed with the
+ *   implementing module's name (e.g. MODULE.$file), but do not include the
+ *   module name prefix in your function call.
  */
 function skinr_module_include($file) {
   foreach (skinr_get_module_apis() as $module => $info) {
@@ -408,10 +479,10 @@ function skinr_get_module_apis() {
 // Skinr data handling functions.
 
 /**
- * Validate a skinr object.
+ * Validate a skinr settings object.
  *
  * @param $skinr
- *   A skinr object.
+ *   The skinr settings object to validate.
  *
  * @return
  *   TRUE on success, FALSE on failure.
@@ -434,7 +505,7 @@ function skinr_validate(&$skinr) {
 }
 
 /**
- * Save a skinr object.
+ * Save a skinr settings object.
  *
  * @param $skinr
  *   A skinr object.
@@ -472,12 +543,21 @@ function skinr_set($skinr) {
 }
 
 /**
- * Retrieves the desired skinr object.
+ * Retrieves the desired skinr settings object.
+ *
+ * @param $theme
+ *   The theme these settings apply to. If no theme name is provided, the
+ *   current theme will be used.
+ * @param $module
+ *   The module these settings apply to.
+ * @param $sid
+ *   The element ID these settings apply to.
  *
  * @return
- *   A skinr object if both $module and $sid are specified. An array of skinr
- *   objects if only $module is specified. An array of all skinr objects for a
- *   theme if neither $module nor $sid is specified. FALSE on failure.
+ *   A skinr settings object if both $module and $sid are specified. An array
+ *   of skinr settings objects if only $module is specified. An array of all
+ *   skinr settings objects for a theme if neither $module nor $sid is
+ *   specified. FALSE on failure.
  */
 function skinr_get($theme = NULL, $module = NULL, $sid = NULL) {
   $cache = &drupal_static(__FUNCTION__, array());
@@ -543,6 +623,12 @@ function skinr_get($theme = NULL, $module = NULL, $sid = NULL) {
 
 /**
  * Helper function to remove empty skins from an array.
+ *
+ * @param $array
+ *   A single- or multi-dimensional array to strip of empty values.
+ *
+ * @return
+ *   An array stripped of empty values.
  */
 function _skinr_array_strip_empty($array) {
   $new_array = array();
@@ -559,12 +645,16 @@ function _skinr_array_strip_empty($array) {
 
 /**
  * Helper function to retrieve the current theme.
+ *
  * The global variable $theme_key doesn't work for our purposes when an admin
  * theme is enabled.
  *
  * @param $exculde_admin_theme
  *   Optional. Set to TRUE to exclude the admin theme from posible themes to
  *   return.
+ *
+ * @return
+ *   The current theme name.
  */
 function skinr_current_theme($exclude_admin_theme = FALSE) {
   global $user, $custom_theme;
@@ -583,7 +673,7 @@ function skinr_current_theme($exclude_admin_theme = FALSE) {
 }
 
 /**
- * Prepare defaults for skins.
+ * Prepare defaults for skinsets.
  *
  * @return
  *   An array of default skinset settings.
@@ -598,10 +688,10 @@ function skinr_skins_default() {
 }
 
 /**
- * Prepare defaults for skinr options.
+ * Prepare defaults for groups.
  *
  * @return
- *   An array of default skinset options settings.
+ *   An array of default group settings.
  */
 function skinr_group_default() {
   return array(
@@ -617,7 +707,7 @@ function skinr_group_default() {
  * Prepare defaults for skins.
  *
  * @return
- *   An array of default skins settings.
+ *   An array of default skin settings.
  */
 function skinr_skin_default() {
   return array(
@@ -636,8 +726,11 @@ function skinr_skin_default() {
 /**
  * Helper function to process a skin or theme .info file.
  *
+ * @param $info
+ *   An array of data as gotten from a skin or theme .info file.
+ *
  * @return
- *    A skinset.
+ *    A processed set of skins.
  */
 function _skinr_skinset($info) {
   $skinset = array(
@@ -745,7 +838,7 @@ function _skinr_add_path_to_files($files, $path, $type) {
  * Helper function to process an array of skins.
  *
  * @return
- *    An array of skinsets.
+ *    An array of skins.
  */
 function skinr_skinsets() {
   $skinsets = &drupal_static(__FUNCTION__, array());
@@ -791,10 +884,10 @@ function skinr_skinsets() {
 }
 
 /**
- * Return an array of statuses of each skin in a skinset for each theme.
+ * Return an array of statuses for each skin in a skinset for each theme.
  *
  * @param $skinset_name
- *   The name of the skinset of which to load the statuses.
+ *   The name of the skinset for which to load the statuses.
  *
  * @return
  *   Array of statuses for individual skins in a skinset.
@@ -815,7 +908,7 @@ function skinr_skinset_statuses($skinset_name) {
 }
 
 /**
- * Themes are allowed to set Skinr skins in their .info files.
+ * Processes and compiles a list of all skins.
  *
  * @return
  *    An array of skinsets keyed by themename.
@@ -871,7 +964,10 @@ function skinr_skin_data() {
 }
 
 /**
- * Fetch Skinr configuration data from modules.
+ * Fetch Skinr configuration data from Skinr functionality plugins.
+ *
+ * @return
+ *   An array of all configuration data.
  */
 function skinr_fetch_config() {
   $cache = &drupal_static(__FUNCTION__);
@@ -888,7 +984,15 @@ function skinr_fetch_config() {
 }
 
 /**
- * Fetch default configuration data for modules.
+ * Fetch default configuration data for Skinr functionality plugins.
+ *
+ * @param @setting
+ *   The value 'form'. There are no other valide options.
+ *
+ * @return
+ *   Returns an array of default values.
+ *
+ * @todo Remove the $setting parameter. There is only ever one option used: 'form'.
  */
 function _skinr_fetch_config_defaults($setting) {
   switch ($setting) {
@@ -912,6 +1016,63 @@ function _skinr_fetch_config_defaults($setting) {
 
 /**
  * Execute a module's data handler.
+ *
+ * @param $type
+ *   The type of handler to execute. Possible values:
+ *   - 'access_handler':
+ *   - 'contextual_links':
+ *   - 'data_handler':
+ *   - 'form_index_handler':
+ *   - 'preprocess_index_handler':
+ *   - 'preprocess_hook_callback':
+ *   - 'submit_handler':
+ * @param $op
+ *   For 'access_handler' the possible values are 'access skinr'
+ *     and 'access skinr classes'.
+ *   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'.
+ *   For 'preprocess_index_handler' the possible values are 'preprocess'.
+ *   For 'preprocess_hook_callback' an empty string is passed.
+ *   For 'submit_handler' an empty string is passed.
+ * @param $handler
+ *   The function name for this handler as gotten from skinr_fetch_config().
+ * @param $a3
+ *   For 'access_handler', passes in the $form parameter as provided to a
+ *     form function.
+ *   For 'contextual_links', passes in the $variables parameter
+ *     from skinr_preprocess().
+ *   For 'data_handler', passes in the $form parameter from hook_form_submit().
+ *   For 'form_index_handler':
+ *   - For $op 'form', passes in the $form parameter from hook_form_alter().
+ *   - For $op 'submit', passes in the $form parameter from hook_form_submit().
+ *   For 'preprocess_index_handler', passes in the $variables parameter
+ *     from module_preprocess().
+ *   For 'preprocess_hook_callback', passes in the $form parameter
+ *     from hook_form_alter().
+ *   For 'submit_handler', passes in the $form parameter
+ *     from hook_form_alter().
+ * @param $a4
+ *   For 'access_handler', passes in the $form_state array as provided to a
+ *     form function.
+ *   For 'data_handler', passes in the $form_state parameter
+ *     from hook_form_submit().
+ *   For 'form_index_handler':
+ *   - For $op 'form', passes in the $form_state parameter from hook_form_alter().
+ *   - For $op 'submit', passes in the $form_state parameter from hook_form_submit().
+ *   For 'preprocess_hook_callback', passes in the $form_state parameter
+ *     from hook_form_alter().
+ *   For 'submit_handler', passes in the $form_state parameter
+ *     from hook_form_alter().
+ * @param $a5
+ *   For 'data_handler', passes in the module that is currently being processed.
+ *   For 'submit_handler', passes in the module that is currently being processed.
+ * @param $a6
+ *   For 'data_handler', passes in the settings from hook_skinr_config() for
+ *     the form that's currently being processed.
+ *   For 'submit_handler', passes in the settings from hook_skinr_config() for
+ *     the form that's currently being processed.
+ * @param $a7
  */
 function skinr_handler($type, $op, $handler, &$a3, $a4 = NULL, $a5 = NULL, $a6 = NULL, $a7 = NULL) {
   if (is_callable($handler)) {
diff --git skinr_ui.admin.inc skinr_ui.admin.inc
index badc799..54f069b 100644
--- skinr_ui.admin.inc
+++ skinr_ui.admin.inc
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Admin page callbacks for the skinr module.
+ * Admin page callbacks for the Skinr module.
  */
 
 /**
@@ -21,6 +21,9 @@ function skinr_ui_skinr_operations() {
 
 /**
  * List skinr administration filters that can be applied.
+ *
+ * @return
+ *   An array of filters.
  */
 function skinr_ui_filters() {
   // Theme filter.
@@ -57,7 +60,11 @@ function skinr_ui_filters() {
 }
 
 /**
- * Return form for skinr administration filters.
+ * Form builder for the Skinr administration filters form.
+ *
+ * @ingroup forms
+ *
+ * @todo This function is missing the $form and $form_state parameters.
  */
 function skinr_ui_filter_form() {
   $session = &$_SESSION['skinr_ui_overview_filter'];
@@ -129,7 +136,7 @@ function skinr_ui_filter_form() {
 }
 
 /**
- * Process result from node administration filter form.
+ * Form submission handler for skinr_ui_filter_form().
  */
 function skinr_ui_filter_form_submit($form, &$form_state) {
   $filters = skinr_ui_filters();
@@ -158,7 +165,9 @@ function skinr_ui_filter_form_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; displays the skinr listing page.
+ * Form builder for the Skinr settings overview form.
+ *
+ * @ingroup forms
  */
 function skinr_ui_list($form, &$form_state) {
   if (isset($form_state['values']['operation']) && $form_state['values']['operation'] == 'delete') {
@@ -172,7 +181,9 @@ function skinr_ui_list($form, &$form_state) {
 }
 
 /**
- * Form builder: Builds the node administration overview.
+ * Subform builder for the Skinr settings overview form.
+ *
+ * @ingroup forms
  */
 function skinr_ui_admin_skins() {
   $session = !empty($_SESSION['skinr_ui_overview_filter']) && is_array($_SESSION['skinr_ui_overview_filter']) ? $_SESSION['skinr_ui_overview_filter'] : array();
@@ -279,7 +290,7 @@ function skinr_ui_admin_skins() {
       }
     }
   }
-  
+
   // Sort table.
   array_multisort($sorts, $sort, $options);
 
@@ -296,7 +307,7 @@ function skinr_ui_admin_skins() {
 }
 
 /**
- * Validate skinr_ui_list form submissions.
+ * Form validation handler for skinr_ui_list().
  *
  * Check if any skinr settings have been selected to perform the chosen
  * 'Update option' on.
@@ -309,7 +320,7 @@ function skinr_ui_admin_skins_validate($form, &$form_state) {
 }
 
 /**
- * Process skinr_ui_list form submissions.
+ * Form submission handler for skinr_ui_list().
  *
  * Execute the chosen 'Update option' on the selected skinr settings.
  */
@@ -337,6 +348,14 @@ function skinr_ui_admin_skins_submit($form, &$form_state) {
   }
 }
 
+/**
+ * Form builder for the confirmation form when deleting multiple Skinr settings.
+ *
+ * @param $skins
+ *   An array of skins to delete.
+ *
+ * @ingroup forms
+ */
 function skinr_ui_multiple_delete_confirm($form, &$form_state, $skins) {
   $themes = list_themes();
 
@@ -362,6 +381,9 @@ function skinr_ui_multiple_delete_confirm($form, &$form_state, $skins) {
                     t('Delete'), t('Cancel'));
 }
 
+/**
+ * Form submission handler for skinr_ui_multiple_delete_confirm().
+ */
 function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     foreach ($form_state['values']['skins'] as $skin => $value) {
@@ -375,7 +397,7 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) {
 
       skinr_set($skinr);
     }
-    
+
     $count = count($form_state['values']['skins']);
     if ($count == 1) {
       watchdog('content', 'Deleted 1 skinr setting.');
@@ -389,7 +411,9 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; displays the skinr settings administration form.
+ * Form builder for the Skinr settings administration form.
+ *
+ * @ingroup forms
  */
 function skinr_ui_settings($form, &$form_state) {
   $form = array();
@@ -416,7 +440,7 @@ function skinr_ui_settings($form, &$form_state) {
 }
 
 /**
- * Validation handler for skinr settings administration form.
+ * Form validation handler for skinr_ui_settings().
  */
 function skinr_ui_settings_validate(&$form, &$form_state) {
   if (empty($form_state['values']['skinr_overlay_width'])) {
@@ -428,7 +452,7 @@ function skinr_ui_settings_validate(&$form, &$form_state) {
 }
 
 /**
- * Menu callback; displays a listing of all non-theme skinsets.
+ * Form builder for the non-theme skinsets listing form.
  *
  * @ingroup forms
  * @see skinr_ui_admin_skinsets_submit()
@@ -512,7 +536,7 @@ function _skinr_ui_admin_skinsets_build_row($info, $extra) {
   $form['screenshot'] = array(
     '#markup' => file_exists($info['screenshot']) ? theme('image', array('path' => $info['screenshot'], 'alt' => t('Screenshot for %theme theme', array('%theme' => $info['name'])), 'attributes' => array('class' => 'screenshot'), 'getsize' => FALSE)) : t('no screenshot'),
   );
-  
+
   $form['name'] = array(
     '#markup' => $info['name'],
   );
@@ -572,13 +596,22 @@ function _skinr_ui_admin_skinsets_build_row($info, $extra) {
 
 /**
  * Helper function to sort skinsets by the name in their .info file.
+ *
+ * @param $a
+ *   The first skinset to compare.
+ * @param $b
+ *   The second skinset to compare.
+ *
+ * @return
+ *   Returns < 0 if $a is less than $b; > 0 if $a is greater than $b, and 0
+ *   if they are equal.
  */
 function skinr_ui_sort_by_info_name($a, $b) {
   return strcasecmp($a->info['name'], $b->info['name']);
 }
 
 /**
- * Process skinr_ui_admin_skinsets form submissions.
+ * Form submission handler for skinr_ui_admin_skinsets().
  */
 function skinr_ui_admin_skinsets_submit($form, &$form_state) {
   // Store list of previously enabled themes and disable all themes.
@@ -631,18 +664,18 @@ function theme_skinr_ui_admin_skinsets_fieldset($variables) {
   foreach (element_children($form) as $key) {
     // Stick it into $skinset for easier accessing.
     $skinset = $form[$key];
-    
+
     $row = array();
 
     // Screenshot.
     $row[] = array('data' => $skinset['screenshot'], 'class' => array('screenshot'));
-    
+
     // Name.
     $row[] = theme('skinr_ui_admin_skinsets_info', array(
       'name' => drupal_render($skinset['name']),
       'description' => drupal_render($skinset['description'])
     ));
-    
+
     // Version.
     $row[] = drupal_render($skinset['version']);
 
@@ -691,7 +724,7 @@ function theme_skinr_ui_admin_skinsets_incompatible($variables) {
 }
 
 /**
- * Menu callback; displays a listing of all skins in a skinsets, allowing you
+ * Menu callback; displays a listing of all skins in a skinset, allowing you
  * to enable or disable them individually for each theme.
  *
  * @ingroup forms
@@ -804,13 +837,13 @@ function theme_skinr_ui_admin_skinsets_settings_fieldset($variables) {
   foreach (element_children($form) as $key) {
     // Stick it into $skin for easier accessing.
     $skin = $form[$key];
-    
+
     $row = array();
 
     // Enabled.
     unset($skin['enable']['#title']);
     $row[] = array('class' => array('checkbox'), 'data' => drupal_render($skin['enable']));
-    
+
     // Name.
     $row[] = theme('skinr_ui_admin_skinsets_settings_info', array(
       'name' => drupal_render($skin['name']),
@@ -840,7 +873,7 @@ function theme_skinr_ui_admin_skinsets_settings_info($variables) {
 }
 
 /**
- * Process skinr_ui_admin_skinsets_settings form submissions.
+ * Process skinr_ui_admin_skinsets_settings() form submissions.
  */
 function skinr_ui_admin_skinsets_settings_submit($form, &$form_state) {
   if ($form_state['values']['op'] == t('Save configuration')) {
@@ -852,7 +885,7 @@ function skinr_ui_admin_skinsets_settings_submit($form, &$form_state) {
         }
       }
     }
-    
+
     foreach ($statuses as $name => $status) {
       $skinr_skin = new StdClass();
       $skinr_skin->name = $form_state['values']['skinset'];
@@ -888,7 +921,13 @@ function skinr_ui_admin_skinsets_settings_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; displays Skinr settings export form.
+ * Form builder for the Skinr settings export form.
+ *
+ * @param $theme
+ *   (optional) The name of the theme to export Skinr settings for. If no
+ *   theme name is provided a theme selector is shown.
+ *
+ * @ingroup forms
  */
 function skinr_ui_export_form($form, &$form_state, $theme = NULL) {
   $form = array();
@@ -937,7 +976,7 @@ function skinr_ui_export_form($form, &$form_state, $theme = NULL) {
       if (!empty($theme->info['hidden'])) {
         continue;
       }
-      
+
       if ($theme->name == $current_theme) {
         // Do nothing.
       }
@@ -966,7 +1005,7 @@ function skinr_ui_export_form($form, &$form_state, $theme = NULL) {
 }
 
 /**
- * Validation handler for skinr settings export form.
+ * Form validation handler for skinr_ui_export_form().
  */
 function skinr_ui_export_form_validate(&$form, &$form_state) {
   if (!empty($form_state['values']['theme']) && preg_match('/[^a-zA-Z0-9_]/', $form_state['values']['theme'])) {
@@ -975,14 +1014,16 @@ function skinr_ui_export_form_validate(&$form, &$form_state) {
 }
 
 /**
- * Submit handler for skinr settings export form.
+ * Form submission handler for skinr_ui_export_form().
  */
 function skinr_ui_export_form_submit(&$form, &$form_state) {
   drupal_goto('admin/appearance/skinr/export/' . str_replace('_', '-', $form_state['values']['theme']));
 }
 
 /**
- * Menu callback; displays Skinr settings import form.
+ * Form builder for the Skinr settings import form.
+ *
+ * @ingroup forms
  */
 function skinr_ui_import_form($form, &$form_state) {
   $form = array();
@@ -1031,7 +1072,7 @@ function skinr_ui_import_form($form, &$form_state) {
 }
 
 /**
- * Validation handler for Skinr settings import form.
+ * Form validation handler for skinr_ui_import_form().
  */
 function skinr_ui_import_form_validate(&$form, &$form_state) {
   if (empty($form_state['values']['skinr_settings'])) {
@@ -1073,7 +1114,7 @@ function skinr_ui_import_form_validate(&$form, &$form_state) {
 }
 
 /**
- * Submit handler for skinr settings import form.
+ * Form submission handler for skinr_ui_import_form().
  */
 function skinr_ui_import_form_submit(&$form, &$form_state) {
   foreach ($form_state['skinrs'] as $module => $skinrs) {
@@ -1089,7 +1130,16 @@ function skinr_ui_import_form_submit(&$form, &$form_state) {
 }
 
 /**
- * Menu callback; displays the delete confirmation for a skinr page rule.
+ * Form builder for the skinr settings delete confirmation form.
+ *
+ * @param $theme
+ *   The name of the theme to delete a setting for.
+ * @param $module
+ *   The module to delete a setting for.
+ * @param $sid
+ *   The ID of the setting to delete.
+ *
+ * @ingroup forms
  */
 function skinr_ui_delete_confirm($form, &$form_state, $theme, $module, $sid) {
   $form['theme'] = array(
@@ -1116,6 +1166,9 @@ function skinr_ui_delete_confirm($form, &$form_state, $theme, $module, $sid) {
   );
 }
 
+/**
+ * Form submission handler for skinr_ui_delete_confirm().
+ */
 function skinr_ui_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     $skinr = new stdClass();
diff --git skinr_ui.install skinr_ui.install
index 294f87c..ee6717a 100644
--- skinr_ui.install
+++ skinr_ui.install
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
 function skinr_ui_install() {
   // Skinr should go before contextual module.
@@ -18,7 +18,7 @@ function skinr_ui_install() {
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function skinr_ui_uninstall() {
   variable_del('skinr_overlay_width');
@@ -27,6 +27,10 @@ function skinr_ui_uninstall() {
 
 /**
  * Delete a few unused variables.
+ *
+ * @todo This is a badly converted function it should be
+ *       skinr_ui_update_6001(). Remove this function and implement
+ *       skinr_update_last_removed() instead.
  */
 function skinr_ui_update_7000() {
   variable_del('skinr_overlay_autofit');
diff --git skinr_ui.module skinr_ui.module
index 6802cca..1136a5a 100644
--- skinr_ui.module
+++ skinr_ui.module
@@ -2,7 +2,12 @@
 // $Id$
 
 /**
- * Implementation of hook_permission().
+ * @file
+ * Handles Skinr UI functionality allowing users to apply skins to their site.
+ */
+
+/**
+ * Implements hook_permission().
  */
 function skinr_ui_permission() {
   return array(
@@ -22,7 +27,7 @@ function skinr_ui_permission() {
 }
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function skinr_ui_menu() {
   $items['admin/appearance/skinr'] = array(
@@ -208,7 +213,7 @@ if (!function_exists('dialog_js_load')) {
 }
 
 /**
- * Implementation of hook_theme().
+ * Implements hook_theme().
  */
 function skinr_ui_theme() {
   return array(
@@ -236,7 +241,7 @@ function skinr_ui_theme() {
 }
 
 /**
- * Implementation of hook_help().
+ * Implements hook_help().
  */
 function skinr_ui_help($path, $arg) {
   if (module_exists('advanced_help')) {
@@ -261,7 +266,10 @@ function skinr_ui_help($path, $arg) {
 }
 
 /**
- * Check if overlay functionality is enabled.
+ * Checks if overlay functionality is enabled.
+ *
+ * @return
+ *   TRUE if enabled, FALE otherwise.
  */
 function skinr_ui_overlay_enabled() {
   static $warned = FALSE;
@@ -319,15 +327,14 @@ function skinr_ui_edit_contextual_title($module, $sid) {
  * Menu callback; prepares some variables and displays a Skinr edit form.
  *
  * @param $js
- *   ...
+ *   TRUE if called from javascript, FALSE otherwise.
  * @param $module
  *   The module that we're editing settings of.
  * @param $sid
  *   The sid of the object we're editing settings of.
  * @param $sids
- *   ...
- *
- * @todo Enter description of parameters.
+ *   An array of $sid when more than one is returned from the preprocess
+ *   index handler. Used by the javascript UI to update all elements involved.
  */
 function skinr_ui_edit($js = FALSE, $module, $sid, $sids = NULL) {
   global $gskinr;
@@ -335,7 +342,7 @@ function skinr_ui_edit($js = FALSE, $module, $sid, $sids = NULL) {
   if ($js) {
     // Do additional ajax related stuff.
   }
-  
+
   $arguments = array(
     'skinr' => array(
       'module' => $module,
@@ -347,7 +354,12 @@ function skinr_ui_edit($js = FALSE, $module, $sid, $sids = NULL) {
 }
 
 /**
- * Skinr form.
+ * Form builder for the skinr settings configuration form.
+ *
+ * @param $arguments
+ *   An array of arguments as passed in by skinr_ui_edit().
+ *
+ * @ingroup forms
  */
 function skinr_ui_form($form, &$form_state, $arguments) {
   $form = array(
@@ -379,14 +391,14 @@ function skinr_ui_form($form, &$form_state, $arguments) {
 }
 
 /**
- * Implementation of hook_form_alter().
+ * Implements hook_form_alter().
  */
 function skinr_ui_form_alter(&$form, $form_state, $form_id) {
   // Fix for update script.
   if ($form_id == 'update_script_selection_form') {
     return;
   }
-  
+
   $skinr_config = skinr_fetch_config();
   $info = skinr_skin_data();
 
@@ -590,7 +602,7 @@ function skinr_ui_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
- * Validation handler.
+ * Form validation handler for skinr_ui_form_alter().
  */
 function skinr_ui_form_validate($form, &$form_state) {
   $form_id = $form_state['values']['form_id'];
@@ -639,7 +651,7 @@ function skinr_ui_form_validate($form, &$form_state) {
 }
 
 /**
- * Submit handler.
+ * Form submission handler for skinr_ui_form_alter().
  */
 function skinr_ui_form_submit($form, &$form_state) {
   $form_id = $form_state['values']['form_id'];
@@ -657,7 +669,7 @@ function skinr_ui_form_submit($form, &$form_state) {
 }
 
 /**
- * Implementation of hook_preprocess().
+ * Implements hook_preprocess().
  */
 function skinr_ui_preprocess(&$variables, $hook) {
   $skinr_config = skinr_fetch_config();
@@ -681,8 +693,15 @@ function skinr_ui_preprocess(&$variables, $hook) {
 }
 
 /**
- * Set contextual menu items for skinr. We couldn't use hook_block_view_alter()
- * because not all blocks are allowing the context to be set from there.
+ * Set contextual menu items for skinr.
+ *
+ * @param $variables
+ *   The $variables parameter from a preprocess function.
+ * @param $hook
+ *   The $hook parameter from a preprocess function.
+ * @param $contextual_links
+ *   An array of contextual links data as returned from Skinr's contextual
+ *   links handler.
  */
 function skinr_ui_contextual_links(&$variables, $hook, $contextual_links) {
   _skinr_ui_set_contextual_links($hook, $contextual_links);
@@ -708,10 +727,22 @@ function skinr_ui_contextual_links(&$variables, $hook, $contextual_links) {
   }
 }
 
+/**
+ * Get all contextual links as returned from Skinr's contextual links handler.
+ *
+ * @return
+ *   An array of contextual links data.
+ */
 function skinr_ui_get_contextual_links() {
   return _skinr_ui_set_contextual_links();
 }
 
+/**
+ * Store contextual links internally for future use.
+ *
+ * @return
+ *   An array of contextual links data.
+ */
 function _skinr_ui_set_contextual_links($hook = NULL, $links = NULL) {
   static $contextual_links = array();
 
@@ -725,8 +756,16 @@ function _skinr_ui_set_contextual_links($hook = NULL, $links = NULL) {
 }
 
 /**
- * Helper function determine whether one of a set of hooks exists in a list of
- * required features.
+ * Helper function to determine whether one of a set of hooks exists in a list
+ * of required theme hooks.
+ *
+ * @param $preprocess_hooks
+ *   An array of theme hooks available to this element.
+ * @param $features
+ *   An array of allowed theme hooks.
+ *
+ * @return
+ *   TRUE if an overlap is found, FALSE otherwise.
  */
 function _skinr_is_featured($preprocess_hooks, $features) {
   foreach ($preprocess_hooks as $preprocess_hook) {
@@ -739,6 +778,9 @@ function _skinr_is_featured($preprocess_hooks, $features) {
 
 /**
  * Helper function to retrieve a unique id for each skinr class. Used by AJAX.
+ *
+ * @return
+ *   A unique ID number.
  */
 function _skinr_ui_ajax_id() {
   static $skinr_id = 0;
@@ -746,8 +788,14 @@ function _skinr_ui_ajax_id() {
 }
 
 /**
- * Helper function to convert an array of options, as specified in the info
- * file, into an array usable by form api.
+ * Helper function to convert an array of options, as specified in the .info
+ * file, into an array usable by Form API.
+ *
+ * @param $options
+ *   An array containing at least the 'class' and 'label' keys.
+ *
+ * @return
+ *   A Form API compatible array of options.
  */
 function skinr_ui_info_options_to_form_options($options) {
   $form_options = array();
diff --git skinr_ui.rules.inc skinr_ui.rules.inc
index e079448..138a2a4 100644
--- skinr_ui.rules.inc
+++ skinr_ui.rules.inc
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Admin page callbacks for the skinr module.
+ * Admin page callbacks for Skinr module's rules.
  */
 
 /**
@@ -54,6 +54,8 @@ function skinr_rules() {
 
 /**
  * Menu callback; displays the edit form for a skinr rule.
+ *
+ * @ingroup forms
  */
 function skinr_rule_add($form, &$form_state) {
   $form = array();
@@ -70,7 +72,7 @@ function skinr_rule_add($form, &$form_state) {
     '#description' => t('Descriptive title for this rule; used by administrators.'),
     '#required' => TRUE,
   );
-  
+
   $regions = array();
   foreach (list_themes() as $key => $theme) {
     $regions += system_region_list($key);
@@ -96,6 +98,9 @@ function skinr_rule_add($form, &$form_state) {
   return $form;
 }
 
+/**
+ * Process skinr_rule_add() submissions.
+ */
 function skinr_rule_add_submit($form, &$form_state) {
   $rule = new stdClass();
   $rule->rid = NULL;
@@ -114,6 +119,11 @@ function skinr_rule_add_submit($form, &$form_state) {
 
 /**
  * Menu callback; displays the edit form for a skinr rule.
+ *
+ * @param $rid
+ *   The rule ID.
+ *
+ * @ingroup forms
  */
 function skinr_rule_edit($form, &$form_state, $rid = NULL) {
   $form = array();
@@ -216,6 +226,9 @@ function skinr_rule_edit($form, &$form_state, $rid = NULL) {
   return $form;
 }
 
+/**
+ * Process skinr_rule_edit() submissions.
+ */
 function skinr_rule_edit_submit($form, &$form_state) {
   $rule = new stdClass();
   $rule->rid = !empty($form_state['values']['rid']) ? $form_state['values']['rid'] : NULL;
@@ -232,6 +245,11 @@ function skinr_rule_edit_submit($form, &$form_state) {
   $form_state['redirect'] = 'admin/appearance/skinr/rules';
 }
 
+/**
+ * Called from within the rule edit form; redirects to skinr_rule_delete_confirm().
+ *
+ * @ingroup forms
+ */
 function skinr_rule_delete_submit($form, &$form_state) {
   $destination = '';
   if (isset($_REQUEST['destination'])) {
@@ -243,6 +261,11 @@ function skinr_rule_delete_submit($form, &$form_state) {
 
 /**
  * Menu callback; displays the delete confirmation for a skinr rule.
+ *
+ * @param $rid
+ *   The rule ID.
+ *
+ * @ingroup forms
  */
 function skinr_rule_delete_confirm($form, &$form_state, $rid) {
   $form['rid'] = array(
@@ -260,6 +283,9 @@ function skinr_rule_delete_confirm($form, &$form_state, $rid) {
   );
 }
 
+/**
+ * Process skinr_rule_delete_confirm() submissions.
+ */
 function skinr_rule_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     skinr_rule_delete($form_state['values']['rid']);