diff --git a/lib/ace/mode/text_highlight_rules.js b/lib/ace/mode/text_highlight_rules.js
index 6a2c5807..660e1308 100644
--- a/lib/ace/mode/text_highlight_rules.js
+++ b/lib/ace/mode/text_highlight_rules.js
@@ -97,7 +97,10 @@ var TextHighlightRules = function() {
     this.createKeywordMapper = function(map, defaultToken, ignoreCase, splitChar) {
         var keywords = Object.create(null);
         Object.keys(map).forEach(function(className) {
-            var list = map[className].split(splitChar || "|");
+            var a = map[className];
+            if (ignoreCase)
+                a = a.toLowerCase();
+            var list = a.split(splitChar || "|");
             for (var i = list.length; i--; )
                 keywords[list[i]] = className;
         });
diff --git a/tool/mode_creator.js b/tool/mode_creator.js
index 7472e78d..70ee3225 100644
--- a/tool/mode_creator.js
+++ b/tool/mode_creator.js
@@ -130,6 +130,7 @@ var continueRun = function(rules) {
     var Tokenizer = DebugTokenizer;
 
     var tk = new Tokenizer(new rules().getRules());
+    editor2.session.$mode.$tokenizer = tk;
     editor2.session.bgTokenizer.setTokenizer(tk);
     editor2.renderer.updateText();
 };