diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 9ac8fc997dc..cf3a4148b6d 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -155,7 +155,7 @@ function ace() {
         source: ACE_HOME + "/ChangeLog.txt",
         dest:   BUILD_DIR + "/ChangeLog.txt"
     });
-    
+
     return project;
 }
 
@@ -211,7 +211,7 @@ function demo(project) {
     });
 
     var demo = copy.createDataObject();
-    
+
     project.assumeAllFilesLoaded();
     copy({
         source: [{
@@ -309,7 +309,7 @@ var buildAce = function(options) {
     for(var key in defaults)
         if (!options.hasOwnProperty(key))
             options[key] = defaults[key];
-    
+
     generateThemesModule(options.themes);
 
     addSuffix(options);
@@ -334,7 +334,7 @@ var buildAce = function(options) {
         filter: [ copy.filter.moduleDefines ],
         dest: ace
     });
-    
+
     if (options.coreOnly)
         return project;
 
@@ -349,7 +349,7 @@ var buildAce = function(options) {
     project.assumeAllFilesLoaded();
     options.modes.forEach(function(mode) {
         console.log("mode " + mode);
-		addSnippetFile(mode, project, targetDir, options);
+        addSnippetFile(mode, project, targetDir, options);
         copy({
             source: [{
                 project: cloneProject(project),
@@ -442,7 +442,7 @@ var buildAce = function(options) {
           dest: BUILD_DIR + '/ace-min.js'
         });
     }
-    
+
     return project;
 };
 
@@ -462,27 +462,27 @@ var buildAce = function(fn) {
 }(buildAce);
 
 var addSnippetFile = function(modeName, project, targetDir, options) {
-	var snippetFilePath = ACE_HOME + "/lib/ace/snippets/" + modeName;
-	if (!fs.existsSync(snippetFilePath + ".js")) {
-		copy({
-			source: ACE_HOME + "/tool/snippet.tmpl.js",
-			dest:   snippetFilePath + ".js",
-			filter: [
-				function(t) {return t.replace("%modeName%", modeName);}
-			]
-		});		
-	}
-	if (!fs.existsSync(snippetFilePath + ".snippets")) {
-		fs.writeFileSync(snippetFilePath + ".snippets", "")
-	}
-	copy({
-		source: [{
-			project: cloneProject(project),
-			require: [ 'ace/snippets/' + modeName ]
-		}],
-		filter: getWriteFilters(options, "mode"),
-		dest:   targetDir + "/snippets/" + modeName + ".js"
-	});
+    var snippetFilePath = ACE_HOME + "/lib/ace/snippets/" + modeName;
+    if (!fs.existsSync(snippetFilePath + ".js")) {
+        copy({
+            source: ACE_HOME + "/tool/snippets.tmpl.js",
+            dest:   snippetFilePath + ".js",
+            filter: [
+                function(t) {return t.replace(/%modeName%/g, modeName);}
+            ]
+        });
+    }
+    if (!fs.existsSync(snippetFilePath + ".snippets")) {
+        fs.writeFileSync(snippetFilePath + ".snippets", "")
+    }
+    copy({
+        source: [{
+            project: cloneProject(project),
+            require: [ 'ace/snippets/' + modeName ]
+        }],
+        filter: getWriteFilters(options, "mode"),
+        dest:   targetDir + "/snippets/" + modeName + ".js"
+    });
 }
 
 var textModules = {}
@@ -494,7 +494,7 @@ var detectTextModules = function(input, source) {
         input = input.toString();
 
     var module = source.isLocation ? source.path : source;
-    
+
     input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
     if (/\.css$/.test(module)) {
         // remove unnecessary whitespace from css
diff --git a/lib/ace/snippets/abap.js b/lib/ace/snippets/abap.js
index 40870ff7846..902cb1bbc69 100644
--- a/lib/ace/snippets/abap.js
+++ b/lib/ace/snippets/abap.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./abap.snippets");
-
+exports.scope = "abap";
 
 });
diff --git a/lib/ace/snippets/actionscript.js b/lib/ace/snippets/actionscript.js
new file mode 100644
index 00000000000..5d4e2168603
--- /dev/null
+++ b/lib/ace/snippets/actionscript.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./actionscript.snippets");
+exports.scope = "actionscript";
+
+});
diff --git a/lib/ace/snippets/ada.js b/lib/ace/snippets/ada.js
new file mode 100644
index 00000000000..5b3ea2150b4
--- /dev/null
+++ b/lib/ace/snippets/ada.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./ada.snippets");
+exports.scope = "ada";
+
+});
diff --git a/lib/ace/snippets/ada.snippets b/lib/ace/snippets/ada.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/asciidoc.js b/lib/ace/snippets/asciidoc.js
index 0d8d353b528..7857020ccf1 100644
--- a/lib/ace/snippets/asciidoc.js
+++ b/lib/ace/snippets/asciidoc.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./asciidoc.snippets");
-
+exports.scope = "asciidoc";
 
 });
diff --git a/lib/ace/snippets/assembly_x86.js b/lib/ace/snippets/assembly_x86.js
new file mode 100644
index 00000000000..747335be0c1
--- /dev/null
+++ b/lib/ace/snippets/assembly_x86.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./assembly_x86.snippets");
+exports.scope = "assembly_x86";
+
+});
diff --git a/lib/ace/snippets/assembly_x86.snippets b/lib/ace/snippets/assembly_x86.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/autohotkey.js b/lib/ace/snippets/autohotkey.js
new file mode 100644
index 00000000000..064647e3fb4
--- /dev/null
+++ b/lib/ace/snippets/autohotkey.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./autohotkey.snippets");
+exports.scope = "autohotkey";
+
+});
diff --git a/lib/ace/snippets/autohotkey.snippets b/lib/ace/snippets/autohotkey.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/batchfile.js b/lib/ace/snippets/batchfile.js
new file mode 100644
index 00000000000..ec949d9618a
--- /dev/null
+++ b/lib/ace/snippets/batchfile.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./batchfile.snippets");
+exports.scope = "batchfile";
+
+});
diff --git a/lib/ace/snippets/batchfile.snippets b/lib/ace/snippets/batchfile.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/c9search.js b/lib/ace/snippets/c9search.js
index da0d310183f..62bc4403a5a 100644
--- a/lib/ace/snippets/c9search.js
+++ b/lib/ace/snippets/c9search.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./c9search.snippets");
-
+exports.scope = "c9search";
 
 });
