diff --git a/icheck.admin.inc b/icheck.admin.inc
new file mode 100644
index 0000000..79a4ccd
--- /dev/null
+++ b/icheck.admin.inc
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Administraton settings.
+ *
+ * @see https://github.com/fronteed/iCheck
+ */
+
+
+/**
+ * Admin settings form.
+ */
+function icheck_settings_form($form, &$form_state) {
+  $form['icheck_enabled'] = array(
+    '#title'         => t('iCheck Enabled'),
+    '#type'          => 'checkbox',
+    '#default_value' => variable_get('icheck_enabled', TRUE)
+  );
+  $form['icheck_admin_theme_enabled'] = array(
+    '#title'         => t('iCheck Enabled on Admin theme'),
+    '#type'          => 'checkbox',
+    '#default_value' => variable_get('icheck_admin_theme_enabled', FALSE)
+  );
+  $form['icheck_skin'] = array(
+    '#title'         => t('Skin'),
+    '#type'          => 'select',
+    '#options'       => icheck_skin_options(),
+    '#default_value' => variable_get('icheck_skin', 'minimal'),
+    '#ajax'          => array (
+      'callback'     => 'icheck_skin_color_ajax',
+      'wrapper'      => 'icheck-skin-color-wrapper',
+    ),
+  );
+  $form['icheck_skin_color'] = array(
+    '#title'         => t('Skin Color'),
+    '#type'          => 'select',
+    '#options'       => icheck_skin_color_options($form['icheck_skin']['#default_value']),
+    '#default_value' => variable_get('icheck_skin_color'),
+    '#validated'     => TRUE, // Drupal does not rebuild options properly when using ajax so we skip validation
+    '#prefix'        => '<div id="icheck-skin-color-wrapper">',
+    '#suffix'        => '</div>',
+  );
+  $form['#submit'] = array('icheck_settings_form_submit');
+
+  return system_settings_form($form);
+}
+
+/**
+ * Submit callback.
+ */
+function icheck_settings_form_submit(&$form, &$form_state) {
+  if (empty($form_state['values']['icheck_skin_color'])) {
+    $form_state['values']['icheck_skin_color'] = $form_state['values']['icheck_skin'];
+  }
+}
+
+/**
+ * Select callback for updating color options.
+ */
+function icheck_skin_color_ajax ($form, $form_state){
+  $form['icheck_skin_color']['#options'] = icheck_skin_color_options($form_state['values']['icheck_skin']);
+  return $form['icheck_skin_color'];
+}
+
+/**
+ * Build #options list of available skins.
+ */
+function icheck_skin_options() {
+  $options = array();
+  $skins_dir = libraries_get_path('icheck') . '/skins';
+  $skins = file_scan_directory($skins_dir, '/.*/', array('recurse' => FALSE));
+
+  foreach ($skins as $skin) {
+    if (is_dir($skin->uri)) {
+        $options[$skin->name] = $skin->name;
+    }
+  }
+
+  return $options;
+}
+
+/**
+ * Build #options list of available colorschemes.
+ */
+function icheck_skin_color_options($skin) {
+  $options = array();
+  $skin_css_dir = libraries_get_path('icheck') . '/skins/' . $skin;
+  $colors = file_scan_directory($skin_css_dir, '/^[^.].*\.css$/', array('nomask' => "/($skin|_all)\.css$/"));
+
+  if (empty($colors)) {
+    return array('' => '-- colors unsupported --');
+  }
+
+  foreach ($colors as $color) {
+    $options[$color->name] = $color->name;
+  }
+
+  return $options;
+}
\ No newline at end of file
diff --git a/icheck.module b/icheck.module
index d4f5dbe..f44d005 100644
--- a/icheck.module
+++ b/icheck.module
@@ -28,28 +28,11 @@ function icheck_menu() {
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('icheck_settings_form'),
     'access arguments' => array('administer site configuration'),
+    'file'             => 'icheck.admin.inc',
   );
   return $items;
 }
 
-/*
- * Define form setting to manage enable/disable Icheck
- */
-function icheck_settings_form($form, &$form_state) {
-  $form['icheck_enabled'] = array(
-    '#title'         => t('iCheck Enabled'),
-    '#type'          => 'checkbox',
-    '#default_value' => variable_get('icheck_enabled', TRUE)
-  );
-  $form['icheck_admin_theme_enabled'] = array(
-    '#title'         => t('iCheck Enabled on Admin theme'),
-    '#type'          => 'checkbox',
-    '#default_value' => variable_get('icheck_admin_theme_enabled', FALSE)
-  );
-
-  return system_settings_form($form);
-}
-
 /**
  * Implements hook_libraries_info().
  */
@@ -119,8 +102,8 @@ function icheck_element_info_alter(&$info) {
     $info[$type]['#process'][] = 'icheck_element_process_callback';
     // Add default icheck's settings.
     $info[$type]['#icheck'] = array(
-      '#skin' => 'minimal',
-      '#color' => 'blue'
+      '#skin' => variable_get('icheck_skin', 'minimal'),
+      '#color' => variable_get('icheck_skin_color', 'blue'),
     );
   }
 }
diff --git a/js/icheck.js b/js/icheck.js
index aa31013..18040eb 100644
--- a/js/icheck.js
+++ b/js/icheck.js
@@ -4,6 +4,7 @@
       for (var id in settings.icheck) {
         var skin = settings.icheck[id]['skin'];
         var color = settings.icheck[id]['color'];
+        var classSuffix = (skin == color) ? '_' + skin : '_' + skin + '-' + color;
 
         // Because of AJAX, Drupal.settings are merged, so we need to get one
         // of the values.
@@ -34,15 +35,15 @@
 
           // line skin need specific label.
           $('#' + id, context).iCheck({
-            checkboxClass: 'icheckbox_' + skin + '-' + color,
-            radioClass: 'iradio_' + skin + '-' + color,
+            checkboxClass: 'icheckbox' + classSuffix,
+            radioClass: 'iradio' + classSuffix,
             insert: '<div class="icheck_line-icon"></div>' + label_text
           });
         }
         else {
           $('#' + id, context).iCheck({
-            checkboxClass: 'icheckbox_' + skin + '-' + color,
-            radioClass: 'iradio_' + skin + '-' + color,
+            checkboxClass: 'icheckbox' + classSuffix,
+            radioClass: 'iradio_' + classSuffix,
           });
         }
       }
