diff --git a/lib/ace/mode/coffee_highlight_rules.js b/lib/ace/mode/coffee_highlight_rules.js
index a0608bd1..af09f05d 100644
--- a/lib/ace/mode/coffee_highlight_rules.js
+++ b/lib/ace/mode/coffee_highlight_rules.js
@@ -53,7 +53,13 @@ define(function(require, exports, module) {
             start : [
                 {
                     token : "identifier",
-                    regex : "(?:@|(?:\\.|::)\\s*)" + identifier
+                    regex : "(?:(?:\\.|::)\\s*)" + identifier
+                }, {
+                    token : "variable",
+                    regex : "@" + identifier
+                }, {
+                    token : "label",
+                    regex : identifier + ":"
                 }, {
                     token : "keyword",
                     regex : "(?:t(?:h(?:is|row|en)|ry|ypeof)|s(?:uper|witch)|return|b(?:reak|y)|c(?:ontinue|atch|lass)|i(?:n(?:stanceof)?|s(?:nt)?|f)|e(?:lse|xtends)|f(?:or (?:own)?|inally|unction)|wh(?:ile|en)|n(?:ew|ot?)|d(?:e(?:lete|bugger)|o)|loop|o(?:ff?|[rn])|un(?:less|til)|and|yes)"
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index f15be700..23af59bb 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -183,6 +183,9 @@ color:#5F5A60;\
 .ace-twilight .ace_variable {\
   color:#7587A6;\
 }\
+.ace-twilight .ace_label {\
+  color:#AC885B;\
+}\
 \
 .ace-twilight .ace_variable.ace_language {\
   \