diff --git a/lib/ace/snippets/c_cpp.js b/lib/ace/snippets/c_cpp.js
index b9555c142ec..cf37a62a610 100644
--- a/lib/ace/snippets/c_cpp.js
+++ b/lib/ace/snippets/c_cpp.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./c_cpp.snippets");
-
+exports.scope = "c_cpp";
 
 });
diff --git a/lib/ace/snippets/clojure.js b/lib/ace/snippets/clojure.js
index 8a1cf1c5307..8f07e5fe24c 100644
--- a/lib/ace/snippets/clojure.js
+++ b/lib/ace/snippets/clojure.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./clojure.snippets");
-
+exports.scope = "clojure";
 
 });
diff --git a/lib/ace/snippets/cobol.js b/lib/ace/snippets/cobol.js
new file mode 100644
index 00000000000..885f1c46e41
--- /dev/null
+++ b/lib/ace/snippets/cobol.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./cobol.snippets");
+exports.scope = "cobol";
+
+});
diff --git a/lib/ace/snippets/cobol.snippets b/lib/ace/snippets/cobol.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/coffee.js b/lib/ace/snippets/coffee.js
index 788227b6804..5511ed11ebd 100644
--- a/lib/ace/snippets/coffee.js
+++ b/lib/ace/snippets/coffee.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./coffee.snippets");
-
+exports.scope = "coffee";
 
 });
diff --git a/lib/ace/snippets/coldfusion.js b/lib/ace/snippets/coldfusion.js
index 0002b081415..6f44f9f754f 100644
--- a/lib/ace/snippets/coldfusion.js
+++ b/lib/ace/snippets/coldfusion.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./coldfusion.snippets");
-
+exports.scope = "coldfusion";
 
 });
diff --git a/lib/ace/snippets/csharp.js b/lib/ace/snippets/csharp.js
index 99fbe4ce2c8..3aafdf85501 100644
--- a/lib/ace/snippets/csharp.js
+++ b/lib/ace/snippets/csharp.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./csharp.snippets");
-
+exports.scope = "csharp";
 
 });
diff --git a/lib/ace/snippets/css.js b/lib/ace/snippets/css.js
index a5d3e7444aa..5d7e66ed36a 100644
--- a/lib/ace/snippets/css.js
+++ b/lib/ace/snippets/css.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./css.snippets");
-
+exports.scope = "css";
 
 });
