60 files changed, 1108 insertions, 416 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 8df868a2..a6c3ff6d 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                }
                this.needsDraw = true;
            }
-        }
+        },
+        serializable: true
    },
    // Internal flags to determine what the change/changing events will contain
@@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                }
                this.needsDraw = true;
            }
-        }
+        },
+        serializable: true
    },
    _maxValue: {
@@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                }
                this.needsDraw = true;
            }
-        }
+        },
+        serializable: true
    },
    _valueCoef: {
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, {
    ////////////////////////////////////////////////////////////////////