diff --git a/.gitignore b/.gitignore
index 45220054..a589a0c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ node_modules/mime/
 node_modules/dryice/
 node_modules/uglify-js/
 node_modules/.bin/
-
+tool/node_modules/
 
 .git-ref
 npm-debug.log
diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js
index e8bbd526..175c360d 100644
--- a/lib/ace/mode/css_highlight_rules.js
+++ b/lib/ace/mode/css_highlight_rules.js
@@ -105,11 +105,17 @@ var CssHighlightRules = function() {
         "purple|red|silver|teal|white|yellow").split("|")
     );
 
+    var fonts = lang.arrayToMap(
+        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
+        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
+        "serif|monospace").split("|")
+    );
+    
     // regexp must not have capturing parentheses. Use (?:) instead.
     // regexps are ordered -> the first match is used
 
     var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-
+    
     var base_ruleset = [
         {
             token : "comment", // multi line comment
@@ -123,8 +129,11 @@ var CssHighlightRules = function() {
             token : "string", // single line
             regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
         }, {
-            token : "constant.numeric",
-            regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
+            token : ["constant.numeric", "keyword"],
+            regex : "(" + numRe + ")(em|ex|px|ch|cm|mm|in|pt|pc|deg|rad|dpi|grad|ms|s|hz|khz|%)"
+        }, {
+            token : ["constant.numeric"],
+            regex : "([0-9]+)"
         }, {
             token : "constant.numeric",  // hex6 color
             regex : "#[a-f0-9]{6}"
@@ -145,12 +154,15 @@ var CssHighlightRules = function() {
                 else if (colors.hasOwnProperty(value.toLowerCase())) {
                     return "support.constant.color";
                 }
+                else if (fonts.hasOwnProperty(value.toLowerCase())) {
+                    return "support.constant.fonts";
+                }
                 else {
                     return "text";
                 }
             },
             regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        }
+        } 
       ];
 
     var ruleset = lang.copyArray(base_ruleset);
diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js
index 0747cf19..4e38c51c 100644
--- a/lib/ace/mode/javascript_highlight_rules.js
+++ b/lib/ace/mode/javascript_highlight_rules.js
@@ -136,9 +136,27 @@ var JavaScriptHighlightRules = function() {
             }, {
                 token : "constant.numeric", // float
                 regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
+            }, { // match stuff like: Sound.prototype.play = function() { }
+                token : ["storage.type", "punctuation.operator", "support.function", "punctuation.operator", "entity.name.function", "text", "keyword.operator", "text", "storage.type", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)?(\\s*)(\\()(.*?)(\\))"
+            }, { // match stuff like: Sound.prototype.play = myfunc
+                token : ["storage.type", "punctuation.operator", "support.function", "punctuation.operator", "entity.name.function", "text", "keyword.operator", "text"],
+                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
+            }, { // match stuff like: Sound.play = function() {  }
+                token : ["storage.type", "punctuation.operator", "entity.name.function", "text", "keyword.operator", "text", "storage.type", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)?(\\s*)(\\()(.*?)(\\))"
+            }, { // match stuff like: play = function() {  }
+                token : ["entity.name.function", "text", "keyword.operator", "text", "storage.type", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)?(\\s*)(\\()(.*?)(\\))"
+            }, { // match regular function like: function myFunc(arg) { }
                 token : ["storage.type", "text", "entity.name.function", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
                 regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
+            }, { // match stuff like: foobar: function() { … }
+                token : ["entity.name.function", "text", "punctuation.operator", "text", "storage.type", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)?(\\s*)(\\()(.*?)(\\))"
+            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { }
+                token : ["text", "text", "storage.type", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
             }, {
                 token : "constant.language.boolean",
                 regex : "(?:true|false)\\b"
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index a447c4df..31db8dd0 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #BFBFBF;\
 }\
 \
-.ace-clouds .ace_keyword {\
+.ace-clouds .ace_keyword, .ace-clouds .ace_meta {\
   color:#AF956F;\
 }\
 \
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index fbc65d88..96a3fe74 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #BFBFBF;\
 }\
 \
-.ace-clouds-midnight .ace_keyword {\
+.ace-clouds-midnight .ace_keyword, .ace-clouds-midnight .ace_meta {\
   color:#927C5D;\
 }\
 \
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index aa7e6f66..a13f8db5 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: rgba(255, 255, 255, 0.15);\
 }\
 \
-.ace-cobalt .ace_keyword {\
+.ace-cobalt .ace_keyword, .ace-cobalt .ace_meta {\
   color:#FF9D00;\
 }\
 \
-.ace-cobalt .ace_constant {\
+.ace-cobalt .ace_constant, .ace-cobalt .ace_constant.ace_other {\
   color:#FF628C;\
 }\
 \
@@ -118,6 +118,10 @@ background-color:#800F00;\
   color:#80FFBB;\
 }\
 \
+.ace-cobalt .ace_support.ace_constant {\
+  color:#EB939A;\
+}\
+\
 .ace-cobalt .ace_fold {\
     background-color: #FF9D00;\
     border-color: #FFFFFF;\
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index 9e6c2cad..de78eede 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: rgba(75, 75, 126, 0.50);\
 }\
 \
-.ace-dawn .ace_keyword {\
+.ace-dawn .ace_keyword, .ace-dawn .ace_meta {\
   color:#794938;\
 }\
 \
-.ace-dawn .ace_constant {\
+.ace-dawn .ace_constant, .ace-dawn .ace_constant.ace_other {\
   color:#811F24;\
 }\
 \
@@ -126,6 +126,10 @@ color:#B52A1D;\
   color:#691C97;\
 }\
 \
+.ace-dawn .ace_support.ace_constant {\
+  color:#B4371F;\
+}\
+\
 .ace-dawn .ace_fold {\
     background-color: #794938;\
     border-color: #080808;\
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 61e03016..7a90540d 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: #404040;\
 }\
 \
-.ace-idle-fingers .ace_keyword {\
+.ace-idle-fingers .ace_keyword, .ace-idle-fingers .ace_meta {\
   color:#CC7833;\
 }\
 \
-.ace-idle-fingers .ace_constant {\
+.ace-idle-fingers .ace_constant, .ace-idle-fingers .ace_constant.ace_other {\
   color:#6C99BB;\
 }\
 \
@@ -114,6 +114,10 @@ exports.cssText = "\
 background-color:#FF0000;\
 }\
 \
+.ace-idle-fingers .ace_support.ace_constant {\
+  color:#6C99BB;\
+}\
+\
 .ace-idle-fingers .ace_fold {\
     background-color: #CC7833;\
     border-color: #FFFFFF;\
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 3306fe69..66fe58c2 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: rgba(255, 177, 111, 0.32);\
 }\
 \
-.ace-kr-theme .ace_keyword {\
+.ace-kr-theme .ace_keyword, .ace-kr-theme .ace_meta {\
   color:#949C8B;\
 }\
 \
-.ace-kr-theme .ace_constant {\
+.ace-kr-theme .ace_constant, .ace-kr-theme .ace_constant.ace_other {\
   color:rgba(210, 117, 24, 0.76);\
 }\
 \
@@ -118,6 +118,10 @@ background-color:#A41300;\
   color:#9FC28A;\
 }\
 \
+.ace-kr-theme .ace_support.ace_constant {\
+  color:#C27E66;\
+}\
+\
 .ace-kr-theme .ace_fold {\
     background-color: #949C8B;\
     border-color: #FCFFE0;\
diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js
index b73eddf4..de2f396b 100644
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: #404040;\
 }\
 \
-.ace-merbivore .ace_keyword {\
+.ace-merbivore .ace_keyword, .ace-merbivore .ace_meta {\
   color:#FC6F09;\
 }\
 \
-.ace-merbivore .ace_constant {\
+.ace-merbivore .ace_constant, .ace-merbivore .ace_constant.ace_other {\
   color:#1EDAFB;\
 }\
 \
@@ -126,6 +126,10 @@ exports.cssText = "\
 background-color:#990000;\
 }\
 \
+.ace-merbivore .ace_support.ace_constant {\
+  color:#8DFF0A;\
+}\
+\
 .ace-merbivore .ace_fold {\
     background-color: #FC6F09;\
     border-color: #E6E1DC;\
diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js
index b380dacd..dce3cebd 100644
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: #404040;\
 }\
 \
-.ace-merbivore-soft .ace_keyword {\
+.ace-merbivore-soft .ace_keyword, .ace-merbivore-soft .ace_meta {\
   color:#FC803A;\
 }\
 \
-.ace-merbivore-soft .ace_constant {\
+.ace-merbivore-soft .ace_constant, .ace-merbivore-soft .ace_constant.ace_other {\
   color:#68C1D8;\
 }\
 \
@@ -131,6 +131,10 @@ background-color:#FE3838;\
 background-color:#FE3838;\
 }\
 \
+.ace-merbivore-soft .ace_support.ace_constant {\
+  color:#8EC65F;\
+}\
+\
 .ace-merbivore-soft .ace_fold {\
     background-color: #FC803A;\
     border-color: #E6E1DC;\
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index 2ab07c81..21f4e6f8 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: rgba(102, 108, 104, 0.50);\
 }\
 \
-.ace-mono-industrial .ace_keyword {\
+.ace-mono-industrial .ace_keyword, .ace-mono-industrial .ace_meta {\
   color:#A39E64;\
 }\
 \
@@ -109,7 +109,7 @@ exports.cssText = "\
   color:#A8B3AB;\
 }\
 \
-.ace-mono-industrial .ace_constant {\
+.ace-mono-industrial .ace_constant, .ace-mono-industrial .ace_constant.ace_other {\
   color:#E98800;\
 }\
 \
@@ -122,6 +122,10 @@ exports.cssText = "\
 background-color:rgba(153, 0, 0, 0.68);\
 }\
 \
+.ace-mono-industrial .ace_support.ace_constant {\
+  color:#C87500;\
+}\
+\
 .ace-mono-industrial .ace_fold {\
     background-color: #A8B3AB;\
     border-color: #FFFFFF;\
@@ -135,6 +139,10 @@ background-color:rgba(153, 0, 0, 0.68);\
   color:#C23B00;\
 }\
 \
+.ace-mono-industrial .ace_variable {\
+  color:#A8B3AB;\
+}\
+\
 .ace-mono-industrial .ace_variable.ace_parameter {\
   color:#648BD2;\
 }\
diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js
index e49fa7fa..c1a5a2d8 100644
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #49483E;\
 }\
 \
-.ace-monokai .ace_keyword {\
+.ace-monokai .ace_keyword, .ace-monokai .ace_meta {\
   color:#F92672;\
 }\
 \
@@ -113,6 +113,10 @@ exports.cssText = "\
   color:#AE81FF;\
 }\
 \
+.ace-monokai .ace_constant.ace_other {\
+  color:#AE81FF;\
+}\
+\
 .ace-monokai .ace_invalid {\
   color:#F8F8F0;\
 background-color:#F92672;\
@@ -123,6 +127,10 @@ background-color:#F92672;\
 background-color:#AE81FF;\
 }\
 \
+.ace-monokai .ace_support.ace_constant {\
+  color:#66D9EF;\
+}\
+\
 .ace-monokai .ace_fold {\
     background-color: #A6E22E;\
     border-color: #F8F8F2;\
@@ -136,11 +144,15 @@ background-color:#AE81FF;\
   color:#F92672;\
 }\
 \
-.ace-monokai .ace_storage.ace_type {\
+.ace-monokai .ace_storage.ace_type,  .ace-monokai .ace_support.ace_type{\
   font-style:italic;\
 color:#66D9EF;\
 }\
 \
+.ace-monokai .ace_variable {\
+  color:#A6E22E;\
+}\
+\
 .ace-monokai .ace_variable.ace_parameter {\
   font-style:italic;\
 color:#FD971F;\
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index 0e909d70..415ffaf2 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: rgba(255, 255, 255, 0.25);\
 }\
 \
-.ace-pastel-on-dark .ace_keyword {\
+.ace-pastel-on-dark .ace_keyword, .ace-pastel-on-dark .ace_meta {\
   color:#757aD8;\
 }\
 \
@@ -109,7 +109,7 @@ exports.cssText = "\
   color:#797878;\
 }\
 \
-.ace-pastel-on-dark .ace_constant {\
+.ace-pastel-on-dark .ace_constant, .ace-pastel-on-dark .ace_constant.ace_other {\
   color:#4FB7C5;\
 }\
 \
diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js
index 6ca07423..0a18111e 100644
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: rgba(147, 161, 161, 0.50);\
 }\
 \
-.ace-solarized-dark .ace_keyword {\
+.ace-solarized-dark .ace_keyword, .ace-solarized-dark .ace_meta {\
   color:#859900;\
 }\
 \
@@ -113,6 +113,10 @@ exports.cssText = "\
   color:#D33682;\
 }\
 \
+.ace-solarized-dark .ace_constant.ace_other {\
+  color:#CB4B16;\
+}\
+\
 .ace-solarized-dark .ace_fold {\
     background-color: #268BD2;\
     border-color: #93A1A1;\
@@ -126,6 +130,10 @@ exports.cssText = "\
   color:#93A1A1;\
 }\
 \
+.ace-solarized-dark .ace_variable {\
+  color:#268BD2;\
+}\
+\
 .ace-solarized-dark .ace_string {\
   color:#2AA198;\
 }\
diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js
index 479f8849..e6866d08 100644
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: rgba(147, 161, 161, 0.50);\
 }\
 \
-.ace-solarized-light .ace_keyword {\
+.ace-solarized-light .ace_keyword, .ace-solarized-light .ace_meta {\
   color:#859900;\
 }\
 \
@@ -113,6 +113,10 @@ exports.cssText = "\
   color:#D33682;\
 }\
 \
+.ace-solarized-light .ace_constant.ace_other {\
+  color:#CB4B16;\
+}\
+\
 .ace-solarized-light .ace_fold {\
     background-color: #268BD2;\
     border-color: #586E75;\
@@ -126,6 +130,10 @@ exports.cssText = "\
   color:#073642;\
 }\
 \
+.ace-solarized-light .ace_variable {\
+  color:#268BD2;\
+}\
+\
 .ace-solarized-light .ace_string {\
   color:#2AA198;\
 }\
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index 9f37aee0..c42902f1 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #D1D1D1;\
 }\
 \
-.ace-tomorrow .ace_keyword {\
+.ace-tomorrow .ace_keyword, .ace-tomorrow .ace_meta {\
   color:#8959A8;\
 }\
 \
@@ -117,6 +117,10 @@ exports.cssText = "\
   color:#F5871F;\
 }\
 \
+.ace-tomorrow .ace_constant.ace_other {\
+  color:#666969;\
+}\
+\
 .ace-tomorrow .ace_invalid {\
   color:#FFFFFF;\
 background-color:#C82829;\
@@ -127,6 +131,10 @@ background-color:#C82829;\
 background-color:#8959A8;\
 }\
 \
+.ace-tomorrow .ace_support.ace_constant {\
+  color:#F5871F;\
+}\
+\
 .ace-tomorrow .ace_fold {\
     background-color: #4271AE;\
     border-color: #4D4D4C;\
@@ -140,10 +148,14 @@ background-color:#8959A8;\
   color:#8959A8;\
 }\
 \
-.ace-tomorrow .ace_storage.ace_type {\
+.ace-tomorrow .ace_storage.ace_type,  .ace-tomorrow .ace_support.ace_type{\
   color:#8959A8;\
 }\
 \
+.ace-tomorrow .ace_variable {\
+  color:#4271AE;\
+}\
+\
 .ace-tomorrow .ace_variable.ace_parameter {\
   color:#F5871F;\
 }\
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index d3d5edb1..e6638144 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #4B4E55;\
 }\
 \
-.ace-tomorrow-night .ace_keyword {\
+.ace-tomorrow-night .ace_keyword, .ace-tomorrow-night .ace_meta {\
   color:#B294BB;\
 }\
 \
@@ -117,6 +117,10 @@ exports.cssText = "\
   color:#DE935F;\
 }\
 \
+.ace-tomorrow-night .ace_constant.ace_other {\
+  color:#CED1CF;\
+}\
+\
 .ace-tomorrow-night .ace_invalid {\
   color:#CED2CF;\
 background-color:#DF5F5F;\
@@ -127,6 +131,10 @@ background-color:#DF5F5F;\
 background-color:#B798BF;\
 }\
 \
+.ace-tomorrow-night .ace_support.ace_constant {\
+  color:#DE935F;\
+}\
+\
 .ace-tomorrow-night .ace_fold {\
     background-color: #81A2BE;\
     border-color: #C5C8C6;\
@@ -140,10 +148,14 @@ background-color:#B798BF;\
   color:#B294BB;\
 }\
 \
-.ace-tomorrow-night .ace_storage.ace_type {\
+.ace-tomorrow-night .ace_storage.ace_type,  .ace-tomorrow-night .ace_support.ace_type{\
   color:#B294BB;\
 }\
 \
+.ace-tomorrow-night .ace_variable {\
+  color:#81A2BE;\
+}\
+\
 .ace-tomorrow-night .ace_variable.ace_parameter {\
   color:#DE935F;\
 }\
diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js
index 67a580d3..f81499f3 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #404F7D;\
 }\
 \
-.ace-tomorrow-night-blue .ace_keyword {\
+.ace-tomorrow-night-blue .ace_keyword, .ace-tomorrow-night-blue .ace_meta {\
   color:#EBBBFF;\
 }\
 \
@@ -117,6 +117,10 @@ exports.cssText = "\
   color:#FFC58F;\
 }\
 \
+.ace-tomorrow-night-blue .ace_constant.ace_other {\
+  color:#FFFFFF;\
+}\
+\
 .ace-tomorrow-night-blue .ace_invalid {\
   color:#FFFFFF;\
 background-color:#F99DA5;\
@@ -127,6 +131,10 @@ background-color:#F99DA5;\
 background-color:#EBBBFF;\
 }\
 \
+.ace-tomorrow-night-blue .ace_support.ace_constant {\
+  color:#FFC58F;\
+}\
+\
 .ace-tomorrow-night-blue .ace_fold {\
     background-color: #BBDAFF;\
     border-color: #FFFFFF;\
@@ -140,10 +148,14 @@ background-color:#EBBBFF;\
   color:#EBBBFF;\
 }\
 \
-.ace-tomorrow-night-blue .ace_storage.ace_type {\
+.ace-tomorrow-night-blue .ace_storage.ace_type,  .ace-tomorrow-night-blue .ace_support.ace_type{\
   color:#EBBBFF;\
 }\
 \
+.ace-tomorrow-night-blue .ace_variable {\
+  color:#BBDAFF;\
+}\
+\
 .ace-tomorrow-night-blue .ace_variable.ace_parameter {\
   color:#FFC58F;\
 }\
diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js
index 70cde6d5..e797641a 100644
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #343434;\
 }\
 \
-.ace-tomorrow-night-bright .ace_keyword {\
+.ace-tomorrow-night-bright .ace_keyword, .ace-tomorrow-night-bright .ace_meta {\
   color:#C397D8;\
 }\
 \
@@ -117,6 +117,10 @@ exports.cssText = "\
   color:#E78C45;\
 }\
 \
+.ace-tomorrow-night-bright .ace_constant.ace_other {\
+  color:#EEEEEE;\
+}\
+\
 .ace-tomorrow-night-bright .ace_invalid {\
   color:#CED2CF;\
 background-color:#DF5F5F;\
@@ -127,6 +131,10 @@ background-color:#DF5F5F;\
 background-color:#B798BF;\
 }\
 \
+.ace-tomorrow-night-bright .ace_support.ace_constant {\
+  color:#E78C45;\
+}\
+\
 .ace-tomorrow-night-bright .ace_fold {\
     background-color: #7AA6DA;\
     border-color: #DEDEDE;\
@@ -140,10 +148,14 @@ background-color:#B798BF;\
   color:#C397D8;\
 }\
 \
-.ace-tomorrow-night-bright .ace_storage.ace_type {\
+.ace-tomorrow-night-bright .ace_storage.ace_type,  .ace-tomorrow-night-bright .ace_support.ace_type{\
   color:#C397D8;\
 }\
 \
+.ace-tomorrow-night-bright .ace_variable {\
+  color:#7AA6DA;\
+}\
+\
 .ace-tomorrow-night-bright .ace_variable.ace_parameter {\
   color:#E78C45;\
 }\
diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js
index e5e543eb..cd815ca2 100644
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@@ -101,7 +101,7 @@ exports.cssText = "\
   color: #6A6A6A;\
 }\
 \
-.ace-tomorrow-night-eighties .ace_keyword {\
+.ace-tomorrow-night-eighties .ace_keyword, .ace-tomorrow-night-eighties .ace_meta {\
   color:#CC99CC;\
 }\
 \
@@ -117,6 +117,10 @@ exports.cssText = "\
   color:#F99157;\
 }\
 \
+.ace-tomorrow-night-eighties .ace_constant.ace_other {\
+  color:#CCCCCC;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_invalid {\
   color:#CDCDCD;\
 background-color:#F2777A;\
@@ -127,6 +131,10 @@ background-color:#F2777A;\
 background-color:#CC99CC;\
 }\
 \
+.ace-tomorrow-night-eighties .ace_support.ace_constant {\
+  color:#F99157;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_fold {\
     background-color: #6699CC;\
     border-color: #CCCCCC;\
@@ -140,10 +148,14 @@ background-color:#CC99CC;\
   color:#CC99CC;\
 }\
 \
-.ace-tomorrow-night-eighties .ace_storage.ace_type {\
+.ace-tomorrow-night-eighties .ace_storage.ace_type,  .ace-tomorrow-night-eighties .ace_support.ace_type{\
   color:#CC99CC;\
 }\
 \
+.ace-tomorrow-night-eighties .ace_variable {\
+  color:#6699CC;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_variable.ace_parameter {\
   color:#F99157;\
 }\
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index e7c8ffe4..f66991ef 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: rgba(255, 255, 255, 0.25);\
 }\
 \
-.ace-twilight .ace_keyword {\
+.ace-twilight .ace_keyword, .ace-twilight .ace_meta {\
   color:#CDA869;\
 }\
 \
-.ace-twilight .ace_constant {\
+.ace-twilight .ace_constant, .ace-twilight .ace_constant.ace_other {\
   color:#CF6A4C;\
 }\
 \
@@ -124,6 +124,10 @@ color:#D2A8A1;\
   color:#9B859D;\
 }\
 \
+.ace-twilight .ace_support.ace_constant {\
+  color:#CF6A4C;\
+}\
+\
 .ace-twilight .ace_fold {\
     background-color: #AC885B;\
     border-color: #F8F8F8;\
@@ -137,6 +141,10 @@ color:#D2A8A1;\
   color:#F9EE98;\
 }\
 \
+.ace-twilight .ace_variable {\
+  color:#AC885B;\
+}\
+\
 .ace-twilight .ace_string {\
   color:#8F9D6A;\
 }\
diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js
index 40c58531..3354a2e7 100644
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@@ -101,11 +101,11 @@ exports.cssText = "\
   color: #404040;\
 }\
 \
-.ace-vibrant-ink .ace_keyword {\
+.ace-vibrant-ink .ace_keyword, .ace-vibrant-ink .ace_meta {\
   color:#FF6600;\
 }\
 \
-.ace-vibrant-ink .ace_constant {\
+.ace-vibrant-ink .ace_constant, .ace-vibrant-ink .ace_constant.ace_other {\
   color:#339999;\
 }\
 \
@@ -132,6 +132,10 @@ background-color:#000000;\
   color:#FFCC00;\
 }\
 \
+.ace-vibrant-ink .ace_variable {\
+  color:#FFCC00;\
+}\
+\
 .ace-vibrant-ink .ace_variable.ace_parameter {\
   font-style:italic;\
 }\
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index f9c1bbbc..6f2962c3 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -60,7 +60,7 @@
   %invisible%
 }
 
-.%cssClass% .ace_keyword {
+.%cssClass% .ace_keyword, .%cssClass% .ace_meta {
   %keyword%
 }
 
@@ -68,7 +68,7 @@
   %keyword.operator%
 }
 
-.%cssClass% .ace_constant {
+.%cssClass% .ace_constant, .%cssClass% .ace_constant.ace_other {
   %constant%
 }
 
@@ -84,6 +84,10 @@
   %constant.numeric%
 }
 
+.%cssClass% .ace_constant.ace_other {
+  %constant.other%
+}
+
 .%cssClass% .ace_invalid {
   %invalid%
 }
@@ -100,6 +104,10 @@
   %support%
 }
 
+.%cssClass% .ace_support.ace_constant {
+  %support.constant%
+}
+
 .%cssClass% .ace_fold {
     background-color: %fold%;
     border-color: %foreground%;
@@ -113,10 +121,14 @@
   %storage%
 }
 
-.%cssClass% .ace_storage.ace_type {
+.%cssClass% .ace_storage.ace_type,  .%cssClass% .ace_support.ace_type{
   %storage.type%
 }
 
+.%cssClass% .ace_variable {
+  %entity.name.function%
+}
+
 .%cssClass% .ace_variable.ace_parameter {
   %variable.parameter%
 }
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index e121eabd..bfda3f1f 100644
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -63,12 +63,14 @@ var supportedScopes = {
    "constant.library": "constant.library",
    "constant.numeric": "constant.numeric",
    "constant.character.escape" : "constant.character.escape",
+   "constant.other" : "constant.other",
    
    "support": "support",
    "support.function": "support.function",
    "support.function.dom": "support.function.dom",
    "support.function.firebug": "support.firebug",
    "support.function.constant": "support.function.constant",
+   "support.constant": "support.constant",
    
    "function": "function",
    "function.buildin": "function.buildin",