diff --git a/lib/ace/snippets/curly.js b/lib/ace/snippets/curly.js
index ee584465df5..aa59f286326 100644
--- a/lib/ace/snippets/curly.js
+++ b/lib/ace/snippets/curly.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./curly.snippets");
-
+exports.scope = "curly";
 
 });
diff --git a/lib/ace/snippets/d.js b/lib/ace/snippets/d.js
new file mode 100644
index 00000000000..79446fdc867
--- /dev/null
+++ b/lib/ace/snippets/d.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./d.snippets");
+exports.scope = "d";
+
+});
diff --git a/lib/ace/snippets/d.snippets b/lib/ace/snippets/d.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/dart.js b/lib/ace/snippets/dart.js
index be721176722..949fcaa3bd6 100644
--- a/lib/ace/snippets/dart.js
+++ b/lib/ace/snippets/dart.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./dart.snippets");
-
+exports.scope = "dart";
 
 });
diff --git a/lib/ace/snippets/diff.js b/lib/ace/snippets/diff.js
index 5ed1e646560..eb48cbc1900 100644
--- a/lib/ace/snippets/diff.js
+++ b/lib/ace/snippets/diff.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./diff.snippets");
-
+exports.scope = "diff";
 
 });
diff --git a/lib/ace/snippets/django.js b/lib/ace/snippets/django.js
index 7ecc97d16f5..b5af7a73b4b 100644
--- a/lib/ace/snippets/django.js
+++ b/lib/ace/snippets/django.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./django.snippets");
-
+exports.scope = "django";
 
 });
diff --git a/lib/ace/snippets/dot.js b/lib/ace/snippets/dot.js
index 7a2f17929ab..420f4f0174c 100644
--- a/lib/ace/snippets/dot.js
+++ b/lib/ace/snippets/dot.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./dot.snippets");
-
+exports.scope = "dot";
 
 });
diff --git a/lib/ace/snippets/ejs.js b/lib/ace/snippets/ejs.js
new file mode 100644
index 00000000000..be477738822
--- /dev/null
+++ b/lib/ace/snippets/ejs.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./ejs.snippets");
+exports.scope = "ejs";
+
+});
diff --git a/lib/ace/snippets/ejs.snippets b/lib/ace/snippets/ejs.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/erlang.js b/lib/ace/snippets/erlang.js
new file mode 100644
index 00000000000..212e36405e7
--- /dev/null
+++ b/lib/ace/snippets/erlang.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./erlang.snippets");
+exports.scope = "erlang";
+
+});
diff --git a/lib/ace/snippets/forth.js b/lib/ace/snippets/forth.js
new file mode 100644
index 00000000000..c2bf910792d
--- /dev/null
+++ b/lib/ace/snippets/forth.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./forth.snippets");
+exports.scope = "forth";
+
+});
diff --git a/lib/ace/snippets/forth.snippets b/lib/ace/snippets/forth.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/ftl.js b/lib/ace/snippets/ftl.js
index ef9d12e0f7b..1cbcc0be61a 100644
--- a/lib/ace/snippets/ftl.js
+++ b/lib/ace/snippets/ftl.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./ftl.snippets");
-
+exports.scope = "ftl";
 
 });
diff --git a/lib/ace/snippets/glsl.js b/lib/ace/snippets/glsl.js
index 729e0890e92..d9c5fc25644 100644
--- a/lib/ace/snippets/glsl.js
+++ b/lib/ace/snippets/glsl.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./glsl.snippets");
-
+exports.scope = "glsl";
 
 });
diff --git a/lib/ace/snippets/golang.js b/lib/ace/snippets/golang.js
index e6b169c9a62..f7b0eeccdc2 100644
--- a/lib/ace/snippets/golang.js
+++ b/lib/ace/snippets/golang.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./golang.snippets");
-
+exports.scope = "golang";
 
 });
diff --git a/lib/ace/snippets/groovy.js b/lib/ace/snippets/groovy.js
index 33bcb3d259e..2fe4e111611 100644
--- a/lib/ace/snippets/groovy.js
+++ b/lib/ace/snippets/groovy.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./groovy.snippets");
-
+exports.scope = "groovy";
 
 });
diff --git a/lib/ace/snippets/haml.js b/lib/ace/snippets/haml.js
index eb1b5fb2c97..efa8eb9ccb2 100644
--- a/lib/ace/snippets/haml.js
+++ b/lib/ace/snippets/haml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./haml.snippets");
-
+exports.scope = "haml";
 
 });
