76 files changed, 1458 insertions, 246 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index dabce6e0..13c9a705 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -52,6 +52,11 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
         }
     },
 
+    autoCompleteLabel: {
+        value: null,
+        serializable: true
+    },
+
     _autocomplete: {
         value: false
     },
@@ -73,7 +78,33 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
     },
 
     codeCompleteCheck: {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    zoomHottext: {
+        value: null,
+        serializable: true
+    },
+
+    comment: {
+        value: null,
+        serializable: true
+    },
+
+    uncomment: {
+        value: null,
+        serializable: true
+    },
+
+    themeSelect: {
+        value: null,
+        serializable: true
+    },
+
+    shortKeys: {
+        value: null,
+        serializable: true
     },
 
     prepareForDraw: {
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/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index bc433f52..29f49b7b 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     labelField: {