diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 5a748eba..081a1b0f 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -152,7 +152,7 @@
     opacity: 0.2;
 }
 
-.ace_editor.multiselect .ace_cursor {
+.ace_editor.ace_multiselect .ace_cursor {
     border-left-width: 1px;
 }
 
diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js
index 857ffba0..547463ad 100644
--- a/lib/ace/multi_select.js
+++ b/lib/ace/multi_select.js
@@ -399,7 +399,7 @@ var Editor = require("./editor").Editor;
             return;
         this.inMultiSelectMode = true;
 
-        this.setStyle("multiselect");
+        this.setStyle("ace_multiselect");
         this.keyBinding.addKeyboardHandler(commands.keyboardHandler);
         this.commands.on("exec", this.$onMultiSelectExec);
 
@@ -412,7 +412,7 @@ var Editor = require("./editor").Editor;
             return;
         this.inMultiSelectMode = false;
 
-        this.unsetStyle("multiselect");
+        this.unsetStyle("ace_multiselect");
         this.keyBinding.removeKeyboardHandler(commands.keyboardHandler);
 
         this.commands.removeEventListener("exec", this.$onMultiSelectExec);
diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css
index 4167e3ef..6877cfd1 100644
--- a/lib/ace/theme/clouds.css
+++ b/lib/ace/theme/clouds.css
@@ -37,7 +37,7 @@
   background: #BDD5FC
 }
 
-.ace-clouds.multiselect .ace_selection.start {
+.ace-clouds.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #FFFFFF;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css
index c4415713..4e9fa38b 100644
--- a/lib/ace/theme/clouds_midnight.css
+++ b/lib/ace/theme/clouds_midnight.css
@@ -37,7 +37,7 @@
   background: #000000
 }
 
-.ace-clouds-midnight.multiselect .ace_selection.start {
+.ace-clouds-midnight.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #191919;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 67c49845..8c15197c 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -37,7 +37,7 @@
   background: rgba(179, 101, 57, 0.75)
 }
 
-.ace-cobalt.multiselect .ace_selection.start {
+.ace-cobalt.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #002240;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
index e5692b45..9adf5960 100644
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@@ -37,7 +37,7 @@
   background: rgba(39, 95, 255, 0.30)
 }
 
-.ace-dawn.multiselect .ace_selection.start {
+.ace-dawn.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #F9F9F9;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css
index e9755423..3ff665d6 100644
--- a/lib/ace/theme/github.css
+++ b/lib/ace/theme/github.css
@@ -94,7 +94,7 @@
 .ace-github .ace_marker-layer .ace_selection {
   background: rgb(181, 213, 255);
 }
-.ace-github.multiselect .ace_selection.start {
+.ace-github.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px white;
   border-radius: 2px;
 }
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
index 0cd4849f..e07d20ad 100644
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@@ -37,7 +37,7 @@
   background: rgba(90, 100, 126, 0.88)
 }
 
-.ace-idle-fingers.multiselect .ace_selection.start {
+.ace-idle-fingers.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #323232;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
index b4d5a4b4..37dec825 100644
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@@ -37,7 +37,7 @@
   background: rgba(170, 0, 255, 0.45)
 }
 
-.ace-kr-theme.multiselect .ace_selection.start {
+.ace-kr-theme.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #0B0A09;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
index 2c0504a9..e5732f78 100644
--- a/lib/ace/theme/merbivore.css
+++ b/lib/ace/theme/merbivore.css
@@ -37,7 +37,7 @@
   background: #454545
 }
 
-.ace-merbivore.multiselect .ace_selection.start {
+.ace-merbivore.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #161616;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
index c7e0cc1f..333348fc 100644
--- a/lib/ace/theme/merbivore_soft.css
+++ b/lib/ace/theme/merbivore_soft.css
@@ -37,7 +37,7 @@
   background: #494949
 }
 
-.ace-merbivore-soft.multiselect .ace_selection.start {
+.ace-merbivore-soft.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #1C1C1C;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css
index 43a11ae7..9f56cdf8 100644
--- a/lib/ace/theme/mono_industrial.css
+++ b/lib/ace/theme/mono_industrial.css
@@ -37,7 +37,7 @@
   background: rgba(145, 153, 148, 0.40)
 }
 