diff --git a/lib/ace/snippets/haskell.js b/lib/ace/snippets/haskell.js
new file mode 100644
index 00000000000..8c583f1c198
--- /dev/null
+++ b/lib/ace/snippets/haskell.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./haskell.snippets");
+exports.scope = "haskell";
+
+});
diff --git a/lib/ace/snippets/haxe.js b/lib/ace/snippets/haxe.js
index 660addb7342..b67f91eb095 100644
--- a/lib/ace/snippets/haxe.js
+++ b/lib/ace/snippets/haxe.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./haxe.snippets");
-
+exports.scope = "haxe";
 
 });
diff --git a/lib/ace/snippets/html.js b/lib/ace/snippets/html.js
index 18db84167ba..bac3bea37b1 100644
--- a/lib/ace/snippets/html.js
+++ b/lib/ace/snippets/html.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./html.snippets");
-
+exports.scope = "html";
 
 });
diff --git a/lib/ace/snippets/html_ruby.js b/lib/ace/snippets/html_ruby.js
new file mode 100644
index 00000000000..d985d568f2b
--- /dev/null
+++ b/lib/ace/snippets/html_ruby.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./html_ruby.snippets");
+exports.scope = "html_ruby";
+
+});
diff --git a/lib/ace/snippets/html_ruby.snippets b/lib/ace/snippets/html_ruby.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/ini.js b/lib/ace/snippets/ini.js
new file mode 100644
index 00000000000..df09d575c9d
--- /dev/null
+++ b/lib/ace/snippets/ini.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./ini.snippets");
+exports.scope = "ini";
+
+});
diff --git a/lib/ace/snippets/ini.snippets b/lib/ace/snippets/ini.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/jade.js b/lib/ace/snippets/jade.js
index e272e8318cc..ca83d483644 100644
--- a/lib/ace/snippets/jade.js
+++ b/lib/ace/snippets/jade.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./jade.snippets");
-
+exports.scope = "jade";
 
 });
diff --git a/lib/ace/snippets/java.js b/lib/ace/snippets/java.js
index 9b861bf5977..7d05e84a694 100644
--- a/lib/ace/snippets/java.js
+++ b/lib/ace/snippets/java.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./java.snippets");
-
+exports.scope = "java";
 
 });
diff --git a/lib/ace/snippets/javascript.js b/lib/ace/snippets/javascript.js
index fe370b0683f..bf59ba85cd6 100644
--- a/lib/ace/snippets/javascript.js
+++ b/lib/ace/snippets/javascript.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./javascript.snippets");
-
+exports.scope = "javascript";
 
 });
diff --git a/lib/ace/snippets/json.js b/lib/ace/snippets/json.js
index cbecb6e1b25..d57fe6c5098 100644
--- a/lib/ace/snippets/json.js
+++ b/lib/ace/snippets/json.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./json.snippets");
-
+exports.scope = "json";
 
 });
diff --git a/lib/ace/snippets/jsoniq.js b/lib/ace/snippets/jsoniq.js
new file mode 100644
index 00000000000..9bde24cf694
--- /dev/null
+++ b/lib/ace/snippets/jsoniq.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./jsoniq.snippets");
+exports.scope = "jsoniq";
+
+});
diff --git a/lib/ace/snippets/jsoniq.snippets b/lib/ace/snippets/jsoniq.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/jsp.js b/lib/ace/snippets/jsp.js
index 0f39d9af07b..2324c541801 100644
--- a/lib/ace/snippets/jsp.js
+++ b/lib/ace/snippets/jsp.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./jsp.snippets");
-
+exports.scope = "jsp";
 
 });
diff --git a/lib/ace/snippets/jsx.js b/lib/ace/snippets/jsx.js
index 5c31e99fbd2..9792a7a00d6 100644
--- a/lib/ace/snippets/jsx.js
+++ b/lib/ace/snippets/jsx.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./jsx.snippets");
-
+exports.scope = "jsx";
 
 });
diff --git a/lib/ace/snippets/julia.js b/lib/ace/snippets/julia.js
new file mode 100644
index 00000000000..f83777efa9d
--- /dev/null
+++ b/lib/ace/snippets/julia.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./julia.snippets");
+exports.scope = "julia";
+
+});
diff --git a/lib/ace/snippets/julia.snippets b/lib/ace/snippets/julia.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/latex.js b/lib/ace/snippets/latex.js
index 98fc6a486f7..44bef369180 100644
--- a/lib/ace/snippets/latex.js
+++ b/lib/ace/snippets/latex.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./latex.snippets");
-
+exports.scope = "latex";
 
 });
