diff --git a/js/Color.js b/js/Color.js
index ab4ba0b4..418154b2 100644
--- a/js/Color.js
+++ b/js/Color.js
@@ -1,163 +1,201 @@
 /**
  * Flotr Color
  */
+(function() {
 
-(function () {
-
-var
-  _ = Flotr._;
-
-// Constructor
-function Color (r, g, b, a) {
-  this.rgba = ['r','g','b','a'];
-  var x = 4;
-  while(-1<--x){
-    this[this.rgba[x]] = arguments[x] || ((x==3) ? 1.0 : 0);
-  }
-  this.normalize();
-}
-
-// Constants
-var COLOR_NAMES = {
-  aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],
-  brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],
-  darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],
-  darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],
-  darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],
-  khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],
-  lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],
-  maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],
-  violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]
-};
-
-Color.prototype = {
-  scale: function(rf, gf, bf, af){
-    var x = 4;
-    while (-1 < --x) {
-      if (!_.isUndefined(arguments[x])) this[this.rgba[x]] *= arguments[x];
-    }
-    return this.normalize();
-  },
-  alpha: function(alpha) {
-    if (!_.isUndefined(alpha) && !_.isNull(alpha)) {
-      this.a = alpha;
-    }
-    return this.normalize();
-  },
-  clone: function(){
-    return new Color(this.r, this.b, this.g, this.a);
-  },
-  limit: function(val,minVal,maxVal){
-    return Math.max(Math.min(val, maxVal), minVal);
-  },
-  normalize: function(){
-    var limit = this.limit;
-    this.r = limit(parseInt(this.r, 10), 0, 255);
-    this.g = limit(parseInt(this.g, 10), 0, 255);
-    this.b = limit(parseInt(this.b, 10), 0, 255);
-    this.a = limit(this.a, 0, 1);
-    return this;
-  },
-  distance: function(color){
-    if (!color) return;
-    color = new Color.parse(color);
-    var dist = 0, x = 3;
-    while(-1<--x){
-      dist += Math.abs(this[this.rgba[x]] - color[this.rgba[x]]);
-    }
-    return dist;
-  },
-  toString: function(){
-    return (this.a >= 1.0) ? 'rgb('+[this.r,this.g,this.b].join(',')+')' : 'rgba('+[this.r,this.g,this.b,this.a].join(',')+')';
-  },
-  contrast: function () {
     var
-      test = 1 - ( 0.299 * this.r + 0.587 * this.g + 0.114 * this.b) / 255;
-    return (test < 0.5 ? '#000000' : '#ffffff');
-  }
-};
-
-_.extend(Color, {
-  /**
-   * Parses a color string and returns a corresponding Color.
-   * The different tests are in order of probability to improve speed.
-   * @param {String, Color} str - string thats representing a color
-   * @return {Color} returns a Color object or false
-   */
-  parse: function(color){
-    if (color instanceof Color) return color;
-
-    var result;
-
-    // #a0b1c2
-    if((result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)))
-      return new Color(parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16));
-
-    // rgb(num,num,num)
-    if((result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)))
-      return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10));
-  
-    // #fff
-    if((result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)))
-      return new Color(parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16));
-  
-    // rgba(num,num,num,num)
-    if((result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
-      return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10), parseFloat(result[4]));
-      
-    // rgb(num%,num%,num%)
-    if((result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)))
-      return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55);
-  
-    // rgba(num%,num%,num%,num)
-    if((result = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
-      return new Color(parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55, parseFloat(result[4]));
-
-    // Otherwise, we're most likely dealing with a named color.
-    var name = (color+'').replace(/^\s*([\S\s]*?)\s*$/, '$1').toLowerCase();
-    if(name == 'transparent'){
-      return new Color(255, 255, 255, 0);
-    }
-    return (result = COLOR_NAMES[name]) ? new Color(result[0], result[1], result[2]) : new Color(0, 0, 0, 0);
-  },
-
-  /**
-   * Process color and options into color style.
-   */
-  processColor: function(color, options) {
-
-    var opacity = options.opacity;
-    if (!color) return 'rgba(0, 0, 0, 0)';
-    if (color instanceof Color) return color.alpha(opacity).toString();
-    if (_.isString(color)) return Color.parse(color).alpha(opacity).toString();
-    
-    var grad = color.colors ? color : {colors: color};
-    
-    if (!options.ctx) {
-      if (!_.isArray(grad.colors)) return 'rgba(0, 0, 0, 0)';
-      return Color.parse(_.isArray(grad.colors[0]) ? grad.colors[0][1] : grad.colors[0]).alpha(opacity).toString();
-    }
-    grad = _.extend({start: 'top', end: 'bottom'}, grad); 
-    
-    if (/top/i.test(grad.start))  options.x1 = 0;
-    if (/left/i.test(grad.start)) options.y1 = 0;
-    if (/bottom/i.test(grad.end)) options.x2 = 0;
-    if (/right/i.test(grad.end))  options.y2 = 0;
-
-    var i, c, stop, gradient = options.ctx.createLinearGradient(options.x1, options.y1, options.x2, options.y2);
-    for (i = 0; i < grad.colors.length; i++) {
-      c = grad.colors[i];
-      if (_.isArray(c)) {
-        stop = c[0];
-        c = c[1];
-      }
-      else stop = i / (grad.colors.length-1);
-      gradient.addColorStop(stop, Color.parse(c).alpha(opacity));
+        _ = Flotr._;
+
+    // Constructor
+    function Color(r, g, b, a) {
+        this.rgba = ['r', 'g', 'b', 'a'];
+        var x = 4;
+        while (-1 < --x) {
+            this[this.rgba[x]] = arguments[x] || ((x == 3) ? 1.0 : 0);
+        }
+        this.normalize();
     }
-    return gradient;
-  }
-});
 
