diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 6dba1e91..438cbcb2 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -86,7 +86,6 @@ Mode.prototype.supportsFile = function(filename) {
     return filename.match(this.extRe);
 };
 
-//{
 var modes = [
     new Mode("c_cpp", "C/C++", ["c", "cpp", "cxx", "h", "hpp"]),
     new Mode("clojure", "Clojure", ["clj"]),
@@ -265,9 +264,6 @@ var docs = [
     )
 ];
 
-//}
-
-
 var docsByName = {};
 docs.forEach(function(d) {
     docsByName[d.name] = d;
@@ -371,7 +367,7 @@ function updateUIEditorOptions() {
     saveOption(showPrintMarginEl, editor.renderer.getShowPrintMargin());
     saveOption(highlightSelectedWordE, editor.getHighlightSelectedWord());
     saveOption(showHScrollEl, editor.renderer.getHScrollBarAlwaysVisible());
-    saveOption(showHScrollEl, editor.getAnimatedScroll());
+    saveOption(animateScrollEl, editor.getAnimatedScroll());
     saveOption(softTabEl, session.getUseSoftTabs());
     saveOption(behavioursEl, editor.getBehavioursEnabled());
 }
@@ -379,13 +375,17 @@ function updateUIEditorOptions() {
 function saveOption(el, val) {
     if (!el.onchange || el.onclick)
         return;
+        
     if ("checked" in el) {
         if (val !== undefined)
             el.checked = val;
+            
         localStorage && localStorage.setItem(el.id, el.checked ? 1 : 0);
-    } else    {
+    } 
+    else {
         if (val !== undefined)
             el.value = val;
+            
         localStorage && localStorage.setItem(el.id, el.value);
     }
 }
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index 389c82e3..8d827f97 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-clouds .ace_cursor {\
-  border-left: 2px solid #000000;\
+  border-left: 1px solid #000000;\
 }\
 \
 .ace-clouds .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index de6fea2e..be2673c7 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-clouds-midnight .ace_cursor {\
-  border-left: 2px solid #7DA5DC;\
+  border-left: 1px solid #7DA5DC;\
 }\
 \
 .ace-clouds-midnight .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index 4631fef2..b678a5cf 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-cobalt .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-cobalt .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index 3967d959..9fd4f22f 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-dawn .ace_cursor {\
-  border-left: 2px solid #000000;\
+  border-left: 1px solid #000000;\
 }\
 \
 .ace-dawn .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 551e7811..b1acacb7 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-idle-fingers .ace_cursor {\
-  border-left: 2px solid #91FF00;\
+  border-left: 1px solid #91FF00;\
 }\
 \
 .ace-idle-fingers .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 56313438..bcd31b67 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-kr-theme .ace_cursor {\
-  border-left: 2px solid #FF9900;\
+  border-left: 1px solid #FF9900;\
 }\
 \
 .ace-kr-theme .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js
index ddc09766..59a78d6d 100644
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-merbivore .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-merbivore .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js
index d684ff63..1ffedc14 100644
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-merbivore-soft .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-merbivore-soft .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index ae4274cb..85c7313a 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-mono-industrial .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-mono-industrial .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js
index 2794ff45..98782855 100644
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-monokai .ace_cursor {\
-  border-left: 2px solid #F8F8F0;\
+  border-left: 1px solid #F8F8F0;\
 }\
 \
 .ace-monokai .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index d0ad8bd6..3a95a36f 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-pastel-on-dark .ace_cursor {\
-  border-left: 2px solid #A7A7A7;\
+  border-left: 1px solid #A7A7A7;\
 }\
 \
 .ace-pastel-on-dark .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js
index fcf0ae42..159f17bd 100644
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-solarized-dark .ace_cursor {\
-  border-left: 2px solid #D30102;\
+  border-left: 1px solid #D30102;\
 }\
 \
 .ace-solarized-dark .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js
index 9191e556..dc635f59 100644
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-solarized-light .ace_cursor {\
-  border-left: 2px solid #000000;\
+  border-left: 1px solid #000000;\
 }\
 \
 .ace-solarized-light .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js
index 8931e60a..71885186 100644
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@@ -67,7 +67,7 @@ exports.cssText = ".ace-tm .ace_editor {\
 }\
 \
 .ace-tm .ace_cursor {\
-  border-left: 2px solid black;\
+  border-left: 1px solid black;\
 }\
 \
 .ace-tm .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index a891f06a..3447769a 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-tomorrow .ace_cursor {\
-  border-left: 2px solid #AEAFAD;\
+  border-left: 1px solid #AEAFAD;\
 }\
 \
 .ace-tomorrow .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index bb8e3a21..141912de 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-tomorrow-night .ace_cursor {\
-  border-left: 2px solid #AEAFAD;\
+  border-left: 1px solid #AEAFAD;\
 }\
 \
 .ace-tomorrow-night .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js
index f8e5c0d8..eae9284d 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-tomorrow-night-blue .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-tomorrow-night-blue .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js
index d294cbfc..a03817d8 100644
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-tomorrow-night-bright .ace_cursor {\
-  border-left: 2px solid #9F9F9F;\
+  border-left: 1px solid #9F9F9F;\
 }\
 \
 .ace-tomorrow-night-bright .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js
index 6c4efbd8..09ad2839 100644
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-tomorrow-night-eighties .ace_cursor {\
-  border-left: 2px solid #CCCCCC;\
+  border-left: 1px solid #CCCCCC;\
 }\
 \
 .ace-tomorrow-night-eighties .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index 728b9922..633ab66c 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-twilight .ace_cursor {\
-  border-left: 2px solid #A7A7A7;\
+  border-left: 1px solid #A7A7A7;\
 }\
 \
 .ace-twilight .ace_cursor.ace_overwrite {\
diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js
index 6ac945c3..4d497b03 100644
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@@ -68,7 +68,7 @@ exports.cssText = "\
 }\
 \
 .ace-vibrant-ink .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
+  border-left: 1px solid #FFFFFF;\
 }\
 \
 .ace-vibrant-ink .ace_cursor.ace_overwrite {\
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index 6585a895..308f63ff 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -27,7 +27,7 @@
 }
 
 .%cssClass% .ace_cursor {
-  border-left: 2px solid %cursor%;
+  border-left: 1px solid %cursor%;
 }
 
 .%cssClass% .ace_cursor.ace_overwrite {