diff --git a/lib/ace/snippets/less.js b/lib/ace/snippets/less.js
index c2af7180086..7acf02f29d7 100644
--- a/lib/ace/snippets/less.js
+++ b/lib/ace/snippets/less.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./less.snippets");
-
+exports.scope = "less";
 
 });
diff --git a/lib/ace/snippets/liquid.js b/lib/ace/snippets/liquid.js
index 1f76c3cc4dc..2e320755197 100644
--- a/lib/ace/snippets/liquid.js
+++ b/lib/ace/snippets/liquid.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./liquid.snippets");
-
+exports.scope = "liquid";
 
 });
diff --git a/lib/ace/snippets/lisp.js b/lib/ace/snippets/lisp.js
index 9dc94deb0b6..2b6870bc4ec 100644
--- a/lib/ace/snippets/lisp.js
+++ b/lib/ace/snippets/lisp.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./lisp.snippets");
-
+exports.scope = "lisp";
 
 });
diff --git a/lib/ace/snippets/livescript.js b/lib/ace/snippets/livescript.js
index 707ea6a4423..ba20e7e4212 100644
--- a/lib/ace/snippets/livescript.js
+++ b/lib/ace/snippets/livescript.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./livescript.snippets");
-
+exports.scope = "livescript";
 
 });
diff --git a/lib/ace/snippets/logiql.js b/lib/ace/snippets/logiql.js
index c879daacab6..7d0167dab2d 100644
--- a/lib/ace/snippets/logiql.js
+++ b/lib/ace/snippets/logiql.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./logiql.snippets");
-
+exports.scope = "logiql";
 
 });
diff --git a/lib/ace/snippets/lsl.js b/lib/ace/snippets/lsl.js
index 342c8fb1d4d..678ba41f634 100644
--- a/lib/ace/snippets/lsl.js
+++ b/lib/ace/snippets/lsl.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./lsl.snippets");
-
+exports.scope = "lsl";
 
 });
diff --git a/lib/ace/snippets/lua.js b/lib/ace/snippets/lua.js
index 8ccd6fcbb21..0ab6fdcd150 100644
--- a/lib/ace/snippets/lua.js
+++ b/lib/ace/snippets/lua.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./lua.snippets");
-
+exports.scope = "lua";
 
 });
diff --git a/lib/ace/snippets/luapage.js b/lib/ace/snippets/luapage.js
index b6671d63e0a..86b228427c7 100644
--- a/lib/ace/snippets/luapage.js
+++ b/lib/ace/snippets/luapage.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./luapage.snippets");
-
+exports.scope = "luapage";
 
 });
diff --git a/lib/ace/snippets/lucene.js b/lib/ace/snippets/lucene.js
index 014daa7632b..01edb07de93 100644
--- a/lib/ace/snippets/lucene.js
+++ b/lib/ace/snippets/lucene.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./lucene.snippets");
-
+exports.scope = "lucene";
 
 });
diff --git a/lib/ace/snippets/makefile.js b/lib/ace/snippets/makefile.js
index 3239254c68f..0ec05ac08ae 100644
--- a/lib/ace/snippets/makefile.js
+++ b/lib/ace/snippets/makefile.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./makefile.snippets");
-
+exports.scope = "makefile";
 
 });
diff --git a/lib/ace/snippets/markdown.js b/lib/ace/snippets/markdown.js
index 1a247b2cdfd..3940bc90ff6 100644
--- a/lib/ace/snippets/markdown.js
+++ b/lib/ace/snippets/markdown.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./markdown.snippets");
-
+exports.scope = "markdown";
 
 });
diff --git a/lib/ace/snippets/matlab.js b/lib/ace/snippets/matlab.js
new file mode 100644
index 00000000000..698366ba455
--- /dev/null
+++ b/lib/ace/snippets/matlab.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./matlab.snippets");
+exports.scope = "matlab";
+
+});
diff --git a/lib/ace/snippets/matlab.snippets b/lib/ace/snippets/matlab.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/mushcode.js b/lib/ace/snippets/mushcode.js
index 3c9f52fc159..8b0d2dcb0ba 100644
--- a/lib/ace/snippets/mushcode.js
+++ b/lib/ace/snippets/mushcode.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./mushcode.snippets");
-
+exports.scope = "mushcode";
 
 });
