diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index ced2e04f710..8df8517cd93 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -221,7 +221,7 @@ console.log('# ace themes ---------');
 [
     "clouds", "clouds_midnight", "cobalt", "dawn", "idle_fingers", "kr_theme",
     "mono_industrial", "monokai", "pastel_on_dark", "twilight", "eclipse",
-    "merbivore", "merbivore_soft", "vibrant_ink"
+    "merbivore", "merbivore_soft", "vibrant_ink", "crimson_editor"
 ].forEach(function(theme) {
     copy({
         source: [{
diff --git a/index.html b/index.html
index 01af80914f9..b6e05184e65 100644
--- a/index.html
+++ b/index.html
@@ -93,6 +93,7 @@
           <option value="ace/theme/twilight">Twilight</option>
           <option value="ace/theme/clouds">Clouds</option>
           <option value="ace/theme/clouds_midnight">Clouds Midnight</option>
+          <option value="ace/theme/crimson_editor">Crimson Editor</option>
           <option value="ace/theme/kr_theme">krTheme</option>
           <option value="ace/theme/mono_industrial">Mono Industrial</option>
           <option value="ace/theme/monokai">Monokai</option>
diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js
new file mode 100644
index 00000000000..e48349ceb20
--- /dev/null
+++ b/lib/ace/theme/crimson_editor.js
@@ -0,0 +1,198 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+
+    var dom = require("pilot/dom");
+
+    var 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 {\
+  width: 50px;\
+  background: #e8e8e8;\
+  color: #333;\
+  overflow : hidden;\
+}\
+\
+.ace-crimson-editor .ace_gutter-layer {\
+  width: 100%;\
+  text-align: right;\
+}\
+\
+.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell {\
+  padding-right: 6px;\
+}\
+\
+.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 {\
+    background-color: #E4E4E4;\
+    border-radius: 3px;\
+}\
+\
+.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_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);\
+}";
+
+    // Import CSS once.
+    dom.importCssString(cssText);
+
+    exports.cssClass = "ace-crimson-editor";
+});
diff --git a/support/pilot b/support/pilot
index e89a461ee76..1442bd4d574 160000
--- a/support/pilot
+++ b/support/pilot
@@ -1 +1 @@
-Subproject commit e89a461ee76ae49e9fc1653dd28ad2064e18f51f
+Subproject commit 1442bd4d574686c5b300daeaaf8fbd0b73c77e21