diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index a8cf3e68..c1620a8a 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -337,14 +337,26 @@ function buildAce(aceProject, options) {
     project.assumeAllFilesLoaded();
     options.themes.forEach(function(theme) {
         console.log("theme " + theme);
-        copy({
+        /*copy({
             source: [{
                 project: cloneProject(project),
                 require: ["ace/theme/" + theme]
             }],
             filter: filters,
             dest:   targetDir + suffix + "/theme-" + theme + ".js"
-        });
+        });*/
+        // use this instead, to not create separate modules for js and css
+        var themePath = "lib/ace/theme/" + theme
+        var js = fs.readFileSync(themePath + ".js", "utf8")
+        js = js.replace("define(", "define('ace/theme/" + theme + "',")
+        
+        if (fs.existsSync(themePath + ".css", "utf8")) {
+            var css = fs.readFileSync(themePath + ".css", "utf8")
+            js = js.replace(/require\(.ace\/requirejs\/text!.*?\)/, quoteString(css))
+        }
+        filters.forEach(function(f) {js = f(js); })
+        
+        fs.writeFileSync(targetDir + suffix + "/theme-" + theme + ".js", js); 
     });
 
     console.log('# ace worker ---------');
@@ -405,7 +417,8 @@ function buildAce(aceProject, options) {
 function cloneProject(project) {
     var clone = copy.createCommonJsProject({
         roots: project.roots,
-        ignores: project.ignoreRequires
+        ignores: project.ignoreRequires,
+        textPluginPattern: project.textPluginPattern
     });
 
     Object.keys(project.currentModules).forEach(function(module) {
@@ -419,6 +432,10 @@ function cloneProject(project) {
     return clone;
 }
 
+function quoteString(str) {
+    return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"';
+}
+
 function filterTextPlugin(text) {
     return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text!");
 }
diff --git a/doc/wiki b/doc/wiki
index d2a65d0a..8bd16ba2 160000
--- a/doc/wiki
+++ b/doc/wiki
@@ -1 +1 @@
-Subproject commit d2a65d0addc2e5ab922bbff9cb6022a4652b4f13
+Subproject commit 8bd16ba2eda6a1b0c6791f37d0803296ae37840f
diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css
new file mode 100644
index 00000000..5997f57c
--- /dev/null
+++ b/lib/ace/theme/chrome.css
@@ -0,0 +1,157 @@
+.ace-chrome .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-chrome .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-chrome .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+  overflow : hidden;
+}
+
+.ace-chrome .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-chrome .ace_text-layer {
+  cursor: text;
+}
+
+.ace-chrome .ace_cursor {
+  border-left: 2px solid black;
+}
+
+.ace-chrome .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid black;
+}
+
+.ace-chrome .ace_line .ace_invisible {
+  color: rgb(191, 191, 191);
+}
+
+.ace-chrome .ace_line .ace_constant.ace_buildin {
+  color: rgb(88, 72, 246);
+}
+
+.ace-chrome .ace_line .ace_constant.ace_language {
+  color: rgb(88, 92, 246);
+}
+
+.ace-chrome .ace_line .ace_constant.ace_library {
+  color: rgb(6, 150, 14);
+}
+
+.ace-chrome .ace_line .ace_invalid {
+  background-color: rgb(153, 0, 0);
+  color: white;
+}
+
+.ace-chrome .ace_line .ace_fold {
+}
+
+.ace-chrome .ace_line .ace_support.ace_function {
+  color: rgb(60, 76, 114);
+}
+
+.ace-chrome .ace_line .ace_support.ace_constant {
+  color: rgb(6, 150, 14);
+}
+
+.ace-chrome .ace_line .ace_support.ace_type,
+.ace-chrome .ace_line .ace_support.ace_class {
+  color: rgb(109, 121, 222);
+}
+
+.ace-chrome .ace_variable.ace_parameter {
+  font-style:italic;
+color:#FD971F;
+}
+.ace-chrome .ace_line .ace_keyword.ace_operator {
+  color: rgb(104, 118, 135);
+}
+
+.ace-chrome .ace_line .ace_comment {
+  color: #236e24;
+}
+
+.ace-chrome .ace_line .ace_comment.ace_doc {
+  color: #236e24;
+}
+
+.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag {
+  color: #236e24;
+}
+
+.ace-chrome .ace_line .ace_constant.ace_numeric {
+  color: rgb(0, 0, 205);
+}
+
+.ace-chrome .ace_line .ace_variable {
+  color: rgb(49, 132, 149);
+}
+
+.ace-chrome .ace_line .ace_xml_pe {
+  color: rgb(104, 104, 91);
+}
+
+.ace-chrome .ace_entity.ace_name.ace_function {
+  color: #0000A2;
+}
+
+.ace-chrome .ace_markup.ace_markupine {
+    text-decoration:underline;
+}
+
+.ace-chrome .ace_markup.ace_heading {
+  color: rgb(12, 7, 255);
+}
+
+.ace-chrome .ace_markup.ace_list {
+  color:rgb(185, 6, 144);
+}
+
+.ace-chrome .ace_marker-layer .ace_selection {
+  background: rgb(181, 213, 255);
+}
+
+.ace-chrome .ace_marker-layer .ace_step {
+  background: rgb(252, 255, 0);
+}
+
+.ace-chrome .ace_marker-layer .ace_stack {
+  background: rgb(164, 229, 101);
+}
+
+.ace-chrome .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgb(192, 192, 192);
+}
+
+.ace-chrome .ace_marker-layer .ace_active_line {
+  background: rgba(0, 0, 0, 0.07);
+}
+
+.ace-chrome .ace_marker-layer .ace_selected_word {
+  background: rgb(250, 250, 255);
+  border: 1px solid rgb(200, 200, 250);
+}
+
+.ace-chrome .ace_storage,
+.ace-chrome .ace_line .ace_keyword,
+.ace-chrome .ace_meta.ace_tag {
+  color: rgb(147, 15, 128);
+}
+
+.ace-chrome .ace_string.ace_regex {
+  color: rgb(255, 0, 0)
+}
+
+.ace-chrome .ace_line .ace_string,
+.ace-chrome .ace_entity.ace_other.ace_attribute-name{
+  color: #994409;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/chrome.js b/lib/ace/theme/chrome.js
index ae9f05da..fd64f72d 100644
--- a/lib/ace/theme/chrome.js
+++ b/lib/ace/theme/chrome.js
@@ -38,163 +38,7 @@
 define(function(require, exports, module) {
 
 exports.cssClass = "ace-chrome";
-exports.cssText = ".ace-chrome .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-chrome .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-chrome .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-  overflow : hidden;\
-}\
-\
-.ace-chrome .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-chrome .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-chrome .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-chrome .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-\
-.ace-chrome .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-chrome .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-chrome .ace_line .ace_constant.ace_language {\
-  color: rgb(88, 92, 246);\
-}\
-\
-.ace-chrome .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-chrome .ace_line .ace_invalid {\
-  background-color: rgb(153, 0, 0);\
-  color: white;\
-}\
-\
-.ace-chrome .ace_line .ace_fold {\
-}\
-\
-.ace-chrome .ace_line .ace_support.ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-chrome .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-chrome .ace_line .ace_support.ace_type,\
-.ace-chrome .ace_line .ace_support.ace_class {\
-  color: rgb(109, 121, 222);\
-}\
-\
-.ace-chrome .ace_variable.ace_parameter {\
-  font-style:italic;\
-color:#FD971F;\
-}\
-.ace-chrome .ace_line .ace_keyword.ace_operator {\
-  color: rgb(104, 118, 135);\
-}\
-\
-.ace-chrome .ace_line .ace_comment {\
-  color: #236e24;\
-}\
-\
-.ace-chrome .ace_line .ace_comment.ace_doc {\
-  color: #236e24;\
-}\
-\
-.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: #236e24;\
-}\
-\
-.ace-chrome .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 205);\
-}\
-\
-.ace-chrome .ace_line .ace_variable {\
-  color: rgb(49, 132, 149);\
-}\
-\
-.ace-chrome .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-chrome .ace_entity.ace_name.ace_function {\
-  color: #0000A2;\
-}\
-\
-.ace-chrome .ace_markup.ace_markupine {\
-    text-decoration:underline;\
-}\
-\
-.ace-chrome .ace_markup.ace_heading {\
-  color: rgb(12, 7, 255);\
-}\
-\
-.ace-chrome .ace_markup.ace_list {\
-  color:rgb(185, 6, 144);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_active_line {\
-  background: rgba(0, 0, 0, 0.07);\
-}\
-\
-.ace-chrome .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-chrome .ace_storage,\
-.ace-chrome .ace_line .ace_keyword,\
-.ace-chrome .ace_meta.ace_tag {\
-  color: rgb(147, 15, 128);\
-}\
-\
-.ace-chrome .ace_string.ace_regex {\
-  color: rgb(255, 0, 0)\
-}\
-\
-.ace-chrome .ace_line .ace_string,\
-.ace-chrome .ace_entity.ace_other.ace_attribute-name{\
-  color: #994409;\
-}";
+exports.cssText = require('ace/requirejs/text!./chrome.css');
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css
new file mode 100644
index 00000000..e666fa8b
--- /dev/null
+++ b/lib/ace/theme/clouds.css
@@ -0,0 +1,115 @@
+
+.ace-clouds .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-clouds .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-clouds .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-clouds .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-clouds .ace_scroller {
+  background-color: #FFFFFF;
+}
+
+.ace-clouds .ace_text-layer {
+  cursor: text;
+  color: #000000;
+}
+
+.ace-clouds .ace_cursor {
+  border-left: 2px solid #000000;
+}
+
+.ace-clouds .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #000000;
+}
+
+.ace-clouds .ace_marker-layer .ace_selection {
+  background: #BDD5FC;
+}
+
+.ace-clouds.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #FFFFFF;
+  border-radius: 2px;
+}
+
+.ace-clouds .ace_marker-layer .ace_step {
+  background: rgb(255, 255, 0);
+}
+
+.ace-clouds .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #BFBFBF;
+}
+
+.ace-clouds .ace_marker-layer .ace_active_line {
+  background: #FFFBD1;
+}
+
+.ace-clouds .ace_marker-layer .ace_selected_word {
+  border: 1px solid #BDD5FC;
+}
+
+.ace-clouds .ace_invisible {
+  color: #BFBFBF;
+}
+
+.ace-clouds .ace_keyword, .ace-clouds .ace_meta {
+  color:#AF956F;
+}
+
+.ace-clouds .ace_keyword.ace_operator {
+  color:#484848;
+}
+
+.ace-clouds .ace_constant.ace_language {
+  color:#39946A;
+}
+
+.ace-clouds .ace_constant.ace_numeric {
+  color:#46A609;
+}
+
+.ace-clouds .ace_invalid {
+  background-color:#FF002A;
+}
+
+.ace-clouds .ace_fold {
+    background-color: #AF956F;
+    border-color: #000000;
+}
+
+.ace-clouds .ace_support.ace_function {
+  color:#C52727;
+}
+
+.ace-clouds .ace_storage {
+  color:#C52727;
+}
+
+.ace-clouds .ace_string {
+  color:#5D90CD;
+}
+
+.ace-clouds .ace_comment {
+  color:#BCC8BA;
+}
+
+.ace-clouds .ace_entity.ace_other.ace_attribute-name {
+  color:#606060;
+}
+
+.ace-clouds .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index 11a54d3d..cc8bafce 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -39,121 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-clouds";
-exports.cssText = "\
-.ace-clouds .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-clouds .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-clouds .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-clouds .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-clouds .ace_scroller {\
-  background-color: #FFFFFF;\
-}\
-\
-.ace-clouds .ace_text-layer {\
-  cursor: text;\
-  color: #000000;\
-}\
-\
-.ace-clouds .ace_cursor {\
-  border-left: 2px solid #000000;\
-}\
-\
-.ace-clouds .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #000000;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selection {\
-  background: #BDD5FC;\
-}\
-\
-.ace-clouds.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #FFFFFF;\
-  border-radius: 2px;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #BFBFBF;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_active_line {\
-  background: #FFFBD1;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #BDD5FC;\
-}\
-\
-.ace-clouds .ace_invisible {\
-  color: #BFBFBF;\
-}\
-\
-.ace-clouds .ace_keyword, .ace-clouds .ace_meta {\
-  color:#AF956F;\
-}\
-\
-.ace-clouds .ace_keyword.ace_operator {\
-  color:#484848;\
-}\
-\
-.ace-clouds .ace_constant.ace_language {\
-  color:#39946A;\
-}\
-\
-.ace-clouds .ace_constant.ace_numeric {\
-  color:#46A609;\
-}\
-\
-.ace-clouds .ace_invalid {\
-  background-color:#FF002A;\
-}\
-\
-.ace-clouds .ace_fold {\
-    background-color: #AF956F;\
-    border-color: #000000;\
-}\
-\
-.ace-clouds .ace_support.ace_function {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_storage {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_string {\
-  color:#5D90CD;\
-}\
-\
-.ace-clouds .ace_comment {\
-  color:#BCC8BA;\
-}\
-\
-.ace-clouds .ace_entity.ace_other.ace_attribute-name {\
-  color:#606060;\
-}\
-\
-.ace-clouds .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./clouds.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css
new file mode 100644
index 00000000..0a9f3382
--- /dev/null
+++ b/lib/ace/theme/clouds_midnight.css
@@ -0,0 +1,116 @@
+
+.ace-clouds-midnight .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-clouds-midnight .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-clouds-midnight .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-clouds-midnight .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-clouds-midnight .ace_scroller {
+  background-color: #191919;
+}
+
+.ace-clouds-midnight .ace_text-layer {
+  cursor: text;
+  color: #929292;
+}
+
+.ace-clouds-midnight .ace_cursor {
+  border-left: 2px solid #7DA5DC;
+}
+
+.ace-clouds-midnight .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #7DA5DC;
+}
+
+.ace-clouds-midnight .ace_marker-layer .ace_selection {
+  background: #000000;
+}
+
+.ace-clouds-midnight.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #191919;
+  border-radius: 2px;
+}
+
+.ace-clouds-midnight .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-clouds-midnight .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #BFBFBF;
+}
+
+.ace-clouds-midnight .ace_marker-layer .ace_active_line {
+  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;
+}
+
+.ace-clouds-midnight .ace_keyword, .ace-clouds-midnight .ace_meta {
+  color:#927C5D;
+}
+
+.ace-clouds-midnight .ace_keyword.ace_operator {
+  color:#4B4B4B;
+}
+
+.ace-clouds-midnight .ace_constant.ace_language {
+  color:#39946A;
+}
+
+.ace-clouds-midnight .ace_constant.ace_numeric {
+  color:#46A609;
+}
+
+.ace-clouds-midnight .ace_invalid {
+  color:#FFFFFF;
+background-color:#E92E2E;
+}
+
+.ace-clouds-midnight .ace_fold {
+    background-color: #927C5D;
+    border-color: #929292;
+}
+
+.ace-clouds-midnight .ace_support.ace_function {
+  color:#E92E2E;
+}
+
+.ace-clouds-midnight .ace_storage {
+  color:#E92E2E;
+}
+
+.ace-clouds-midnight .ace_string {
+  color:#5D90CD;
+}
+
+.ace-clouds-midnight .ace_comment {
+  color:#3C403B;
+}
+
+.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {
+  color:#606060;
+}
+
+.ace-clouds-midnight .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index 094f95de..5ce5dbf0 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -39,122 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-clouds-midnight";
-exports.cssText = "\
-.ace-clouds-midnight .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-clouds-midnight .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-clouds-midnight .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-clouds-midnight .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-clouds-midnight .ace_scroller {\
-  background-color: #191919;\
-}\
-\
-.ace-clouds-midnight .ace_text-layer {\
-  cursor: text;\
-  color: #929292;\
-}\
-\
-.ace-clouds-midnight .ace_cursor {\
-  border-left: 2px solid #7DA5DC;\
-}\
-\
-.ace-clouds-midnight .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #7DA5DC;\
-}\
-\
-.ace-clouds-midnight .ace_marker-layer .ace_selection {\
-  background: #000000;\
-}\
-\
-.ace-clouds-midnight.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #191919;\
-  border-radius: 2px;\
-}\
-\
-.ace-clouds-midnight .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-clouds-midnight .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #BFBFBF;\
-}\
-\
-.ace-clouds-midnight .ace_marker-layer .ace_active_line {\
-  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;\
-}\
-\
-.ace-clouds-midnight .ace_keyword, .ace-clouds-midnight .ace_meta {\
-  color:#927C5D;\
-}\
-\
-.ace-clouds-midnight .ace_keyword.ace_operator {\
-  color:#4B4B4B;\
-}\
-\
-.ace-clouds-midnight .ace_constant.ace_language {\
-  color:#39946A;\
-}\
-\
-.ace-clouds-midnight .ace_constant.ace_numeric {\
-  color:#46A609;\
-}\
-\
-.ace-clouds-midnight .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#E92E2E;\
-}\
-\
-.ace-clouds-midnight .ace_fold {\
-    background-color: #927C5D;\
-    border-color: #929292;\
-}\
-\
-.ace-clouds-midnight .ace_support.ace_function {\
-  color:#E92E2E;\
-}\
-\
-.ace-clouds-midnight .ace_storage {\
-  color:#E92E2E;\
-}\
-\
-.ace-clouds-midnight .ace_string {\
-  color:#5D90CD;\
-}\
-\
-.ace-clouds-midnight .ace_comment {\
-  color:#3C403B;\
-}\
-\
-.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {\
-  color:#606060;\
-}\
-\
-.ace-clouds-midnight .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./clouds_midnight.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
new file mode 100644
index 00000000..fc4c8118
--- /dev/null
+++ b/lib/ace/theme/cobalt.css
@@ -0,0 +1,142 @@
+
+.ace-cobalt .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-cobalt .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-cobalt .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-cobalt .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-cobalt .ace_scroller {
+  background-color: #002240;
+}
+
+.ace-cobalt .ace_text-layer {
+  cursor: text;
+  color: #FFFFFF;
+}
+
+.ace-cobalt .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-cobalt .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-cobalt .ace_marker-layer .ace_selection {
+  background: rgba(179, 101, 57, 0.75);
+}
+
+.ace-cobalt.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #002240;
+  border-radius: 2px;
+}
+
+.ace-cobalt .ace_marker-layer .ace_step {
+  background: rgb(127, 111, 19);
+}
+
+.ace-cobalt .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(255, 255, 255, 0.15);
+}
+
+.ace-cobalt .ace_marker-layer .ace_active_line {
+  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);
+}
+
+.ace-cobalt .ace_keyword, .ace-cobalt .ace_meta {
+  color:#FF9D00;
+}
+
+.ace-cobalt .ace_constant, .ace-cobalt .ace_constant.ace_other {
+  color:#FF628C;
+}
+
+.ace-cobalt .ace_constant.ace_character,  {
+  color:#FF628C;
+}
+
+.ace-cobalt .ace_constant.ace_character.ace_escape,  {
+  color:#FF628C;
+}
+
+.ace-cobalt .ace_invalid {
+  color:#F8F8F8;
+background-color:#800F00;
+}
+
+.ace-cobalt .ace_support {
+  color:#80FFBB;
+}
+
+.ace-cobalt .ace_support.ace_constant {
+  color:#EB939A;
+}
+
+.ace-cobalt .ace_fold {
+    background-color: #FF9D00;
+    border-color: #FFFFFF;
+}
+
+.ace-cobalt .ace_support.ace_function {
+  color:#FFB054;
+}
+
+.ace-cobalt .ace_storage {
+  color:#FFEE80;
+}
+
+.ace-cobalt .ace_string.ace_regexp {
+  color:#80FFC2;
+}
+
+.ace-cobalt .ace_comment {
+  font-style:italic;
+color:#0088FF;
+}
+
+.ace-cobalt .ace_variable {
+  color:#CCCCCC;
+}
+
+.ace-cobalt .ace_variable.ace_language {
+  color:#FF80E1;
+}
+
+.ace-cobalt .ace_meta.ace_tag {
+  color:#9EFFFF;
+}
+
+.ace-cobalt .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-cobalt .ace_markup.ace_heading {
+  color:#C8E4FD;
+background-color:#001221;
+}
+
+.ace-cobalt .ace_markup.ace_list {
+  background-color:#130D26;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index 0b461b39..f88f10df 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -39,148 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-cobalt";
-exports.cssText = "\
-.ace-cobalt .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-cobalt .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-cobalt .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-cobalt .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-cobalt .ace_scroller {\
-  background-color: #002240;\
-}\
-\
-.ace-cobalt .ace_text-layer {\
-  cursor: text;\
-  color: #FFFFFF;\
-}\
-\
-.ace-cobalt .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-cobalt .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-cobalt .ace_marker-layer .ace_selection {\
-  background: rgba(179, 101, 57, 0.75);\
-}\
-\
-.ace-cobalt.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #002240;\
-  border-radius: 2px;\
-}\
-\
-.ace-cobalt .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-cobalt .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(255, 255, 255, 0.15);\
-}\
-\
-.ace-cobalt .ace_marker-layer .ace_active_line {\
-  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);\
-}\
-\
-.ace-cobalt .ace_keyword, .ace-cobalt .ace_meta {\
-  color:#FF9D00;\
-}\
-\
-.ace-cobalt .ace_constant, .ace-cobalt .ace_constant.ace_other {\
-  color:#FF628C;\
-}\
-\
-.ace-cobalt .ace_constant.ace_character,  {\
-  color:#FF628C;\
-}\
-\
-.ace-cobalt .ace_constant.ace_character.ace_escape,  {\
-  color:#FF628C;\
-}\
-\
-.ace-cobalt .ace_invalid {\
-  color:#F8F8F8;\
-background-color:#800F00;\
-}\
-\
-.ace-cobalt .ace_support {\
-  color:#80FFBB;\
-}\
-\
-.ace-cobalt .ace_support.ace_constant {\
-  color:#EB939A;\
-}\
-\
-.ace-cobalt .ace_fold {\
-    background-color: #FF9D00;\
-    border-color: #FFFFFF;\
-}\
-\
-.ace-cobalt .ace_support.ace_function {\
-  color:#FFB054;\
-}\
-\
-.ace-cobalt .ace_storage {\
-  color:#FFEE80;\
-}\
-\
-.ace-cobalt .ace_string.ace_regexp {\
-  color:#80FFC2;\
-}\
-\
-.ace-cobalt .ace_comment {\
-  font-style:italic;\
-color:#0088FF;\
-}\
-\
-.ace-cobalt .ace_variable {\
-  color:#CCCCCC;\
-}\
-\
-.ace-cobalt .ace_variable.ace_language {\
-  color:#FF80E1;\
-}\
-\
-.ace-cobalt .ace_meta.ace_tag {\
-  color:#9EFFFF;\
-}\
-\
-.ace-cobalt .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-cobalt .ace_markup.ace_heading {\
-  color:#C8E4FD;\
-background-color:#001221;\
-}\
-\
-.ace-cobalt .ace_markup.ace_list {\
-  background-color:#130D26;\
-}";
+exports.cssText = require('ace/requirejs/text!./cobalt.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css
new file mode 100644
index 00000000..e38910aa
--- /dev/null
+++ b/lib/ace/theme/crimson_editor.css
@@ -0,0 +1,148 @@
+.ace-crimson-editor .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-crimson-editor .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-crimson-editor .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+  overflow : hidden;
+}
+
+.ace-crimson-editor .ace_gutter-layer {
+  width: 100%;
+  text-align: right;
+}
+
+.ace-crimson-editor .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-crimson-editor .ace_text-layer {
+  cursor: text;
+  color: rgb(64, 64, 64);
+}
+
+.ace-crimson-editor .ace_cursor {
+  border-left: 2px solid black;
+}
+
+.ace-crimson-editor .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid black;
+}
+
+.ace-crimson-editor .ace_line .ace_invisible {
+  color: rgb(191, 191, 191);
+}
+
+.ace-crimson-editor .ace_line .ace_identifier {
+  color: black;
+}
+
+.ace-crimson-editor .ace_line .ace_keyword {
+  color: blue;
+}
+
+.ace-crimson-editor .ace_line .ace_constant.ace_buildin {
+  color: rgb(88, 72, 246);
+}
+
+.ace-crimson-editor .ace_line .ace_constant.ace_language {
+  color: rgb(255, 156, 0);
+}
+
+.ace-crimson-editor .ace_line .ace_constant.ace_library {
+  color: rgb(6, 150, 14);
+}
+
+.ace-crimson-editor .ace_line .ace_invalid {
+  text-decoration: line-through;
+  color: rgb(224, 0, 0);
+}
+
+.ace-crimson-editor .ace_line .ace_fold {
+}
+
+.ace-crimson-editor .ace_line .ace_support.ace_function {
+  color: rgb(192, 0, 0);
+}
+
+.ace-crimson-editor .ace_line .ace_support.ace_constant {
+  color: rgb(6, 150, 14);
+}
+
+.ace-crimson-editor .ace_line .ace_support.ace_type,
+.ace-crimson-editor .ace_line .ace_support.ace_class {
+  color: rgb(109, 121, 222);
+}
+
+.ace-crimson-editor .ace_line .ace_keyword.ace_operator {
+  color: rgb(49, 132, 149);
+}
+
+.ace-crimson-editor .ace_line .ace_string {
+  color: rgb(128, 0, 128);
+}
+
+.ace-crimson-editor .ace_line .ace_comment {
+  color: rgb(76, 136, 107);
+}
+
+.ace-crimson-editor .ace_line .ace_comment.ace_doc {
+  color: rgb(0, 102, 255);
+}
+
+.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {
+  color: rgb(128, 159, 191);
+}
+
+.ace-crimson-editor .ace_line .ace_constant.ace_numeric {
+  color: rgb(0, 0, 64);
+}
+
+.ace-crimson-editor .ace_line .ace_variable {
+  color: rgb(0, 64, 128);
+}
+
+.ace-crimson-editor .ace_line .ace_xml_pe {
+  color: rgb(104, 104, 91);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_selection {
+  background: rgb(181, 213, 255);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_step {
+  background: rgb(252, 255, 0);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_stack {
+  background: rgb(164, 229, 101);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgb(192, 192, 192);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_active_line {
+  background: rgb(232, 242, 254);
+}
+
+.ace-crimson-editor .ace_meta.ace_tag {
+  color:rgb(28, 2, 255);
+}
+
+.ace-crimson-editor .ace_marker-layer .ace_selected_word {
+  background: rgb(250, 250, 255);
+  border: 1px solid rgb(200, 200, 250);
+}
+
+.ace-crimson-editor .ace_string.ace_regex {
+  color: rgb(192, 0, 192);
+}
\ No newline at end of file
diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js
index c0981537..fcee36a5 100644
--- a/lib/ace/theme/crimson_editor.js
+++ b/lib/ace/theme/crimson_editor.js
@@ -37,154 +37,7 @@
 
 define(function(require, exports, module) {
 exports.isDark = false;
-exports.cssText = ".ace-crimson-editor .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-crimson-editor .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-crimson-editor .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-  overflow : hidden;\
-}\
-\
-.ace-crimson-editor .ace_gutter-layer {\
-  width: 100%;\
-  text-align: right;\
-}\
-\
-.ace-crimson-editor .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-crimson-editor .ace_text-layer {\
-  cursor: text;\
-  color: rgb(64, 64, 64);\
-}\
-\
-.ace-crimson-editor .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-crimson-editor .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-\
-.ace-crimson-editor .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_identifier {\
-  color: black;\
-}\
-\
-.ace-crimson-editor .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
-.ace-crimson-editor .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_constant.ace_language {\
-  color: rgb(255, 156, 0);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_invalid {\
-  text-decoration: line-through;\
-  color: rgb(224, 0, 0);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_fold {\
-}\
-\
-.ace-crimson-editor .ace_line .ace_support.ace_function {\
-  color: rgb(192, 0, 0);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_support.ace_type,\
-.ace-crimson-editor .ace_line .ace_support.ace_class {\
-  color: rgb(109, 121, 222);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_keyword.ace_operator {\
-  color: rgb(49, 132, 149);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_string {\
-  color: rgb(128, 0, 128);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_comment {\
-  color: rgb(76, 136, 107);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_comment.ace_doc {\
-  color: rgb(0, 102, 255);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(128, 159, 191);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 64);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_variable {\
-  color: rgb(0, 64, 128);\
-}\
-\
-.ace-crimson-editor .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_active_line {\
-  background: rgb(232, 242, 254);\
-}\
-\
-.ace-crimson-editor .ace_meta.ace_tag {\
-  color:rgb(28, 2, 255);\
-}\
-\
-.ace-crimson-editor .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-crimson-editor .ace_string.ace_regex {\
-  color: rgb(192, 0, 192);\
-}";
+exports.cssText = require('ace/requirejs/text!./crimson_editor.css');
 
 exports.cssClass = "ace-crimson-editor";
 
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
new file mode 100644
index 00000000..86fe47dd
--- /dev/null
+++ b/lib/ace/theme/dawn.css
@@ -0,0 +1,146 @@
+
+.ace-dawn .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-dawn .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-dawn .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-dawn .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-dawn .ace_scroller {
+  background-color: #F9F9F9;
+}
+
+.ace-dawn .ace_text-layer {
+  cursor: text;
+  color: #080808;
+}
+
+.ace-dawn .ace_cursor {
+  border-left: 2px solid #000000;
+}
+
+.ace-dawn .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #000000;
+}
+
+.ace-dawn .ace_marker-layer .ace_selection {
+  background: rgba(39, 95, 255, 0.30);
+}
+
+.ace-dawn.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #F9F9F9;
+  border-radius: 2px;
+}
+
+.ace-dawn .ace_marker-layer .ace_step {
+  background: rgb(255, 255, 0);
+}
+
+.ace-dawn .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(75, 75, 126, 0.50);
+}
+
+.ace-dawn .ace_marker-layer .ace_active_line {
+  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);
+}
+
+.ace-dawn .ace_keyword, .ace-dawn .ace_meta {
+  color:#794938;
+}
+
+.ace-dawn .ace_constant, .ace-dawn .ace_constant.ace_other {
+  color:#811F24;
+}
+
+.ace-dawn .ace_constant.ace_character,  {
+  color:#811F24;
+}
+
+.ace-dawn .ace_constant.ace_character.ace_escape,  {
+  color:#811F24;
+}
+
+.ace-dawn .ace_invalid.ace_illegal {
+  text-decoration:underline;
+font-style:italic;
+color:#F8F8F8;
+background-color:#B52A1D;
+}
+
+.ace-dawn .ace_invalid.ace_deprecated {
+  text-decoration:underline;
+font-style:italic;
+color:#B52A1D;
+}
+
+.ace-dawn .ace_support {
+  color:#691C97;
+}
+
+.ace-dawn .ace_support.ace_constant {
+  color:#B4371F;
+}
+
+.ace-dawn .ace_fold {
+    background-color: #794938;
+    border-color: #080808;
+}
+
+.ace-dawn .ace_support.ace_function {
+  color:#693A17;
+}
+
+.ace-dawn .ace_storage {
+  font-style:italic;
+color:#A71D5D;
+}
+
+.ace-dawn .ace_string {
+  color:#0B6125;
+}
+
+.ace-dawn .ace_string.ace_regexp {
+  color:#CF5628;
+}
+
+.ace-dawn .ace_comment {
+  font-style:italic;
+color:#5A525F;
+}
+
+.ace-dawn .ace_variable {
+  color:#234A97;
+}
+
+.ace-dawn .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-dawn .ace_markup.ace_heading {
+  color:#19356D;
+}
+
+.ace-dawn .ace_markup.ace_list {
+  color:#693A17;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index 1974a94d..f8f3b181 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -39,152 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-dawn";
-exports.cssText = "\
-.ace-dawn .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-dawn .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-dawn .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-dawn .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-dawn .ace_scroller {\
-  background-color: #F9F9F9;\
-}\
-\
-.ace-dawn .ace_text-layer {\
-  cursor: text;\
-  color: #080808;\
-}\
-\
-.ace-dawn .ace_cursor {\
-  border-left: 2px solid #000000;\
-}\
-\
-.ace-dawn .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #000000;\
-}\
-\
-.ace-dawn .ace_marker-layer .ace_selection {\
-  background: rgba(39, 95, 255, 0.30);\
-}\
-\
-.ace-dawn.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #F9F9F9;\
-  border-radius: 2px;\
-}\
-\
-.ace-dawn .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-dawn .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(75, 75, 126, 0.50);\
-}\
-\
-.ace-dawn .ace_marker-layer .ace_active_line {\
-  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);\
-}\
-\
-.ace-dawn .ace_keyword, .ace-dawn .ace_meta {\
-  color:#794938;\
-}\
-\
-.ace-dawn .ace_constant, .ace-dawn .ace_constant.ace_other {\
-  color:#811F24;\
-}\
-\
-.ace-dawn .ace_constant.ace_character,  {\
-  color:#811F24;\
-}\
-\
-.ace-dawn .ace_constant.ace_character.ace_escape,  {\
-  color:#811F24;\
-}\
-\
-.ace-dawn .ace_invalid.ace_illegal {\
-  text-decoration:underline;\
-font-style:italic;\
-color:#F8F8F8;\
-background-color:#B52A1D;\
-}\
-\
-.ace-dawn .ace_invalid.ace_deprecated {\
-  text-decoration:underline;\
-font-style:italic;\
-color:#B52A1D;\
-}\
-\
-.ace-dawn .ace_support {\
-  color:#691C97;\
-}\
-\
-.ace-dawn .ace_support.ace_constant {\
-  color:#B4371F;\
-}\
-\
-.ace-dawn .ace_fold {\
-    background-color: #794938;\
-    border-color: #080808;\
-}\
-\
-.ace-dawn .ace_support.ace_function {\
-  color:#693A17;\
-}\
-\
-.ace-dawn .ace_storage {\
-  font-style:italic;\
-color:#A71D5D;\
-}\
-\
-.ace-dawn .ace_string {\
-  color:#0B6125;\
-}\
-\
-.ace-dawn .ace_string.ace_regexp {\
-  color:#CF5628;\
-}\
-\
-.ace-dawn .ace_comment {\
-  font-style:italic;\
-color:#5A525F;\
-}\
-\
-.ace-dawn .ace_variable {\
-  color:#234A97;\
-}\
-\
-.ace-dawn .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-dawn .ace_markup.ace_heading {\
-  color:#19356D;\
-}\
-\
-.ace-dawn .ace_markup.ace_list {\
-  color:#693A17;\
-}";
+exports.cssText = require('ace/requirejs/text!./dawn.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css
new file mode 100644
index 00000000..b44699af
--- /dev/null
+++ b/lib/ace/theme/dreamweaver.css
@@ -0,0 +1,183 @@
+.ace-dreamweaver .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-dreamweaver .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-dreamweaver .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-dreamweaver .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-dreamweaver .ace_fold {
+    background-color: #00F;
+}
+
+.ace-dreamweaver .ace_text-layer {
+  cursor: text;
+}
+
+.ace-dreamweaver .ace_cursor {
+  border-left: 2px solid black;
+}
+
+.ace-dreamweaver .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid black;
+}
+        
+.ace-dreamweaver .ace_line .ace_invisible {
+  color: rgb(191, 191, 191);
+}
+
+.ace-dreamweaver .ace_line .ace_storage,
+.ace-dreamweaver .ace_line .ace_keyword {
+  color: blue;
+}
+
+.ace-dreamweaver .ace_line .ace_constant.ace_buildin {
+  color: rgb(88, 72, 246);
+}
+
+.ace-dreamweaver .ace_line .ace_constant.ace_language {
+  color: rgb(88, 92, 246);
+}
+
+.ace-dreamweaver .ace_line .ace_constant.ace_library {
+  color: rgb(6, 150, 14);
+}
+
+.ace-dreamweaver .ace_line .ace_invalid {
+  background-color: rgb(153, 0, 0);
+  color: white;
+}
+
+.ace-dreamweaver .ace_line .ace_support.ace_function {
+  color: rgb(60, 76, 114);
+}
+
+.ace-dreamweaver .ace_line .ace_support.ace_constant {
+  color: rgb(6, 150, 14);
+}
+
+.ace-dreamweaver .ace_line .ace_support.ace_type,
+.ace-dreamweaver .ace_line .ace_support.ace_class {
+  color: #009;
+}
+
+.ace-dreamweaver .ace_line .ace_support.ace_php_tag {
+  color: #f00;
+}
+
+.ace-dreamweaver .ace_line .ace_keyword.ace_operator {
+  color: rgb(104, 118, 135);
+}
+
+.ace-dreamweaver .ace_line .ace_string {
+  color: #00F;
+}
+
+.ace-dreamweaver .ace_line .ace_comment {
+  color: rgb(76, 136, 107);
+}
+
+.ace-dreamweaver .ace_line .ace_comment.ace_doc {
+  color: rgb(0, 102, 255);
+}
+
+.ace-dreamweaver .ace_line .ace_comment.ace_doc.ace_tag {
+  color: rgb(128, 159, 191);
+}
+
+.ace-dreamweaver .ace_line .ace_constant.ace_numeric {
+  color: rgb(0, 0, 205);
+}
+
+.ace-dreamweaver .ace_line .ace_variable {
+  color: #06F
+}
+
+.ace-dreamweaver .ace_line .ace_xml_pe {
+  color: rgb(104, 104, 91);
+}
+
+.ace-dreamweaver .ace_entity.ace_name.ace_function {
+  color: #00F;
+}
+
+.ace-dreamweaver .ace_markup.ace_markupine {
+    text-decoration:underline;
+}
+
+.ace-dreamweaver .ace_markup.ace_heading {
+  color: rgb(12, 7, 255);
+}
+
+.ace-dreamweaver .ace_markup.ace_list {
+  color:rgb(185, 6, 144);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_selection {
+  background: rgb(181, 213, 255);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_step {
+  background: rgb(252, 255, 0);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_stack {
+  background: rgb(164, 229, 101);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgb(192, 192, 192);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_active_line {
+  background: rgba(0, 0, 0, 0.07);
+}
+
+.ace-dreamweaver .ace_marker-layer .ace_selected_word {
+  background: rgb(250, 250, 255);
+  border: 1px solid rgb(200, 200, 250);
+}
+
+.ace-dreamweaver .ace_meta.ace_tag {
+  color:#009;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {
+  color:#060;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_form {
+  color:#F90;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_image {
+  color:#909;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_script {
+  color:#900;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_style {
+  color:#909;
+}
+
+.ace-dreamweaver .ace_meta.ace_tag.ace_table {
+  color:#099;
+}
+
+.ace-dreamweaver .ace_string.ace_regex {
+  color: rgb(255, 0, 0)
+}
\ No newline at end of file
diff --git a/lib/ace/theme/dreamweaver.js b/lib/ace/theme/dreamweaver.js
index cfa8c467..73239ea6 100644
--- a/lib/ace/theme/dreamweaver.js
+++ b/lib/ace/theme/dreamweaver.js
@@ -38,189 +38,7 @@
 define(function(require, exports, module) {
 exports.isDark = false;
 exports.cssClass = "ace-dreamweaver";
-exports.cssText = ".ace-dreamweaver .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-dreamweaver .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-dreamweaver .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-dreamweaver .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-dreamweaver .ace_fold {\
-    background-color: #00F;\
-}\
-\
-.ace-dreamweaver .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-dreamweaver .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-dreamweaver .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-        \
-.ace-dreamweaver .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_storage,\
-.ace-dreamweaver .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
-.ace-dreamweaver .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_constant.ace_language {\
-  color: rgb(88, 92, 246);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_invalid {\
-  background-color: rgb(153, 0, 0);\
-  color: white;\
-}\
-\
-.ace-dreamweaver .ace_line .ace_support.ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_support.ace_type,\
-.ace-dreamweaver .ace_line .ace_support.ace_class {\
-  color: #009;\
-}\
-\
-.ace-dreamweaver .ace_line .ace_support.ace_php_tag {\
-  color: #f00;\
-}\
-\
-.ace-dreamweaver .ace_line .ace_keyword.ace_operator {\
-  color: rgb(104, 118, 135);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_string {\
-  color: #00F;\
-}\
-\
-.ace-dreamweaver .ace_line .ace_comment {\
-  color: rgb(76, 136, 107);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_comment.ace_doc {\
-  color: rgb(0, 102, 255);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(128, 159, 191);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 205);\
-}\
-\
-.ace-dreamweaver .ace_line .ace_variable {\
-  color: #06F\
-}\
-\
-.ace-dreamweaver .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-dreamweaver .ace_entity.ace_name.ace_function {\
-  color: #00F;\
-}\
-\
-.ace-dreamweaver .ace_markup.ace_markupine {\
-    text-decoration:underline;\
-}\
-\
-.ace-dreamweaver .ace_markup.ace_heading {\
-  color: rgb(12, 7, 255);\
-}\
-\
-.ace-dreamweaver .ace_markup.ace_list {\
-  color:rgb(185, 6, 144);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_active_line {\
-  background: rgba(0, 0, 0, 0.07);\
-}\
-\
-.ace-dreamweaver .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag {\
-  color:#009;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {\
-  color:#060;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_form {\
-  color:#F90;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_image {\
-  color:#909;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_script {\
-  color:#900;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_style {\
-  color:#909;\
-}\
-\
-.ace-dreamweaver .ace_meta.ace_tag.ace_table {\
-  color:#099;\
-}\
-\
-.ace-dreamweaver .ace_string.ace_regex {\
-  color: rgb(255, 0, 0)\
-}";
+exports.cssText = require('ace/requirejs/text!./dreamweaver.css');
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css
new file mode 100644
index 00000000..c39a8470
--- /dev/null
+++ b/lib/ace/theme/eclipse.css
@@ -0,0 +1,103 @@
+.ace-eclipse .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-eclipse .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-eclipse .ace_gutter {
+  background: rgb(227, 227, 227);
+  border-right: 1px solid rgb(159, 159, 159);
+  color: rgb(136, 136, 136);
+}
+
+.ace-eclipse .ace_print_margin {
+  width: 1px;
+  background: #b1b4ba;
+}
+
+.ace-eclipse .ace_fold {
+    background-color: rgb(60, 76, 114);
+}
+
+.ace-eclipse .ace_text-layer {
+  cursor: text;
+}
+
+.ace-eclipse .ace_cursor {
+  border-left: 2px solid black;
+}
+
+.ace-eclipse .ace_line .ace_storage,
+.ace-eclipse .ace_line .ace_keyword,
+.ace-eclipse .ace_line .ace_variable {
+  color: rgb(127, 0, 85);
+}
+
+.ace-eclipse .ace_line .ace_constant.ace_buildin {
+  color: rgb(88, 72, 246);
+}
+
+.ace-eclipse .ace_line .ace_constant.ace_library {
+  color: rgb(6, 150, 14);
+}
+
+.ace-eclipse .ace_line .ace_function {
+  color: rgb(60, 76, 114);
+}
+
+.ace-eclipse .ace_line .ace_string {
+  color: rgb(42, 0, 255);
+}
+
+.ace-eclipse .ace_line .ace_comment {
+  color: rgb(63, 127, 95);
+}
+
+.ace-eclipse .ace_line .ace_comment.ace_doc {
+  color: rgb(63, 95, 191);
+}
+
+.ace-eclipse .ace_line .ace_comment.ace_doc.ace_tag {
+  color: rgb(127, 159, 191);
+}
+
+.ace-eclipse .ace_line .ace_constant.ace_numeric {
+}
+
+.ace-eclipse .ace_line .ace_tag {
+  color: rgb(63, 127, 127);
+}
+
+.ace-eclipse .ace_line .ace_type {
+  color: rgb(127, 0, 127);
+}
+
+.ace-eclipse .ace_line .ace_xml_pe {
+  color: rgb(104, 104, 91);
+}
+
+.ace-eclipse .ace_marker-layer .ace_selection {
+  background: rgb(181, 213, 255);
+}
+
+.ace-eclipse .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgb(192, 192, 192);
+}
+
+.ace-eclipse .ace_line .ace_meta.ace_tag {
+  color:rgb(63, 127, 127);
+}
+
+.ace-eclipse .ace_entity.ace_other.ace_attribute-name {
+  color:rgb(127, 0, 127);
+}
+.ace-eclipse .ace_marker-layer .ace_step {
+  background: rgb(255, 255, 0);
+}
+
+.ace-eclipse .ace_marker-layer .ace_active_line {
+  background: rgb(232, 242, 254);
+}
\ No newline at end of file
diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js
index 8f0bc7c9..25eaf27b 100644
--- a/lib/ace/theme/eclipse.js
+++ b/lib/ace/theme/eclipse.js
@@ -39,106 +39,7 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.isDark = false;
-exports.cssText = ".ace-eclipse .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-eclipse .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-eclipse .ace_gutter {\
-  background: rgb(227, 227, 227);\
-  border-right: 1px solid rgb(159, 159, 159);\
-  color: rgb(136, 136, 136);\
-}\
-\
-.ace-eclipse .ace_print_margin {\
-  width: 1px;\
-  background: #b1b4ba;\
-}\
-\
-.ace-eclipse .ace_fold {\
-    background-color: rgb(60, 76, 114);\
-}\
-\
-.ace-eclipse .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-eclipse .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-eclipse .ace_line .ace_storage,\
-.ace-eclipse .ace_line .ace_keyword,\
-.ace-eclipse .ace_line .ace_variable {\
-  color: rgb(127, 0, 85);\
-}\
-\
-.ace-eclipse .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-eclipse .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-eclipse .ace_line .ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-eclipse .ace_line .ace_string {\
-  color: rgb(42, 0, 255);\
-}\
-\
-.ace-eclipse .ace_line .ace_comment {\
-  color: rgb(63, 127, 95);\
-}\
-\
-.ace-eclipse .ace_line .ace_comment.ace_doc {\
-  color: rgb(63, 95, 191);\
-}\
-\
-.ace-eclipse .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(127, 159, 191);\
-}\
-\
-.ace-eclipse .ace_line .ace_constant.ace_numeric {\
-}\
-\
-.ace-eclipse .ace_line .ace_tag {\
-  color: rgb(63, 127, 127);\
-}\
-\
-.ace-eclipse .ace_line .ace_type {\
-  color: rgb(127, 0, 127);\
-}\
-\
-.ace-eclipse .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-eclipse .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-\
-.ace-eclipse .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-eclipse .ace_line .ace_meta.ace_tag {\
-  color:rgb(63, 127, 127);\
-}\
-\
-.ace-eclipse .ace_entity.ace_other.ace_attribute-name {\
-  color:rgb(127, 0, 127);\
-}\
-\
-.ace-eclipse .ace_marker-layer .ace_active_line {\
-  background: rgb(232, 242, 254);\
-}";
+exports.cssText = require('ace/requirejs/text!./eclipse.css');
 
 exports.cssClass = "ace-eclipse";
 
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
new file mode 100644
index 00000000..a7737f6d
--- /dev/null
+++ b/lib/ace/theme/idle_fingers.css
@@ -0,0 +1,134 @@
+
+.ace-idle-fingers .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-idle-fingers .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-idle-fingers .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-idle-fingers .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-idle-fingers .ace_scroller {
+  background-color: #323232;
+}
+
+.ace-idle-fingers .ace_text-layer {
+  cursor: text;
+  color: #FFFFFF;
+}
+
+.ace-idle-fingers .ace_cursor {
+  border-left: 2px solid #91FF00;
+}
+
+.ace-idle-fingers .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #91FF00;
+}
+
+.ace-idle-fingers .ace_marker-layer .ace_selection {
+  background: rgba(90, 100, 126, 0.88);
+}
+
+.ace-idle-fingers.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #323232;
+  border-radius: 2px;
+}
+
+.ace-idle-fingers .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-idle-fingers .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #404040;
+}
+
+.ace-idle-fingers .ace_marker-layer .ace_active_line {
+  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;
+}
+
+.ace-idle-fingers .ace_keyword, .ace-idle-fingers .ace_meta {
+  color:#CC7833;
+}
+
+.ace-idle-fingers .ace_constant, .ace-idle-fingers .ace_constant.ace_other {
+  color:#6C99BB;
+}
+
+.ace-idle-fingers .ace_constant.ace_character,  {
+  color:#6C99BB;
+}
+
+.ace-idle-fingers .ace_constant.ace_character.ace_escape,  {
+  color:#6C99BB;
+}
+
+.ace-idle-fingers .ace_invalid {
+  color:#FFFFFF;
+background-color:#FF0000;
+}
+
+.ace-idle-fingers .ace_support.ace_constant {
+  color:#6C99BB;
+}
+
+.ace-idle-fingers .ace_fold {
+    background-color: #CC7833;
+    border-color: #FFFFFF;
+}
+
+.ace-idle-fingers .ace_support.ace_function {
+  color:#B83426;
+}
+
+.ace-idle-fingers .ace_variable.ace_parameter {
+  font-style:italic;
+}
+
+.ace-idle-fingers .ace_string {
+  color:#A5C261;
+}
+
+.ace-idle-fingers .ace_string.ace_regexp {
+  color:#CCCC33;
+}
+
+.ace-idle-fingers .ace_comment {
+  font-style:italic;
+color:#BC9458;
+}
+
+.ace-idle-fingers .ace_meta.ace_tag {
+  color:#FFE5BB;
+}
+
+.ace-idle-fingers .ace_entity.ace_name {
+  color:#FFC66D;
+}
+
+.ace-idle-fingers .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-idle-fingers .ace_collab.ace_user1 {
+  color:#323232;
+background-color:#FFF980;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 9da3d396..e8606835 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -39,140 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-idle-fingers";
-exports.cssText = "\
-.ace-idle-fingers .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-idle-fingers .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-idle-fingers .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-idle-fingers .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-idle-fingers .ace_scroller {\
-  background-color: #323232;\
-}\
-\
-.ace-idle-fingers .ace_text-layer {\
-  cursor: text;\
-  color: #FFFFFF;\
-}\
-\
-.ace-idle-fingers .ace_cursor {\
-  border-left: 2px solid #91FF00;\
-}\
-\
-.ace-idle-fingers .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #91FF00;\
-}\
-\
-.ace-idle-fingers .ace_marker-layer .ace_selection {\
-  background: rgba(90, 100, 126, 0.88);\
-}\
-\
-.ace-idle-fingers.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #323232;\
-  border-radius: 2px;\
-}\
-\
-.ace-idle-fingers .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-idle-fingers .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #404040;\
-}\
-\
-.ace-idle-fingers .ace_marker-layer .ace_active_line {\
-  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;\
-}\
-\
-.ace-idle-fingers .ace_keyword, .ace-idle-fingers .ace_meta {\
-  color:#CC7833;\
-}\
-\
-.ace-idle-fingers .ace_constant, .ace-idle-fingers .ace_constant.ace_other {\
-  color:#6C99BB;\
-}\
-\
-.ace-idle-fingers .ace_constant.ace_character,  {\
-  color:#6C99BB;\
-}\
-\
-.ace-idle-fingers .ace_constant.ace_character.ace_escape,  {\
-  color:#6C99BB;\
-}\
-\
-.ace-idle-fingers .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#FF0000;\
-}\
-\
-.ace-idle-fingers .ace_support.ace_constant {\
-  color:#6C99BB;\
-}\
-\
-.ace-idle-fingers .ace_fold {\
-    background-color: #CC7833;\
-    border-color: #FFFFFF;\
-}\
-\
-.ace-idle-fingers .ace_support.ace_function {\
-  color:#B83426;\
-}\
-\
-.ace-idle-fingers .ace_variable.ace_parameter {\
-  font-style:italic;\
-}\
-\
-.ace-idle-fingers .ace_string {\
-  color:#A5C261;\
-}\
-\
-.ace-idle-fingers .ace_string.ace_regexp {\
-  color:#CCCC33;\
-}\
-\
-.ace-idle-fingers .ace_comment {\
-  font-style:italic;\
-color:#BC9458;\
-}\
-\
-.ace-idle-fingers .ace_meta.ace_tag {\
-  color:#FFE5BB;\
-}\
-\
-.ace-idle-fingers .ace_entity.ace_name {\
-  color:#FFC66D;\
-}\
-\
-.ace-idle-fingers .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-idle-fingers .ace_collab.ace_user1 {\
-  color:#323232;\
-background-color:#FFF980;\
-}";
+exports.cssText = require('ace/requirejs/text!./idle_fingers.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
new file mode 100644
index 00000000..57ad4be1
--- /dev/null
+++ b/lib/ace/theme/kr_theme.css
@@ -0,0 +1,137 @@
+
+.ace-kr-theme .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-kr-theme .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-kr-theme .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-kr-theme .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-kr-theme .ace_scroller {
+  background-color: #0B0A09;
+}
+
+.ace-kr-theme .ace_text-layer {
+  cursor: text;
+  color: #FCFFE0;
+}
+
+.ace-kr-theme .ace_cursor {
+  border-left: 2px solid #FF9900;
+}
+
+.ace-kr-theme .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FF9900;
+}
+
+.ace-kr-theme .ace_marker-layer .ace_selection {
+  background: rgba(170, 0, 255, 0.45);
+}
+
+.ace-kr-theme.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #0B0A09;
+  border-radius: 2px;
+}
+
+.ace-kr-theme .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-kr-theme .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(255, 177, 111, 0.32);
+}
+
+.ace-kr-theme .ace_marker-layer .ace_active_line {
+  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);
+}
+
+.ace-kr-theme .ace_keyword, .ace-kr-theme .ace_meta {
+  color:#949C8B;
+}
+
+.ace-kr-theme .ace_constant, .ace-kr-theme .ace_constant.ace_other {
+  color:rgba(210, 117, 24, 0.76);
+}
+
+.ace-kr-theme .ace_constant.ace_character,  {
+  color:rgba(210, 117, 24, 0.76);
+}
+
+.ace-kr-theme .ace_constant.ace_character.ace_escape,  {
+  color:rgba(210, 117, 24, 0.76);
+}
+
+.ace-kr-theme .ace_invalid {
+  color:#F8F8F8;
+background-color:#A41300;
+}
+
+.ace-kr-theme .ace_support {
+  color:#9FC28A;
+}
+
+.ace-kr-theme .ace_support.ace_constant {
+  color:#C27E66;
+}
+
+.ace-kr-theme .ace_fold {
+    background-color: #949C8B;
+    border-color: #FCFFE0;
+}
+
+.ace-kr-theme .ace_support.ace_function {
+  color:#85873A;
+}
+
+.ace-kr-theme .ace_storage {
+  color:#FFEE80;
+}
+
+.ace-kr-theme .ace_string.ace_regexp {
+  color:rgba(125, 255, 192, 0.65);
+}
+
+.ace-kr-theme .ace_comment {
+  font-style:italic;
+color:#706D5B;
+}
+
+.ace-kr-theme .ace_variable {
+  color:#D1A796;
+}
+
+.ace-kr-theme .ace_variable.ace_language {
+  color:#FF80E1;
+}
+
+.ace-kr-theme .ace_meta.ace_tag {
+  color:#BABD9C;
+}
+
+.ace-kr-theme .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-kr-theme .ace_markup.ace_list {
+  background-color:#0F0040;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 413d55d2..2c3d6672 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -39,143 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-kr-theme";
-exports.cssText = "\
-.ace-kr-theme .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-kr-theme .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-kr-theme .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-kr-theme .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-kr-theme .ace_scroller {\
-  background-color: #0B0A09;\
-}\
-\
-.ace-kr-theme .ace_text-layer {\
-  cursor: text;\
-  color: #FCFFE0;\
-}\
-\
-.ace-kr-theme .ace_cursor {\
-  border-left: 2px solid #FF9900;\
-}\
-\
-.ace-kr-theme .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FF9900;\
-}\
-\
-.ace-kr-theme .ace_marker-layer .ace_selection {\
-  background: rgba(170, 0, 255, 0.45);\
-}\
-\
-.ace-kr-theme.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #0B0A09;\
-  border-radius: 2px;\
-}\
-\
-.ace-kr-theme .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-kr-theme .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(255, 177, 111, 0.32);\
-}\
-\
-.ace-kr-theme .ace_marker-layer .ace_active_line {\
-  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);\
-}\
-\
-.ace-kr-theme .ace_keyword, .ace-kr-theme .ace_meta {\
-  color:#949C8B;\
-}\
-\
-.ace-kr-theme .ace_constant, .ace-kr-theme .ace_constant.ace_other {\
-  color:rgba(210, 117, 24, 0.76);\
-}\
-\
-.ace-kr-theme .ace_constant.ace_character,  {\
-  color:rgba(210, 117, 24, 0.76);\
-}\
-\
-.ace-kr-theme .ace_constant.ace_character.ace_escape,  {\
-  color:rgba(210, 117, 24, 0.76);\
-}\
-\
-.ace-kr-theme .ace_invalid {\
-  color:#F8F8F8;\
-background-color:#A41300;\
-}\
-\
-.ace-kr-theme .ace_support {\
-  color:#9FC28A;\
-}\
-\
-.ace-kr-theme .ace_support.ace_constant {\
-  color:#C27E66;\
-}\
-\
-.ace-kr-theme .ace_fold {\
-    background-color: #949C8B;\
-    border-color: #FCFFE0;\
-}\
-\
-.ace-kr-theme .ace_support.ace_function {\
-  color:#85873A;\
-}\
-\
-.ace-kr-theme .ace_storage {\
-  color:#FFEE80;\
-}\
-\
-.ace-kr-theme .ace_string.ace_regexp {\
-  color:rgba(125, 255, 192, 0.65);\
-}\
-\
-.ace-kr-theme .ace_comment {\
-  font-style:italic;\
-color:#706D5B;\
-}\
-\
-.ace-kr-theme .ace_variable {\
-  color:#D1A796;\
-}\
-\
-.ace-kr-theme .ace_variable.ace_language {\
-  color:#FF80E1;\
-}\
-\
-.ace-kr-theme .ace_meta.ace_tag {\
-  color:#BABD9C;\
-}\
-\
-.ace-kr-theme .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-kr-theme .ace_markup.ace_list {\
-  background-color:#0F0040;\
-}";
+exports.cssText = require('ace/requirejs/text!./kr_theme.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
new file mode 100644
index 00000000..7d255603
--- /dev/null
+++ b/lib/ace/theme/merbivore.css
@@ -0,0 +1,137 @@
+
+.ace-merbivore .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-merbivore .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-merbivore .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-merbivore .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-merbivore .ace_scroller {
+  background-color: #161616;
+}
+
+.ace-merbivore .ace_text-layer {
+  cursor: text;
+  color: #E6E1DC;
+}
+
+.ace-merbivore .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-merbivore .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-merbivore .ace_marker-layer .ace_selection {
+  background: #454545;
+}
+
+.ace-merbivore.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #161616;
+  border-radius: 2px;
+}
+
+.ace-merbivore .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-merbivore .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #404040;
+}
+
+.ace-merbivore .ace_marker-layer .ace_active_line {
+  background: #333435;
+}
+
+.ace-merbivore .ace_marker-layer .ace_selected_word {
+  border: 1px solid #454545;
+}
+
+.ace-merbivore .ace_invisible {
+  color: #404040;
+}
+
+.ace-merbivore .ace_keyword, .ace-merbivore .ace_meta {
+  color:#FC6F09;
+}
+
+.ace-merbivore .ace_constant, .ace-merbivore .ace_constant.ace_other {
+  color:#1EDAFB;
+}
+
+.ace-merbivore .ace_constant.ace_character,  {
+  color:#1EDAFB;
+}
+
+.ace-merbivore .ace_constant.ace_character.ace_escape,  {
+  color:#1EDAFB;
+}
+
+.ace-merbivore .ace_constant.ace_language {
+  color:#FDC251;
+}
+
+.ace-merbivore .ace_constant.ace_library {
+  color:#8DFF0A;
+}
+
+.ace-merbivore .ace_constant.ace_numeric {
+  color:#58C554;
+}
+
+.ace-merbivore .ace_invalid {
+  color:#FFFFFF;
+background-color:#990000;
+}
+
+.ace-merbivore .ace_support.ace_constant {
+  color:#8DFF0A;
+}
+
+.ace-merbivore .ace_fold {
+    background-color: #FC6F09;
+    border-color: #E6E1DC;
+}
+
+.ace-merbivore .ace_support.ace_function {
+  color:#FC6F09;
+}
+
+.ace-merbivore .ace_storage {
+  color:#FC6F09;
+}
+
+.ace-merbivore .ace_string {
+  color:#8DFF0A;
+}
+
+.ace-merbivore .ace_comment {
+  font-style:italic;
+color:#AD2EA4;
+}
+
+.ace-merbivore .ace_meta.ace_tag {
+  color:#FC6F09;
+}
+
+.ace-merbivore .ace_entity.ace_other.ace_attribute-name {
+  color:#FFFF89;
+}
+
+.ace-merbivore .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js
index 95927960..6757f2c3 100644
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@@ -39,143 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-merbivore";
-exports.cssText = "\
-.ace-merbivore .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-merbivore .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-merbivore .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-merbivore .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-merbivore .ace_scroller {\
-  background-color: #161616;\
-}\
-\
-.ace-merbivore .ace_text-layer {\
-  cursor: text;\
-  color: #E6E1DC;\
-}\
-\
-.ace-merbivore .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-merbivore .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-merbivore .ace_marker-layer .ace_selection {\
-  background: #454545;\
-}\
-\
-.ace-merbivore.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #161616;\
-  border-radius: 2px;\
-}\
-\
-.ace-merbivore .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-merbivore .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #404040;\
-}\
-\
-.ace-merbivore .ace_marker-layer .ace_active_line {\
-  background: #333435;\
-}\
-\
-.ace-merbivore .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #454545;\
-}\
-\
-.ace-merbivore .ace_invisible {\
-  color: #404040;\
-}\
-\
-.ace-merbivore .ace_keyword, .ace-merbivore .ace_meta {\
-  color:#FC6F09;\
-}\
-\
-.ace-merbivore .ace_constant, .ace-merbivore .ace_constant.ace_other {\
-  color:#1EDAFB;\
-}\
-\
-.ace-merbivore .ace_constant.ace_character,  {\
-  color:#1EDAFB;\
-}\
-\
-.ace-merbivore .ace_constant.ace_character.ace_escape,  {\
-  color:#1EDAFB;\
-}\
-\
-.ace-merbivore .ace_constant.ace_language {\
-  color:#FDC251;\
-}\
-\
-.ace-merbivore .ace_constant.ace_library {\
-  color:#8DFF0A;\
-}\
-\
-.ace-merbivore .ace_constant.ace_numeric {\
-  color:#58C554;\
-}\
-\
-.ace-merbivore .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#990000;\
-}\
-\
-.ace-merbivore .ace_support.ace_constant {\
-  color:#8DFF0A;\
-}\
-\
-.ace-merbivore .ace_fold {\
-    background-color: #FC6F09;\
-    border-color: #E6E1DC;\
-}\
-\
-.ace-merbivore .ace_support.ace_function {\
-  color:#FC6F09;\
-}\
-\
-.ace-merbivore .ace_storage {\
-  color:#FC6F09;\
-}\
-\
-.ace-merbivore .ace_string {\
-  color:#8DFF0A;\
-}\
-\
-.ace-merbivore .ace_comment {\
-  font-style:italic;\
-color:#AD2EA4;\
-}\
-\
-.ace-merbivore .ace_meta.ace_tag {\
-  color:#FC6F09;\
-}\
-\
-.ace-merbivore .ace_entity.ace_other.ace_attribute-name {\
-  color:#FFFF89;\
-}\
-\
-.ace-merbivore .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./merbivore.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
new file mode 100644
index 00000000..6ab63324
--- /dev/null
+++ b/lib/ace/theme/merbivore_soft.css
@@ -0,0 +1,143 @@
+
+.ace-merbivore-soft .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-merbivore-soft .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-merbivore-soft .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-merbivore-soft .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-merbivore-soft .ace_scroller {
+  background-color: #1C1C1C;
+}
+
+.ace-merbivore-soft .ace_text-layer {
+  cursor: text;
+  color: #E6E1DC;
+}
+
+.ace-merbivore-soft .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-merbivore-soft .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-merbivore-soft .ace_marker-layer .ace_selection {
+  background: #494949;
+}
+
+.ace-merbivore-soft.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #1C1C1C;
+  border-radius: 2px;
+}
+
+.ace-merbivore-soft .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-merbivore-soft .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #404040;
+}
+
+.ace-merbivore-soft .ace_marker-layer .ace_active_line {
+  background: #333435;
+}
+
+.ace-merbivore-soft .ace_marker-layer .ace_selected_word {
+  border: 1px solid #494949;
+}
+
+.ace-merbivore-soft .ace_invisible {
+  color: #404040;
+}
+
+.ace-merbivore-soft .ace_keyword, .ace-merbivore-soft .ace_meta {
+  color:#FC803A;
+}
+
+.ace-merbivore-soft .ace_constant, .ace-merbivore-soft .ace_constant.ace_other {
+  color:#68C1D8;
+}
+
+.ace-merbivore-soft .ace_constant.ace_character,  {
+  color:#68C1D8;
+}
+
+.ace-merbivore-soft .ace_constant.ace_character.ace_escape,  {
+  color:#68C1D8;
+}
+
+.ace-merbivore-soft .ace_constant.ace_language {
+  color:#E1C582;
+}
+
+.ace-merbivore-soft .ace_constant.ace_library {
+  color:#8EC65F;
+}
+
+.ace-merbivore-soft .ace_constant.ace_numeric {
+  color:#7FC578;
+}
+
+.ace-merbivore-soft .ace_invalid {
+  color:#FFFFFF;
+background-color:#FE3838;
+}
+
+.ace-merbivore-soft .ace_invalid.ace_deprecated {
+  color:#FFFFFF;
+background-color:#FE3838;
+}
+
+.ace-merbivore-soft .ace_support.ace_constant {
+  color:#8EC65F;
+}
+
+.ace-merbivore-soft .ace_fold {
+    background-color: #FC803A;
+    border-color: #E6E1DC;
+}
+
+.ace-merbivore-soft .ace_storage {
+  color:#FC803A;
+}
+
+.ace-merbivore-soft .ace_string {
+  color:#8EC65F;
+}
+
+.ace-merbivore-soft .ace_comment {
+  font-style:italic;
+color:#AC4BB8;
+}
+
+.ace-merbivore-soft .ace_meta {
+  font-style:italic;
+color:#AC4BB8;
+}
+
+.ace-merbivore-soft .ace_meta.ace_tag {
+  color:#FC803A;
+}
+
+.ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {
+  color:#EAF1A3;
+}
+
+.ace-merbivore-soft .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js
index 107d6df6..2e7f6029 100644
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@@ -39,149 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-merbivore-soft";
-exports.cssText = "\
-.ace-merbivore-soft .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-merbivore-soft .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-merbivore-soft .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-merbivore-soft .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-merbivore-soft .ace_scroller {\
-  background-color: #1C1C1C;\
-}\
-\
-.ace-merbivore-soft .ace_text-layer {\
-  cursor: text;\
-  color: #E6E1DC;\
-}\
-\
-.ace-merbivore-soft .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-merbivore-soft .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-merbivore-soft .ace_marker-layer .ace_selection {\
-  background: #494949;\
-}\
-\
-.ace-merbivore-soft.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #1C1C1C;\
-  border-radius: 2px;\
-}\
-\
-.ace-merbivore-soft .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-merbivore-soft .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #404040;\
-}\
-\
-.ace-merbivore-soft .ace_marker-layer .ace_active_line {\
-  background: #333435;\
-}\
-\
-.ace-merbivore-soft .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #494949;\
-}\
-\
-.ace-merbivore-soft .ace_invisible {\
-  color: #404040;\
-}\
-\
-.ace-merbivore-soft .ace_keyword, .ace-merbivore-soft .ace_meta {\
-  color:#FC803A;\
-}\
-\
-.ace-merbivore-soft .ace_constant, .ace-merbivore-soft .ace_constant.ace_other {\
-  color:#68C1D8;\
-}\
-\
-.ace-merbivore-soft .ace_constant.ace_character,  {\
-  color:#68C1D8;\
-}\
-\
-.ace-merbivore-soft .ace_constant.ace_character.ace_escape,  {\
-  color:#68C1D8;\
-}\
-\
-.ace-merbivore-soft .ace_constant.ace_language {\
-  color:#E1C582;\
-}\
-\
-.ace-merbivore-soft .ace_constant.ace_library {\
-  color:#8EC65F;\
-}\
-\
-.ace-merbivore-soft .ace_constant.ace_numeric {\
-  color:#7FC578;\
-}\
-\
-.ace-merbivore-soft .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#FE3838;\
-}\
-\
-.ace-merbivore-soft .ace_invalid.ace_deprecated {\
-  color:#FFFFFF;\
-background-color:#FE3838;\
-}\
-\
-.ace-merbivore-soft .ace_support.ace_constant {\
-  color:#8EC65F;\
-}\
-\
-.ace-merbivore-soft .ace_fold {\
-    background-color: #FC803A;\
-    border-color: #E6E1DC;\
-}\
-\
-.ace-merbivore-soft .ace_storage {\
-  color:#FC803A;\
-}\
-\
-.ace-merbivore-soft .ace_string {\
-  color:#8EC65F;\
-}\
-\
-.ace-merbivore-soft .ace_comment {\
-  font-style:italic;\
-color:#AC4BB8;\
-}\
-\
-.ace-merbivore-soft .ace_meta {\
-  font-style:italic;\
-color:#AC4BB8;\
-}\
-\
-.ace-merbivore-soft .ace_meta.ace_tag {\
-  color:#FC803A;\
-}\
-\
-.ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {\
-  color:#EAF1A3;\
-}\
-\
-.ace-merbivore-soft .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./merbivore_soft.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css
new file mode 100644
index 00000000..3eaf1cae
--- /dev/null
+++ b/lib/ace/theme/mono_industrial.css
@@ -0,0 +1,145 @@
+
+.ace-mono-industrial .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-mono-industrial .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-mono-industrial .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-mono-industrial .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-mono-industrial .ace_scroller {
+  background-color: #222C28;
+}
+
+.ace-mono-industrial .ace_text-layer {
+  cursor: text;
+  color: #FFFFFF;
+}
+
+.ace-mono-industrial .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-mono-industrial .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-mono-industrial .ace_marker-layer .ace_selection {
+  background: rgba(145, 153, 148, 0.40);
+}
+
+.ace-mono-industrial.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #222C28;
+  border-radius: 2px;
+}
+
+.ace-mono-industrial .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-mono-industrial .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(102, 108, 104, 0.50);
+}
+
+.ace-mono-industrial .ace_marker-layer .ace_active_line {
+  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);
+}
+
+.ace-mono-industrial .ace_keyword, .ace-mono-industrial .ace_meta {
+  color:#A39E64;
+}
+
+.ace-mono-industrial .ace_keyword.ace_operator {
+  color:#A8B3AB;
+}
+
+.ace-mono-industrial .ace_constant, .ace-mono-industrial .ace_constant.ace_other {
+  color:#E98800;
+}
+
+.ace-mono-industrial .ace_constant.ace_character,  {
+  color:#E98800;
+}
+
+.ace-mono-industrial .ace_constant.ace_character.ace_escape,  {
+  color:#E98800;
+}
+
+.ace-mono-industrial .ace_constant.ace_numeric {
+  color:#E98800;
+}
+
+.ace-mono-industrial .ace_invalid {
+  color:#FFFFFF;
+background-color:rgba(153, 0, 0, 0.68);
+}
+
+.ace-mono-industrial .ace_support.ace_constant {
+  color:#C87500;
+}
+
+.ace-mono-industrial .ace_fold {
+    background-color: #A8B3AB;
+    border-color: #FFFFFF;
+}
+
+.ace-mono-industrial .ace_support.ace_function {
+  color:#588E60;
+}
+
+.ace-mono-industrial .ace_storage {
+  color:#C23B00;
+}
+
+.ace-mono-industrial .ace_variable {
+  color:#A8B3AB;
+}
+
+.ace-mono-industrial .ace_variable.ace_parameter {
+  color:#648BD2;
+}
+
+.ace-mono-industrial .ace_comment {
+  color:#666C68;
+background-color:#151C19;
+}
+
+.ace-mono-industrial .ace_variable.ace_language {
+  color:#648BD2;
+}
+
+.ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {
+  color:#909993;
+}
+
+.ace-mono-industrial .ace_entity.ace_name {
+  color:#5778B6;
+}
+
+.ace-mono-industrial .ace_entity.ace_name.ace_function {
+  color:#A8B3AB;
+}
+
+.ace-mono-industrial .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index fdf47fa2..d967b2e4 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -39,151 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-mono-industrial";
-exports.cssText = "\
-.ace-mono-industrial .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-mono-industrial .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-mono-industrial .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-mono-industrial .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-mono-industrial .ace_scroller {\
-  background-color: #222C28;\
-}\
-\
-.ace-mono-industrial .ace_text-layer {\
-  cursor: text;\
-  color: #FFFFFF;\
-}\
-\
-.ace-mono-industrial .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-mono-industrial .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-mono-industrial .ace_marker-layer .ace_selection {\
-  background: rgba(145, 153, 148, 0.40);\
-}\
-\
-.ace-mono-industrial.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #222C28;\
-  border-radius: 2px;\
-}\
-\
-.ace-mono-industrial .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-mono-industrial .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(102, 108, 104, 0.50);\
-}\
-\
-.ace-mono-industrial .ace_marker-layer .ace_active_line {\
-  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);\
-}\
-\
-.ace-mono-industrial .ace_keyword, .ace-mono-industrial .ace_meta {\
-  color:#A39E64;\
-}\
-\
-.ace-mono-industrial .ace_keyword.ace_operator {\
-  color:#A8B3AB;\
-}\
-\
-.ace-mono-industrial .ace_constant, .ace-mono-industrial .ace_constant.ace_other {\
-  color:#E98800;\
-}\
-\
-.ace-mono-industrial .ace_constant.ace_character,  {\
-  color:#E98800;\
-}\
-\
-.ace-mono-industrial .ace_constant.ace_character.ace_escape,  {\
-  color:#E98800;\
-}\
-\
-.ace-mono-industrial .ace_constant.ace_numeric {\
-  color:#E98800;\
-}\
-\
-.ace-mono-industrial .ace_invalid {\
-  color:#FFFFFF;\
-background-color:rgba(153, 0, 0, 0.68);\
-}\
-\
-.ace-mono-industrial .ace_support.ace_constant {\
-  color:#C87500;\
-}\
-\
-.ace-mono-industrial .ace_fold {\
-    background-color: #A8B3AB;\
-    border-color: #FFFFFF;\
-}\
-\
-.ace-mono-industrial .ace_support.ace_function {\
-  color:#588E60;\
-}\
-\
-.ace-mono-industrial .ace_storage {\
-  color:#C23B00;\
-}\
-\
-.ace-mono-industrial .ace_variable {\
-  color:#A8B3AB;\
-}\
-\
-.ace-mono-industrial .ace_variable.ace_parameter {\
-  color:#648BD2;\
-}\
-\
-.ace-mono-industrial .ace_comment {\
-  color:#666C68;\
-background-color:#151C19;\
-}\
-\
-.ace-mono-industrial .ace_variable.ace_language {\
-  color:#648BD2;\
-}\
-\
-.ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {\
-  color:#909993;\
-}\
-\
-.ace-mono-industrial .ace_entity.ace_name {\
-  color:#5778B6;\
-}\
-\
-.ace-mono-industrial .ace_entity.ace_name.ace_function {\
-  color:#A8B3AB;\
-}\
-\
-.ace-mono-industrial .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./mono_industrial.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css
new file mode 100644
index 00000000..36b0a23c
--- /dev/null
+++ b/lib/ace/theme/monokai.css
@@ -0,0 +1,146 @@
+
+.ace-monokai .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-monokai .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-monokai .ace_gutter {
+  background: #292a24;
+  color: #f1f1f1;
+}
+
+.ace-monokai .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-monokai .ace_scroller {
+  background-color: #272822;
+}
+
+.ace-monokai .ace_text-layer {
+  cursor: text;
+  color: #F8F8F2;
+}
+
+.ace-monokai .ace_cursor {
+  border-left: 2px solid #F8F8F0;
+}
+
+.ace-monokai .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #F8F8F0;
+}
+
+.ace-monokai .ace_marker-layer .ace_selection {
+  background: #49483E;
+}
+
+.ace-monokai.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #272822;
+  border-radius: 2px;
+}
+
+.ace-monokai .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-monokai .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #49483E;
+}
+
+.ace-monokai .ace_marker-layer .ace_active_line{
+  background: #49483E;
+}
+.ace-monokai .ace_gutter_active_line{
+  background: #191916;
+}
+
+.ace-monokai .ace_marker-layer .ace_selected_word {
+  border: 1px solid #49483E;
+}
+
+.ace-monokai .ace_invisible {
+  color: #49483E;
+}
+
+.ace-monokai .ace_keyword, .ace-monokai .ace_meta {
+  color:#F92672;
+}
+
+.ace-monokai .ace_constant.ace_language {
+  color:#AE81FF;
+}
+
+.ace-monokai .ace_constant.ace_numeric {
+  color:#AE81FF;
+}
+
+.ace-monokai .ace_constant.ace_other {
+  color:#AE81FF;
+}
+
+.ace-monokai .ace_invalid {
+  color:#F8F8F0;
+background-color:#F92672;
+}
+
+.ace-monokai .ace_invalid.ace_deprecated {
+  color:#F8F8F0;
+background-color:#AE81FF;
+}
+
+.ace-monokai .ace_support.ace_constant {
+  color:#66D9EF;
+}
+
+.ace-monokai .ace_fold {
+    background-color: #A6E22E;
+    border-color: #F8F8F2;
+}
+
+.ace-monokai .ace_support.ace_function {
+  color:#66D9EF;
+}
+
+.ace-monokai .ace_storage {
+  color:#F92672;
+}
+
+.ace-monokai .ace_storage.ace_type,  .ace-monokai .ace_support.ace_type{
+  font-style:italic;
+color:#66D9EF;
+}
+
+.ace-monokai .ace_variable {
+  color:#A6E22E;
+}
+
+.ace-monokai .ace_variable.ace_parameter {
+  font-style:italic;
+color:#FD971F;
+}
+
+.ace-monokai .ace_string {
+  color:#E6DB74;
+}
+
+.ace-monokai .ace_comment {
+  color:#75715E;
+}
+
+.ace-monokai .ace_entity.ace_other.ace_attribute-name {
+  color:#A6E22E;
+}
+
+.ace-monokai .ace_entity.ace_name.ace_function {
+  color:#A6E22E;
+}
+
+.ace-monokai .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js
index c31efa85..4b906248 100644
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@@ -39,152 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-monokai";
-exports.cssText = "\
-.ace-monokai .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-monokai .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-monokai .ace_gutter {\
-  background: #292a24;\
-  color: #f1f1f1;\
-}\
-\
-.ace-monokai .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-monokai .ace_scroller {\
-  background-color: #272822;\
-}\
-\
-.ace-monokai .ace_text-layer {\
-  cursor: text;\
-  color: #F8F8F2;\
-}\
-\
-.ace-monokai .ace_cursor {\
-  border-left: 2px solid #F8F8F0;\
-}\
-\
-.ace-monokai .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #F8F8F0;\
-}\
-\
-.ace-monokai .ace_marker-layer .ace_selection {\
-  background: #49483E;\
-}\
-\
-.ace-monokai.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #272822;\
-  border-radius: 2px;\
-}\
-\
-.ace-monokai .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-monokai .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #49483E;\
-}\
-\
-.ace-monokai .ace_marker-layer .ace_active_line{\
-  background: #49483E;\
-}\
-.ace-monokai .ace_gutter_active_line{\
-  background: #191916;\
-}\
-\
-.ace-monokai .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #49483E;\
-}\
-\
-.ace-monokai .ace_invisible {\
-  color: #49483E;\
-}\
-\
-.ace-monokai .ace_keyword, .ace-monokai .ace_meta {\
-  color:#F92672;\
-}\
-\
-.ace-monokai .ace_constant.ace_language {\
-  color:#AE81FF;\
-}\
-\
-.ace-monokai .ace_constant.ace_numeric {\
-  color:#AE81FF;\
-}\
-\
-.ace-monokai .ace_constant.ace_other {\
-  color:#AE81FF;\
-}\
-\
-.ace-monokai .ace_invalid {\
-  color:#F8F8F0;\
-background-color:#F92672;\
-}\
-\
-.ace-monokai .ace_invalid.ace_deprecated {\
-  color:#F8F8F0;\
-background-color:#AE81FF;\
-}\
-\
-.ace-monokai .ace_support.ace_constant {\
-  color:#66D9EF;\
-}\
-\
-.ace-monokai .ace_fold {\
-    background-color: #A6E22E;\
-    border-color: #F8F8F2;\
-}\
-\
-.ace-monokai .ace_support.ace_function {\
-  color:#66D9EF;\
-}\
-\
-.ace-monokai .ace_storage {\
-  color:#F92672;\
-}\
-\
-.ace-monokai .ace_storage.ace_type,  .ace-monokai .ace_support.ace_type{\
-  font-style:italic;\
-color:#66D9EF;\
-}\
-\
-.ace-monokai .ace_variable {\
-  color:#A6E22E;\
-}\
-\
-.ace-monokai .ace_variable.ace_parameter {\
-  font-style:italic;\
-color:#FD971F;\
-}\
-\
-.ace-monokai .ace_string {\
-  color:#E6DB74;\
-}\
-\
-.ace-monokai .ace_comment {\
-  color:#75715E;\
-}\
-\
-.ace-monokai .ace_entity.ace_other.ace_attribute-name {\
-  color:#A6E22E;\
-}\
-\
-.ace-monokai .ace_entity.ace_name.ace_function {\
-  color:#A6E22E;\
-}\
-\
-.ace-monokai .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./monokai.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css
new file mode 100644
index 00000000..31460fb7
--- /dev/null
+++ b/lib/ace/theme/pastel_on_dark.css
@@ -0,0 +1,147 @@
+
+.ace-pastel-on-dark .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-pastel-on-dark .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-pastel-on-dark .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-pastel-on-dark .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-pastel-on-dark .ace_scroller {
+  background-color: #2C2828;
+}
+
+.ace-pastel-on-dark .ace_text-layer {
+  cursor: text;
+  color: #8F938F;
+}
+
+.ace-pastel-on-dark .ace_cursor {
+  border-left: 2px solid #A7A7A7;
+}
+
+.ace-pastel-on-dark .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #A7A7A7;
+}
+
+.ace-pastel-on-dark .ace_marker-layer .ace_selection {
+  background: rgba(221, 240, 255, 0.20);
+}
+
+.ace-pastel-on-dark.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #2C2828;
+  border-radius: 2px;
+}
+
+.ace-pastel-on-dark .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-pastel-on-dark .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(255, 255, 255, 0.25);
+}
+
+.ace-pastel-on-dark .ace_marker-layer .ace_active_line {
+  background: rgba(255, 255, 255, 0.031);
+}
+
+.ace-pastel-on-dark .ace_marker-layer .ace_selected_word {
+  border: 1px solid rgba(221, 240, 255, 0.20);
+}
+
+.ace-pastel-on-dark .ace_invisible {
+  color: rgba(255, 255, 255, 0.25);
+}
+
+.ace-pastel-on-dark .ace_keyword, .ace-pastel-on-dark .ace_meta {
+  color:#757aD8;
+}
+
+.ace-pastel-on-dark .ace_keyword.ace_operator {
+  color:#797878;
+}
+
+.ace-pastel-on-dark .ace_constant, .ace-pastel-on-dark .ace_constant.ace_other {
+  color:#4FB7C5;
+}
+
+.ace-pastel-on-dark .ace_constant.ace_character,  {
+  color:#4FB7C5;
+}
+
+.ace-pastel-on-dark .ace_constant.ace_character.ace_escape,  {
+  color:#4FB7C5;
+}
+
+.ace-pastel-on-dark .ace_constant.ace_language {
+  color:#DE8E30;
+}
+
+.ace-pastel-on-dark .ace_constant.ace_numeric {
+  color:#CCCCCC;
+}
+
+.ace-pastel-on-dark .ace_invalid {
+  color:#F8F8F8;
+background-color:rgba(86, 45, 86, 0.75);
+}
+
+.ace-pastel-on-dark .ace_invalid.ace_illegal {
+  color:#F8F8F8;
+background-color:rgba(86, 45, 86, 0.75);
+}
+
+.ace-pastel-on-dark .ace_invalid.ace_deprecated {
+  text-decoration:underline;
+font-style:italic;
+color:#D2A8A1;
+}
+
+.ace-pastel-on-dark .ace_fold {
+    background-color: #757aD8;
+    border-color: #8F938F;
+}
+
+.ace-pastel-on-dark .ace_support.ace_function {
+  color:#AEB2F8;
+}
+
+.ace-pastel-on-dark .ace_string {
+  color:#66A968;
+}
+
+.ace-pastel-on-dark .ace_string.ace_regexp {
+  color:#E9C062;
+}
+
+.ace-pastel-on-dark .ace_comment {
+  color:#A6C6FF;
+}
+
+.ace-pastel-on-dark .ace_variable {
+  color:#BEBF55;
+}
+
+.ace-pastel-on-dark .ace_variable.ace_language {
+  color:#C1C144;
+}
+
+.ace-pastel-on-dark .ace_xml_pe {
+  color:#494949;
+}
+
+.ace-pastel-on-dark .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index 3399e7ce..073ec6a5 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -39,153 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-pastel-on-dark";
-exports.cssText = "\
-.ace-pastel-on-dark .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-pastel-on-dark .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-pastel-on-dark .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-pastel-on-dark .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-pastel-on-dark .ace_scroller {\
-  background-color: #2C2828;\
-}\
-\
-.ace-pastel-on-dark .ace_text-layer {\
-  cursor: text;\
-  color: #8F938F;\
-}\
-\
-.ace-pastel-on-dark .ace_cursor {\
-  border-left: 2px solid #A7A7A7;\
-}\
-\
-.ace-pastel-on-dark .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #A7A7A7;\
-}\
-\
-.ace-pastel-on-dark .ace_marker-layer .ace_selection {\
-  background: rgba(221, 240, 255, 0.20);\
-}\
-\
-.ace-pastel-on-dark.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #2C2828;\
-  border-radius: 2px;\
-}\
-\
-.ace-pastel-on-dark .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-pastel-on-dark .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(255, 255, 255, 0.25);\
-}\
-\
-.ace-pastel-on-dark .ace_marker-layer .ace_active_line {\
-  background: rgba(255, 255, 255, 0.031);\
-}\
-\
-.ace-pastel-on-dark .ace_marker-layer .ace_selected_word {\
-  border: 1px solid rgba(221, 240, 255, 0.20);\
-}\
-\
-.ace-pastel-on-dark .ace_invisible {\
-  color: rgba(255, 255, 255, 0.25);\
-}\
-\
-.ace-pastel-on-dark .ace_keyword, .ace-pastel-on-dark .ace_meta {\
-  color:#757aD8;\
-}\
-\
-.ace-pastel-on-dark .ace_keyword.ace_operator {\
-  color:#797878;\
-}\
-\
-.ace-pastel-on-dark .ace_constant, .ace-pastel-on-dark .ace_constant.ace_other {\
-  color:#4FB7C5;\
-}\
-\
-.ace-pastel-on-dark .ace_constant.ace_character,  {\
-  color:#4FB7C5;\
-}\
-\
-.ace-pastel-on-dark .ace_constant.ace_character.ace_escape,  {\
-  color:#4FB7C5;\
-}\
-\
-.ace-pastel-on-dark .ace_constant.ace_language {\
-  color:#DE8E30;\
-}\
-\
-.ace-pastel-on-dark .ace_constant.ace_numeric {\
-  color:#CCCCCC;\
-}\
-\
-.ace-pastel-on-dark .ace_invalid {\
-  color:#F8F8F8;\
-background-color:rgba(86, 45, 86, 0.75);\
-}\
-\
-.ace-pastel-on-dark .ace_invalid.ace_illegal {\
-  color:#F8F8F8;\
-background-color:rgba(86, 45, 86, 0.75);\
-}\
-\
-.ace-pastel-on-dark .ace_invalid.ace_deprecated {\
-  text-decoration:underline;\
-font-style:italic;\
-color:#D2A8A1;\
-}\
-\
-.ace-pastel-on-dark .ace_fold {\
-    background-color: #757aD8;\
-    border-color: #8F938F;\
-}\
-\
-.ace-pastel-on-dark .ace_support.ace_function {\
-  color:#AEB2F8;\
-}\
-\
-.ace-pastel-on-dark .ace_string {\
-  color:#66A968;\
-}\
-\
-.ace-pastel-on-dark .ace_string.ace_regexp {\
-  color:#E9C062;\
-}\
-\
-.ace-pastel-on-dark .ace_comment {\
-  color:#A6C6FF;\
-}\
-\
-.ace-pastel-on-dark .ace_variable {\
-  color:#BEBF55;\
-}\
-\
-.ace-pastel-on-dark .ace_variable.ace_language {\
-  color:#C1C144;\
-}\
-\
-.ace-pastel-on-dark .ace_xml_pe {\
-  color:#494949;\
-}\
-\
-.ace-pastel-on-dark .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css
new file mode 100644
index 00000000..392afe54
--- /dev/null
+++ b/lib/ace/theme/solarized_dark.css
@@ -0,0 +1,131 @@
+
+.ace-solarized-dark .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-solarized-dark .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-solarized-dark .ace_gutter {
+  background: #09222b;
+  color: #d0edf7;
+}
+
+.ace-solarized-dark .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-solarized-dark .ace_scroller {
+  background-color: #002B36;
+}
+
+.ace-solarized-dark .ace_text-layer {
+  cursor: text;
+  color: #93A1A1;
+}
+
+.ace-solarized-dark .ace_cursor {
+  border-left: 2px solid #D30102;
+}
+
+.ace-solarized-dark .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #D30102;
+}
+
+.ace-solarized-dark .ace_marker-layer .ace_selection {
+  background: #073642;
+}
+
+.ace-solarized-dark.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #002B36;
+  border-radius: 2px;
+}
+
+.ace-solarized-dark .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-solarized-dark .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(147, 161, 161, 0.50);
+}
+
+.ace-solarized-dark .ace_marker-layer .ace_active_line {
+  background: #073642;
+}
+.ace-solarized-dark .ace_gutter_active_line{
+  background: #0d3440;
+}
+
+.ace-solarized-dark .ace_marker-layer .ace_selected_word {
+  border: 1px solid #073642;
+}
+
+.ace-solarized-dark .ace_invisible {
+  color: rgba(147, 161, 161, 0.50);
+}
+
+.ace-solarized-dark .ace_keyword, .ace-solarized-dark .ace_meta {
+  color:#859900;
+}
+
+.ace-solarized-dark .ace_constant.ace_language {
+  color:#B58900;
+}
+
+.ace-solarized-dark .ace_constant.ace_numeric {
+  color:#D33682;
+}
+
+.ace-solarized-dark .ace_constant.ace_other {
+  color:#CB4B16;
+}
+
+.ace-solarized-dark .ace_fold {
+    background-color: #268BD2;
+    border-color: #93A1A1;
+}
+
+.ace-solarized-dark .ace_support.ace_function {
+  color:#268BD2;
+}
+
+.ace-solarized-dark .ace_storage {
+  color:#93A1A1;
+}
+
+.ace-solarized-dark .ace_variable {
+  color:#268BD2;
+}
+
+.ace-solarized-dark .ace_string {
+  color:#2AA198;
+}
+
+.ace-solarized-dark .ace_string.ace_regexp {
+  color:#D30102;
+}
+
+.ace-solarized-dark .ace_comment {
+  font-style:italic;
+color:#657B83;
+}
+
+.ace-solarized-dark .ace_variable.ace_language {
+  color:#268BD2;
+}
+
+.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name {
+  color:#93A1A1;
+}
+
+.ace-solarized-dark .ace_entity.ace_name.ace_function {
+  color:#268BD2;
+}
+
+.ace-solarized-dark .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js
index 5113467b..4b7dd9dc 100644
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@@ -39,137 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-solarized-dark";
-exports.cssText = "\
-.ace-solarized-dark .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-solarized-dark .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-solarized-dark .ace_gutter {\
-  background: #09222b;\
-  color: #d0edf7;\
-}\
-\
-.ace-solarized-dark .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-solarized-dark .ace_scroller {\
-  background-color: #002B36;\
-}\
-\
-.ace-solarized-dark .ace_text-layer {\
-  cursor: text;\
-  color: #93A1A1;\
-}\
-\
-.ace-solarized-dark .ace_cursor {\
-  border-left: 2px solid #D30102;\
-}\
-\
-.ace-solarized-dark .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #D30102;\
-}\
-\
-.ace-solarized-dark .ace_marker-layer .ace_selection {\
-  background: #073642;\
-}\
-\
-.ace-solarized-dark.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #002B36;\
-  border-radius: 2px;\
-}\
-\
-.ace-solarized-dark .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-solarized-dark .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(147, 161, 161, 0.50);\
-}\
-\
-.ace-solarized-dark .ace_marker-layer .ace_active_line {\
-  background: #073642;\
-}\
-.ace-solarized-dark .ace_gutter_active_line{\
-  background: #0d3440;\
-}\
-\
-.ace-solarized-dark .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #073642;\
-}\
-\
-.ace-solarized-dark .ace_invisible {\
-  color: rgba(147, 161, 161, 0.50);\
-}\
-\
-.ace-solarized-dark .ace_keyword, .ace-solarized-dark .ace_meta {\
-  color:#859900;\
-}\
-\
-.ace-solarized-dark .ace_constant.ace_language {\
-  color:#B58900;\
-}\
-\
-.ace-solarized-dark .ace_constant.ace_numeric {\
-  color:#D33682;\
-}\
-\
-.ace-solarized-dark .ace_constant.ace_other {\
-  color:#CB4B16;\
-}\
-\
-.ace-solarized-dark .ace_fold {\
-    background-color: #268BD2;\
-    border-color: #93A1A1;\
-}\
-\
-.ace-solarized-dark .ace_support.ace_function {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-dark .ace_storage {\
-  color:#93A1A1;\
-}\
-\
-.ace-solarized-dark .ace_variable {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-dark .ace_string {\
-  color:#2AA198;\
-}\
-\
-.ace-solarized-dark .ace_string.ace_regexp {\
-  color:#D30102;\
-}\
-\
-.ace-solarized-dark .ace_comment {\
-  font-style:italic;\
-color:#657B83;\
-}\
-\
-.ace-solarized-dark .ace_variable.ace_language {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name {\
-  color:#93A1A1;\
-}\
-\
-.ace-solarized-dark .ace_entity.ace_name.ace_function {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-dark .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./solarized_dark.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css
new file mode 100644
index 00000000..cdf01956
--- /dev/null
+++ b/lib/ace/theme/solarized_light.css
@@ -0,0 +1,127 @@
+
+.ace-solarized-light .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-solarized-light .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-solarized-light .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-solarized-light .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-solarized-light .ace_scroller {
+  background-color: #FDF6E3;
+}
+
+.ace-solarized-light .ace_text-layer {
+  cursor: text;
+  color: #586E75;
+}
+
+.ace-solarized-light .ace_cursor {
+  border-left: 2px solid #000000;
+}
+
+.ace-solarized-light .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #000000;
+}
+
+.ace-solarized-light .ace_marker-layer .ace_selection {
+  background: #073642;
+}
+
+.ace-solarized-light.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #FDF6E3;
+  border-radius: 2px;
+}
+
+.ace-solarized-light .ace_marker-layer .ace_step {
+  background: rgb(255, 255, 0);
+}
+
+.ace-solarized-light .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(147, 161, 161, 0.50);
+}
+
+.ace-solarized-light .ace_marker-layer .ace_active_line {
+  background: #EEE8D5;
+}
+
+.ace-solarized-light .ace_marker-layer .ace_selected_word {
+  border: 1px solid #073642;
+}
+
+.ace-solarized-light .ace_invisible {
+  color: rgba(147, 161, 161, 0.50);
+}
+
+.ace-solarized-light .ace_keyword, .ace-solarized-light .ace_meta {
+  color:#859900;
+}
+
+.ace-solarized-light .ace_constant.ace_language {
+  color:#B58900;
+}
+
+.ace-solarized-light .ace_constant.ace_numeric {
+  color:#D33682;
+}
+
+.ace-solarized-light .ace_constant.ace_other {
+  color:#CB4B16;
+}
+
+.ace-solarized-light .ace_fold {
+    background-color: #268BD2;
+    border-color: #586E75;
+}
+
+.ace-solarized-light .ace_support.ace_function {
+  color:#268BD2;
+}
+
+.ace-solarized-light .ace_storage {
+  color:#073642;
+}
+
+.ace-solarized-light .ace_variable {
+  color:#268BD2;
+}
+
+.ace-solarized-light .ace_string {
+  color:#2AA198;
+}
+
+.ace-solarized-light .ace_string.ace_regexp {
+  color:#D30102;
+}
+
+.ace-solarized-light .ace_comment {
+  color:#93A1A1;
+}
+
+.ace-solarized-light .ace_variable.ace_language {
+  color:#268BD2;
+}
+
+.ace-solarized-light .ace_entity.ace_other.ace_attribute-name {
+  color:#93A1A1;
+}
+
+.ace-solarized-light .ace_entity.ace_name.ace_function {
+  color:#268BD2;
+}
+
+.ace-solarized-light .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js
index 1327ce64..894c0edb 100644
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@@ -39,133 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-solarized-light";
-exports.cssText = "\
-.ace-solarized-light .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-solarized-light .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-solarized-light .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-solarized-light .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-solarized-light .ace_scroller {\
-  background-color: #FDF6E3;\
-}\
-\
-.ace-solarized-light .ace_text-layer {\
-  cursor: text;\
-  color: #586E75;\
-}\
-\
-.ace-solarized-light .ace_cursor {\
-  border-left: 2px solid #000000;\
-}\
-\
-.ace-solarized-light .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #000000;\
-}\
-\
-.ace-solarized-light .ace_marker-layer .ace_selection {\
-  background: #073642;\
-}\
-\
-.ace-solarized-light.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #FDF6E3;\
-  border-radius: 2px;\
-}\
-\
-.ace-solarized-light .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-solarized-light .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(147, 161, 161, 0.50);\
-}\
-\
-.ace-solarized-light .ace_marker-layer .ace_active_line {\
-  background: #EEE8D5;\
-}\
-\
-.ace-solarized-light .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #073642;\
-}\
-\
-.ace-solarized-light .ace_invisible {\
-  color: rgba(147, 161, 161, 0.50);\
-}\
-\
-.ace-solarized-light .ace_keyword, .ace-solarized-light .ace_meta {\
-  color:#859900;\
-}\
-\
-.ace-solarized-light .ace_constant.ace_language {\
-  color:#B58900;\
-}\
-\
-.ace-solarized-light .ace_constant.ace_numeric {\
-  color:#D33682;\
-}\
-\
-.ace-solarized-light .ace_constant.ace_other {\
-  color:#CB4B16;\
-}\
-\
-.ace-solarized-light .ace_fold {\
-    background-color: #268BD2;\
-    border-color: #586E75;\
-}\
-\
-.ace-solarized-light .ace_support.ace_function {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-light .ace_storage {\
-  color:#073642;\
-}\
-\
-.ace-solarized-light .ace_variable {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-light .ace_string {\
-  color:#2AA198;\
-}\
-\
-.ace-solarized-light .ace_string.ace_regexp {\
-  color:#D30102;\
-}\
-\
-.ace-solarized-light .ace_comment {\
-  color:#93A1A1;\
-}\
-\
-.ace-solarized-light .ace_variable.ace_language {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-light .ace_entity.ace_other.ace_attribute-name {\
-  color:#93A1A1;\
-}\
-\
-.ace-solarized-light .ace_entity.ace_name.ace_function {\
-  color:#268BD2;\
-}\
-\
-.ace-solarized-light .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./solarized_light.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css
new file mode 100644
index 00000000..dafb9fa1
--- /dev/null
+++ b/lib/ace/theme/textmate.css
@@ -0,0 +1,165 @@
+.ace-tm .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tm .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tm .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-tm .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tm .ace_fold {
+    background-color: #6B72E6;
+}
+
+.ace-tm .ace_text-layer {
+  cursor: text;
+}
+
+.ace-tm .ace_cursor {
+  border-left: 2px solid black;
+}
+
+.ace-tm .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid black;
+}
+        
+.ace-tm .ace_line .ace_invisible {
+  color: rgb(191, 191, 191);
+}
+
+.ace-tm .ace_line .ace_storage,
+.ace-tm .ace_line .ace_keyword {
+  color: blue;
+}
+
+.ace-tm .ace_line .ace_constant {
+  color: rgb(197, 6, 11);
+}
+
+.ace-tm .ace_line .ace_constant.ace_buildin {
+  color: rgb(88, 72, 246);
+}
+
+.ace-tm .ace_line .ace_constant.ace_language {
+  color: rgb(88, 92, 246);
+}
+
+.ace-tm .ace_line .ace_constant.ace_library {
+  color: rgb(6, 150, 14);
+}
+
+.ace-tm .ace_line .ace_invalid {
+  background-color: rgba(255, 0, 0, 0.1);
+  color: red;
+}
+
+.ace-tm .ace_line .ace_support.ace_function {
+  color: rgb(60, 76, 114);
+}
+
+.ace-tm .ace_line .ace_support.ace_constant {
+  color: rgb(6, 150, 14);
+}
+
+.ace-tm .ace_line .ace_support.ace_type,
+.ace-tm .ace_line .ace_support.ace_class {
+  color: rgb(109, 121, 222);
+}
+
+.ace-tm .ace_line .ace_keyword.ace_operator {
+  color: rgb(104, 118, 135);
+}
+
+.ace-tm .ace_line .ace_string {
+  color: rgb(3, 106, 7);
+}
+
+.ace-tm .ace_line .ace_comment {
+  color: rgb(76, 136, 107);
+}
+
+.ace-tm .ace_line .ace_comment.ace_doc {
+  color: rgb(0, 102, 255);
+}
+
+.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {
+  color: rgb(128, 159, 191);
+}
+
+.ace-tm .ace_line .ace_constant.ace_numeric {
+  color: rgb(0, 0, 205);
+}
+
+.ace-tm .ace_line .ace_variable {
+  color: rgb(49, 132, 149);
+}
+
+.ace-tm .ace_line .ace_xml_pe {
+  color: rgb(104, 104, 91);
+}
+
+.ace-tm .ace_entity.ace_name.ace_function {
+  color: #0000A2;
+}
+
+.ace-tm .ace_markup.ace_markupine {
+    text-decoration:underline;
+}
+
+.ace-tm .ace_markup.ace_heading {
+  color: rgb(12, 7, 255);
+}
+
+.ace-tm .ace_markup.ace_list {
+  color:rgb(185, 6, 144);
+}
+
+.ace-tm .ace_marker-layer .ace_selection {
+  background: rgb(181, 213, 255);
+}
+.ace-tm.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px white;
+  border-radius: 2px;
+}
+.ace-tm .ace_marker-layer .ace_step {
+  background: rgb(252, 255, 0);
+}
+
+.ace-tm .ace_marker-layer .ace_stack {
+  background: rgb(164, 229, 101);
+}
+
+.ace-tm .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgb(192, 192, 192);
+}
+
+.ace-tm .ace_marker-layer .ace_active_line {
+  background: rgba(0, 0, 0, 0.07);
+}
+.ace-tm .ace_gutter_active_line{
+    background-color : #dcdcdc;
+}
+
+.ace-tm .ace_marker-layer .ace_selected_word {
+  background: rgb(250, 250, 255);
+  border: 1px solid rgb(200, 200, 250);
+}
+
+.ace-tm .ace_meta.ace_tag {
+  color:rgb(0, 50, 198);
+}
+
+.ace-tm .ace_string.ace_regex {
+  color: rgb(255, 0, 0)
+}
\ No newline at end of file
diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js
index a7d028c9..cd83f116 100644
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@@ -40,171 +40,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-tm";
-exports.cssText = ".ace-tm .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tm .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tm .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tm .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tm .ace_fold {\
-    background-color: #6B72E6;\
-}\
-\
-.ace-tm .ace_text-layer {\
-  cursor: text;\
-}\
-\
-.ace-tm .ace_cursor {\
-  border-left: 2px solid black;\
-}\
-\
-.ace-tm .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid black;\
-}\
-        \
-.ace-tm .ace_line .ace_invisible {\
-  color: rgb(191, 191, 191);\
-}\
-\
-.ace-tm .ace_line .ace_storage,\
-.ace-tm .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
-.ace-tm .ace_line .ace_constant {\
-  color: rgb(197, 6, 11);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_buildin {\
-  color: rgb(88, 72, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_language {\
-  color: rgb(88, 92, 246);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_library {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_invalid {\
-  background-color: rgba(255, 0, 0, 0.1);\
-  color: red;\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_function {\
-  color: rgb(60, 76, 114);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_constant {\
-  color: rgb(6, 150, 14);\
-}\
-\
-.ace-tm .ace_line .ace_support.ace_type,\
-.ace-tm .ace_line .ace_support.ace_class {\
-  color: rgb(109, 121, 222);\
-}\
-\
-.ace-tm .ace_line .ace_keyword.ace_operator {\
-  color: rgb(104, 118, 135);\
-}\
-\
-.ace-tm .ace_line .ace_string {\
-  color: rgb(3, 106, 7);\
-}\
-\
-.ace-tm .ace_line .ace_comment {\
-  color: rgb(76, 136, 107);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc {\
-  color: rgb(0, 102, 255);\
-}\
-\
-.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
-  color: rgb(128, 159, 191);\
-}\
-\
-.ace-tm .ace_line .ace_constant.ace_numeric {\
-  color: rgb(0, 0, 205);\
-}\
-\
-.ace-tm .ace_line .ace_variable {\
-  color: rgb(49, 132, 149);\
-}\
-\
-.ace-tm .ace_line .ace_xml_pe {\
-  color: rgb(104, 104, 91);\
-}\
-\
-.ace-tm .ace_entity.ace_name.ace_function {\
-  color: #0000A2;\
-}\
-\
-.ace-tm .ace_markup.ace_markupine {\
-    text-decoration:underline;\
-}\
-\
-.ace-tm .ace_markup.ace_heading {\
-  color: rgb(12, 7, 255);\
-}\
-\
-.ace-tm .ace_markup.ace_list {\
-  color:rgb(185, 6, 144);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selection {\
-  background: rgb(181, 213, 255);\
-}\
-.ace-tm.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px white;\
-  border-radius: 2px;\
-}\
-.ace-tm .ace_marker-layer .ace_step {\
-  background: rgb(252, 255, 0);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_stack {\
-  background: rgb(164, 229, 101);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgb(192, 192, 192);\
-}\
-\
-.ace-tm .ace_marker-layer .ace_active_line {\
-  background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-tm .ace_gutter_active_line{\
-    background-color : #dcdcdc;\
-}\
-\
-.ace-tm .ace_marker-layer .ace_selected_word {\
-  background: rgb(250, 250, 255);\
-  border: 1px solid rgb(200, 200, 250);\
-}\
-\
-.ace-tm .ace_meta.ace_tag {\
-  color:rgb(0, 50, 198);\
-}\
-\
-.ace-tm .ace_string.ace_regex {\
-  color: rgb(255, 0, 0)\
-}";
+exports.cssText = require('ace/requirejs/text!./textmate.css');
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
new file mode 100644
index 00000000..27bc1e87
--- /dev/null
+++ b/lib/ace/theme/tomorrow.css
@@ -0,0 +1,161 @@
+
+.ace-tomorrow .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tomorrow .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tomorrow .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-tomorrow .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tomorrow .ace_scroller {
+  background-color: #FFFFFF;
+}
+
+.ace-tomorrow .ace_text-layer {
+  cursor: text;
+  color: #4D4D4C;
+}
+
+.ace-tomorrow .ace_cursor {
+  border-left: 2px solid #AEAFAD;
+}
+
+.ace-tomorrow .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #AEAFAD;
+}
+
+.ace-tomorrow .ace_marker-layer .ace_selection {
+  background: #D6D6D6;
+}
+
+.ace-tomorrow.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #FFFFFF;
+  border-radius: 2px;
+}
+
+.ace-tomorrow .ace_marker-layer .ace_step {
+  background: rgb(255, 255, 0);
+}
+
+.ace-tomorrow .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #D1D1D1;
+}
+
+.ace-tomorrow .ace_marker-layer .ace_active_line {
+  background: #EFEFEF;
+}
+
+.ace-tomorrow .ace_marker-layer .ace_selected_word {
+  border: 1px solid #D6D6D6;
+}
+
+.ace-tomorrow .ace_invisible {
+  color: #D1D1D1;
+}
+
+.ace-tomorrow .ace_keyword, .ace-tomorrow .ace_meta {
+  color:#8959A8;
+}
+
+.ace-tomorrow .ace_keyword.ace_operator {
+  color:#3E999F;
+}
+
+.ace-tomorrow .ace_constant.ace_language {
+  color:#F5871F;
+}
+
+.ace-tomorrow .ace_constant.ace_numeric {
+  color:#F5871F;
+}
+
+.ace-tomorrow .ace_constant.ace_other {
+  color:#666969;
+}
+
+.ace-tomorrow .ace_invalid {
+  color:#FFFFFF;
+background-color:#C82829;
+}
+
+.ace-tomorrow .ace_invalid.ace_deprecated {
+  color:#FFFFFF;
+background-color:#8959A8;
+}
+
+.ace-tomorrow .ace_support.ace_constant {
+  color:#F5871F;
+}
+
+.ace-tomorrow .ace_fold {
+    background-color: #4271AE;
+    border-color: #4D4D4C;
+}
+
+.ace-tomorrow .ace_support.ace_function {
+  color:#4271AE;
+}
+
+.ace-tomorrow .ace_storage {
+  color:#8959A8;
+}
+
+.ace-tomorrow .ace_storage.ace_type,  .ace-tomorrow .ace_support.ace_type{
+  color:#8959A8;
+}
+
+.ace-tomorrow .ace_variable {
+  color:#4271AE;
+}
+
+.ace-tomorrow .ace_variable.ace_parameter {
+  color:#F5871F;
+}
+
+.ace-tomorrow .ace_string {
+  color:#718C00;
+}
+
+.ace-tomorrow .ace_string.ace_regexp {
+  color:#C82829;
+}
+
+.ace-tomorrow .ace_comment {
+  color:#8E908C;
+}
+
+.ace-tomorrow .ace_variable {
+  color:#C82829;
+}
+
+.ace-tomorrow .ace_meta.ace_tag {
+  color:#C82829;
+}
+
+.ace-tomorrow .ace_entity.ace_other.ace_attribute-name {
+  color:#C82829;
+}
+
+.ace-tomorrow .ace_entity.ace_name.ace_function {
+  color:#4271AE;
+}
+
+.ace-tomorrow .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-tomorrow .ace_markup.ace_heading {
+  color:#718C00;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index 14e19d77..45daba61 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -39,167 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-tomorrow";
-exports.cssText = "\
-.ace-tomorrow .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tomorrow .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tomorrow .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tomorrow .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tomorrow .ace_scroller {\
-  background-color: #FFFFFF;\
-}\
-\
-.ace-tomorrow .ace_text-layer {\
-  cursor: text;\
-  color: #4D4D4C;\
-}\
-\
-.ace-tomorrow .ace_cursor {\
-  border-left: 2px solid #AEAFAD;\
-}\
-\
-.ace-tomorrow .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #AEAFAD;\
-}\
-\
-.ace-tomorrow .ace_marker-layer .ace_selection {\
-  background: #D6D6D6;\
-}\
-\
-.ace-tomorrow.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #FFFFFF;\
-  border-radius: 2px;\
-}\
-\
-.ace-tomorrow .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-tomorrow .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #D1D1D1;\
-}\
-\
-.ace-tomorrow .ace_marker-layer .ace_active_line {\
-  background: #EFEFEF;\
-}\
-\
-.ace-tomorrow .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #D6D6D6;\
-}\
-\
-.ace-tomorrow .ace_invisible {\
-  color: #D1D1D1;\
-}\
-\
-.ace-tomorrow .ace_keyword, .ace-tomorrow .ace_meta {\
-  color:#8959A8;\
-}\
-\
-.ace-tomorrow .ace_keyword.ace_operator {\
-  color:#3E999F;\
-}\
-\
-.ace-tomorrow .ace_constant.ace_language {\
-  color:#F5871F;\
-}\
-\
-.ace-tomorrow .ace_constant.ace_numeric {\
-  color:#F5871F;\
-}\
-\
-.ace-tomorrow .ace_constant.ace_other {\
-  color:#666969;\
-}\
-\
-.ace-tomorrow .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#C82829;\
-}\
-\
-.ace-tomorrow .ace_invalid.ace_deprecated {\
-  color:#FFFFFF;\
-background-color:#8959A8;\
-}\
-\
-.ace-tomorrow .ace_support.ace_constant {\
-  color:#F5871F;\
-}\
-\
-.ace-tomorrow .ace_fold {\
-    background-color: #4271AE;\
-    border-color: #4D4D4C;\
-}\
-\
-.ace-tomorrow .ace_support.ace_function {\
-  color:#4271AE;\
-}\
-\
-.ace-tomorrow .ace_storage {\
-  color:#8959A8;\
-}\
-\
-.ace-tomorrow .ace_storage.ace_type,  .ace-tomorrow .ace_support.ace_type{\
-  color:#8959A8;\
-}\
-\
-.ace-tomorrow .ace_variable {\
-  color:#4271AE;\
-}\
-\
-.ace-tomorrow .ace_variable.ace_parameter {\
-  color:#F5871F;\
-}\
-\
-.ace-tomorrow .ace_string {\
-  color:#718C00;\
-}\
-\
-.ace-tomorrow .ace_string.ace_regexp {\
-  color:#C82829;\
-}\
-\
-.ace-tomorrow .ace_comment {\
-  color:#8E908C;\
-}\
-\
-.ace-tomorrow .ace_variable {\
-  color:#C82829;\
-}\
-\
-.ace-tomorrow .ace_meta.ace_tag {\
-  color:#C82829;\
-}\
-\
-.ace-tomorrow .ace_entity.ace_other.ace_attribute-name {\
-  color:#C82829;\
-}\
-\
-.ace-tomorrow .ace_entity.ace_name.ace_function {\
-  color:#4271AE;\
-}\
-\
-.ace-tomorrow .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-tomorrow .ace_markup.ace_heading {\
-  color:#718C00;\
-}";
+exports.cssText = require('ace/requirejs/text!./tomorrow.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
new file mode 100644
index 00000000..eb09c39c
--- /dev/null
+++ b/lib/ace/theme/tomorrow_night.css
@@ -0,0 +1,161 @@
+
+.ace-tomorrow-night .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tomorrow-night .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tomorrow-night .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-tomorrow-night .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tomorrow-night .ace_scroller {
+  background-color: #1D1F21;
+}
+
+.ace-tomorrow-night .ace_text-layer {
+  cursor: text;
+  color: #C5C8C6;
+}
+
+.ace-tomorrow-night .ace_cursor {
+  border-left: 2px solid #AEAFAD;
+}
+
+.ace-tomorrow-night .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #AEAFAD;
+}
+
+.ace-tomorrow-night .ace_marker-layer .ace_selection {
+  background: #373B41;
+}
+
+.ace-tomorrow-night.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #1D1F21;
+  border-radius: 2px;
+}
+
+.ace-tomorrow-night .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-tomorrow-night .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #4B4E55;
+}
+
+.ace-tomorrow-night .ace_marker-layer .ace_active_line {
+  background: #282A2E;
+}
+
+.ace-tomorrow-night .ace_marker-layer .ace_selected_word {
+  border: 1px solid #373B41;
+}
+
+.ace-tomorrow-night .ace_invisible {
+  color: #4B4E55;
+}
+
+.ace-tomorrow-night .ace_keyword, .ace-tomorrow-night .ace_meta {
+  color:#B294BB;
+}
+
+.ace-tomorrow-night .ace_keyword.ace_operator {
+  color:#8ABEB7;
+}
+
+.ace-tomorrow-night .ace_constant.ace_language {
+  color:#DE935F;
+}
+
+.ace-tomorrow-night .ace_constant.ace_numeric {
+  color:#DE935F;
+}
+
+.ace-tomorrow-night .ace_constant.ace_other {
+  color:#CED1CF;
+}
+
+.ace-tomorrow-night .ace_invalid {
+  color:#CED2CF;
+background-color:#DF5F5F;
+}
+
+.ace-tomorrow-night .ace_invalid.ace_deprecated {
+  color:#CED2CF;
+background-color:#B798BF;
+}
+
+.ace-tomorrow-night .ace_support.ace_constant {
+  color:#DE935F;
+}
+
+.ace-tomorrow-night .ace_fold {
+    background-color: #81A2BE;
+    border-color: #C5C8C6;
+}
+
+.ace-tomorrow-night .ace_support.ace_function {
+  color:#81A2BE;
+}
+
+.ace-tomorrow-night .ace_storage {
+  color:#B294BB;
+}
+
+.ace-tomorrow-night .ace_storage.ace_type,  .ace-tomorrow-night .ace_support.ace_type{
+  color:#B294BB;
+}
+
+.ace-tomorrow-night .ace_variable {
+  color:#81A2BE;
+}
+
+.ace-tomorrow-night .ace_variable.ace_parameter {
+  color:#DE935F;
+}
+
+.ace-tomorrow-night .ace_string {
+  color:#B5BD68;
+}
+
+.ace-tomorrow-night .ace_string.ace_regexp {
+  color:#CC6666;
+}
+
+.ace-tomorrow-night .ace_comment {
+  color:#969896;
+}
+
+.ace-tomorrow-night .ace_variable {
+  color:#CC6666;
+}
+
+.ace-tomorrow-night .ace_meta.ace_tag {
+  color:#CC6666;
+}
+
+.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name {
+  color:#CC6666;
+}
+
+.ace-tomorrow-night .ace_entity.ace_name.ace_function {
+  color:#81A2BE;
+}
+
+.ace-tomorrow-night .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-tomorrow-night .ace_markup.ace_heading {
+  color:#B5BD68;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index 621c6bb8..645aaa9c 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -39,167 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night";
-exports.cssText = "\
-.ace-tomorrow-night .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tomorrow-night .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tomorrow-night .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tomorrow-night .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tomorrow-night .ace_scroller {\
-  background-color: #1D1F21;\
-}\
-\
-.ace-tomorrow-night .ace_text-layer {\
-  cursor: text;\
-  color: #C5C8C6;\
-}\
-\
-.ace-tomorrow-night .ace_cursor {\
-  border-left: 2px solid #AEAFAD;\
-}\
-\
-.ace-tomorrow-night .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #AEAFAD;\
-}\
-\
-.ace-tomorrow-night .ace_marker-layer .ace_selection {\
-  background: #373B41;\
-}\
-\
-.ace-tomorrow-night.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #1D1F21;\
-  border-radius: 2px;\
-}\
-\
-.ace-tomorrow-night .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-tomorrow-night .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #4B4E55;\
-}\
-\
-.ace-tomorrow-night .ace_marker-layer .ace_active_line {\
-  background: #282A2E;\
-}\
-\
-.ace-tomorrow-night .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #373B41;\
-}\
-\
-.ace-tomorrow-night .ace_invisible {\
-  color: #4B4E55;\
-}\
-\
-.ace-tomorrow-night .ace_keyword, .ace-tomorrow-night .ace_meta {\
-  color:#B294BB;\
-}\
-\
-.ace-tomorrow-night .ace_keyword.ace_operator {\
-  color:#8ABEB7;\
-}\
-\
-.ace-tomorrow-night .ace_constant.ace_language {\
-  color:#DE935F;\
-}\
-\
-.ace-tomorrow-night .ace_constant.ace_numeric {\
-  color:#DE935F;\
-}\
-\
-.ace-tomorrow-night .ace_constant.ace_other {\
-  color:#CED1CF;\
-}\
-\
-.ace-tomorrow-night .ace_invalid {\
-  color:#CED2CF;\
-background-color:#DF5F5F;\
-}\
-\
-.ace-tomorrow-night .ace_invalid.ace_deprecated {\
-  color:#CED2CF;\
-background-color:#B798BF;\
-}\
-\
-.ace-tomorrow-night .ace_support.ace_constant {\
-  color:#DE935F;\
-}\
-\
-.ace-tomorrow-night .ace_fold {\
-    background-color: #81A2BE;\
-    border-color: #C5C8C6;\
-}\
-\
-.ace-tomorrow-night .ace_support.ace_function {\
-  color:#81A2BE;\
-}\
-\
-.ace-tomorrow-night .ace_storage {\
-  color:#B294BB;\
-}\
-\
-.ace-tomorrow-night .ace_storage.ace_type,  .ace-tomorrow-night .ace_support.ace_type{\
-  color:#B294BB;\
-}\
-\
-.ace-tomorrow-night .ace_variable {\
-  color:#81A2BE;\
-}\
-\
-.ace-tomorrow-night .ace_variable.ace_parameter {\
-  color:#DE935F;\
-}\
-\
-.ace-tomorrow-night .ace_string {\
-  color:#B5BD68;\
-}\
-\
-.ace-tomorrow-night .ace_string.ace_regexp {\
-  color:#CC6666;\
-}\
-\
-.ace-tomorrow-night .ace_comment {\
-  color:#969896;\
-}\
-\
-.ace-tomorrow-night .ace_variable {\
-  color:#CC6666;\
-}\
-\
-.ace-tomorrow-night .ace_meta.ace_tag {\
-  color:#CC6666;\
-}\
-\
-.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name {\
-  color:#CC6666;\
-}\
-\
-.ace-tomorrow-night .ace_entity.ace_name.ace_function {\
-  color:#81A2BE;\
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-tomorrow-night .ace_markup.ace_heading {\
-  color:#B5BD68;\
-}";
+exports.cssText = require('ace/requirejs/text!./tomorrow_night.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
new file mode 100644
index 00000000..23b197bf
--- /dev/null
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -0,0 +1,164 @@
+
+.ace-tomorrow-night-blue .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tomorrow-night-blue .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tomorrow-night-blue .ace_gutter {
+  background: #022346;
+  color: #7388b5;
+}
+
+.ace-tomorrow-night-blue .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tomorrow-night-blue .ace_scroller {
+  background-color: #002451;
+}
+
+.ace-tomorrow-night-blue .ace_text-layer {
+  cursor: text;
+  color: #FFFFFF;
+}
+
+.ace-tomorrow-night-blue .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-tomorrow-night-blue .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-tomorrow-night-blue .ace_marker-layer .ace_selection {
+  background: #003F8E;
+}
+
+.ace-tomorrow-night-blue.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #002451;
+  border-radius: 2px;
+}
+
+.ace-tomorrow-night-blue .ace_marker-layer .ace_step {
+  background: rgb(127, 111, 19);
+}
+
+.ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #404F7D;
+}
+
+.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line{
+  background: #00346E;
+}
+.ace-tomorrow-night-blue .ace_gutter_active_line{
+  background: #022040;
+}
+
+.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {
+  border: 1px solid #003F8E;
+}
+
+.ace-tomorrow-night-blue .ace_invisible {
+  color: #404F7D;
+}
+
+.ace-tomorrow-night-blue .ace_keyword, .ace-tomorrow-night-blue .ace_meta {
+  color:#EBBBFF;
+}
+
+.ace-tomorrow-night-blue .ace_keyword.ace_operator {
+  color:#99FFFF;
+}
+
+.ace-tomorrow-night-blue .ace_constant.ace_language {
+  color:#FFC58F;
+}
+
+.ace-tomorrow-night-blue .ace_constant.ace_numeric {
+  color:#FFC58F;
+}
+
+.ace-tomorrow-night-blue .ace_constant.ace_other {
+  color:#FFFFFF;
+}
+
+.ace-tomorrow-night-blue .ace_invalid {
+  color:#FFFFFF;
+background-color:#F99DA5;
+}
+
+.ace-tomorrow-night-blue .ace_invalid.ace_deprecated {
+  color:#FFFFFF;
+background-color:#EBBBFF;
+}
+
+.ace-tomorrow-night-blue .ace_support.ace_constant {
+  color:#FFC58F;
+}
+
+.ace-tomorrow-night-blue .ace_fold {
+    background-color: #BBDAFF;
+    border-color: #FFFFFF;
+}
+
+.ace-tomorrow-night-blue .ace_support.ace_function {
+  color:#BBDAFF;
+}
+
+.ace-tomorrow-night-blue .ace_storage {
+  color:#EBBBFF;
+}
+
+.ace-tomorrow-night-blue .ace_storage.ace_type,  .ace-tomorrow-night-blue .ace_support.ace_type{
+  color:#EBBBFF;
+}
+
+.ace-tomorrow-night-blue .ace_variable {
+  color:#BBDAFF;
+}
+
+.ace-tomorrow-night-blue .ace_variable.ace_parameter {
+  color:#FFC58F;
+}
+
+.ace-tomorrow-night-blue .ace_string {
+  color:#D1F1A9;
+}
+
+.ace-tomorrow-night-blue .ace_string.ace_regexp {
+  color:#FF9DA4;
+}
+
+.ace-tomorrow-night-blue .ace_comment {
+  color:#7285B7;
+}
+
+.ace-tomorrow-night-blue .ace_variable {
+  color:#FF9DA4;
+}
+
+.ace-tomorrow-night-blue .ace_meta.ace_tag {
+  color:#FF9DA4;
+}
+
+.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name {
+  color:#FF9DA4;
+}
+
+.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function {
+  color:#BBDAFF;
+}
+
+.ace-tomorrow-night-blue .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-tomorrow-night-blue .ace_markup.ace_heading {
+  color:#D1F1A9;
+}
\ 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 1dddf919..ab321ebd 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -39,170 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-blue";
-exports.cssText = "\
-.ace-tomorrow-night-blue .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tomorrow-night-blue .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tomorrow-night-blue .ace_gutter {\
-  background: #022346;\
-  color: #7388b5;\
-}\
-\
-.ace-tomorrow-night-blue .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tomorrow-night-blue .ace_scroller {\
-  background-color: #002451;\
-}\
-\
-.ace-tomorrow-night-blue .ace_text-layer {\
-  cursor: text;\
-  color: #FFFFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_selection {\
-  background: #003F8E;\
-}\
-\
-.ace-tomorrow-night-blue.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #002451;\
-  border-radius: 2px;\
-}\
-\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #404F7D;\
-}\
-\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line{\
-  background: #00346E;\
-}\
-.ace-tomorrow-night-blue .ace_gutter_active_line{\
-  background: #022040;\
-}\
-\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #003F8E;\
-}\
-\
-.ace-tomorrow-night-blue .ace_invisible {\
-  color: #404F7D;\
-}\
-\
-.ace-tomorrow-night-blue .ace_keyword, .ace-tomorrow-night-blue .ace_meta {\
-  color:#EBBBFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_keyword.ace_operator {\
-  color:#99FFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_constant.ace_language {\
-  color:#FFC58F;\
-}\
-\
-.ace-tomorrow-night-blue .ace_constant.ace_numeric {\
-  color:#FFC58F;\
-}\
-\
-.ace-tomorrow-night-blue .ace_constant.ace_other {\
-  color:#FFFFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_invalid {\
-  color:#FFFFFF;\
-background-color:#F99DA5;\
-}\
-\
-.ace-tomorrow-night-blue .ace_invalid.ace_deprecated {\
-  color:#FFFFFF;\
-background-color:#EBBBFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_support.ace_constant {\
-  color:#FFC58F;\
-}\
-\
-.ace-tomorrow-night-blue .ace_fold {\
-    background-color: #BBDAFF;\
-    border-color: #FFFFFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_support.ace_function {\
-  color:#BBDAFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_storage {\
-  color:#EBBBFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_storage.ace_type,  .ace-tomorrow-night-blue .ace_support.ace_type{\
-  color:#EBBBFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_variable {\
-  color:#BBDAFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_variable.ace_parameter {\
-  color:#FFC58F;\
-}\
-\
-.ace-tomorrow-night-blue .ace_string {\
-  color:#D1F1A9;\
-}\
-\
-.ace-tomorrow-night-blue .ace_string.ace_regexp {\
-  color:#FF9DA4;\
-}\
-\
-.ace-tomorrow-night-blue .ace_comment {\
-  color:#7285B7;\
-}\
-\
-.ace-tomorrow-night-blue .ace_variable {\
-  color:#FF9DA4;\
-}\
-\
-.ace-tomorrow-night-blue .ace_meta.ace_tag {\
-  color:#FF9DA4;\
-}\
-\
-.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name {\
-  color:#FF9DA4;\
-}\
-\
-.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function {\
-  color:#BBDAFF;\
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-tomorrow-night-blue .ace_markup.ace_heading {\
-  color:#D1F1A9;\
-}";
+exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
new file mode 100644
index 00000000..c7b35f8b
--- /dev/null
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -0,0 +1,161 @@
+
+.ace-tomorrow-night-bright .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tomorrow-night-bright .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tomorrow-night-bright .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-tomorrow-night-bright .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tomorrow-night-bright .ace_scroller {
+  background-color: #000000;
+}
+
+.ace-tomorrow-night-bright .ace_text-layer {
+  cursor: text;
+  color: #DEDEDE;
+}
+
+.ace-tomorrow-night-bright .ace_cursor {
+  border-left: 2px solid #9F9F9F;
+}
+
+.ace-tomorrow-night-bright .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #9F9F9F;
+}
+
+.ace-tomorrow-night-bright .ace_marker-layer .ace_selection {
+  background: #424242;
+}
+
+.ace-tomorrow-night-bright.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #000000;
+  border-radius: 2px;
+}
+
+.ace-tomorrow-night-bright .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #343434;
+}
+
+.ace-tomorrow-night-bright .ace_marker-layer .ace_active_line {
+  background: #2A2A2A;
+}
+
+.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {
+  border: 1px solid #424242;
+}
+
+.ace-tomorrow-night-bright .ace_invisible {
+  color: #343434;
+}
+
+.ace-tomorrow-night-bright .ace_keyword, .ace-tomorrow-night-bright .ace_meta {
+  color:#C397D8;
+}
+
+.ace-tomorrow-night-bright .ace_keyword.ace_operator {
+  color:#70C0B1;
+}
+
+.ace-tomorrow-night-bright .ace_constant.ace_language {
+  color:#E78C45;
+}
+
+.ace-tomorrow-night-bright .ace_constant.ace_numeric {
+  color:#E78C45;
+}
+
+.ace-tomorrow-night-bright .ace_constant.ace_other {
+  color:#EEEEEE;
+}
+
+.ace-tomorrow-night-bright .ace_invalid {
+  color:#CED2CF;
+background-color:#DF5F5F;
+}
+
+.ace-tomorrow-night-bright .ace_invalid.ace_deprecated {
+  color:#CED2CF;
+background-color:#B798BF;
+}
+
+.ace-tomorrow-night-bright .ace_support.ace_constant {
+  color:#E78C45;
+}
+
+.ace-tomorrow-night-bright .ace_fold {
+    background-color: #7AA6DA;
+    border-color: #DEDEDE;
+}
+
+.ace-tomorrow-night-bright .ace_support.ace_function {
+  color:#7AA6DA;
+}
+
+.ace-tomorrow-night-bright .ace_storage {
+  color:#C397D8;
+}
+
+.ace-tomorrow-night-bright .ace_storage.ace_type,  .ace-tomorrow-night-bright .ace_support.ace_type{
+  color:#C397D8;
+}
+
+.ace-tomorrow-night-bright .ace_variable {
+  color:#7AA6DA;
+}
+
+.ace-tomorrow-night-bright .ace_variable.ace_parameter {
+  color:#E78C45;
+}
+
+.ace-tomorrow-night-bright .ace_string {
+  color:#B9CA4A;
+}
+
+.ace-tomorrow-night-bright .ace_string.ace_regexp {
+  color:#D54E53;
+}
+
+.ace-tomorrow-night-bright .ace_comment {
+  color:#969896;
+}
+
+.ace-tomorrow-night-bright .ace_variable {
+  color:#D54E53;
+}
+
+.ace-tomorrow-night-bright .ace_meta.ace_tag {
+  color:#D54E53;
+}
+
+.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name {
+  color:#D54E53;
+}
+
+.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function {
+  color:#7AA6DA;
+}
+
+.ace-tomorrow-night-bright .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-tomorrow-night-bright .ace_markup.ace_heading {
+  color:#B9CA4A;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js
index 6d5f2c2f..396fa860 100644
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@@ -39,167 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-bright";
-exports.cssText = "\
-.ace-tomorrow-night-bright .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tomorrow-night-bright .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tomorrow-night-bright .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tomorrow-night-bright .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tomorrow-night-bright .ace_scroller {\
-  background-color: #000000;\
-}\
-\
-.ace-tomorrow-night-bright .ace_text-layer {\
-  cursor: text;\
-  color: #DEDEDE;\
-}\
-\
-.ace-tomorrow-night-bright .ace_cursor {\
-  border-left: 2px solid #9F9F9F;\
-}\
-\
-.ace-tomorrow-night-bright .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #9F9F9F;\
-}\
-\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_selection {\
-  background: #424242;\
-}\
-\
-.ace-tomorrow-night-bright.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #000000;\
-  border-radius: 2px;\
-}\
-\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #343434;\
-}\
-\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_active_line {\
-  background: #2A2A2A;\
-}\
-\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #424242;\
-}\
-\
-.ace-tomorrow-night-bright .ace_invisible {\
-  color: #343434;\
-}\
-\
-.ace-tomorrow-night-bright .ace_keyword, .ace-tomorrow-night-bright .ace_meta {\
-  color:#C397D8;\
-}\
-\
-.ace-tomorrow-night-bright .ace_keyword.ace_operator {\
-  color:#70C0B1;\
-}\
-\
-.ace-tomorrow-night-bright .ace_constant.ace_language {\
-  color:#E78C45;\
-}\
-\
-.ace-tomorrow-night-bright .ace_constant.ace_numeric {\
-  color:#E78C45;\
-}\
-\
-.ace-tomorrow-night-bright .ace_constant.ace_other {\
-  color:#EEEEEE;\
-}\
-\
-.ace-tomorrow-night-bright .ace_invalid {\
-  color:#CED2CF;\
-background-color:#DF5F5F;\
-}\
-\
-.ace-tomorrow-night-bright .ace_invalid.ace_deprecated {\
-  color:#CED2CF;\
-background-color:#B798BF;\
-}\
-\
-.ace-tomorrow-night-bright .ace_support.ace_constant {\
-  color:#E78C45;\
-}\
-\
-.ace-tomorrow-night-bright .ace_fold {\
-    background-color: #7AA6DA;\
-    border-color: #DEDEDE;\
-}\
-\
-.ace-tomorrow-night-bright .ace_support.ace_function {\
-  color:#7AA6DA;\
-}\
-\
-.ace-tomorrow-night-bright .ace_storage {\
-  color:#C397D8;\
-}\
-\
-.ace-tomorrow-night-bright .ace_storage.ace_type,  .ace-tomorrow-night-bright .ace_support.ace_type{\
-  color:#C397D8;\
-}\
-\
-.ace-tomorrow-night-bright .ace_variable {\
-  color:#7AA6DA;\
-}\
-\
-.ace-tomorrow-night-bright .ace_variable.ace_parameter {\
-  color:#E78C45;\
-}\
-\
-.ace-tomorrow-night-bright .ace_string {\
-  color:#B9CA4A;\
-}\
-\
-.ace-tomorrow-night-bright .ace_string.ace_regexp {\
-  color:#D54E53;\
-}\
-\
-.ace-tomorrow-night-bright .ace_comment {\
-  color:#969896;\
-}\
-\
-.ace-tomorrow-night-bright .ace_variable {\
-  color:#D54E53;\
-}\
-\
-.ace-tomorrow-night-bright .ace_meta.ace_tag {\
-  color:#D54E53;\
-}\
-\
-.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name {\
-  color:#D54E53;\
-}\
-\
-.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function {\
-  color:#7AA6DA;\
-}\
-\
-.ace-tomorrow-night-bright .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-tomorrow-night-bright .ace_markup.ace_heading {\
-  color:#B9CA4A;\
-}";
+exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
new file mode 100644
index 00000000..8f0244f4
--- /dev/null
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -0,0 +1,157 @@
+
+.ace-tomorrow-night-eighties .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-tomorrow-night-eighties .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-tomorrow-night-eighties .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-tomorrow-night-eighties .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-tomorrow-night-eighties .ace_scroller {
+  background-color: #2D2D2D;
+}
+
+.ace-tomorrow-night-eighties .ace_text-layer {
+  cursor: text;
+  color: #CCCCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_cursor {
+  border-left: 2px solid #CCCCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #CCCCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_marker-layer .ace_selection {
+  background: #515151;
+}
+
+.ace-tomorrow-night-eighties.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #2D2D2D;
+  border-radius: 2px;
+}
+
+.ace-tomorrow-night-eighties .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #6A6A6A;
+}
+
+.ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line {
+  background: #393939;
+}
+
+.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {
+  border: 1px solid #515151;
+}
+
+.ace-tomorrow-night-eighties .ace_invisible {
+  color: #6A6A6A;
+}
+
+.ace-tomorrow-night-eighties .ace_keyword, .ace-tomorrow-night-eighties .ace_meta {
+  color:#CC99CC;
+}
+
+.ace-tomorrow-night-eighties .ace_keyword.ace_operator {
+  color:#66CCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_constant.ace_language {
+  color:#F99157;
+}
+
+.ace-tomorrow-night-eighties .ace_constant.ace_numeric {
+  color:#F99157;
+}
+
+.ace-tomorrow-night-eighties .ace_constant.ace_other {
+  color:#CCCCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_invalid {
+  color:#CDCDCD;
+background-color:#F2777A;
+}
+
+.ace-tomorrow-night-eighties .ace_invalid.ace_deprecated {
+  color:#CDCDCD;
+background-color:#CC99CC;
+}
+
+.ace-tomorrow-night-eighties .ace_support.ace_constant {
+  color:#F99157;
+}
+
+.ace-tomorrow-night-eighties .ace_fold {
+    background-color: #6699CC;
+    border-color: #CCCCCC;
+}
+
+.ace-tomorrow-night-eighties .ace_support.ace_function {
+  color:#6699CC;
+}
+
+.ace-tomorrow-night-eighties .ace_storage {
+  color:#CC99CC;
+}
+
+.ace-tomorrow-night-eighties .ace_storage.ace_type,  .ace-tomorrow-night-eighties .ace_support.ace_type{
+  color:#CC99CC;
+}
+
+.ace-tomorrow-night-eighties .ace_variable {
+  color:#6699CC;
+}
+
+.ace-tomorrow-night-eighties .ace_variable.ace_parameter {
+  color:#F99157;
+}
+
+.ace-tomorrow-night-eighties .ace_string {
+  color:#99CC99;
+}
+
+.ace-tomorrow-night-eighties .ace_comment {
+  color:#999999;
+}
+
+.ace-tomorrow-night-eighties .ace_variable {
+  color:#F2777A;
+}
+
+.ace-tomorrow-night-eighties .ace_meta.ace_tag {
+  color:#F2777A;
+}
+
+.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name {
+  color:#F2777A;
+}
+
+.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function {
+  color:#6699CC;
+}
+
+.ace-tomorrow-night-eighties .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-tomorrow-night-eighties .ace_markup.ace_heading {
+  color:#99CC99;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js
index f6a67d4e..c6a2a553 100644
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@@ -39,163 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-eighties";
-exports.cssText = "\
-.ace-tomorrow-night-eighties .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-tomorrow-night-eighties .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_scroller {\
-  background-color: #2D2D2D;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_text-layer {\
-  cursor: text;\
-  color: #CCCCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_cursor {\
-  border-left: 2px solid #CCCCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #CCCCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_selection {\
-  background: #515151;\
-}\
-\
-.ace-tomorrow-night-eighties.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #2D2D2D;\
-  border-radius: 2px;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #6A6A6A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line {\
-  background: #393939;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #515151;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_invisible {\
-  color: #6A6A6A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_keyword, .ace-tomorrow-night-eighties .ace_meta {\
-  color:#CC99CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_keyword.ace_operator {\
-  color:#66CCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_constant.ace_language {\
-  color:#F99157;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_constant.ace_numeric {\
-  color:#F99157;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_constant.ace_other {\
-  color:#CCCCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_invalid {\
-  color:#CDCDCD;\
-background-color:#F2777A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_invalid.ace_deprecated {\
-  color:#CDCDCD;\
-background-color:#CC99CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_support.ace_constant {\
-  color:#F99157;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_fold {\
-    background-color: #6699CC;\
-    border-color: #CCCCCC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_support.ace_function {\
-  color:#6699CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_storage {\
-  color:#CC99CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_storage.ace_type,  .ace-tomorrow-night-eighties .ace_support.ace_type{\
-  color:#CC99CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_variable {\
-  color:#6699CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_variable.ace_parameter {\
-  color:#F99157;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_string {\
-  color:#99CC99;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_comment {\
-  color:#999999;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_variable {\
-  color:#F2777A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_meta.ace_tag {\
-  color:#F2777A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name {\
-  color:#F2777A;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function {\
-  color:#6699CC;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-tomorrow-night-eighties .ace_markup.ace_heading {\
-  color:#99CC99;\
-}";
+exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
new file mode 100644
index 00000000..a9637b09
--- /dev/null
+++ b/lib/ace/theme/twilight.css
@@ -0,0 +1,159 @@
+
+.ace-twilight .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-twilight .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-twilight .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-twilight .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-twilight .ace_scroller {
+  background-color: #141414;
+}
+
+.ace-twilight .ace_text-layer {
+  cursor: text;
+  color: #F8F8F8;
+}
+
+.ace-twilight .ace_cursor {
+  border-left: 2px solid #A7A7A7;
+}
+
+.ace-twilight .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #A7A7A7;
+}
+
+.ace-twilight .ace_marker-layer .ace_selection {
+  background: rgba(221, 240, 255, 0.20);
+}
+
+.ace-twilight.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #141414;
+  border-radius: 2px;
+}
+
+.ace-twilight .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-twilight .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid rgba(255, 255, 255, 0.25);
+}
+
+.ace-twilight .ace_marker-layer .ace_active_line {
+  background: rgba(255, 255, 255, 0.031);
+}
+
+.ace-twilight .ace_marker-layer .ace_selected_word {
+  border: 1px solid rgba(221, 240, 255, 0.20);
+}
+
+.ace-twilight .ace_invisible {
+  color: rgba(255, 255, 255, 0.25);
+}
+
+.ace-twilight .ace_keyword, .ace-twilight .ace_meta {
+  color:#CDA869;
+}
+
+.ace-twilight .ace_constant, .ace-twilight .ace_constant.ace_other {
+  color:#CF6A4C;
+}
+
+.ace-twilight .ace_constant.ace_character,  {
+  color:#CF6A4C;
+}
+
+.ace-twilight .ace_constant.ace_character.ace_escape,  {
+  color:#CF6A4C;
+}
+
+.ace-twilight .ace_invalid.ace_illegal {
+  color:#F8F8F8;
+background-color:rgba(86, 45, 86, 0.75);
+}
+
+.ace-twilight .ace_invalid.ace_deprecated {
+  text-decoration:underline;
+font-style:italic;
+color:#D2A8A1;
+}
+
+.ace-twilight .ace_support {
+  color:#9B859D;
+}
+
+.ace-twilight .ace_support.ace_constant {
+  color:#CF6A4C;
+}
+
+.ace-twilight .ace_fold {
+    background-color: #AC885B;
+    border-color: #F8F8F8;
+}
+
+.ace-twilight .ace_support.ace_function {
+  color:#DAD085;
+}
+
+.ace-twilight .ace_storage {
+  color:#F9EE98;
+}
+
+.ace-twilight .ace_variable {
+  color:#AC885B;
+}
+
+.ace-twilight .ace_string {
+  color:#8F9D6A;
+}
+
+.ace-twilight .ace_string.ace_regexp {
+  color:#E9C062;
+}
+
+.ace-twilight .ace_comment {
+  font-style:italic;
+color:#5F5A60;
+}
+
+.ace-twilight .ace_variable {
+  color:#7587A6;
+}
+
+.ace-twilight .ace_xml_pe {
+  color:#494949;
+}
+
+.ace-twilight .ace_meta.ace_tag {
+  color:#AC885B;
+}
+
+.ace-twilight .ace_entity.ace_name.ace_function {
+  color:#AC885B;
+}
+
+.ace-twilight .ace_markup.ace_underline {
+    text-decoration:underline;
+}
+
+.ace-twilight .ace_markup.ace_heading {
+  color:#CF6A4C;
+}
+
+.ace-twilight .ace_markup.ace_list {
+  color:#F9EE98;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index 842dd234..b497826f 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -39,165 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-twilight";
-exports.cssText = "\
-.ace-twilight .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-twilight .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-twilight .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-twilight .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-twilight .ace_scroller {\
-  background-color: #141414;\
-}\
-\
-.ace-twilight .ace_text-layer {\
-  cursor: text;\
-  color: #F8F8F8;\
-}\
-\
-.ace-twilight .ace_cursor {\
-  border-left: 2px solid #A7A7A7;\
-}\
-\
-.ace-twilight .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #A7A7A7;\
-}\
-\
-.ace-twilight .ace_marker-layer .ace_selection {\
-  background: rgba(221, 240, 255, 0.20);\
-}\
-\
-.ace-twilight.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #141414;\
-  border-radius: 2px;\
-}\
-\
-.ace-twilight .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-twilight .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid rgba(255, 255, 255, 0.25);\
-}\
-\
-.ace-twilight .ace_marker-layer .ace_active_line {\
-  background: rgba(255, 255, 255, 0.031);\
-}\
-\
-.ace-twilight .ace_marker-layer .ace_selected_word {\
-  border: 1px solid rgba(221, 240, 255, 0.20);\
-}\
-\
-.ace-twilight .ace_invisible {\
-  color: rgba(255, 255, 255, 0.25);\
-}\
-\
-.ace-twilight .ace_keyword, .ace-twilight .ace_meta {\
-  color:#CDA869;\
-}\
-\
-.ace-twilight .ace_constant, .ace-twilight .ace_constant.ace_other {\
-  color:#CF6A4C;\
-}\
-\
-.ace-twilight .ace_constant.ace_character,  {\
-  color:#CF6A4C;\
-}\
-\
-.ace-twilight .ace_constant.ace_character.ace_escape,  {\
-  color:#CF6A4C;\
-}\
-\
-.ace-twilight .ace_invalid.ace_illegal {\
-  color:#F8F8F8;\
-background-color:rgba(86, 45, 86, 0.75);\
-}\
-\
-.ace-twilight .ace_invalid.ace_deprecated {\
-  text-decoration:underline;\
-font-style:italic;\
-color:#D2A8A1;\
-}\
-\
-.ace-twilight .ace_support {\
-  color:#9B859D;\
-}\
-\
-.ace-twilight .ace_support.ace_constant {\
-  color:#CF6A4C;\
-}\
-\
-.ace-twilight .ace_fold {\
-    background-color: #AC885B;\
-    border-color: #F8F8F8;\
-}\
-\
-.ace-twilight .ace_support.ace_function {\
-  color:#DAD085;\
-}\
-\
-.ace-twilight .ace_storage {\
-  color:#F9EE98;\
-}\
-\
-.ace-twilight .ace_variable {\
-  color:#AC885B;\
-}\
-\
-.ace-twilight .ace_string {\
-  color:#8F9D6A;\
-}\
-\
-.ace-twilight .ace_string.ace_regexp {\
-  color:#E9C062;\
-}\
-\
-.ace-twilight .ace_comment {\
-  font-style:italic;\
-color:#5F5A60;\
-}\
-\
-.ace-twilight .ace_variable {\
-  color:#7587A6;\
-}\
-\
-.ace-twilight .ace_xml_pe {\
-  color:#494949;\
-}\
-\
-.ace-twilight .ace_meta.ace_tag {\
-  color:#AC885B;\
-}\
-\
-.ace-twilight .ace_entity.ace_name.ace_function {\
-  color:#AC885B;\
-}\
-\
-.ace-twilight .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}\
-\
-.ace-twilight .ace_markup.ace_heading {\
-  color:#CF6A4C;\
-}\
-\
-.ace-twilight .ace_markup.ace_list {\
-  color:#F9EE98;\
-}";
+exports.cssText = require('ace/requirejs/text!./twilight.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css
new file mode 100644
index 00000000..9144a275
--- /dev/null
+++ b/lib/ace/theme/vibrant_ink.css
@@ -0,0 +1,138 @@
+
+.ace-vibrant-ink .ace_editor {
+  border: 2px solid rgb(159, 159, 159);
+}
+
+.ace-vibrant-ink .ace_editor.ace_focus {
+  border: 2px solid #327fbd;
+}
+
+.ace-vibrant-ink .ace_gutter {
+  background: #e8e8e8;
+  color: #333;
+}
+
+.ace-vibrant-ink .ace_print_margin {
+  width: 1px;
+  background: #e8e8e8;
+}
+
+.ace-vibrant-ink .ace_scroller {
+  background-color: #0F0F0F;
+}
+
+.ace-vibrant-ink .ace_text-layer {
+  cursor: text;
+  color: #FFFFFF;
+}
+
+.ace-vibrant-ink .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+
+.ace-vibrant-ink .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+.ace-vibrant-ink .ace_marker-layer .ace_selection {
+  background: #6699CC;
+}
+
+.ace-vibrant-ink.multiselect .ace_selection.start {
+  box-shadow: 0 0 3px 0px #0F0F0F;
+  border-radius: 2px;
+}
+
+.ace-vibrant-ink .ace_marker-layer .ace_step {
+  background: rgb(102, 82, 0);
+}
+
+.ace-vibrant-ink .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #404040;
+}
+
+.ace-vibrant-ink .ace_marker-layer .ace_active_line {
+  background: #333333;
+}
+
+.ace-vibrant-ink .ace_marker-layer .ace_selected_word {
+  border: 1px solid #6699CC;
+}
+
+.ace-vibrant-ink .ace_invisible {
+  color: #404040;
+}
+
+.ace-vibrant-ink .ace_keyword, .ace-vibrant-ink .ace_meta {
+  color:#FF6600;
+}
+
+.ace-vibrant-ink .ace_constant, .ace-vibrant-ink .ace_constant.ace_other {
+  color:#339999;
+}
+
+.ace-vibrant-ink .ace_constant.ace_character,  {
+  color:#339999;
+}
+
+.ace-vibrant-ink .ace_constant.ace_character.ace_escape,  {
+  color:#339999;
+}
+
+.ace-vibrant-ink .ace_constant.ace_numeric {
+  color:#99CC99;
+}
+
+.ace-vibrant-ink .ace_invalid {
+  color:#CCFF33;
+background-color:#000000;
+}
+
+.ace-vibrant-ink .ace_invalid.ace_deprecated {
+  color:#CCFF33;
+background-color:#000000;
+}
+
+.ace-vibrant-ink .ace_fold {
+    background-color: #FFCC00;
+    border-color: #FFFFFF;
+}
+
+.ace-vibrant-ink .ace_support.ace_function {
+  color:#FFCC00;
+}
+
+.ace-vibrant-ink .ace_variable {
+  color:#FFCC00;
+}
+
+.ace-vibrant-ink .ace_variable.ace_parameter {
+  font-style:italic;
+}
+
+.ace-vibrant-ink .ace_string {
+  color:#66FF00;
+}
+
+.ace-vibrant-ink .ace_string.ace_regexp {
+  color:#44B4CC;
+}
+
+.ace-vibrant-ink .ace_comment {
+  color:#9933CC;
+}
+
+.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {
+  font-style:italic;
+color:#99CC99;
+}
+
+.ace-vibrant-ink .ace_entity.ace_name.ace_function {
+  color:#FFCC00;
+}
+
+.ace-vibrant-ink .ace_markup.ace_underline {
+    text-decoration:underline;
+}
\ No newline at end of file
diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js
index fac89c15..d0f94415 100644
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@@ -39,144 +39,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-vibrant-ink";
-exports.cssText = "\
-.ace-vibrant-ink .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-vibrant-ink .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-vibrant-ink .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-vibrant-ink .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-vibrant-ink .ace_scroller {\
-  background-color: #0F0F0F;\
-}\
-\
-.ace-vibrant-ink .ace_text-layer {\
-  cursor: text;\
-  color: #FFFFFF;\
-}\
-\
-.ace-vibrant-ink .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-}\
-\
-.ace-vibrant-ink .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-}\
-\
-.ace-vibrant-ink .ace_marker-layer .ace_selection {\
-  background: #6699CC;\
-}\
-\
-.ace-vibrant-ink.multiselect .ace_selection.start {\
-  box-shadow: 0 0 3px 0px #0F0F0F;\
-  border-radius: 2px;\
-}\
-\
-.ace-vibrant-ink .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-vibrant-ink .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #404040;\
-}\
-\
-.ace-vibrant-ink .ace_marker-layer .ace_active_line {\
-  background: #333333;\
-}\
-\
-.ace-vibrant-ink .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #6699CC;\
-}\
-\
-.ace-vibrant-ink .ace_invisible {\
-  color: #404040;\
-}\
-\
-.ace-vibrant-ink .ace_keyword, .ace-vibrant-ink .ace_meta {\
-  color:#FF6600;\
-}\
-\
-.ace-vibrant-ink .ace_constant, .ace-vibrant-ink .ace_constant.ace_other {\
-  color:#339999;\
-}\
-\
-.ace-vibrant-ink .ace_constant.ace_character,  {\
-  color:#339999;\
-}\
-\
-.ace-vibrant-ink .ace_constant.ace_character.ace_escape,  {\
-  color:#339999;\
-}\
-\
-.ace-vibrant-ink .ace_constant.ace_numeric {\
-  color:#99CC99;\
-}\
-\
-.ace-vibrant-ink .ace_invalid {\
-  color:#CCFF33;\
-background-color:#000000;\
-}\
-\
-.ace-vibrant-ink .ace_invalid.ace_deprecated {\
-  color:#CCFF33;\
-background-color:#000000;\
-}\
-\
-.ace-vibrant-ink .ace_fold {\
-    background-color: #FFCC00;\
-    border-color: #FFFFFF;\
-}\
-\
-.ace-vibrant-ink .ace_support.ace_function {\
-  color:#FFCC00;\
-}\
-\
-.ace-vibrant-ink .ace_variable {\
-  color:#FFCC00;\
-}\
-\
-.ace-vibrant-ink .ace_variable.ace_parameter {\
-  font-style:italic;\
-}\
-\
-.ace-vibrant-ink .ace_string {\
-  color:#66FF00;\
-}\
-\
-.ace-vibrant-ink .ace_string.ace_regexp {\
-  color:#44B4CC;\
-}\
-\
-.ace-vibrant-ink .ace_comment {\
-  color:#9933CC;\
-}\
-\
-.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {\
-  font-style:italic;\
-color:#99CC99;\
-}\
-\
-.ace-vibrant-ink .ace_entity.ace_name.ace_function {\
-  color:#FFCC00;\
-}\
-\
-.ace-vibrant-ink .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
+exports.cssText = require('ace/requirejs/text!./vibrant_ink.css');
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index 0d0b5d35..d56cf766 100755
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -166,23 +166,14 @@ function fillTemplate(template, replacements) {
     });
 }
 
-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),
-        isDark: styles.isDark
-    });
-}
-
 function hyphenate(str) {
     return str.replace(/([A-Z])/g, "-$1").replace(/_/g, "-").toLowerCase();
 }
 
+function quoteString(str) {
+    return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"';
+}
+
 var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8");
 var jsTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.js", "utf8");
 
@@ -214,8 +205,20 @@ function convertTheme(name) {
     var tmTheme = fs.readFileSync(__dirname + "/tmthemes/" + themes[name] + ".tmTheme", "utf8");
 	parseTheme(tmTheme, function(theme) {
 		var styles = extractStyles(theme);
-		theme = createTheme(name, styles, cssTemplate, jsTemplate)
-		fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", theme);
+
+		styles.cssClass = "ace-" + hyphenate(name);
+		var css = fillTemplate(cssTemplate, styles);
+		css = css.replace(/[^\{\}]+{\s*}/g, "");
+
+		var js = fillTemplate(jsTemplate, {
+			name: name,
+			css: "require('ace/requirejs/text!./" + name + ".css')", // quoteString(css), //
+			cssClass: "ace-" + hyphenate(name),
+			isDark: styles.isDark
+		});
+
+		fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", js);
+		fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".css", css);
 	})
 }