diff --git a/lib/ace/snippets/mushcode_high_rules.js b/lib/ace/snippets/mushcode_high_rules.js
index e4670debbb1..25d42827437 100644
--- a/lib/ace/snippets/mushcode_high_rules.js
+++ b/lib/ace/snippets/mushcode_high_rules.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./mushcode_high_rules.snippets");
-
+exports.scope = "mushcode_high_rules";
 
 });
diff --git a/lib/ace/snippets/mysql.js b/lib/ace/snippets/mysql.js
new file mode 100644
index 00000000000..e5462390b37
--- /dev/null
+++ b/lib/ace/snippets/mysql.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./mysql.snippets");
+exports.scope = "mysql";
+
+});
diff --git a/lib/ace/snippets/mysql.snippets b/lib/ace/snippets/mysql.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/objectivec.js b/lib/ace/snippets/objectivec.js
index 2e200fbdc5b..ed5d5fa8331 100644
--- a/lib/ace/snippets/objectivec.js
+++ b/lib/ace/snippets/objectivec.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./objectivec.snippets");
-
+exports.scope = "objectivec";
 
 });
diff --git a/lib/ace/snippets/ocaml.js b/lib/ace/snippets/ocaml.js
index 805c6a3796a..a6e6842e931 100644
--- a/lib/ace/snippets/ocaml.js
+++ b/lib/ace/snippets/ocaml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./ocaml.snippets");
-
+exports.scope = "ocaml";
 
 });
diff --git a/lib/ace/snippets/pascal.js b/lib/ace/snippets/pascal.js
index 8d2fa6f4606..cd8f19fe272 100644
--- a/lib/ace/snippets/pascal.js
+++ b/lib/ace/snippets/pascal.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./pascal.snippets");
-
+exports.scope = "pascal";
 
 });
diff --git a/lib/ace/snippets/perl.js b/lib/ace/snippets/perl.js
index 70d2e8d611f..9b1fbe8deab 100644
--- a/lib/ace/snippets/perl.js
+++ b/lib/ace/snippets/perl.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./perl.snippets");
-
+exports.scope = "perl";
 
 });
diff --git a/lib/ace/snippets/pgsql.js b/lib/ace/snippets/pgsql.js
index 7b2bc647ffd..9bbd9012e77 100644
--- a/lib/ace/snippets/pgsql.js
+++ b/lib/ace/snippets/pgsql.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./pgsql.snippets");
-
+exports.scope = "pgsql";
 
 });
diff --git a/lib/ace/snippets/php.js b/lib/ace/snippets/php.js
index e10929e99fc..b8f8ce0ea27 100644
--- a/lib/ace/snippets/php.js
+++ b/lib/ace/snippets/php.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./php.snippets");
-
+exports.scope = "php";
 
 });
diff --git a/lib/ace/snippets/powershell.js b/lib/ace/snippets/powershell.js
index 8b30a0b589c..4639a304b1f 100644
--- a/lib/ace/snippets/powershell.js
+++ b/lib/ace/snippets/powershell.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./powershell.snippets");
-
+exports.scope = "powershell";
 
 });
diff --git a/lib/ace/snippets/prolog.js b/lib/ace/snippets/prolog.js
new file mode 100644
index 00000000000..7c9d0fbc932
--- /dev/null
+++ b/lib/ace/snippets/prolog.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./prolog.snippets");
+exports.scope = "prolog";
+
+});
diff --git a/lib/ace/snippets/prolog.snippets b/lib/ace/snippets/prolog.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/properties.js b/lib/ace/snippets/properties.js
new file mode 100644
index 00000000000..18bd3883023
--- /dev/null
+++ b/lib/ace/snippets/properties.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./properties.snippets");
+exports.scope = "properties";
+
+});
diff --git a/lib/ace/snippets/properties.snippets b/lib/ace/snippets/properties.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/python.js b/lib/ace/snippets/python.js
index bb17d22e078..48ddba28dca 100644
--- a/lib/ace/snippets/python.js
+++ b/lib/ace/snippets/python.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./python.snippets");
-
+exports.scope = "python";
 
 });
diff --git a/lib/ace/snippets/r.js b/lib/ace/snippets/r.js
index f4fe2265cc3..6b319194738 100644
--- a/lib/ace/snippets/r.js
+++ b/lib/ace/snippets/r.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./r.snippets");
-
+exports.scope = "r";
 
 });
diff --git a/lib/ace/snippets/rdoc.js b/lib/ace/snippets/rdoc.js
index 758bdd9aa33..0d9e6c95814 100644
--- a/lib/ace/snippets/rdoc.js
+++ b/lib/ace/snippets/rdoc.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./rdoc.snippets");
-
+exports.scope = "rdoc";
 
 });
