diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 2603efcd..07da6796 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -148,7 +148,7 @@
     box-sizing: border-box;
 }
 
-.ace_cursor.ace_hidden {
+.ace_hidden-cursors .ace_cursor {
     opacity: 0.2;
 }
 
diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js
index a1248759..8fc3aeeb 100644
--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@@ -66,7 +66,7 @@ exports.handler.attach = function(editor) {
                 opacity: 1;\
                 background-color: transparent;\
             }\
-            .emacs-mode .ace_cursor.ace_overwrite {\
+            .emacs-mode .ace_overwrite-cursors .ace_cursor {\
                 opacity: 1;\
                 background-color: transparent;\
                 border-width: 0 0 2px 2px !important;\
diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js
index 8bcc5423..d42b1d28 100644
--- a/lib/ace/layer/cursor.js
+++ b/lib/ace/layer/cursor.js
@@ -85,13 +85,7 @@ var Cursor = function(parentEl) {
 
     this.addCursor = function() {
         var el = dom.createElement("div");
-        var className = "ace_cursor";
-        if (!this.isVisible)
-            className += " ace_hidden";
-        if (this.overwrite)
-            className += " ace_overwrite";
-
-        el.className = className;
+        el.className = "ace_cursor";
         this.element.appendChild(el);
         this.cursors.push(el);
         return el;
@@ -107,15 +101,13 @@ var Cursor = function(parentEl) {
 
     this.hideCursor = function() {
         this.isVisible = false;
-        for (var i = this.cursors.length; i--; )
-            dom.addCssClass(this.cursors[i], "ace_hidden");
+        dom.addCssClass(this.element, "ace_hidden-cursors");
         this.resetTimer();
     };
 
     this.showCursor = function() {
         this.isVisible = true;
-        for (var i = this.cursors.length; i--; )
-            dom.removeCssClass(this.cursors[i], "ace_hidden");
+        dom.removeCssClass(this.element, "ace_hidden-cursors");
         this.resetTimer();
     };
 
@@ -213,12 +205,10 @@ var Cursor = function(parentEl) {
     this.$setOverwrite = function(overwrite) {
         if (overwrite != this.overwrite) {
             this.overwrite = overwrite;
-            for (var i = this.cursors.length; i--; ) {
-                if (overwrite)
-                    dom.addCssClass(this.cursors[i], "ace_overwrite");
-                else
-                    dom.removeCssClass(this.cursors[i], "ace_overwrite");
-            }
+            if (overwrite)
+                dom.addCssClass(this.element, "ace_overwrite-cursors");
+            else
+                dom.removeCssClass(this.element, "ace_overwrite-cursors");
         }
     };
 
diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css
index 65a25bbd..524ad03a 100644
--- a/lib/ace/theme/ambiance.css
+++ b/lib/ace/theme/ambiance.css
@@ -66,7 +66,7 @@
   border-left: 1px solid #7991E8;
 }
 
-.ace-ambiance .ace_cursor.ace_overwrite {
+.ace-ambiance .ace_overwrite-cursors .ace_cursor {
   border: 1px solid #FFE300;
   background: #766B13;
 }
diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css
index 8e166a90..773c213c 100644
--- a/lib/ace/theme/chrome.css
+++ b/lib/ace/theme/chrome.css
@@ -17,7 +17,7 @@
   border-left: 2px solid black;
 }
 
-.ace-chrome .ace_cursor.ace_overwrite {
+.ace-chrome .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css
index 1f64a7cd..4ff7e7c2 100644
--- a/lib/ace/theme/clouds.css
+++ b/lib/ace/theme/clouds.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #000000
 }
 
-.ace-clouds .ace_cursor.ace_overwrite {
+.ace-clouds .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #000000
 }
diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css
index 632dc4e5..6bc319d1 100644
--- a/lib/ace/theme/clouds_midnight.css
+++ b/lib/ace/theme/clouds_midnight.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #7DA5DC
 }
 
-.ace-clouds-midnight .ace_cursor.ace_overwrite {
+.ace-clouds-midnight .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #7DA5DC
 }
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 3c8d61f9..3717ba64 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-cobalt .ace_cursor.ace_overwrite {
+.ace-cobalt .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css
index f8032fa4..2d4a0eef 100644
--- a/lib/ace/theme/crimson_editor.css
+++ b/lib/ace/theme/crimson_editor.css
@@ -26,7 +26,7 @@
   border-left: 2px solid black;
 }
 
-.ace-crimson-editor .ace_cursor.ace_overwrite {
+.ace-crimson-editor .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
index fcfd5e89..ca544fea 100644
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #000000
 }
 
-.ace-dawn .ace_cursor.ace_overwrite {
+.ace-dawn .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #000000
 }
diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css
index 04983385..30f77cbf 100644
--- a/lib/ace/theme/dreamweaver.css
+++ b/lib/ace/theme/dreamweaver.css
@@ -23,7 +23,7 @@
   border-left: 2px solid black;
 }
 
-.ace-dreamweaver .ace_cursor.ace_overwrite {
+.ace-dreamweaver .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css
index 12ffa256..5b059727 100644
--- a/lib/ace/theme/github.css
+++ b/lib/ace/theme/github.css
@@ -70,7 +70,7 @@
   border-left: 2px solid black;
 }
 
-.ace-github .ace_cursor.ace_overwrite {
+.ace-github .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
index 1b735dff..43eff698 100644
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #91FF00
 }
 
-.ace-idle-fingers .ace_cursor.ace_overwrite {
+.ace-idle-fingers .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #91FF00
 }
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
index ffefb03a..0f42c384 100644
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FF9900
 }
 
-.ace-kr-theme .ace_cursor.ace_overwrite {
+.ace-kr-theme .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FF9900
 }
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
index a842b716..69e81376 100644
--- a/lib/ace/theme/merbivore.css
+++ b/lib/ace/theme/merbivore.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-merbivore .ace_cursor.ace_overwrite {
+.ace-merbivore .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
index 7e276a89..ddd417f8 100644
--- a/lib/ace/theme/merbivore_soft.css
+++ b/lib/ace/theme/merbivore_soft.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-merbivore-soft .ace_cursor.ace_overwrite {
+.ace-merbivore-soft .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css
index b5eb68b2..f9a318fc 100644
--- a/lib/ace/theme/mono_industrial.css
+++ b/lib/ace/theme/mono_industrial.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-mono-industrial .ace_cursor.ace_overwrite {
+.ace-mono-industrial .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
@@ -135,4 +135,4 @@
 
 .ace-mono-industrial .ace_indent-guide {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y
-}
\ No newline at end of file
+}
diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css
index 1a34fed4..ed876c79 100644
--- a/lib/ace/theme/monokai.css
+++ b/lib/ace/theme/monokai.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #F8F8F0
 }
 
-.ace-monokai .ace_cursor.ace_overwrite {
+.ace-monokai .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #F8F8F0
 }
diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css
index 18f61d85..b517f22a 100644
--- a/lib/ace/theme/pastel_on_dark.css
+++ b/lib/ace/theme/pastel_on_dark.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #A7A7A7
 }
 
-.ace-pastel-on-dark .ace_cursor.ace_overwrite {
+.ace-pastel-on-dark .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #A7A7A7
 }
diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css
index 26b206b0..4d47fb76 100644
--- a/lib/ace/theme/solarized_dark.css
+++ b/lib/ace/theme/solarized_dark.css
@@ -22,7 +22,7 @@
   border-left: 2px solid #D30102
 }
 
-.ace-solarized-dark .ace_cursor.ace_overwrite {
+.ace-solarized-dark .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #D30102
 }
diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css
index e00b9b39..65dfe8df 100644
--- a/lib/ace/theme/solarized_light.css
+++ b/lib/ace/theme/solarized_light.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #000000
 }
 
-.ace-solarized-light .ace_cursor.ace_overwrite {
+.ace-solarized-light .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #000000
 }
diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css
index ef0be415..538700f2 100644
--- a/lib/ace/theme/textmate.css
+++ b/lib/ace/theme/textmate.css
@@ -20,7 +20,7 @@
   border-left: 2px solid black;
 }
 
