diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 677ae44f..a9e9df4d 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -102,7 +102,7 @@ copy({
 });
 copy({
     source: [
-        'build_support/boot.js'    
+        'build_support/boot.js'
     ],
     dest: ace
 });
@@ -216,32 +216,9 @@ copy({
 
 console.log('# ace themes ---------');
 
-var eclipseTheme = copy.createDataObject();
-copy({
-    source: [{
-        root: aceHome + '/lib',
-        include: "ace/theme/eclipse.js"
-    }],
-    filter: [ copy.filter.moduleDefines ],
-    dest: eclipseTheme
-});
-copy({
-    source: [{
-        root: aceHome + '/lib',
-        include: "ace/theme/eclipse.css"
-    }],
-    filter: [ copy.filter.addDefines ],
-    dest: eclipseTheme
-});
-copy({
-    source: eclipseTheme,
-    filter: [ copy.filter.uglifyjs ],
-    dest: 'build/src/theme-eclipse.js'
-});
-
 [
-    "clouds", "clouds_midnight", "cobalt", "dawn", "idle_fingers", "kr_theme", 
-    "mono_industrial", "monokai", "pastel_on_dark", "twilight"
+    "clouds", "clouds_midnight", "cobalt", "dawn", "idle_fingers", "kr_theme",
+    "mono_industrial", "monokai", "pastel_on_dark", "twilight", "eclipse"
 ].forEach(function(theme) {
     copy({
         source: [{
@@ -292,9 +269,9 @@ copy({
 //            "ace", "cockpit",
 //            "keybinding-vim", "keybinding-emacs",
 //            "mode-javascript", "mode-css", "mode-html", "mode-php", "mode-python",
-//            "mode-xml", 
+//            "mode-xml",
 //            "theme-clouds", "theme-clouds_midnight", "theme-cobalt",
-//            "theme-dawn", "theme-idle_fingers", "theme-kr_theme", 
+//            "theme-dawn", "theme-idle_fingers", "theme-kr_theme",
 //            "theme-mono_industrial", "theme-monokai", "theme-pastel_on_dark",
 //            "theme-twilight"
 //        ].map(function(module) {
@@ -307,7 +284,7 @@ copy({
 //    } ],
 //    dest: "build/editor-demo.html"
 //});
-//copy({    
+//copy({
 //    source: [{
 //        root: aceHome + '/demo',
 //        include: "demo.js"
@@ -315,11 +292,11 @@ copy({
 //    filter: [ copy.filter.moduleDefines ],
 //    dest: "build/demo/demo.js"
 //});
-//copy({    
+//copy({
 //    source: aceHome + '/demo/styles.css',
 //    dest: "build/demo/styles.css"
 //});
-//copy({    
+//copy({
 //    source: aceHome + '/demo/logo.png',
 //    dest: "build/demo/logo.png"
 //});
diff --git a/Makefile.dryice.textarea.js b/Makefile.dryice.textarea.js
index d3bb044f..1cb0ffd6 100755
--- a/Makefile.dryice.textarea.js
+++ b/Makefile.dryice.textarea.js
@@ -42,7 +42,6 @@ var copy = require('dryice').copy;
 var aceHome = __dirname;
 
 function shadow(input) {
-    console.log("shadow input");
     if (typeof input !== 'string') {
         input = input.toString();
     }
@@ -160,7 +159,7 @@ console.log('# ace themes ---------');
 // create themes
 [
     "clouds", "clouds_midnight", "cobalt", "dawn", "idle_fingers", "kr_theme",
-    "mono_industrial", "monokai", "pastel_on_dark", "twilight"
+    "mono_industrial", "monokai", "pastel_on_dark", "twilight", "eclipse"
 ].forEach(function(theme) {
     console.log("theme " + theme);
     copy({
diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css
deleted file mode 100644
index ff24f87f..00000000
--- a/lib/ace/theme/eclipse.css
+++ /dev/null
@@ -1,83 +0,0 @@
-.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 {
-  width: 40px;
-  background: rgb(227, 227, 227);
-  border-right: 1px solid rgb(159, 159, 159);	 
-  color: rgb(136, 136, 136);
-}
-
-.ace-eclipse .ace_gutter-layer {
-  right: 10px;
-  text-align: right;
-}
-
-.ace-eclipse .ace_text-layer {
-  cursor: text;
-}
-
-.ace-eclipse .ace_cursor {
-  border-left: 1px solid black;
-}
-
-.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_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_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 0629867e..c97ae0d0 100644
--- a/lib/ace/theme/eclipse.js
+++ b/lib/ace/theme/eclipse.js
@@ -38,7 +38,94 @@
 define(function(require, exports, module) {
 
     var dom = require("pilot/dom");
-    var cssText = require("text!ace/theme/eclipse.css");
+
+    var 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 {\
+  width: 50px;\
+  background: rgb(227, 227, 227);\
+  border-right: 1px solid rgb(159, 159, 159);	 \
+  color: rgb(136, 136, 136);\
+}\
+\
+.ace-eclipse .ace_gutter-layer {\
+  width: 100%;\
+  text-align: right;\
+}\
+\
+.ace-eclipse .ace_gutter-layer .ace_gutter-cell {\
+  padding-right: 6px;\
+}\
+\
+.ace-eclipse .ace_text-layer {\
+  cursor: text;\
+}\
+\
+.ace-eclipse .ace_cursor {\
+  border-left: 1px solid black;\
+}\
+\
+.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_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_marker-layer .ace_active_line {\
+  background: rgb(232, 242, 254);\
+}";
 
     // import CSS once
     dom.importCssString(cssText);
diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js
index 3a1cbd36..337a8c57 100644
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@@ -38,7 +38,148 @@
 define(function(require, exports, module) {
 
     var dom = require("pilot/dom");
-    var cssText = require("text!ace/theme/tm.css");
+
+    var 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 {\
+  width: 50px;\
+  background: #e8e8e8;\
+  color: #333;\
+  overflow : hidden;\
+}\
+\
+.ace-tm .ace_gutter-layer {\
+  width: 100%;\
+  text-align: right;\
+}\
+\
+.ace-tm .ace_gutter-layer .ace_gutter-cell {\
+  padding-right: 6px;\
+}\
+\
+.ace-tm .ace_print_margin {\
+  width: 1px;\
+  background: #e8e8e8;\
+}\
+\
+.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_keyword {\
+  color: blue;\
+}\
+\
+.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: rgb(153, 0, 0);\
+  color: white;\
+}\
+\
+.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_marker-layer .ace_selection {\
+  background: rgb(181, 213, 255);\
+}\
+\
+.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: rgb(232, 242, 254);\
+}\
+\
+.ace-tm .ace_marker-layer .ace_selected_word {\
+  background: rgb(250, 250, 255);\
+  border: 1px solid rgb(200, 200, 250);\
+}\
+\
+.ace-tm .ace_string.ace_regex {\
+  color: rgb(255, 0, 0)\
+}";
 
     // import CSS once
     dom.importCssString(cssText);
diff --git a/lib/ace/theme/tm.css b/lib/ace/theme/tm.css
deleted file mode 100644
index 987901d1..00000000
--- a/lib/ace/theme/tm.css
+++ /dev/null
@@ -1,141 +0,0 @@
-.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 {
-  width: 50px;
-  background: #e8e8e8;
-  color: #333;
-  overflow : hidden;
-}
-
-.ace-tm .ace_gutter-layer {
-  width: 100%;
-  text-align: right;
-}
-
-.ace-tm .ace_gutter-layer .ace_gutter-cell {
-  padding-right: 6px;
-}
-
-.ace-tm .ace_print_margin {
-  width: 1px;
-  background: #e8e8e8;
-}
-
-.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_keyword {
-  color: blue;
-}
-
-.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: rgb(153, 0, 0);
-  color: white;
-}
-
-.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_marker-layer .ace_selection {
-  background: rgb(181, 213, 255);
-}
-
-.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: rgb(232, 242, 254);
-}
-
-.ace-tm .ace_marker-layer .ace_selected_word {
-  background: rgb(250, 250, 255);
-  border: 1px solid rgb(200, 200, 250);
-}
-
-.ace-tm .ace_string.ace_regex {
-  color: rgb(255, 0, 0)   
-}