@@ -423,6 +423,7 @@
 
   // Prepare color conversion table
   $conversion = $palette;
+  unset($conversion['base']);
   foreach ($conversion as $k => $v) {
     $conversion[$k] = drupal_strtolower($v);
   }
@@ -440,13 +441,20 @@
   $output = '';
   $base = 'base';
 
-  // Iterate over all the parts.
+  // Convert all default colors to lower case, so that looking for $chunk in $default would work
+  foreach ($default as $color_name => $color_default) {
+    $default[$color_name] = drupal_strtolower($color_default);
+  }
+
+  // Iterate over all parts.
   foreach ($style as $chunk) {
     if ($is_color) {
       $chunk = drupal_strtolower($chunk);
       // Check if this is one of the colors in the default palette.
       if ($key = array_search($chunk, $default)) {
-        $chunk = $conversion[$key];
+        //$chunk = $conversion[$key];
+        // Using $palette instead of $conversion because $conversion['base'] has been unset
+        $chunk = $palette[$key];
       }
       // Not a pre-set color. Extrapolate from the base.
       else {