diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 5793ddc1..8de99943 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -40,6 +40,7 @@
     overflow-x: hidden;
     overflow-y: hidden;
     height: 100%;
+    cursor: default;
 }
 
 .ace_gutter-cell.ace_error {
@@ -162,8 +163,18 @@
 
 .ace_line .ace_fold {
     cursor: pointer;
-     pointer-events: auto;
-     color: darkred;
+    color: darkred;
+    -moz-outline-radius: 4px;
+    outline-radius: 4px;
+    border-radius: 4px;
+    outline: 1px solid #1C00FF;
+    outline-offset: -2px;
+    pointer-events: auto;
+}
+
+.ace_dark .ace_fold {
+    color: #E6E1DC;
+    outline-color: #FC6F09;
 }
 
 .ace_fold:hover{
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index da88f9eb..1a457cb0 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -37,9 +37,10 @@
 
 define(function(require, exports, module) {
 
-exports.cssClass = "ace-clouds";
 exports.isDark = false;
-exports.cssText = ".ace-clouds .ace_editor {\
+exports.cssClass = "ace-clouds";
+exports.cssText = "\
+.ace-clouds .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -103,6 +104,9 @@ exports.cssText = ".ace-clouds .ace_editor {\
   background: #FFFBD1;\
 }\
 \
+.ace-clouds .ace_marker-layer .ace_selected_word {\
+  border: 1px solid #BDD5FC;\
+}\
        \
 .ace-clouds .ace_invisible {\
   color: #BFBFBF;\
@@ -116,18 +120,10 @@ exports.cssText = ".ace-clouds .ace_editor {\
   color:#484848;\
 }\
 \
-.ace-clouds .ace_constant {\
-  \
-}\
-\
 .ace-clouds .ace_constant.ace_language {\
   color:#39946A;\
 }\
 \
-.ace-clouds .ace_constant.ace_library {\
-  \
-}\
-\
 .ace-clouds .ace_constant.ace_numeric {\
   color:#46A609;\
 }\
@@ -136,123 +132,30 @@ exports.cssText = ".ace-clouds .ace_editor {\
   background-color:#FF002A;\
 }\
 \
-.ace-clouds .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-clouds .ace_invalid.ace_deprecated {\
-  \
-}\
-\
-.ace-clouds .ace_support {\
-  \
+.ace-clouds .ace_fold {\
+    outline-color: #AF956F\
 }\
 \
 .ace-clouds .ace_support.ace_function {\
   color:#C52727;\
 }\
 \
-.ace-clouds .ace_function.ace_buildin {\
-  \
-}\
-\
 .ace-clouds .ace_string {\
   color:#5D90CD;\
 }\
 \
-.ace-clouds .ace_string.ace_regexp {\
-  \
-}\
-\
 .ace-clouds .ace_comment {\
   color:#BCC8BA;\
 }\
 \
-.ace-clouds .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-clouds .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
-.ace-clouds .ace_variable {\
-  \
-}\
-\
-.ace-clouds .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-clouds .ace_xml_pe {\
-  \
-}\
-\
-.ace-clouds .ace_meta {\
-  \
-}\
-\
-.ace-clouds .ace_meta.ace_tag {\
-  \
-}\
-\
-.ace-clouds .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
 .ace-clouds .ace_entity.ace_other.ace_attribute-name {\
   color:#606060;\
 }\
 \
-.ace-clouds .ace_entity.ace_name {\
-  \
-}\
-\
-.ace-clouds .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-clouds .ace_markup.ace_underline {\
     text-decoration:underline;\
-}\
-\
-.ace-clouds .ace_markup.ace_heading {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-clouds .ace_markup.ace_list {\
-  \
-}\
-\
-.ace-clouds .ace_collab.ace_user1 {\
-     \
 }";
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index 897bffee..335d93b4 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -37,9 +37,10 @@
 
 define(function(require, exports, module) {
 
-exports.cssClass = "ace-clouds-midnight";
 exports.isDark = true;
-exports.cssText = ".ace-clouds-midnight .ace_editor {\
+exports.cssClass = "ace-clouds-midnight";
+exports.cssText = "\
+.ace-clouds-midnight .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -103,6 +104,9 @@ exports.cssText = ".ace-clouds-midnight .ace_editor {\
   background: rgba(215, 215, 215, 0.031);\
 }\
 \
+.ace-clouds-midnight .ace_marker-layer .ace_selected_word {\
+  border: 1px solid #000000;\
+}\
        \
 .ace-clouds-midnight .ace_invisible {\
   color: #BFBFBF;\
@@ -116,18 +120,10 @@ exports.cssText = ".ace-clouds-midnight .ace_editor {\
   color:#4B4B4B;\
 }\
 \
-.ace-clouds-midnight .ace_constant {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_constant.ace_language {\
   color:#39946A;\
 }\
 \
-.ace-clouds-midnight .ace_constant.ace_library {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_constant.ace_numeric {\
   color:#46A609;\
 }\
@@ -137,123 +133,30 @@ exports.cssText = ".ace-clouds-midnight .ace_editor {\
 background-color:#E92E2E;\
 }\
 \
-.ace-clouds-midnight .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_invalid.ace_deprecated {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_support {\
-  \
+.ace-clouds-midnight .ace_fold {\
+    outline-color: #927C5D\
 }\
 \
 .ace-clouds-midnight .ace_support.ace_function {\
   color:#E92E2E;\
 }\
 \
-.ace-clouds-midnight .ace_function.ace_buildin {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_string {\
   color:#5D90CD;\
 }\
 \
-.ace-clouds-midnight .ace_string.ace_regexp {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_comment {\
   color:#3C403B;\
 }\
 \
-.ace-clouds-midnight .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_variable {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_xml_pe {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_meta {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_meta.ace_tag {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {\
   color:#606060;\
 }\
 \
-.ace-clouds-midnight .ace_entity.ace_name {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-clouds-midnight .ace_markup.ace_underline {\
     text-decoration:underline;\
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_list {\
-  \
-}\
-\
-.ace-clouds-midnight .ace_collab.ace_user1 {\
-     \
 }";
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index 3d32e7b7..d29bcd4d 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -37,9 +37,10 @@
 
 define(function(require, exports, module) {
 
-exports.cssClass = "ace-cobalt";
 exports.isDark = true;
-exports.cssText = ".ace-cobalt .ace_editor {\
+exports.cssClass = "ace-cobalt";
+exports.cssText = "\
+.ace-cobalt .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -103,6 +104,9 @@ exports.cssText = ".ace-cobalt .ace_editor {\
   background: rgba(0, 0, 0, 0.35);\
 }\
 \
+.ace-cobalt .ace_marker-layer .ace_selected_word {\
+  border: 1px solid rgba(179, 101, 57, 0.75);\
+}\
        \
 .ace-cobalt .ace_invisible {\
   color: rgba(255, 255, 255, 0.15);\
@@ -112,55 +116,27 @@ exports.cssText = ".ace-cobalt .ace_editor {\
   color:#FF9D00;\
 }\
 \
-.ace-cobalt .ace_keyword.ace_operator {\
-  \
-}\
-\
 .ace-cobalt .ace_constant {\
   color:#FF628C;\
 }\
 \
-.ace-cobalt .ace_constant.ace_language {\
-  \
-}\
-\
-.ace-cobalt .ace_constant.ace_library {\
-  \
-}\
-\
-.ace-cobalt .ace_constant.ace_numeric {\
-  \
-}\
-\
 .ace-cobalt .ace_invalid {\
   color:#F8F8F8;\
 background-color:#800F00;\
 }\
 \
-.ace-cobalt .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-cobalt .ace_invalid.ace_deprecated {\
-  \
-}\
-\
 .ace-cobalt .ace_support {\
   color:#80FFBB;\
 }\
 \
+.ace-cobalt .ace_fold {\
+    outline-color: #FF9D00\
+}\
+\
 .ace-cobalt .ace_support.ace_function {\
   color:#FFB054;\
 }\
 \
-.ace-cobalt .ace_function.ace_buildin {\
-  \
-}\
-\
-.ace-cobalt .ace_string {\
-  \
-}\
-\
 .ace-cobalt .ace_string.ace_regexp {\
   color:#80FFC2;\
 }\
@@ -170,14 +146,6 @@ background-color:#800F00;\
 color:#0088FF;\
 }\
 \
-.ace-cobalt .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-cobalt .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
 .ace-cobalt .ace_variable {\
   color:#CCCCCC;\
 }\
@@ -186,34 +154,10 @@ color:#0088FF;\
   color:#FF80E1;\
 }\
 \
-.ace-cobalt .ace_xml_pe {\
-  \
-}\
-\
-.ace-cobalt .ace_meta {\
-  \
-}\
-\
 .ace-cobalt .ace_meta.ace_tag {\
   color:#9EFFFF;\
 }\
 \
-.ace-cobalt .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
-.ace-cobalt .ace_entity.ace_other.ace_attribute-name {\
-  \
-}\
-\
-.ace-cobalt .ace_entity.ace_name {\
-  \
-}\
-\
-.ace-cobalt .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-cobalt .ace_markup.ace_underline {\
     text-decoration:underline;\
 }\
@@ -223,39 +167,10 @@ color:#0088FF;\
 background-color:#001221;\
 }\
 \
-.ace-cobalt .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-cobalt .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-cobalt .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-cobalt .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-cobalt .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-cobalt .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
 .ace-cobalt .ace_markup.ace_list {\
   background-color:#130D26;\
-}\
-\
-.ace-cobalt .ace_collab.ace_user1 {\
-     \
 }";
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js
index eb0ec722..3b3a118b 100644
--- a/lib/ace/theme/crimson_editor.js
+++ b/lib/ace/theme/crimson_editor.js
@@ -110,8 +110,7 @@ exports.cssText = ".ace-crimson-editor .ace_editor {\
 }\
 \
 .ace-crimson-editor .ace_line .ace_fold {\
-    background-color: #E4E4E4;\
-    border-radius: 3px;\
+    background-color: rgba(228, 228, 228, 0.5);\
 }\
 \
 .ace-crimson-editor .ace_line .ace_support.ace_function {\
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index faf44ad3..32c17ab9 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = false;
-exports.cssText = ".ace-dawn .ace_editor {\
+exports.cssClass = "ace-dawn";
+exports.cssText = "\
+.ace-dawn .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-dawn .ace_editor {\
   background: rgba(36, 99, 180, 0.12);\
 }\
 \
+.ace-dawn .ace_marker-layer .ace_selected_word {\
+  border: 1px solid rgba(39, 95, 255, 0.30);\
+}\
        \
 .ace-dawn .ace_invisible {\
   color: rgba(75, 75, 126, 0.50);\
@@ -110,30 +116,10 @@ exports.cssText = ".ace-dawn .ace_editor {\
   color:#794938;\
 }\
 \
-.ace-dawn .ace_keyword.ace_operator {\
-  \
-}\
-\
 .ace-dawn .ace_constant {\
   color:#811F24;\
 }\
 \
-.ace-dawn .ace_constant.ace_language {\
-  \
-}\
-\
-.ace-dawn .ace_constant.ace_library {\
-  \
-}\
-\
-.ace-dawn .ace_constant.ace_numeric {\
-  \
-}\
-\
-.ace-dawn .ace_invalid {\
-  \
-}\
-\
 .ace-dawn .ace_invalid.ace_illegal {\
   text-decoration:underline;\
 font-style:italic;\
@@ -151,12 +137,12 @@ color:#B52A1D;\
   color:#691C97;\
 }\
 \
-.ace-dawn .ace_support.ace_function {\
-  color:#693A17;\
+.ace-dawn .ace_fold {\
+    outline-color: #794938\
 }\
 \
-.ace-dawn .ace_function.ace_buildin {\
-  \
+.ace-dawn .ace_support.ace_function {\
+  color:#693A17;\
 }\
 \
 .ace-dawn .ace_string {\
@@ -172,50 +158,10 @@ color:#B52A1D;\
 color:#5A525F;\
 }\
 \
-.ace-dawn .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-dawn .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
 .ace-dawn .ace_variable {\
   color:#234A97;\
 }\
 \
-.ace-dawn .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-dawn .ace_xml_pe {\
-  \
-}\
-\
-.ace-dawn .ace_meta {\
-  \
-}\
-\
-.ace-dawn .ace_meta.ace_tag {\
-  \
-}\
-\
-.ace-dawn .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
-.ace-dawn .ace_entity.ace_other.ace_attribute-name {\
-  \
-}\
-\
-.ace-dawn .ace_entity.ace_name {\
-  \
-}\
-\
-.ace-dawn .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-dawn .ace_markup.ace_underline {\
     text-decoration:underline;\
 }\
@@ -224,41 +170,10 @@ color:#5A525F;\
   color:#19356D;\
 }\
 \
-.ace-dawn .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-dawn .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-dawn .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-dawn .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-dawn .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-dawn .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
 .ace-dawn .ace_markup.ace_list {\
   color:#693A17;\
-}\
-\
-.ace-dawn .ace_collab.ace_user1 {\
-     \
 }";
 
-exports.cssClass = "ace-dawn";
-
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index d4de985d..ca5cba1d 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = true;
-exports.cssText = ".ace-idle-fingers .ace_editor {\
+exports.cssClass = "ace-idle-fingers";
+exports.cssText = "\
+.ace-idle-fingers .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-idle-fingers .ace_editor {\
   background: #353637;\
 }\
 \
+.ace-idle-fingers .ace_marker-layer .ace_selected_word {\
+  border: 1px solid rgba(90, 100, 126, 0.88);\
+}\
        \
 .ace-idle-fingers .ace_invisible {\
   color: #404040;\
@@ -110,51 +116,23 @@ exports.cssText = ".ace-idle-fingers .ace_editor {\
   color:#CC7833;\
 }\
 \
-.ace-idle-fingers .ace_keyword.ace_operator {\
-  \
-}\
-\
 .ace-idle-fingers .ace_constant {\
   color:#6C99BB;\
 }\
 \
-.ace-idle-fingers .ace_constant.ace_language {\
-  \
-}\
-\
-.ace-idle-fingers .ace_constant.ace_library {\
-  \
-}\
-\
-.ace-idle-fingers .ace_constant.ace_numeric {\
-  \
-}\
-\
 .ace-idle-fingers .ace_invalid {\
   color:#FFFFFF;\
 background-color:#FF0000;\
 }\
 \
-.ace-idle-fingers .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-idle-fingers .ace_invalid.ace_deprecated {\
-  \
-}\
-\
-.ace-idle-fingers .ace_support {\
-  \
+.ace-idle-fingers .ace_fold {\
+    outline-color: #CC7833\
 }\
 \
 .ace-idle-fingers .ace_support.ace_function {\
   color:#B83426;\
 }\
 \
-.ace-idle-fingers .ace_function.ace_buildin {\
-  \
-}\
-\
 .ace-idle-fingers .ace_string {\
   color:#A5C261;\
 }\
@@ -168,94 +146,23 @@ background-color:#FF0000;\
 color:#BC9458;\
 }\
 \
-.ace-idle-fingers .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-idle-fingers .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
-.ace-idle-fingers .ace_variable {\
-  \
-}\
-\
-.ace-idle-fingers .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-idle-fingers .ace_xml_pe {\
-  \
-}\
-\
-.ace-idle-fingers .ace_meta {\
-  \
-}\
-\
 .ace-idle-fingers .ace_meta.ace_tag {\
   color:#FFE5BB;\
 }\
 \
-.ace-idle-fingers .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
-.ace-idle-fingers .ace_entity.ace_other.ace_attribute-name {\
-  \
-}\
-\
 .ace-idle-fingers .ace_entity.ace_name {\
   color:#FFC66D;\
 }\
 \
-.ace-idle-fingers .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-idle-fingers .ace_markup.ace_underline {\
     text-decoration:underline;\
 }\
 \
-.ace-idle-fingers .ace_markup.ace_heading {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-idle-fingers .ace_markup.ace_list {\
-  \
-}\
-\
 .ace-idle-fingers .ace_collab.ace_user1 {\
   color:#323232;\
 background-color:#FFF980;   \
 }";
 
-exports.cssClass = "ace-idle-fingers";
-
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 7cfc40a6..0e55567a 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = true;
-exports.cssText = ".ace-kr-theme .ace_editor {\
+exports.cssClass = "ace-kr-theme";
+exports.cssText = "\
+.ace-kr-theme .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-kr-theme .ace_editor {\
   background: #38403D;\
 }\
 \
+.ace-kr-theme .ace_marker-layer .ace_selected_word {\
+  border: 1px solid rgba(170, 0, 255, 0.45);\
+}\
        \
 .ace-kr-theme .ace_invisible {\
   color: rgba(255, 177, 111, 0.32);\
@@ -110,55 +116,27 @@ exports.cssText = ".ace-kr-theme .ace_editor {\
   color:#949C8B;\
 }\
 \
-.ace-kr-theme .ace_keyword.ace_operator {\
-  \
-}\
-\
 .ace-kr-theme .ace_constant {\
   color:rgba(210, 117, 24, 0.76);\
 }\
 \
-.ace-kr-theme .ace_constant.ace_language {\
-  \
-}\
-\
-.ace-kr-theme .ace_constant.ace_library {\
-  \
-}\
-\
-.ace-kr-theme .ace_constant.ace_numeric {\
-  \
-}\
-\
 .ace-kr-theme .ace_invalid {\
   color:#F8F8F8;\
 background-color:#A41300;\
 }\
 \
-.ace-kr-theme .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-kr-theme .ace_invalid.ace_deprecated {\
-  \
-}\
-\
 .ace-kr-theme .ace_support {\
   color:#9FC28A;\
 }\
 \
+.ace-kr-theme .ace_fold {\
+    outline-color: #949C8B\
+}\
+\
 .ace-kr-theme .ace_support.ace_function {\
   color:#85873A;\
 }\
 \
-.ace-kr-theme .ace_function.ace_buildin {\
-  \
-}\
-\
-.ace-kr-theme .ace_string {\
-  \
-}\
-\
 .ace-kr-theme .ace_string.ace_regexp {\
   color:rgba(125, 255, 192, 0.65);\
 }\
@@ -168,14 +146,6 @@ background-color:#A41300;\
 color:#706D5B;\
 }\
 \
-.ace-kr-theme .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-kr-theme .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
 .ace-kr-theme .ace_variable {\
   color:#D1A796;\
 }\
@@ -184,77 +154,18 @@ color:#706D5B;\
   color:#FF80E1;\
 }\
 \
-.ace-kr-theme .ace_xml_pe {\
-  \
-}\
-\
-.ace-kr-theme .ace_meta {\
-  \
-}\
-\
 .ace-kr-theme .ace_meta.ace_tag {\
   color:#BABD9C;\
 }\
 \
-.ace-kr-theme .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
-.ace-kr-theme .ace_entity.ace_other.ace_attribute-name {\
-  \
-}\
-\
-.ace-kr-theme .ace_entity.ace_name {\
-  \
-}\
-\
-.ace-kr-theme .ace_entity.ace_name.ace_function {\
-  \
-}\
-\
 .ace-kr-theme .ace_markup.ace_underline {\
     text-decoration:underline;\
 }\
 \
-.ace-kr-theme .ace_markup.ace_heading {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-kr-theme .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
 .ace-kr-theme .ace_markup.ace_list {\
   background-color:#0F0040;\
-}\
-\
-.ace-kr-theme .ace_collab.ace_user1 {\
-     \
 }";
 
-exports.cssClass = "ace-kr-theme";
-
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index 71f539fb..36b003fe 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = true;
-exports.cssText = ".ace-mono-industrial .ace_editor {\
+exports.cssClass = "ace-mono-industrial";
+exports.cssText = "\
+.ace-mono-industrial .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-mono-industrial .ace_editor {\
   background: rgba(12, 13, 12, 0.25);\
 }\
 \
+.ace-mono-industrial .ace_marker-layer .ace_selected_word {\
+  border: 1px solid rgba(145, 153, 148, 0.40);\
+}\
        \
 .ace-mono-industrial .ace_invisible {\
   color: rgba(102, 108, 104, 0.50);\
@@ -118,14 +124,6 @@ exports.cssText = ".ace-mono-industrial .ace_editor {\
   color:#E98800;\
 }\
 \
-.ace-mono-industrial .ace_constant.ace_language {\
-  \
-}\
-\
-.ace-mono-industrial .ace_constant.ace_library {\
-  \
-}\
-\
 .ace-mono-industrial .ace_constant.ace_numeric {\
   color:#E98800;\
 }\
@@ -135,71 +133,23 @@ exports.cssText = ".ace-mono-industrial .ace_editor {\
 background-color:rgba(153, 0, 0, 0.68);\
 }\
 \
-.ace-mono-industrial .ace_invalid.ace_illegal {\
-  \
-}\
-\
-.ace-mono-industrial .ace_invalid.ace_deprecated {\
-  \
-}\
-\
-.ace-mono-industrial .ace_support {\
-  \
+.ace-mono-industrial .ace_fold {\
+    outline-color: #A39E64\
 }\
 \
 .ace-mono-industrial .ace_support.ace_function {\
   color:#588E60;\
 }\
 \
-.ace-mono-industrial .ace_function.ace_buildin {\
-  \
-}\
-\
-.ace-mono-industrial .ace_string {\
-  \
-}\
-\
-.ace-mono-industrial .ace_string.ace_regexp {\
-  \
-}\
-\
 .ace-mono-industrial .ace_comment {\
   color:#666C68;\
 background-color:#151C19;\
 }\
 \
-.ace-mono-industrial .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-mono-industrial .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
-.ace-mono-industrial .ace_variable {\
-  \
-}\
-\
 .ace-mono-industrial .ace_variable.ace_language {\
   color:#648BD2;\
 }\
 \
-.ace-mono-industrial .ace_xml_pe {\
-  \
-}\
-\
-.ace-mono-industrial .ace_meta {\
-  \
-}\
-\
-.ace-mono-industrial .ace_meta.ace_tag {\
-  \
-}\
-\
-.ace-mono-industrial .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
 .ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {\
   color:#909993;\
 }\
@@ -214,47 +164,8 @@ background-color:#151C19;\
 \
 .ace-mono-industrial .ace_markup.ace_underline {\
     text-decoration:underline;\
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-mono-industrial .ace_markup.ace_list {\
-  \
-}\
-\
-.ace-mono-industrial .ace_collab.ace_user1 {\
-     \
 }";
 
-exports.cssClass = "ace-mono-industrial";
-
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-
 });
diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js
index 90a7d8a3..4a5c6852 100644
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@@ -106,8 +106,7 @@ exports.cssText = ".ace-tm .ace_editor {\
 }\
 \
 .ace-tm .ace_line .ace_fold {\
-    background-color: #E4E4E4;\
-    border-radius: 3px;\
+    outline-color: #1C00FF;\
 }\
 \
 .ace-tm .ace_line .ace_support.ace_function {\
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index d71ea5c9..79e5718e 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = true;
-exports.cssText = ".ace-tomorrow-night .ace_editor {\
+exports.cssClass = "ace-tomorrow-night";
+exports.cssText = "\
+.ace-tomorrow-night .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-tomorrow-night .ace_editor {\
   background: #282A2E;\
 }\
 \
+.ace-tomorrow-night .ace_marker-layer .ace_selected_word {\
+  border: 1px solid #373B41;\
+}\
        \
 .ace-tomorrow-night .ace_invisible {\
   color: #4B4E55;\
@@ -114,18 +120,10 @@ exports.cssText = ".ace-tomorrow-night .ace_editor {\
   color:#8ABEB7;\
 }\
 \
-.ace-tomorrow-night .ace_constant {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_constant.ace_language {\
   color:#DE935F;\
 }\
 \
-.ace-tomorrow-night .ace_constant.ace_library {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_constant.ace_numeric {\
   color:#DE935F;\
 }\
@@ -135,27 +133,19 @@ exports.cssText = ".ace-tomorrow-night .ace_editor {\
 background-color:#DF5F5F;\
 }\
 \
-.ace-tomorrow-night .ace_invalid.ace_illegal {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_invalid.ace_deprecated {\
   color:#CED2CF;\
 background-color:#B798BF;\
 }\
 \
-.ace-tomorrow-night .ace_support {\
-  \
+.ace-tomorrow-night .ace_fold {\
+    outline-color: #B294BB\
 }\
 \
 .ace-tomorrow-night .ace_support.ace_function {\
   color:#81A2BE;\
 }\
 \
-.ace-tomorrow-night .ace_function.ace_buildin {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_string {\
   color:#B5BD68;\
 }\
@@ -168,46 +158,18 @@ background-color:#B798BF;\
   color:#969896;\
 }\
 \
-.ace-tomorrow-night .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_variable {\
   color:#CC6666;\
 }\
 \
-.ace-tomorrow-night .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_xml_pe {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_meta {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_meta.ace_tag {\
   color:#CC6666;\
 }\
 \
-.ace-tomorrow-night .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name {\
   color:#CC6666;\
 }\
 \
-.ace-tomorrow-night .ace_entity.ace_name {\
-  \
-}\
-\
 .ace-tomorrow-night .ace_entity.ace_name.ace_function {\
   color:#81A2BE;\
 }\
@@ -218,43 +180,8 @@ background-color:#B798BF;\
 \
 .ace-tomorrow-night .ace_markup.ace_heading {\
   color:#B5BD68;\
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_list {\
-  \
-}\
-\
-.ace-tomorrow-night .ace_collab.ace_user1 {\
-     \
 }";
 
-    exports.cssClass = "ace-tomorrow-night";
-
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText);
-    
-});
\ No newline at end of file
+});
diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js
index 548fa3c7..358f1300 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -36,8 +36,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
+
 exports.isDark = true;
-exports.cssText = ".ace-tomorrow-night-blue .ace_editor {\
+exports.cssClass = "ace-tomorrow-night-blue";
+exports.cssText = "\
+.ace-tomorrow-night-blue .ace_editor {\
   border: 2px solid rgb(159, 159, 159);\
 }\
 \
@@ -101,6 +104,9 @@ exports.cssText = ".ace-tomorrow-night-blue .ace_editor {\
   background: #00346E;\
 }\
 \
+.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {\
+  border: 1px solid #003F8E;\
+}\
        \
 .ace-tomorrow-night-blue .ace_invisible {\
   color: #404F7D;\
@@ -114,18 +120,10 @@ exports.cssText = ".ace-tomorrow-night-blue .ace_editor {\
   color:#99FFFF;\
 }\
 \
-.ace-tomorrow-night-blue .ace_constant {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_constant.ace_language {\
   color:#FFC58F;\
 }\
 \
-.ace-tomorrow-night-blue .ace_constant.ace_library {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_constant.ace_numeric {\
   color:#FFC58F;\
 }\
@@ -135,27 +133,19 @@ exports.cssText = ".ace-tomorrow-night-blue .ace_editor {\
 background-color:#F99DA5;\
 }\
 \
-.ace-tomorrow-night-blue .ace_invalid.ace_illegal {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_invalid.ace_deprecated {\
   color:#FFFFFF;\
 background-color:#EBBBFF;\
 }\
 \
-.ace-tomorrow-night-blue .ace_support {\
-  \
+.ace-tomorrow-night-blue .ace_fold {\
+    outline-color: #EBBBFF\
 }\
 \
 .ace-tomorrow-night-blue .ace_support.ace_function {\
   color:#BBDAFF;\
 }\
 \
-.ace-tomorrow-night-blue .ace_function.ace_buildin {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_string {\
   color:#D1F1A9;\
 }\
@@ -168,46 +158,18 @@ background-color:#EBBBFF;\
   color:#7285B7;\
 }\
 \
-.ace-tomorrow-night-blue .ace_comment.ace_doc {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_comment.ace_doc.ace_tag {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_variable {\
   color:#FF9DA4;\
 }\
 \
-.ace-tomorrow-night-blue .ace_variable.ace_language {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_xml_pe {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_meta {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_meta.ace_tag {\
   color:#FF9DA4;\
 }\
 \
-.ace-tomorrow-night-blue .ace_meta.ace_tag.ace_input {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name {\
   color:#FF9DA4;\
 }\
 \
-.ace-tomorrow-night-blue .ace_entity.ace_name {\
-  \
-}\
-\
 .ace-tomorrow-night-blue .ace_entity.ace_name.ace_function {\
   color:#BBDAFF;\
 }\
@@ -218,43 +180,8 @@ background-color:#EBBBFF;\
 \
 .ace-tomorrow-night-blue .ace_markup.ace_heading {\
   color:#D1F1A9;\
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_1 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_2 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_3 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_4 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_5 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading.ace_6 {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_list {\
-  \
-}\
-\
-.ace-tomorrow-night-blue .ace_collab.ace_user1 {\
-     \
 }";
 
-    exports.cssClass = "ace-tomorrow-night-blue";
-    
     var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText);    
-    
-});
\ No newline at end of file
+    dom.importCssString(exports.cssText);
+});
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index f1abe83a..d2ed7969 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -1,3 +1,4 @@
+
 .%cssClass% .ace_editor {
   border: 2px solid rgb(159, 159, 159);
 }
@@ -62,6 +63,9 @@
   background: %active_line%;
 }
 
+.%cssClass% .ace_marker-layer .ace_selected_word {
+  %selected_word_highlight%
+}
        
 .%cssClass% .ace_invisible {
   %invisible%
@@ -107,6 +111,10 @@
   %support%
 }
 
+.%cssClass% .ace_fold {
+    outline-color: %foldOutline%
+}
+
 .%cssClass% .ace_support.ace_function {
   %support.function%
 }
diff --git a/tool/theme.tmpl.js b/tool/theme.tmpl.js
index 05f109a9..fba43b29 100644
--- a/tool/theme.tmpl.js
+++ b/tool/theme.tmpl.js
@@ -37,8 +37,10 @@
 
 define(function(require, exports, module) {
 
-    var dom = require("ace/lib/dom");
+exports.isDark = %isDark%;
+exports.cssClass = "%cssClass%";
+exports.cssText = %css%;
 
-    exports.cssText = %css%;
-    exports.cssClass = "%cssClass%";
-});
\ No newline at end of file
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText);
+});
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index edb6f4eb..8bd43221 100644
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -103,9 +103,9 @@ var supportedScopes = {
    "collab.user1": "collab.user1"
 };
 
-function extractStyles(theme) {   
+function extractStyles(theme) {
     var globalSettings = theme.settings[0].settings;
-    
+
     var colors = {
         "printMargin": "#e8e8e8",
         "background": parseColor(globalSettings.background),
@@ -117,10 +117,10 @@ function extractStyles(theme) {
         "bracket": parseColor(globalSettings.invisibles),
         "active_line": parseColor(globalSettings.lineHighlight),
         "cursor": parseColor(globalSettings.caret),
-        
+
         "invisible": "color: " + parseColor(globalSettings.invisibles) + ";"
     }
-    
+
     for (var i=1; i<theme.settings.length; i++) {
         var element = theme.settings[i];
         if (!element.scope)
@@ -133,8 +133,29 @@ function extractStyles(theme) {
             }
         }
     }
+    
+    if (!colors.foldOutline)
+        colors.foldOutline = (colors.keyword.match(/\:([^;]+)/)||[])[1];
+    
+    if (!colors.selected_word_highlight)
+        colors.selected_word_highlight =  "border: 1px solid " + colors.selection + ";";
+
+    colors.isDark = (luma(colors.background) < 0.5) + ""
 
     return colors;
+};
+
+function luma(color) {
+    if (color[0]=="#")
+        var rgb = color.match(/^#(..)(..)(..)/).slice(1).map(function(c) {
+            return parseInt(c, 16);
+        });
+    else
+        var rgb = color.match(/\(([^,]+),([^,]+),([^,]+)/).slice(1).map(function(c) {
+            return parseInt(c, 10);
+        });
+
+    return (0.21 * rgb[0] + 0.72 * rgb[1] + 0.07 * rgb[2]) / 255
 }
 
 function parseColor(color) {
@@ -158,32 +179,35 @@ function parseStyles(styles) {
     if (fontStyle.indexOf("italic") !== -1) {
         css.push("font-style:italic;");
     }
-    
+
     if (styles.foreground) {
         css.push("color:" + parseColor(styles.foreground) + ";");
     }
     if (styles.background) {
         css.push("background-color:" + parseColor(styles.background) + ";");
     }
-    
+
     return css.join("\n");
 }
 
 function fillTemplate(template, replacements) {
     return template.replace(/%(.+?)%/g, function(str, m) {
         return replacements[m] || "";
-    }); 
+    });
 }
 
 function createTheme(name, styles, cssTemplate, jsTemplate) {
     styles.cssClass = "ace-" + hyphenate(name);
     var css = fillTemplate(cssTemplate, styles);
+    
+    css = css.replace(/[^\{\}]+{\s*}/g, "");
     return fillTemplate(jsTemplate, {
         name: name,
         css: '"' + css.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"',
-        cssClass: "ace-" + hyphenate(name)
-    });
-}
+        cssClass: "ace-" + hyphenate(name),
+        isDark: styles.isDark
+    })
+};
 
 function hyphenate(str) {
     return str.replace(/([A-Z])/g, "-$1").replace(/_/g, "-").toLowerCase();