64 files changed, 3034 insertions, 2625 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index 2e189c87..5018b1f4 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -6,11 +6,9 @@
        (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
 </copyright>
 -->
-<html lang="en">
+<html>
        <head>
        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
        <link rel="stylesheet" type="text/css" href="css/colorbar.css">
                
                <script type="text/montage-serialization">
diff --git a/js/components/colorbar.reel/colorbar.js b/js/components/colorbar.reel/colorbar.js
index e547b9bc..e5dd84cf 100755
--- a/js/components/colorbar.reel/colorbar.js
+++ b/js/components/colorbar.reel/colorbar.js
@@ -19,28 +19,22 @@ exports.ColorBar = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //Width of spectrum (not including b/w buttons)
    _colorBarSpectrumWidth: {
-        enumerable: false,
        value: null
    },
    ////////////////////////////////////////////////////////////////////
    //Width of spectrum steps (used to calculate size of B/W buttons)
    _colorBarSpectrumWidthSteps: {
-        enumerable: false,
        value: 10
    },
    ////////////////////////////////////////////////////////////////////
    //Default value
    _value: {
-        enumerable: false,
        value: {h: 0, s: 0, v: 0}
    },
        ////////////////////////////////////////////////////////////////////
    //HSV Value selected from bar
    value: {
-        enumerable: true,
+        get: function() {return this._value;},
-        get: function() {
-            return this._value;
-        },
        set: function(value) {
                if (value) {
                        //Checking for limits (Max and Min HSV values)
@@ -73,7 +67,6 @@ exports.ColorBar = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //
    prepareForDraw: {
-        enumerable: false,
        value: function() {
                        //Nothing
        }
@@ -81,7 +74,6 @@ exports.ColorBar = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //Setting up and drawing canvas to object
    willDraw: {
-        enumerable: false,
        value: function() {
                //Setting the width and height of the canvas to match container
                this.element.width = parseInt(window.getComputedStyle(this.element, null).width);
@@ -168,7 +160,6 @@ exports.ColorBar = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //Used to check mouse mode and display cursor
    _isMouseDown: {
-        enumerable: false,
        value: false
    },
    ////////////////////////////////////////////////////////////////////
@@ -224,4 +215,5 @@ exports.ColorBar = Montage.create(Component, {
        }
    }
    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 });
 \ No newline at end of file
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index b0e23653..4765a677 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -6,11 +6,10 @@
        (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
 </copyright>
 -->
-<html lang="en">
+<html>
        <head>
        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
        <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
                <script type="text/montage-serialization">
@@ -18,7 +17,12 @@