diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 658174e6..378713be 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -988,10 +988,12 @@ var EditSession = function(text, mode) {
         var removedFolds = null;
 
         if (action.indexOf("Lines") != -1) {
-            if (action == "insertLines") {
-                lastRow = firstRow + (e.data.lines.length);
-            } else {
-                lastRow = firstRow;
+            if (e.data.lines) {
+                if (action == "insertLines" && e.data.lines) {
+                    lastRow = firstRow + (e.data.lines.length);
+                } else {
+                    lastRow = firstRow;
+                }
             }
             len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
         } else {
diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js
index 9caa76da..02ef6992 100644
--- a/lib/ace/keyboard/keybinding.js
+++ b/lib/ace/keyboard/keybinding.js
@@ -86,7 +86,9 @@ var KeyBinding = function(editor) {
 
         if (!toExecute || !toExecute.command)
             return false;
-        var success = false, commands = this.$editor.commands;
+
+        var success = false;
+        var commands = this.$editor.commands;
 
         // allow keyboardHandler to consume keys
         if (toExecute.command != "null")
diff --git a/lib/ace/keyboard/state_handler.js b/lib/ace/keyboard/state_handler.js
index 15d17c8c..a5bc7fbf 100644
--- a/lib/ace/keyboard/state_handler.js
+++ b/lib/ace/keyboard/state_handler.js
@@ -73,7 +73,7 @@ StateHandler.prototype = {
         });
     },
 
-    $composeBuffer: function(data, hashId, key) {
+    $composeBuffer: function(data, hashId, key, e) {
         // Initialize the data object.
         if (data.state == null || data.buffer == null) {
             data.state = "start";
@@ -102,17 +102,23 @@ StateHandler.prototype = {
             data.buffer = bufferToUse;
         }
 
-        return {
-            bufferToUse:    bufferToUse,
-            symbolicName:   symbolicName
+        var bufferObj = {
+            bufferToUse: bufferToUse,
+            symbolicName: symbolicName,
         };
+
+        if (e) {
+            bufferObj.keyIdentifier = e.keyIdentifier
+        }
+
+        return bufferObj;
     },
 
-    $find: function(data, buffer, symbolicName, hashId, key) {
+    $find: function(data, buffer, symbolicName, hashId, key, keyIdentifier) {
         // Holds the command to execute and the args if a command matched.
         var result = {};
 
-        // Loop over all the bindings of the keymapp until a match is found.
+        // Loop over all the bindings of the keymap until a match is found.
         this.keymapping[data.state].some(function(binding) {
             var match;
 
@@ -127,7 +133,7 @@ StateHandler.prototype = {
             }
 
             // Check if the match function matches.
-            if (binding.match && !binding.match(buffer, hashId, key, symbolicName)) {
+            if (binding.match && !binding.match(buffer, hashId, key, symbolicName, keyIdentifier)) {
                 return false;
             }
 
@@ -194,20 +200,21 @@ StateHandler.prototype = {
     /**
      * This function is called by keyBinding.
      */
-    handleKeyboard: function(data, hashId, key) {
+    handleKeyboard: function(data, hashId, key, keyCode, e) {
         // If we pressed any command key but no other key, then ignore the input.
         // Otherwise "shift-" is added to the buffer, and later on "shift-g"
-        // which results in "shift-shift-g" which doesn't make senese.
+        // which results in "shift-shift-g" which doesn't make sense.
         if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
             return null;
         }
 
         // Compute the current value of the keyboard input buffer.
-        var r = this.$composeBuffer(data, hashId, key);
+        var r = this.$composeBuffer(data, hashId, key, e);
         var buffer = r.bufferToUse;
         var symbolicName = r.symbolicName;
+        var keyId = r.keyIdentifier;
 
-        r = this.$find(data, buffer, symbolicName, hashId, key);
+        r = this.$find(data, buffer, symbolicName, hashId, key, keyId);
         if (DEBUG) {
             console.log("KeyboardStateMapper#match", buffer, symbolicName, r);
         }
diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js
index 06242c73..503cc93a 100644
--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@@ -85,7 +85,9 @@ var Gutter = function(parentEl) {
             };
             for (var i=0; i<rowAnnotations.length; i++) {
                 var annotation = rowAnnotations[i];
-                rowInfo.text.push(annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;"));
+                var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;");
+                if (rowInfo.text.indexOf(annoText) === -1)
+                    rowInfo.text.push(annoText);
                 var type = annotation.type;
                 if (type == "error")
                     rowInfo.className = "ace_error";
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 21110a02..372e4027 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -51,7 +51,7 @@ var HtmlHighlightRules = function() {
             token : "string",
             regex : '".*?"'
         }, {
-            token : "string", // multi line string start
+            token : "meta.tag", // multi line string start
             merge : true,
             regex : '["].*$',
             next : state + "-qqstring"
@@ -59,7 +59,7 @@ var HtmlHighlightRules = function() {
             token : "string",
             regex : "'.*?'"
         }, {
-            token : "string", // multi line string start
+            token : "meta.tag", // multi line string start
             merge : true,
             regex : "['].*$",
             next : state + "-qstring"
@@ -68,7 +68,7 @@ var HtmlHighlightRules = function() {
     
     function multiLineString(quote, state) {
         return [{
-            token : "string",
+            token : "meta.tag",
             merge : true,
             regex : ".*" + quote,
             next : state
@@ -97,9 +97,12 @@ var HtmlHighlightRules = function() {
         states[name + "-qqstring"] = multiLineString("\"", name);
         
         states[name + "embed-attribute-list"] = [{
-            token : "text",
+            token : "meta.tag",
             regex : ">",
             next : nextState
+        }, {
+            token : "meta.tag",
+            regex : "="
         }, {
             token : "entity.other.attribute-name",
             regex : "[-_a-zA-Z0-9:]+"
@@ -114,7 +117,7 @@ var HtmlHighlightRules = function() {
 
     this.$rules = {
         start : [ {
-            token : "text",
+            token : "meta.tag",
             merge : true,
             regex : "<\\!\\[CDATA\\[",
             next : "cdata"
@@ -127,15 +130,15 @@ var HtmlHighlightRules = function() {
             regex : "<\\!--",
             next : "comment"
         }, {
-            token : "text",
+            token : "meta.tag",
             regex : "<(?=\s*script)",
             next : "script"
         }, {
-            token : "text",
+            token : "meta.tag",
             regex : "<(?=\s*style)",
             next : "css"
         }, {
-            token : "text", // opening tag
+            token : "meta.tag", // opening tag
             regex : "<\\/?",
             next : "tag"
         }, {
@@ -176,17 +179,17 @@ var HtmlHighlightRules = function() {
     tag(this.$rules, "script", "js-start");
     
     this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
+        token: "meta.tag",
         regex: "\\/\\/.*(?=<\\/script>)",
         next: "tag"
     }, {
-        token: "text",
+        token: "meta.tag",
         regex: "<\\/(?=script)",
         next: "tag"
     }]);
     
     this.embedRules(CssHighlightRules, "css-", [{
-        token: "text",
+        token: "meta.tag",
         regex: "<\\/(?=style)",
         next: "tag"
     }]);