diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js
index 4a909641..9493a117 100644
--- a/lib/ace/mode/c_cpp_highlight_rules.js
+++ b/lib/ace/mode/c_cpp_highlight_rules.js
@@ -122,8 +122,7 @@ var c_cppHighlightRules = function() {
                 regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
             }, {
               token : "punctuation.operator",
-              regex : "\\?|\\:|\\,|\\;|\\.",
-              next  : "regex_allowed"
+              regex : "\\?|\\:|\\,|\\;|\\."
             }, {
                 token : "paren.lparen",
                 regex : "[[({]"
diff --git a/lib/ace/mode/coffee_highlight_rules.js b/lib/ace/mode/coffee_highlight_rules.js
index c4a8b566..a0aa173e 100644
--- a/lib/ace/mode/coffee_highlight_rules.js
+++ b/lib/ace/mode/coffee_highlight_rules.js
@@ -149,8 +149,7 @@ define(function(require, exports, module) {
                     regex : "#.*"
                 }, {
                     token : "punctuation.operator",
-                    regex : "\\?|\\:|\\,|\\.",
-                    next  : "regex_allowed"
+                    regex : "\\?|\\:|\\,|\\."
                 }, {
                     token : "paren.lparen",
                     regex : "[({[]"
diff --git a/lib/ace/mode/csharp_highlight_rules.js b/lib/ace/mode/csharp_highlight_rules.js
index 953c6f96..5c5c0910 100644
--- a/lib/ace/mode/csharp_highlight_rules.js
+++ b/lib/ace/mode/csharp_highlight_rules.js
@@ -68,8 +68,7 @@ var CSharpHighlightRules = function() {
                 regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
                 token : "punctuation.operator",
-                regex : "\\?|\\:|\\,|\\;|\\.",
-                next  : "regex_allowed"
+                regex : "\\?|\\:|\\,|\\;|\\."
             }, {
                 token : "paren.lparen",
                 regex : "[[({]"
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 3dff3c5a..43b93297 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -86,17 +86,17 @@ var HtmlHighlightRules = function() {
         }, {
             token : "meta.tag",
             regex : "[-_a-zA-Z0-9:]+",
-            next : name + "-attribute-list" 
+            next : name + "embed-attribute-list" 
         }, {
             token: "empty",
             regex: "",
-            next : name + "-attribute-list"
+            next : name + "embed-attribute-list"
         }];
 
         states[name + "-qstring"] = multiLineString("'", name);
         states[name + "-qqstring"] = multiLineString("\"", name);
         
-        states[name + "-attribute-list"] = [{
+        states[name + "embed-attribute-list"] = [{
             token : "text",
             regex : ">",
             next : nextState