-.ace-tm .ace_cursor.ace_overwrite {
+.ace-tm .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
index 90c397bf..a5d88b6c 100644
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #AEAFAD
 }
 
-.ace-tomorrow .ace_cursor.ace_overwrite {
+.ace-tomorrow .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #AEAFAD
 }
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
index 8a62bac2..0baaf323 100644
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #AEAFAD
 }
 
-.ace-tomorrow-night .ace_cursor.ace_overwrite {
+.ace-tomorrow-night .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #AEAFAD
 }
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
index ca0a84fe..daebddb1 100644
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -21,7 +21,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-tomorrow-night-blue .ace_cursor.ace_overwrite {
+.ace-tomorrow-night-blue .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 24f4469c..065e2f00 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #9F9F9F
 }
 
-.ace-tomorrow-night-bright .ace_cursor.ace_overwrite {
+.ace-tomorrow-night-bright .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #9F9F9F
 }
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
index c1695b0d..5584d62d 100644
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -21,7 +21,7 @@
   border-left: 2px solid #CCCCCC
 }
 
-.ace-tomorrow-night-eighties .ace_cursor.ace_overwrite {
+.ace-tomorrow-night-eighties .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #CCCCCC
 }
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
index 3051a3e6..3ef9de2e 100644
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #A7A7A7
 }
 
-.ace-twilight .ace_cursor.ace_overwrite {
+.ace-twilight .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #A7A7A7
 }
diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css
index fdd965f1..c611681d 100644
--- a/lib/ace/theme/vibrant_ink.css
+++ b/lib/ace/theme/vibrant_ink.css
@@ -20,7 +20,7 @@
   border-left: 2px solid #FFFFFF
 }
 
-.ace-vibrant-ink .ace_cursor.ace_overwrite {
+.ace-vibrant-ink .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #FFFFFF
 }
diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css
index 16db2006..463703b0 100644
--- a/lib/ace/theme/xcode.css
+++ b/lib/ace/theme/xcode.css
@@ -22,7 +22,7 @@
   border-left: 2px solid #000000
 }
 
-.ace-xcode .ace_cursor.ace_overwrite {
+.ace-xcode .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid #000000
 }
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index 3b83c5ba..180132f2 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -22,7 +22,7 @@
   border-left: 2px solid %cursor%;
 }
 
-.%cssClass% .ace_cursor.ace_overwrite {
+.%cssClass% .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid %overwrite%;
 }