diff --git a/lib/ace/snippets/rhtml.js b/lib/ace/snippets/rhtml.js
index a583b085604..96707f21916 100644
--- a/lib/ace/snippets/rhtml.js
+++ b/lib/ace/snippets/rhtml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./rhtml.snippets");
-
+exports.scope = "rhtml";
 
 });
diff --git a/lib/ace/snippets/ruby.js b/lib/ace/snippets/ruby.js
index 4fccdbfac3a..f705044999e 100644
--- a/lib/ace/snippets/ruby.js
+++ b/lib/ace/snippets/ruby.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./ruby.snippets");
-
+exports.scope = "ruby";
 
 });
diff --git a/lib/ace/snippets/rust.js b/lib/ace/snippets/rust.js
new file mode 100644
index 00000000000..556d9a6b100
--- /dev/null
+++ b/lib/ace/snippets/rust.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./rust.snippets");
+exports.scope = "rust";
+
+});
diff --git a/lib/ace/snippets/rust.snippets b/lib/ace/snippets/rust.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/sass.js b/lib/ace/snippets/sass.js
index 9ff1aa06bfb..ba728ac2fee 100644
--- a/lib/ace/snippets/sass.js
+++ b/lib/ace/snippets/sass.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./sass.snippets");
-
+exports.scope = "sass";
 
 });
diff --git a/lib/ace/snippets/scad.js b/lib/ace/snippets/scad.js
index added1b4774..28db2155d16 100644
--- a/lib/ace/snippets/scad.js
+++ b/lib/ace/snippets/scad.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./scad.snippets");
-
+exports.scope = "scad";
 
 });
diff --git a/lib/ace/snippets/scala.js b/lib/ace/snippets/scala.js
index d2281a4988e..2e5a8c57789 100644
--- a/lib/ace/snippets/scala.js
+++ b/lib/ace/snippets/scala.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./scala.snippets");
-
+exports.scope = "scala";
 
 });
diff --git a/lib/ace/snippets/scheme.js b/lib/ace/snippets/scheme.js
index 208454f67aa..7d3c6f65ea3 100644
--- a/lib/ace/snippets/scheme.js
+++ b/lib/ace/snippets/scheme.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./scheme.snippets");
-
+exports.scope = "scheme";
 
 });
diff --git a/lib/ace/snippets/scss.js b/lib/ace/snippets/scss.js
index cf621dd3e1a..a940eabdb6d 100644
--- a/lib/ace/snippets/scss.js
+++ b/lib/ace/snippets/scss.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./scss.snippets");
-
+exports.scope = "scss";
 
 });
diff --git a/lib/ace/snippets/sh.js b/lib/ace/snippets/sh.js
index ac859391731..c48dc17ffdf 100644
--- a/lib/ace/snippets/sh.js
+++ b/lib/ace/snippets/sh.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./sh.snippets");
-
+exports.scope = "sh";
 
 });
diff --git a/lib/ace/snippets/snippets.js b/lib/ace/snippets/snippets.js
new file mode 100644
index 00000000000..0927805bac7
--- /dev/null
+++ b/lib/ace/snippets/snippets.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./snippets.snippets");
+exports.scope = "snippets";
+
+});
diff --git a/lib/ace/snippets/sql.js b/lib/ace/snippets/sql.js
index 34954dfa2e9..c96f6cb2451 100644
--- a/lib/ace/snippets/sql.js
+++ b/lib/ace/snippets/sql.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./sql.snippets");
-
+exports.scope = "sql";
 
 });
diff --git a/lib/ace/snippets/stylus.js b/lib/ace/snippets/stylus.js
index 97a414efc27..86a79f7aca1 100644
--- a/lib/ace/snippets/stylus.js
+++ b/lib/ace/snippets/stylus.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./stylus.snippets");
-
+exports.scope = "stylus";
 
 });
diff --git a/lib/ace/snippets/svg.js b/lib/ace/snippets/svg.js
index db48fb329a8..aeb6245619d 100644
--- a/lib/ace/snippets/svg.js
+++ b/lib/ace/snippets/svg.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./svg.snippets");
-
+exports.scope = "svg";
 
 });
diff --git a/lib/ace/snippets/tcl.js b/lib/ace/snippets/tcl.js
index 1af7e59b771..53482fc7b6b 100644
--- a/lib/ace/snippets/tcl.js
+++ b/lib/ace/snippets/tcl.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./tcl.snippets");
-
+exports.scope = "tcl";
 
 });
