diff --git skinr.module skinr.module
index 0f4cf30..9023d8d 100644
--- skinr.module
+++ skinr.module
@@ -45,7 +45,7 @@ function skinr_init() {
 /**
  * Implements hook_preprocess().
  *
- * @todo Account for drupal's caching being enabled and make it work.
+ * @todo Account for Drupal's caching being enabled and make it work.
  */
 function skinr_preprocess(&$variables, $hook) {
   // Fix for update script.
@@ -202,7 +202,7 @@ function skinr_skin_get_files($skin_options, $type, $theme = NULL) {
           if (!empty($skin_info_option['attached'][$type])) {
             foreach ($skin_info_option['attached'][$type] as $file) {
               $enabled = FALSE;
-              if (in_multiarray($skin_info_option_name, $skin_options)) {
+              if (_skinr_in_multiarray($skin_info_option_name, $skin_options)) {
                 $enabled = TRUE;
               }
 
@@ -246,7 +246,7 @@ function skinr_skin_get_files($skin_options, $type, $theme = NULL) {
  * @return
  *   Returns TRUE if $needle is found in the array, FALSE otherwise.
  */
-function in_multiarray($needle, $haystack) {
+function _skinr_in_multiarray($needle, $haystack) {
   if (is_array($haystack)) {
     // If $needle is in $haystack return TRUE.
     if (in_array($needle, $haystack)) {
@@ -255,7 +255,7 @@ function in_multiarray($needle, $haystack) {
 
     // If $needle isn't in $haystack, then check each item in the array.
     foreach ($haystack as $haybale) {
-      if (is_array($haybale) && in_multiarray($needle, $haybale)) {
+      if (is_array($haybale) && _skinr_in_multiarray($needle, $haybale)) {
         return TRUE;
       }
     }
@@ -784,8 +784,9 @@ function skinr_plugin_hooks() {
 }
 
 /**
- * Helper function to prepend a path to an array of stylesheets or scripts
- * in a .info file. If the url is absolute (e.g. the url start with 'http://')
+ * Helper function to prepend a path to an array of stylesheet or script filenames.
+ *
+ * If the url is absolute (e.g. the url start with 'http://' or 'https://')
  * the path does not get prepended.
  *
  * @param $files
@@ -797,13 +798,13 @@ function skinr_plugin_hooks() {
 function _skinr_add_path_to_files(&$files, $path) {
   foreach ($files as $key => $file) {
     if (is_array($file)) {
-      if (strpos($file[0], 'http://') === 0) {
+      if (strpos($file[0], 'http://') === 0 || strpos($file[0], 'https://') === 0 ) {
         continue;
       }
       $files[$key][0] = $path . '/' . $file[0];
     }
     else {
-      if (strpos($file, 'http://') === 0) {
+      if (strpos($file, 'http://') === 0 || strpos($file, 'https://') === 0) {
         continue;
       }
       $files[$key] = $path . '/' . $file;
@@ -815,7 +816,7 @@ function _skinr_add_path_to_files(&$files, $path) {
  * Parse a skin_infos array as returned from a skins plugin.
  *
  * This function inserts any missing defaults and updates the stylesheet and
- * script paths to be relative to drupal's root.
+ * script paths to be relative to Drupal's root.
  *
  * @param $skin_infos
  *   A skins array as returned from a skins plugin.
@@ -890,7 +891,6 @@ function skinr_get_skin_info() {
     // Load skins from hook_skinr_skins().
     $hooks = skinr_plugin_hooks();
     foreach ($hooks as $hook => $source) {
-      // @todo Update the hook name once we settle on one.
       $function = $hook . '_skinr_skin_info';
       $result = $function();
       if (isset($result)) {
@@ -929,7 +929,6 @@ function skinr_get_group_info() {
     // Load skins from hook_skinr_groups().
     $hooks = skinr_plugin_hooks();
     foreach ($hooks as $hook => $source) {
-      // @todo Update the hook name once we settle on one.
       $function = $hook . '_skinr_group_info';
       $result = $function();
       if (isset($result)) {
diff --git skinr_ui.admin.inc skinr_ui.admin.inc
index 3b088ae..3bd91cc 100644
--- skinr_ui.admin.inc
+++ skinr_ui.admin.inc
@@ -411,47 +411,6 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Form builder for the Skinr settings administration form.
- *
- * @ingroup forms
- */
-function skinr_ui_settings($form, &$form_state) {
-  $form = array();
-
-  $form['overlay'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Overlay'),
-    '#collapsible' => TRUE,
-  );
-  $form['overlay']['skinr_overlay_width'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Window width'),
-    '#default_value' => variable_get('skinr_overlay_width', 600),
-    '#description' => t('The width of the overlay window. Leave this field blank to allow the window to automatically resize itself to a minimal width.'),
-  );
-  $form['overlay']['skinr_overlay_height'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Window height'),
-    '#default_value' => variable_get('skinr_overlay_height', NULL),
-    '#description' => t('The height of the overlay window. Leave this field blank to allow the window to automatically resize itself to the height of your browser.'),
-  );
-
-  return system_settings_form($form);
-}
-
-/**
- * Form validation handler for skinr_ui_settings().
- */
-function skinr_ui_settings_validate(&$form, &$form_state) {
-  if (empty($form_state['values']['skinr_overlay_width'])) {
-    $form_state['values']['skinr_overlay_width'] = NULL;
-  }
-  if (empty($form_state['values']['skinr_overlay_height'])) {
-    $form_state['values']['skinr_overlay_height'] = NULL;
-  }
-}
-
-/**
  * Form builder for the skin info listing form.
  *
  * @ingroup forms
diff --git skinr_ui.info skinr_ui.info
index db7938c..654eb1c 100644
--- skinr_ui.info
+++ skinr_ui.info
@@ -6,7 +6,6 @@ package = Skinr
 core = 7.x
 
 dependencies[] = skinr
-;dependencies[] = dialog
 
 files[] = skinr_ui.module
 files[] = skinr_ui.admin.inc
diff --git skinr_ui.module skinr_ui.module
index 6c52ea1..cb0f4fd 100644
--- skinr_ui.module
+++ skinr_ui.module
@@ -149,21 +149,8 @@ function skinr_ui_menu() {
     'file' => 'skinr_ui.admin.inc',
   );
 
-  // Settings.
-  $items['admin/appearance/skinr/settings'] = array(
-    'title' => 'Settings',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('skinr_ui_settings'),
-    'type' => MENU_LOCAL_TASK,
-    'access arguments' => array('administer skinr'),
-    'parent' => 'admin/appearance/skinr',
-    'weight' => 4,
-    'description' => t('Configure Skinr settings.'),
-    'file' => 'skinr_ui.admin.inc',
-  );
-
   // Edit Skinr settings.
-  $items['admin/appearance/skinr/edit/%dialog_js/%/%'] = array(
+  $items['admin/appearance/skinr/edit/%skinr_js/%/%'] = array(
     'title' => 'Edit skin',
     'title callback' => 'skinr_ui_edit_title',
     'title arguments' => array(5, 6),
@@ -173,7 +160,7 @@ function skinr_ui_menu() {
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'access arguments' => array('administer skinr'),
   );
-  $items['admin/appearance/skinr/edit/%dialog_js/%/%/configure'] = array(
+  $items['admin/appearance/skinr/edit/%skinr_js/%/%/configure'] = array(
     'title' => 'Edit skin',
     'title callback' => 'skinr_ui_edit_contextual_title',
     'title arguments' => array(5, 6),
@@ -203,13 +190,14 @@ function skinr_ui_menu() {
   return $items;
 }
 
-if (!function_exists('dialog_js_load')) {
-  function dialog_js_load($js = 'nojs') {
-    if ($js == 'ajax') {
-      return TRUE;
-    }
-    return 0;
+/**
+ * Helper function to determine if ajax is used to call a function.
+ */
+function skinr_js_load($js = 'nojs') {
+  if ($js == 'ajax') {
+    return TRUE;
   }
+  return 0;
 }
 
 /**
@@ -316,8 +304,6 @@ function skinr_ui_edit_contextual_title($module, $sid) {
  *   index handler. Used by the javascript UI to update all elements involved.
  */
 function skinr_ui_edit($js = FALSE, $module, $sid, $sids = NULL) {
-  global $gskinr;
-
   if ($js) {
     // Do additional ajax related stuff.
   }