diff --git a/lib/ace/mode/lsl_highlight_rules.js b/lib/ace/mode/lsl_highlight_rules.js
index 23f0ce89..73c1b6f4 100644
--- a/lib/ace/mode/lsl_highlight_rules.js
+++ b/lib/ace/mode/lsl_highlight_rules.js
@@ -192,7 +192,7 @@ var keywordMapper = this.createKeywordMapper({
     "invalid.illegal" : "event",
     "keyword.control" : "do|else|for|if|jump|return|while",
     "keyword.other" : "default|state",
-    "storage.type" : "float|integer|key|list|quaternion|rotation|string|vector"
+    "storage.type" : "float|integer|key|list|quaternion|rotation|string|vector",
     "support.function": "llAbs|llAcos|llAddToLandBanList|llAddToLandPassList|" +
         "llAdjustSoundVolume|llAllowInventoryDrop|llAngleBetween|llApplyImpulse|" +
         "llApplyRotationalImpulse|llAsin|llAtan2|llAttachToAvatar|llAttachToAvatarTemp|" +
@@ -307,7 +307,7 @@ var keywordMapper = this.createKeywordMapper({
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
                 token : "keyword.operator",
-                regex : "[!%<>=*+\\-\\/]=?|<<|>>|&|&&|\\+\\+|\\-\\-|\\||\\|\\||^|~"
+                regex : "\\+\\+|\\-\\-|<<|>>|&&?|\\|\\|?|\\^|~|[!%<>=*+\\-\\/]=?"
             }, {
                 token : "punctuation.operator",
                 regex : "\\?|\\:|\\,|\\;|\\."