diff --git a/lib/ace/snippets/tex.js b/lib/ace/snippets/tex.js
index d72e8320453..267b6b69088 100644
--- a/lib/ace/snippets/tex.js
+++ b/lib/ace/snippets/tex.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./tex.snippets");
-
+exports.scope = "tex";
 
 });
diff --git a/lib/ace/snippets/text.js b/lib/ace/snippets/text.js
index f88da241924..434d75bed46 100644
--- a/lib/ace/snippets/text.js
+++ b/lib/ace/snippets/text.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./text.snippets");
-
+exports.scope = "text";
 
 });
diff --git a/lib/ace/snippets/textile.js b/lib/ace/snippets/textile.js
index 4bed9a59bf1..f2622e057a6 100644
--- a/lib/ace/snippets/textile.js
+++ b/lib/ace/snippets/textile.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./textile.snippets");
-
+exports.scope = "textile";
 
 });
diff --git a/lib/ace/snippets/tmsnippet.js b/lib/ace/snippets/tmsnippet.js
deleted file mode 100644
index 38ea1af01a4..00000000000
--- a/lib/ace/snippets/tmsnippet.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(function(require, exports, module) {
-"use strict";
-
-exports.snippetText = require("../requirejs/text!./tmsnippet.snippets");
-
-
-});
diff --git a/lib/ace/snippets/toml.js b/lib/ace/snippets/toml.js
index 295bc824c13..419b06d83e2 100644
--- a/lib/ace/snippets/toml.js
+++ b/lib/ace/snippets/toml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./toml.snippets");
-
+exports.scope = "toml";
 
 });
diff --git a/lib/ace/snippets/twig.js b/lib/ace/snippets/twig.js
new file mode 100644
index 00000000000..b08b884c500
--- /dev/null
+++ b/lib/ace/snippets/twig.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./twig.snippets");
+exports.scope = "twig";
+
+});
diff --git a/lib/ace/snippets/twig.snippets b/lib/ace/snippets/twig.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/typescript.js b/lib/ace/snippets/typescript.js
index fe01171ea11..495da3f35b1 100644
--- a/lib/ace/snippets/typescript.js
+++ b/lib/ace/snippets/typescript.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./typescript.snippets");
-
+exports.scope = "typescript";
 
 });
diff --git a/lib/ace/snippets/vbscript.js b/lib/ace/snippets/vbscript.js
index f6e370f3eca..5ab8e650d5e 100644
--- a/lib/ace/snippets/vbscript.js
+++ b/lib/ace/snippets/vbscript.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./vbscript.snippets");
-
+exports.scope = "vbscript";
 
 });
diff --git a/lib/ace/snippets/velocity.js b/lib/ace/snippets/velocity.js
index 02f5b3385eb..ef59f621e41 100644
--- a/lib/ace/snippets/velocity.js
+++ b/lib/ace/snippets/velocity.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./velocity.snippets");
-
+exports.scope = "velocity";
 
 });
diff --git a/lib/ace/snippets/verilog.js b/lib/ace/snippets/verilog.js
new file mode 100644
index 00000000000..7360341e6d3
--- /dev/null
+++ b/lib/ace/snippets/verilog.js
@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./verilog.snippets");
+exports.scope = "verilog";
+
+});
diff --git a/lib/ace/snippets/verilog.snippets b/lib/ace/snippets/verilog.snippets
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ace/snippets/xml.js b/lib/ace/snippets/xml.js
index e9328060982..83b1870c9bc 100644
--- a/lib/ace/snippets/xml.js
+++ b/lib/ace/snippets/xml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./xml.snippets");
-
+exports.scope = "xml";
 
 });
diff --git a/lib/ace/snippets/xquery.js b/lib/ace/snippets/xquery.js
index 0854dfb7fb9..d96a0619dd9 100644
--- a/lib/ace/snippets/xquery.js
+++ b/lib/ace/snippets/xquery.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./xquery.snippets");
-
+exports.scope = "xquery";
 
 });
diff --git a/lib/ace/snippets/yaml.js b/lib/ace/snippets/yaml.js
index bbdf80031de..17e70a3cbfb 100644
--- a/lib/ace/snippets/yaml.js
+++ b/lib/ace/snippets/yaml.js
@@ -2,6 +2,6 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.snippetText = require("../requirejs/text!./yaml.snippets");
-
+exports.scope = "yaml";
 
 });