diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..4cb9d9a95
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/ace-builds"]
+	path = lib/ace-builds
+	url = git@github.com:ajaxorg/ace-builds.git
diff --git a/lib/ace-builds b/lib/ace-builds
new file mode 160000
index 000000000..cf536740d
--- /dev/null
+++ b/lib/ace-builds
@@ -0,0 +1 @@
+Subproject commit cf536740d866276b65cfd351610001c2a841e751
diff --git a/partials/builder.html b/partials/builder.html
index 30c373141..2ef65e04b 100644
--- a/partials/builder.html
+++ b/partials/builder.html
@@ -1,17 +1,20 @@
-<!--<script src="/lib/ace/src/ace.js" type="text/javascript" charset="utf-8"></script>-->
+<script src="/lib/ace-builds/src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
+<h2>Build image:</h2>
 
-<h2>Builder:</h2>
+<div class="detail">
+    <div id="response" class="alert alert-{{ alertClass }}">
+        {{ response }}
+    </div>
 
-<div id="response" class="alert alert-{{ alertClass }}">
-    {{ response }}
-</div>
+    <div id="editor">
 
-<div id="editor">
+    </div>
 
-</div>
+    <script>
+        ace.config.set('basePath', '/lib/ace-builds/src-noconflict/');
 
-<script>
-    var editor = ace.edit("editor");
-    editor.setTheme("/lib/ace/theme/monokai");
-    editor.getSession().setMode("/lib/ace/mode/javascript");
-</script>
+        var editor = ace.edit("editor");
+        editor.setTheme("ace/theme/clouds");
+        editor.getSession().setMode("ace/mode/batchfile");
+    </script>
+</div>