diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 14ffea23..6c691238 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -301,7 +301,7 @@ var buildAce = function(options) {
         noconflict: false,
         suffix: null,
         name: "ace",
-        modes: jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour/),
+        modes: jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour|completions/),
         themes: jsFileList("lib/ace/theme"),
         extensions: jsFileList("lib/ace/ext"),
         workers: workers("lib/ace/mode"),
@@ -522,7 +522,7 @@ function generateThemesModule(themes) {
         '\n\nmodule.exports.themes = ' + JSON.stringify(themes, null, '    '),
         ';\n\n});'
     ].join('');
-    fs.writeFileSync('./lib/ace/ext/themelist_utils/themes.js', themelist, 'utf8');
+    fs.writeFileSync(__dirname + '/lib/ace/ext/themelist_utils/themes.js', themelist, 'utf8');
 }
 
 function inlineTextModules(text) {
diff --git a/lib/ace/snippets/handlebars.js b/lib/ace/snippets/handlebars.js
new file mode 100644
index 00000000..64ba39b3
--- /dev/null
+++ b/lib/ace/snippets/handlebars.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./handlebars.snippets");
+exports.scope = "handlebars";
+
+});
diff --git a/lib/ace/snippets/handlebars.snippets b/lib/ace/snippets/handlebars.snippets
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/ace/snippets/soy_template.js b/lib/ace/snippets/soy_template.js
new file mode 100644
index 00000000..194da757
--- /dev/null
+++ b/lib/ace/snippets/soy_template.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./soy_template.snippets");
+exports.scope = "soy_template";
+
+});
diff --git a/lib/ace/snippets/soy_template.snippets b/lib/ace/snippets/soy_template.snippets
new file mode 100644
index 00000000..e69de29b