-Flotr.Color = Color;
+    // Constants
+    var COLOR_NAMES = {
+        aqua: [0, 255, 255],
+        azure: [240, 255, 255],
+        beige: [245, 245, 220],
+        black: [0, 0, 0],
+        blue: [0, 0, 255],
+        brown: [165, 42, 42],
+        cyan: [0, 255, 255],
+        darkblue: [0, 0, 139],
+        darkcyan: [0, 139, 139],
+        darkgrey: [169, 169, 169],
+        darkgreen: [0, 100, 0],
+        darkkhaki: [189, 183, 107],
+        darkmagenta: [139, 0, 139],
+        darkolivegreen: [85, 107, 47],
+        darkorange: [255, 140, 0],
+        darkorchid: [153, 50, 204],
+        darkred: [139, 0, 0],
+        darksalmon: [233, 150, 122],
+        darkviolet: [148, 0, 211],
+        fuchsia: [255, 0, 255],
+        gold: [255, 215, 0],
+        green: [0, 128, 0],
+        indigo: [75, 0, 130],
+        khaki: [240, 230, 140],
+        lightblue: [173, 216, 230],
+        lightcyan: [224, 255, 255],
+        lightgreen: [144, 238, 144],
+        lightgrey: [211, 211, 211],
+        lightpink: [255, 182, 193],
+        lightyellow: [255, 255, 224],
+        lime: [0, 255, 0],
+        magenta: [255, 0, 255],
+        maroon: [128, 0, 0],
+        navy: [0, 0, 128],
+        olive: [128, 128, 0],
+        orange: [255, 165, 0],
+        pink: [255, 192, 203],
+        purple: [128, 0, 128],
+        violet: [128, 0, 128],
+        red: [255, 0, 0],
+        silver: [192, 192, 192],
+        white: [255, 255, 255],
+        yellow: [255, 255, 0]
+    };
+
+    Color.prototype = {
+        scale: function(rf, gf, bf, af) {
+            var x = 4;
+            while (-1 < --x) {
+                if (!_.isUndefined(arguments[x])) this[this.rgba[x]] *= arguments[x];
+            }
+            return this.normalize();
+        },
+        alpha: function(alpha) {
+            if (!_.isUndefined(alpha) && !_.isNull(alpha)) {
+                this.a = alpha;
+            }
+            return this.normalize();
+        },
+        clone: function() {
+            return new Color(this.r, this.b, this.g, this.a);
+        },
+        limit: function(val, minVal, maxVal) {
+            return Math.max(Math.min(val, maxVal), minVal);
+        },
+        normalize: function() {
+            var limit = this.limit;
+            this.r = limit(parseInt(this.r, 10), 0, 255);
+            this.g = limit(parseInt(this.g, 10), 0, 255);
+            this.b = limit(parseInt(this.b, 10), 0, 255);
+            this.a = limit(this.a, 0, 1);
+            return this;
+        },
+        distance: function(color) {
+            if (!color) return;
+            color = new Color.parse(color);
+            var dist = 0,
+                x = 3;
+            while (-1 < --x) {
+                dist += Math.abs(this[this.rgba[x]] - color[this.rgba[x]]);
+            }
+            return dist;
+        },
+        toString: function() {
+            return (this.a >= 1.0) ? 'rgb(' + [this.r, this.g, this.b].join(',') + ')' : 'rgba(' + [this.r, this.g, this.b, this.a].join(',') + ')';
+        },
+        contrast: function() {
+            var
+                test = 1 - (0.299 * this.r + 0.587 * this.g + 0.114 * this.b) / 255;
+            return (test < 0.5 ? '#000000' : '#ffffff');
+        }
+    };
+
+    _.extend(Color, {
+        /**
+         * Parses a color string and returns a corresponding Color.
+         * The different tests are in order of probability to improve speed.
+         * @param {String, Color} str - string thats representing a color
+         * @return {Color} returns a Color object or false
+         */
+        parse: function(color) {
+            if (color instanceof Color) return color;
+
+            var result;
+
+            // #a0b1c2
+            if ((result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)))
+                return new Color(parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16));
+
+            // rgb(num,num,num)
+            if ((result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)))
+                return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10));
+
+            // #fff
+            if ((result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)))
+                return new Color(parseInt(result[1] + result[1], 16), parseInt(result[2] + result[2], 16), parseInt(result[3] + result[3], 16));
+
+            // rgba(num,num,num,num)
+            if ((result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
+                return new Color(parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10), parseFloat(result[4]));
+
+            // rgb(num%,num%,num%)
+            if ((result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)))
+                return new Color(parseFloat(result[1]) * 2.55, parseFloat(result[2]) * 2.55, parseFloat(result[3]) * 2.55);
+
+            // rgba(num%,num%,num%,num)
+            if ((result = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(color)))
+                return new Color(parseFloat(result[1]) * 2.55, parseFloat(result[2]) * 2.55, parseFloat(result[3]) * 2.55, parseFloat(result[4]));
+
+            // Otherwise, we're most likely dealing with a named color.
+            var name = (color + '').replace(/^\s*([\S\s]*?)\s*$/, '$1').toLowerCase();
+            if (name == 'transparent') {
+                return new Color(255, 255, 255, 0);
+            }
+            return (result = COLOR_NAMES[name]) ? new Color(result[0], result[1], result[2]) : new Color(0, 0, 0, 0);
+        },
+
+        /**
+         * Process color and options into color style.
+         */
+        processColor: function(color, options) {
+
+            var opacity = options.opacity;
+            if (!color) return 'rgba(0, 0, 0, 0)';
+            if (color instanceof Color) return color.alpha(opacity).toString();
+            if (_.isString(color)) return Color.parse(color).alpha(opacity).toString();
+
+            var grad = color.colors ? color : {
+                colors: color
+            };
+
+            if (!options.ctx) {
+                if (!_.isArray(grad.colors)) return 'rgba(0, 0, 0, 0)';
+                return Color.parse(_.isArray(grad.colors[0]) ? grad.colors[0][1] : grad.colors[0]).alpha(opacity).toString();
+            }
+            grad = _.extend({
+                start: 'top',
+                end: 'bottom'
+            }, grad);
+
+            if (/top/i.test(grad.start)) options.x1 = 0;
+            if (/left/i.test(grad.start)) options.y1 = 0;
+            if (/bottom/i.test(grad.end)) options.x2 = 0;
+            if (/right/i.test(grad.end)) options.y2 = 0;
+
+            var i, c, stop, gradient = options.ctx.createLinearGradient(options.x1, options.y1, options.x2, options.y2);
+            for (i = 0; i < grad.colors.length; i++) {
+                c = grad.colors[i];
+                if (_.isArray(c)) {
+                    stop = c[0];
+                    c = c[1];
+                } else stop = i / (grad.colors.length - 1);
+                gradient.addColorStop(stop, Color.parse(c).alpha(opacity));
+            }
+            return gradient;
+        }
+    });
+
+    Flotr.Color = Color;
 
 })();