diff -u modules/color/color.js modules/color/color.js
--- modules/color/color.js
+++ modules/color/color.js
@@ -3,6 +3,7 @@
 
 Drupal.behaviors.color = {
   attach: function (context, settings) {
+    var i, colors, field_name;
     // This behavior attaches by ID, so is only valid once on a page.
     var form = $('#system-theme-settings .color-form', context).once('color');
     if (form.length == 0) {
@@ -148,6 +149,7 @@
      * Callback for Farbtastic when a new color is chosen.
      */
     function callback(input, color, propagate, colorScheme) {
+      var i, j, matched;
       // Set background/foreground colors.
       $(input).css({
         backgroundColor: color,
@@ -160,15 +162,15 @@
 
         // Update locked values.
         if (propagate) {
-          var i = input.i;
+          i = input.i;
           for (j = i + 1; ; ++j) {
             if (!locks[j - 1] || $(locks[j - 1]).is('.unlocked')) break;
-            var matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
+            matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
             callback(inputs[j], matched, false);
           }
           for (j = i - 1; ; --j) {
             if (!locks[j] || $(locks[j]).is('.unlocked')) break;
-            var matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
+            matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
             callback(inputs[j], matched, false);
           }
 
diff -u modules/color/color.module modules/color/color.module
--- modules/color/color.module
+++ modules/color/color.module
@@ -153,15 +153,20 @@
 
   // See if we're using a predefined scheme.
   // Note: we use the original theme when the default scheme is chosen.
-  $current_scheme = variable_get('color_' . $theme . '_palette', 'default');
+  $current_scheme = variable_get('color_' . $theme . '_palette', array());
   foreach ($schemes as $key => $scheme) {
     if ($current_scheme == $scheme) {
-      $current = $key;
+      $scheme_name = $key;
       break;
     }
   }
-  if (empty($current)) {
-    $current = '';
+  if (empty($scheme_name)) {
+    if (empty($current_scheme)) {
+      $scheme_name = 'default';
+    }
+    else {
+      $scheme_name = '';
+    }
   }
 
   // Add scheme selector.
@@ -169,7 +174,7 @@
     '#type' => 'select',
     '#title' => t('Color set'),
     '#options' => $color_sets,
-    '#default_value' => $current,
+    '#default_value' => $scheme_name,
     '#attached' => array(
       // Add Farbtastic color picker.
       'library' => array(
@@ -464,7 +469,6 @@
  * Render images that match a given palette.
  */
 function _color_render_images($theme, &$info, &$paths, $palette) {
-
   // Prepare template image.
   $source = $paths['source'] . '/' . $info['base_image'];
   $source = imagecreatefrompng($source);
@@ -484,7 +488,7 @@
   foreach ($info['gradients'] as $gradient) {
     // Get direction of the gradient.
     if (isset($gradient['direction']) && $gradient['direction'] == 'horizontal') {
-    	// Horizontal gradient.
+      // Horizontal gradient.
       for ($x = 0; $x < $gradient['dimension'][2]; $x++) {
         $color = _color_blend($target, $palette[$gradient['colors'][0]], $palette[$gradient['colors'][1]], $x / ($gradient['dimension'][2] - 1));
         imagefilledrectangle($target, ($gradient['dimension'][0] + $x), $gradient['dimension'][1], ($gradient['dimension'][0] + $x + 1), ($gradient['dimension'][1] + $gradient['dimension'][3]), $color);