diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 7d847dbc83..5f95120d46 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -1,46 +1,46 @@
-function ColorPickerController($scope) {
-
-    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
-
-    if ($scope.isConfigured) {
-
-        for (var key in $scope.model.config.items) {
-            if (!$scope.model.config.items[key].hasOwnProperty("value"))
-                $scope.model.config.items[key] = { value: $scope.model.config.items[key], label: $scope.model.config.items[key] };
-        }
-
-        $scope.model.useLabel = isTrue($scope.model.config.useLabel);
-        initActiveColor();
-    }
+function ColorPickerController($scope) {
+
+    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
+
+    if ($scope.isConfigured) {
+
+        for (var key in $scope.model.config.items) {
+            if (!$scope.model.config.items[key].hasOwnProperty("value"))
+                $scope.model.config.items[key] = { value: $scope.model.config.items[key], label: $scope.model.config.items[key] };
+        }
+
+        $scope.model.useLabel = isTrue($scope.model.config.useLabel);
+        initActiveColor();
+    }
+
+    $scope.toggleItem = function (color) {
+
+        var currentColor = ($scope.model.value && $scope.model.value.hasOwnProperty("value"))
+            ? $scope.model.value.value
+            : $scope.model.value;
 
-    $scope.toggleItem = function (color) {
-
-        var currentColor = $scope.model.value.hasOwnProperty("value")
-            ? $scope.model.value.value
-            : $scope.model.value;
-
         var newColor;
-        if (currentColor === color.value) {
-            // deselect
-            $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
-            newColor = "";
-        }
-        else {
+        if (currentColor === color.value) {
+            // deselect
+            $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
+            newColor = "";
+        }
+        else {
             // select
-            $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
+            $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
             newColor = color.value;
-        }
-
-        // this is required to re-validate
-        $scope.propertyForm.modelValue.$setViewValue(newColor);
-    };
+        }
+
+        // this is required to re-validate
+        $scope.propertyForm.modelValue.$setViewValue(newColor);
+    };
 
     // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
-    $scope.validateMandatory = function () {
-        var isValid = !$scope.model.validation.mandatory || (
-            $scope.model.value != null
-            && $scope.model.value != ""
-            && (!$scope.model.value.hasOwnProperty("value") || $scope.model.value.value !== "")
+    $scope.validateMandatory = function () {
+        var isValid = !$scope.model.validation.mandatory || (
+            $scope.model.value != null
+            && $scope.model.value != ""
+            && (!$scope.model.value.hasOwnProperty("value") || $scope.model.value.value !== "")
         );
         return {
             isValid: isValid,
@@ -48,83 +48,83 @@ function ColorPickerController($scope) {
             errorKey: "required"
         };
     }
-    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
-
-    // A color is active if it matches the value and label of the model.
-    // If the model doesn't store the label, ignore the label during the comparison.
-    $scope.isActiveColor = function (color) {
-
-        // no value
-        if (!$scope.model.value)
-            return false;
-
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return $scope.model.value === color.value;
-
-        return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
-    };
-
-    // Finds the color best matching the model's color,
-    // and sets the model color to that one. This is useful when
-    // either the value or label was changed on the data type.
-    function initActiveColor() {
-
-        // no value
-        if (!$scope.model.value)
-            return;
-
-        // Complex color (value and label)?
-        if (!$scope.model.value.hasOwnProperty("value"))
-            return;
-
-        var modelColor = $scope.model.value.value;
-        var modelLabel = $scope.model.value.label;
-
-        // Check for a full match or partial match.
-        var foundItem = null;
-
-        // Look for a fully matching color.
-        for (var key in $scope.model.config.items) {
-            var item = $scope.model.config.items[key];
-            if (item.value == modelColor && item.label == modelLabel) {
-                foundItem = item;
-                break;
-            }
-        }
-
-        // Look for a color with a matching value.
-        if (!foundItem) {
-            for (var key in $scope.model.config.items) {
-                var item = $scope.model.config.items[key];
-                if (item.value == modelColor) {
-                    foundItem = item;
-                    break;
-                }
-            }
-        }
-
-        // Look for a color with a matching label.
-        if (!foundItem) {
-            for (var key in $scope.model.config.items) {
-                var item = $scope.model.config.items[key];
-                if (item.label == modelLabel) {
-                    foundItem = item;
-                    break;
-                }
-            }
-        }
-
-        // If a match was found, set it as the active color.
-        if (foundItem) {
-            $scope.model.value.value = foundItem.value;
-            $scope.model.value.label = foundItem.label;
-        }
-    }
-
-    // figures out if a value is trueish enough
-    function isTrue(bool) {
-        return !!bool && bool !== "0" && angular.lowercase(bool) !== "false";
+    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
+
+    // A color is active if it matches the value and label of the model.
+    // If the model doesn't store the label, ignore the label during the comparison.
+    $scope.isActiveColor = function (color) {
+
+        // no value
+        if (!$scope.model.value)
+            return false;
+
+        // Complex color (value and label)?
+        if (!$scope.model.value.hasOwnProperty("value"))
+            return $scope.model.value === color.value;
+
+        return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
+    };
+
+    // Finds the color best matching the model's color,
+    // and sets the model color to that one. This is useful when
+    // either the value or label was changed on the data type.
+    function initActiveColor() {
+
+        // no value
+        if (!$scope.model.value)
+            return;
+
+        // Complex color (value and label)?
+        if (!$scope.model.value.hasOwnProperty("value"))
+            return;
+
+        var modelColor = $scope.model.value.value;
+        var modelLabel = $scope.model.value.label;
+
+        // Check for a full match or partial match.
+        var foundItem = null;
+
+        // Look for a fully matching color.
+        for (var key in $scope.model.config.items) {
+            var item = $scope.model.config.items[key];
+            if (item.value == modelColor && item.label == modelLabel) {
+                foundItem = item;
+                break;
+            }
+        }
+
+        // Look for a color with a matching value.
+        if (!foundItem) {
+            for (var key in $scope.model.config.items) {
+                var item = $scope.model.config.items[key];
+                if (item.value == modelColor) {
+                    foundItem = item;
+                    break;
+                }
+            }
+        }
+
+        // Look for a color with a matching label.
+        if (!foundItem) {
+            for (var key in $scope.model.config.items) {
+                var item = $scope.model.config.items[key];
+                if (item.label == modelLabel) {
+                    foundItem = item;
+                    break;
+                }
+            }
+        }
+
+        // If a match was found, set it as the active color.
+        if (foundItem) {
+            $scope.model.value.value = foundItem.value;
+            $scope.model.value.label = foundItem.label;
+        }
+    }
+
+    // figures out if a value is trueish enough
+    function isTrue(bool) {
+        return !!bool && bool !== "0" && angular.lowercase(bool) !== "false";
     }
 }