diff --git a/lib/ace/mode/_test/highlight_rules_test.js b/lib/ace/mode/_test/highlight_rules_test.js
index 231d58cb..be6656d8 100644
--- a/lib/ace/mode/_test/highlight_rules_test.js
+++ b/lib/ace/mode/_test/highlight_rules_test.js
@@ -11,9 +11,9 @@ function generateTestData() {
     var docs = fs.readdirSync(cwd + root);
     var specialDocs = fs.readdirSync(cwd);
     var modes = fs.readdirSync(cwd + "../").filter(function(x){
-        return /^\w+_highlight_rules.js$/.test(x);
+        return !/(_highlight_rules|behaviour|worker)\.js$/.test(x) && /\.js$/.test(x);
     }).map(function(x) {
-        return x.replace(/_highlight_rules.js$/, "");
+        return x.replace(/\.js$/, "");
     });
 
     console.log("Docs:", docs);
diff --git a/lib/ace/mode/tm_snippet.js b/lib/ace/mode/tmsnippet.js
similarity index 97%
rename from lib/ace/mode/tm_snippet.js
rename to lib/ace/mode/tmsnippet.js
index 7b7ace08..79b299ec 100644
--- a/lib/ace/mode/tm_snippet.js
+++ b/lib/ace/mode/tmsnippet.js
@@ -1,86 +1,86 @@
-define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var SnippetHighlightRules = function() {
-
-    var builtins = "SELECTION|CURRENT_WORD|SELECTED_TEXT|CURRENT_LINE|LINE_INDEX|" +
-        "LINE_NUMBER|SOFT_TABS|TAB_SIZE|FILENAME|FILEPATH|FULLNAME";
-
-    this.$rules = {
-        "start" : [
-            {token:"constant.language.escape", regex: /\\[\$}`\\]/},
-            {token:"keyword", regex: "\\$(?:TM_)?(?:" + builtins + ")\\b"},
-            {token:"variable", regex: "\\$\\w+"},
-            {token: function(value, state, stack) {
-                if (stack[1])
-                    stack[1]++;
-                else
-                    stack.unshift("start", 1);
-                return this.tokenName;
-            }, tokenName: "markup.list", regex: "\\${", next: "varDecl"},
-            {token: function(value, state, stack) {
-                if (!stack[1])
-                    return "text";
-                stack[1]--;
-                if (!stack[1])
-                    stack.splice(0,2);
-                return this.tokenName;
-            }, tokenName: "markup.list", regex: "}"},
-            {token: "doc,comment", regex:/^\${2}-{5,}$/}
-        ],
-        "varDecl" : [
-            {regex: /\d+\b/, token: "constant.numeric"},
-            {token:"keyword", regex: "(?:TM_)?(?:" + builtins + ")\\b"},
-            {token:"variable", regex: "\\w+"},
-            {regex: /:/, token: "punctuation.operator", next: "start"},
-            {regex: /\//, token: "string.regex", next: "regexp"},
-            {regex: "", next: "start"}
-        ],
-        "regexp" : [
-            {regex: /\\./, token: "escape"},
-            {regex: /\[/, token: "regex.start", next: "charClass"},
-            {regex: "/", token: "string.regex", next: "format"},
-            //{"default": "string.regex"},
-            {"token": "string.regex", regex:"."},
-        ],
-        charClass : [
-            {regex: "\\.", token: "escape"},
-            {regex: "\\]", token: "regex.end", next: "regexp"},
-            {"token": "string.regex", regex:"."},
-        ],
-        "format" : [
-            {regex: /\\[ulULE]/, token: "keyword"},
-            {regex: /\$\d+/, token: "variable"},
-            {regex: "/[gim]*:?", token: "string.regex", next: "start"},
-            // {"default": "string"},
-            {"token": "string", regex:"."},
-        ]
-    };
-};
-
-oop.inherits(SnippetHighlightRules, TextHighlightRules);
-
-exports.SnippetHighlightRules = SnippetHighlightRules;
-
-
-var Mode = function() {
-    var highlighter = new SnippetHighlightRules();
-
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-}).call(Mode.prototype);
-exports.Mode = Mode;
-
-
-});
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var SnippetHighlightRules = function() {
+
+    var builtins = "SELECTION|CURRENT_WORD|SELECTED_TEXT|CURRENT_LINE|LINE_INDEX|" +
+        "LINE_NUMBER|SOFT_TABS|TAB_SIZE|FILENAME|FILEPATH|FULLNAME";
+
+    this.$rules = {
+        "start" : [
+            {token:"constant.language.escape", regex: /\\[\$}`\\]/},
+            {token:"keyword", regex: "\\$(?:TM_)?(?:" + builtins + ")\\b"},
+            {token:"variable", regex: "\\$\\w+"},
+            {token: function(value, state, stack) {
+                if (stack[1])
+                    stack[1]++;
+                else
+                    stack.unshift("start", 1);
+                return this.tokenName;
+            }, tokenName: "markup.list", regex: "\\${", next: "varDecl"},
+            {token: function(value, state, stack) {
+                if (!stack[1])
+                    return "text";
+                stack[1]--;
+                if (!stack[1])
+                    stack.splice(0,2);
+                return this.tokenName;
+            }, tokenName: "markup.list", regex: "}"},
+            {token: "doc,comment", regex:/^\${2}-{5,}$/}
+        ],
+        "varDecl" : [
+            {regex: /\d+\b/, token: "constant.numeric"},
+            {token:"keyword", regex: "(?:TM_)?(?:" + builtins + ")\\b"},
+            {token:"variable", regex: "\\w+"},
+            {regex: /:/, token: "punctuation.operator", next: "start"},
+            {regex: /\//, token: "string.regex", next: "regexp"},
+            {regex: "", next: "start"}
+        ],
+        "regexp" : [
+            {regex: /\\./, token: "escape"},
+            {regex: /\[/, token: "regex.start", next: "charClass"},
+            {regex: "/", token: "string.regex", next: "format"},
+            //{"default": "string.regex"},
+            {"token": "string.regex", regex:"."},
+        ],
+        charClass : [
+            {regex: "\\.", token: "escape"},
+            {regex: "\\]", token: "regex.end", next: "regexp"},
+            {"token": "string.regex", regex:"."},
+        ],
+        "format" : [
+            {regex: /\\[ulULE]/, token: "keyword"},
+            {regex: /\$\d+/, token: "variable"},
+            {regex: "/[gim]*:?", token: "string.regex", next: "start"},
+            // {"default": "string"},
+            {"token": "string", regex:"."},
+        ]
+    };
+};
+
+oop.inherits(SnippetHighlightRules, TextHighlightRules);
+
+exports.SnippetHighlightRules = SnippetHighlightRules;
+
+
+var Mode = function() {
+    var highlighter = new SnippetHighlightRules();
+
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+}).call(Mode.prototype);
+exports.Mode = Mode;
+
+
+});