-.ace-mono-industrial.multiselect .ace_selection.start {
+.ace-mono-industrial.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #222C28;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css
index 9ffd189b..7f0de488 100644
--- a/lib/ace/theme/monokai.css
+++ b/lib/ace/theme/monokai.css
@@ -37,7 +37,7 @@
   background: #49483E
 }
 
-.ace-monokai.multiselect .ace_selection.start {
+.ace-monokai.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #272822;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css
index 57e83356..cbf3f43f 100644
--- a/lib/ace/theme/pastel_on_dark.css
+++ b/lib/ace/theme/pastel_on_dark.css
@@ -37,7 +37,7 @@
   background: rgba(221, 240, 255, 0.20)
 }
 
-.ace-pastel-on-dark.multiselect .ace_selection.start {
+.ace-pastel-on-dark.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #2C2828;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css
index 8f802a9f..f870db7d 100644
--- a/lib/ace/theme/solarized_dark.css
+++ b/lib/ace/theme/solarized_dark.css
@@ -40,7 +40,7 @@
   background: rgba(255, 255, 255, 0.1)
 }
 
-.ace-solarized-dark.multiselect .ace_selection.start {
+.ace-solarized-dark.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #002B36;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css
index 062c5e63..3dd8098d 100644
--- a/lib/ace/theme/solarized_light.css
+++ b/lib/ace/theme/solarized_light.css
@@ -37,7 +37,7 @@
   background: #073642
 }
 
-.ace-solarized-light.multiselect .ace_selection.start {
+.ace-solarized-light.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #FDF6E3;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css
index e46c4cfc..eca40750 100644
--- a/lib/ace/theme/textmate.css
+++ b/lib/ace/theme/textmate.css
@@ -132,7 +132,7 @@
 .ace-tm .ace_marker-layer .ace_selection {
   background: rgb(181, 213, 255);
 }
-.ace-tm.multiselect .ace_selection.start {
+.ace-tm.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px white;
   border-radius: 2px;
 }
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
index 0d4b5c1e..fb95693b 100644
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@@ -37,7 +37,7 @@
   background: #D6D6D6
 }
 
-.ace-tomorrow.multiselect .ace_selection.start {
+.ace-tomorrow.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #FFFFFF;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
index a0f907cd..f044a623 100644
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@@ -37,7 +37,7 @@
   background: #373B41
 }
 
-.ace-tomorrow-night.multiselect .ace_selection.start {
+.ace-tomorrow-night.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #1D1F21;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
index 4272045a..975646ec 100644
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -38,7 +38,7 @@
   background: #003F8E
 }
 
-.ace-tomorrow-night-blue.multiselect .ace_selection.start {
+.ace-tomorrow-night-blue.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #002451;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 0b8c88db..56e915f1 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -37,7 +37,7 @@
   background: #424242
 }
 
-.ace-tomorrow-night-bright.multiselect .ace_selection.start {
+.ace-tomorrow-night-bright.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #000000;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
index ef9ba4fc..6e040685 100644
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -38,7 +38,7 @@
   background: #515151
 }
 
-.ace-tomorrow-night-eighties.multiselect .ace_selection.start {
+.ace-tomorrow-night-eighties.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #2D2D2D;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
index 6f452147..86a0f95b 100644
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@@ -37,7 +37,7 @@
   background: rgba(221, 240, 255, 0.20)
 }
 
-.ace-twilight.multiselect .ace_selection.start {
+.ace-twilight.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #141414;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css
index 14d5b4f0..f4eafc0b 100644
--- a/lib/ace/theme/vibrant_ink.css
+++ b/lib/ace/theme/vibrant_ink.css
@@ -37,7 +37,7 @@
   background: #6699CC
 }
 
-.ace-vibrant-ink.multiselect .ace_selection.start {
+.ace-vibrant-ink.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #0F0F0F;
   border-radius: 2px
 }
diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css
index 00916e18..86d141e3 100644
--- a/lib/ace/theme/xcode.css
+++ b/lib/ace/theme/xcode.css
@@ -38,7 +38,7 @@
   background: #B5D5FF
 }
 
-.ace-xcode.multiselect .ace_selection.start {
+.ace-xcode.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px #FFFFFF;
   border-radius: 2px
 }
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index 757819ab..447c88e1 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -39,7 +39,7 @@
   background: %selection%;
 }
 
-.%cssClass%.multiselect .ace_selection.start {
+.%cssClass%.ace_multiselect .ace_selection.start {
   box-shadow: 0 0 3px 0px %background%;
   border-radius: 2px;
 }