diff --git a/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage b/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage
index d171bb5b..f0daaede 100644
--- a/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage
+++ b/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage
@@ -230,6 +230,39 @@
name
comment.line.coffee
+
+ begin
+ (?<=[=(:]|^|return)\s*(/)(?![/*+{}?])
+ beginCaptures
+
+ 1
+
+ name
+ punctuation.definition.string.begin.coffee
+
+
+ end
+ (/)[igm]*
+ endCaptures
+
+ 1
+
+ name
+ punctuation.definition.string.end.coffee
+
+
+ name
+ string.regexp.coffee
+ patterns
+
+
+ match
+ \\.
+ name
+ constant.character.escape.coffee
+
+
+
match
\b(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while)\b
@@ -238,7 +271,7 @@
match
- \b([a-zA-Z$_](\w|\$|:|\.)*)(\:)\s
+ \b([a-zA-Z$_](\w|\$|:|\.)*\s*(?=\:))
name
variable.assignment.coffee
captures
@@ -248,11 +281,6 @@
name
entity.name.function.coffee
- 3
-
- name
- keyword.operator.coffee
-
@@ -297,39 +325,6 @@
name
constant.language.coffee
-
- begin
- (?<=[=(:]|^|return)\s*(/)(?![/*+{}?])
- beginCaptures
-
- 1
-
- name
- punctuation.definition.string.begin.coffee
-
-
- end
- (/)[igm]*
- endCaptures
-
- 1
-
- name
- punctuation.definition.string.end.coffee
-
-
- name
- string.regexp.coffee
- patterns
-
-
- match
- \\.
- name
- constant.character.escape.coffee
-
-
-
match
\;