diff --git a/core/modules/color/color.admin-rtl.css b/core/modules/color/color.admin-rtl.css
index d5bfbe8..e7d8d9a 100644
--- a/core/modules/color/color.admin-rtl.css
+++ b/core/modules/color/color.admin-rtl.css
@@ -18,16 +18,16 @@
   clear: right;
 }
 .color-form .form-text,
-.color-form .form-select {
+.color-form .form-select,
+#palette .hook,
+#palette .lock,
+.js #preview {
   float: right;
 }
 .color-form .form-text {
   margin-right: 0;
   margin-left: 5px;
 }
-#palette .hook {
-  float: right;
-}
 #palette .down,
 #palette .up,
 #palette .both {
@@ -40,9 +40,5 @@
   background-position: 0 -54px;
 }
 #palette .lock {
-  float: right;
   right: -10px;
 }
-.js #preview {
-  float: right;
-}
diff --git a/core/modules/color/color.js b/core/modules/color/color.js
index 014ea2b..a9f7f37 100644
--- a/core/modules/color/color.js
+++ b/core/modules/color/color.js
@@ -9,16 +9,16 @@
 
 Drupal.behaviors.color = {
   attach: function (context, settings) {
-    var i, j, colors;
+    var i, j, colors,
     // This behavior attaches by ID, so is only valid once on a page.
-    var form = $(context).find('#system-theme-settings .color-form').once('color');
+    form = $(context).find('#system-theme-settings .color-form').once('color');
     if (form.length === 0) {
       return;
     }
-    var inputs = [];
-    var hooks = [];
-    var locks = [];
-    var focused = null;
+    var inputs = [],
+    hooks = [],
+    locks = [],
+    focused = null;
 
     // Add Farbtastic.
     $('<div id="placeholder"></div>').once('color').prependTo(form);
@@ -33,8 +33,8 @@ Drupal.behaviors.color = {
     }
 
     // Build a preview.
-    var height = [];
-    var width = [];
+    var height = [],
+    width = [];
     // Loop through all defined gradients.
     for (i in settings.gradients) {
       if (settings.gradients.hasOwnProperty(i)) {
@@ -181,10 +181,11 @@ Drupal.behaviors.color = {
      * Focuses Farbtastic on a particular field.
      */
     function focus(e) {
-      var input = e.target;
+      var input = e.target,
+      $focused = $(focused);
       // Remove old bindings.
       if (focused) {
-        $(focused).unbind('keyup', farb.updateValue)
+        $focused.unbind('keyup', farb.updateValue)
           .unbind('keyup', preview).unbind('keyup', resetScheme)
           .parent().removeClass('item-selected');
       }
@@ -193,7 +194,7 @@ Drupal.behaviors.color = {
       focused = input;
       farb.linkTo(function (color) { callback(input, color, true, false); });
       farb.setColor(input.value);
-      $(focused).keyup(farb.updateValue).keyup(preview).keyup(resetScheme)
+      $focused.keyup(farb.updateValue).keyup(preview).keyup(resetScheme)
         .parent().addClass('item-selected');
     }