diff --git a/extensions/coffeescript/OSSREADME.json b/extensions/coffeescript/OSSREADME.json
index 08ab8d0b59e..92bff23d04d 100644
--- a/extensions/coffeescript/OSSREADME.json
+++ b/extensions/coffeescript/OSSREADME.json
@@ -1,7 +1,9 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
 [{
-	"name": "textmate/coffee-script.tmbundle",
+	"name": "atom/language-coffee-script",
 	"version": "0.0.0",
-	"license": "TextMate Bundle License",
-	"repositoryURL": "https://github.com/textmate/coffee-script.tmbundle"
+	"license": "MIT",
+	"repositoryURL": "https://github.com/atom/language-coffee-script",
+	"description": "The file syntaxes/coffeescript.tmLanguage.json was derived from the Atom package https://github.com/atom/language-coffee-script which was originally converted from the TextMate bundle https://github.com/jashkenas/coffee-script-tmbundle."
+
 }]
diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
index 841a3846a54..5c8f11b7206 100644
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/coffee-script.tmbundle Syntaxes/CoffeeScript.tmLanguage ./syntaxes/coffeescript.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-coffee-script grammars/coffeescript.cson ./syntaxes/coffeescript.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -16,7 +16,7 @@
 		"grammars": [{
 			"language": "coffeescript",
 			"scopeName": "source.coffee",
-			"path": "./syntaxes/coffeescript.json"
+			"path": "./syntaxes/coffeescript.tmLanguage.json"
 		}],
 		"breakpoints": [
 			{
diff --git a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
new file mode 100644
index 00000000000..663f548d4c6
--- /dev/null
+++ b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
@@ -0,0 +1,666 @@
+{
+	"scopeName": "source.coffee",
+	"name": "CoffeeScript",
+	"fileTypes": [
+		"coffee",
+		"Cakefile",
+		"coffee.erb",
+		"cson",
+		"_coffee"
+	],
+	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  coffee\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    coffee\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    coffee\n  (?=\\s|:|$)\n)",
+	"patterns": [
+		{
+			"captures": {
+				"1": {
+					"name": "variable.parameter.function.coffee"
+				},
+				"2": {
+					"name": "storage.type.function.coffee"
+				}
+			},
+			"comment": "match stuff like: a -> … ",
+			"match": "(\\([^()]*?\\))\\s*([=-]>)",
+			"name": "meta.inline.function.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "keyword.operator.new.coffee"
+				},
+				"4": {
+					"name": "storage.type.class.coffee"
+				},
+				"6": {
+					"name": "entity.name.type.instance.coffee"
+				},
+				"7": {
+					"name": "entity.name.type.instance.coffee"
+				}
+			},
+			"match": "(new)\\s+(((class)(\\s+(\\w+(?:\\.\\w*)*))?)|(\\w+(?:\\.\\w*)*))",
+			"name": "meta.class.instance.constructor"
+		},
+		{
+			"begin": "'''",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "'''",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.quoted.heredoc.coffee"
+		},
+		{
+			"begin": "\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.quoted.double.heredoc.coffee",
+			"patterns": [
+				{
+					"match": "\\\\.",
+					"name": "constant.character.escape.coffee"
+				},
+				{
+					"include": "#interpolated_coffee"
+				}
+			]
+		},
+		{
+			"begin": "`",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "`",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.quoted.script.coffee",
+			"patterns": [
+				{
+					"match": "(xh{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
+					"name": "constant.character.escape.coffee"
+				}
+			]
+		},
+		{
+			"begin": "(?<!#)###(?!#)",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.coffee"
+				}
+			},
+			"end": "###(?:[ \\t]*\\n)",
+			"name": "comment.block.coffee",
+			"patterns": [
+				{
+					"match": "(?<=^|\\s)@\\w*(?=\\s)",
+					"name": "storage.type.annotation.coffee"
+				}
+			]
+		},
+		{
+			"begin": "#",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.coffee"
+				}
+			},
+			"end": "$",
+			"name": "comment.line.number-sign.coffee"
+		},
+		{
+			"begin": "///",
+			"end": "(///)[gimuy]*",
+			"name": "string.regexp.coffee",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#heregexp"
+				}
+			]
+		},
+		{
+			"begin": "/(?![/*+?])(?=([^\\\\]|\\\\.)*?/[gimuy]*)",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "(/)[gimuy]*",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.regexp.coffee",
+			"patterns": [
+				{
+					"include": "source.js.regexp"
+				}
+			]
+		},
+		{
+			"match": "\\b(?<![\\.\\$])(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while|until|loop|do|(?<=for)\\s+own)(?!\\s*:)\\b",
+			"name": "keyword.control.coffee"
+		},
+		{
+			"match": "(and|or|<<|>>>?|(?<!\\()\\/|[=!<>*%+\\-&^])?=(?!>)|[!%^*\\/~?:]|\\-?\\-(?!>)|\\+\\+?|<>|<|>|&&?|\\.\\.\\.?|\\|\\|?|\\b(?<![\\.\\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)(?!\\s*:)\\b",
+			"name": "keyword.operator.coffee"
+		},
+		{
+			"match": "\\b(?<![\\.\\$])(case|default|function|var|void|with|const|let|enum|export|import|native|__hasProp|__extends|__slice|__bind|__indexOf|implements|interface|package|private|protected|public|static|yield)(?!\\s*:)\\b",
+			"name": "keyword.reserved.coffee"
+		},
+		{
+			"match": "([a-zA-Z$_][\\w$]*)\\s*(?!::)(?:(:)|((?:or|and|[-+\\/&%*?])?=)(?![>=]))(?!(\\s*\\(.*\\))?\\s*([=-]>))",
+			"captures": {
+				"1": {
+					"name": "variable.assignment.coffee"
+				},
+				"2": {
+					"name": "punctuation.separator.key-value"
+				},
+				"3": {
+					"name": "keyword.operator.coffee"
+				}
+			}
+		},
+		{
+			"begin": "(?<=\\s|^)({)(?=[^'\"#]+?}[\\s\\]}]*=)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.destructuring.begin.bracket.curly.coffee"
+				}
+			},
+			"end": "(})",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.destructuring.end.bracket.curly.coffee"
+				}
+			},
+			"name": "meta.variable.assignment.destructured.object.coffee",
+			"patterns": [
+				{
+					"include": "$self"
+				},
+				{
+					"include": "#variable_name"
+				}
+			]
+		},
+		{
+			"begin": "(?<=\\s|^)(\\[)(?=[^'\"#]+?}[\\s\\]}]*=)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.destructuring.begin.bracket.square.coffee"
+				}
+			},
+			"end": "(\\])",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.destructuring.end.bracket.square.coffee"
+				}
+			},
+			"name": "meta.variable.assignment.destructured.array.coffee",
+			"patterns": [
+				{
+					"include": "$self"
+				},
+				{
+					"include": "#variable_name"
+				}
+			]
+		},
+		{
+			"match": "(?x)\n(?<=^|\\s)\n(?=@?[a-zA-Z\\$_])\n@?([a-zA-Z\\$_]\\w*)(\\$|:|\\.)?\\s*\n(?=[:=](\\s*\\(.*\\))?\\s*([=-]>))",
+			"captures": {
+				"1": {
+					"name": "entity.name.function.coffee"
+				},
+				"3": {
+					"name": "variable.parameter.function.coffee"
+				},
+				"4": {
+					"name": "storage.type.function.coffee"
+				}
+			},
+			"name": "meta.function.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.|::)(true|on|yes)(?!\\s*[:=][^=])\\b",
+			"name": "constant.language.boolean.true.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.|::)(false|off|no)(?!\\s*[:=][^=])\\b",
+			"name": "constant.language.boolean.false.coffee"
+		},
+		{
+			"match": "@?\\b(?!class|subclass|extends|decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require)(\\w+)(?=\\s+(?!(of|in|then|is|isnt|and|or|for|else|when|not|if|unless)\\b)(?=(@?\\w+|\\->|\\-\\d|\\[|\\{|\"|'))|(?=\\())",
+			"captures": {
+				"4": {
+					"name": "entity.name.function.coffee"
+				}
+			}
+		},
+		{
+			"match": "[=-]>",
+			"name": "storage.type.function.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.|::)null(?!\\s*[:=][^=])\\b",
+			"name": "constant.language.null.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.|::)extends(?!\\s*[:=])\\b",
+			"name": "variable.language.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.)this(?!\\s*[:=][^=])\\b",
+			"name": "variable.language.this.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "storage.type.class.coffee"
+				},
+				"2": {
+					"name": "keyword.control.inheritance.coffee"
+				},
+				"3": {
+					"name": "entity.other.inherited-class.coffee"
+				}
+			},
+			"match": "(?<=\\s|^|\\[|\\()(class)\\s+(extends)\\s+(@?[a-zA-Z\\$\\._][\\w\\.]*)",
+			"name": "meta.class.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "storage.type.class.coffee"
+				},
+				"2": {
+					"name": "entity.name.type.class.coffee"
+				},
+				"3": {
+					"name": "keyword.control.inheritance.coffee"
+				},
+				"4": {
+					"name": "entity.other.inherited-class.coffee"
+				}
+			},
+			"match": "(?<=\\s|^|\\[|\\()(class\\b)\\s+(@?[a-zA-Z\\$_][\\w\\.]*)?(?:\\s+(extends)\\s+(@?[a-zA-Z\\$\\._][\\w\\.]*))?",
+			"name": "meta.class.coffee"
+		},
+		{
+			"match": "\\b(debugger|\\\\)\\b",
+			"name": "keyword.other.coffee"
+		},
+		{
+			"match": "\\b(Array|ArrayBuffer|Blob|Boolean|Date|document|Function|Int(8|16|32|64)Array|Math|Map|Number|Object|Proxy|RegExp|Set|String|WeakMap|window|Uint(8|16|32|64)Array|XMLHttpRequest)\\b",
+			"name": "support.class.coffee"
+		},
+		{
+			"match": "\\b(console)\\b",
+			"name": "entity.name.type.object.coffee"
+		},
+		{
+			"match": "((?<=console\\.)(debug|warn|info|log|error|time|timeEnd|assert))\\b",
+			"name": "support.function.console.coffee"
+		},
+		{
+			"match": "\\b(decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require)\\b",
+			"name": "support.function.coffee"
+		},
+		{
+			"match": "((?<=\\.)(apply|call|concat|every|filter|forEach|from|hasOwnProperty|indexOf|isPrototypeOf|join|lastIndexOf|map|of|pop|propertyIsEnumerable|push|reduce(Right)?|reverse|shift|slice|some|sort|splice|to(Locale)?String|unshift|valueOf))\\b",
+			"name": "support.function.method.array.coffee"
+		},
+		{
+			"match": "((?<=Array\\.)(isArray))\\b",
+			"name": "support.function.static.array.coffee"
+		},
+		{
+			"match": "((?<=Object\\.)(create|definePropert(ies|y)|freeze|getOwnProperty(Descriptors?|Names)|getProperty(Descriptor|Names)|getPrototypeOf|is(Extensible|Frozen|Sealed)?|isnt|keys|preventExtensions|seal))\\b",
+			"name": "support.function.static.object.coffee"
+		},
+		{
+			"match": "((?<=Math\\.)(abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|tan|tanh|trunc))\\b",
+			"name": "support.function.static.math.coffee"
+		},
+		{
+			"match": "((?<=Number\\.)(is(Finite|Integer|NaN)|toInteger))\\b",
+			"name": "support.function.static.number.coffee"
+		},
+		{
+			"match": "(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b",
+			"name": "support.variable.coffee"
+		},
+		{
+			"match": "\\b(Infinity|NaN|undefined)\\b",
+			"name": "constant.language.coffee"
+		},
+		{
+			"match": "\\;",
+			"name": "punctuation.terminator.statement.coffee"
+		},
+		{
+			"match": ",",
+			"name": "meta.delimiter.object.comma.coffee"
+		},
+		{
+			"match": "\\.",
+			"name": "meta.delimiter.method.period.coffee"
+		},
+		{
+			"match": "\\{|\\}",
+			"name": "meta.brace.curly.coffee"
+		},
+		{
+			"match": "\\(|\\)",
+			"name": "meta.brace.round.coffee"
+		},
+		{
+			"match": "\\[|\\]\\s*",
+			"name": "meta.brace.square.coffee"
+		},
+		{
+			"include": "#instance_variable"
+		},
+		{
+			"include": "#single_quoted_string"
+		},
+		{
+			"include": "#double_quoted_string"
+		},
+		{
+			"include": "#numeric"
+		}
+	],
+	"repository": {
+		"double_quoted_string": {
+			"patterns": [
+				{
+					"begin": "\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.coffee"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.coffee"
+						}
+					},
+					"name": "string.quoted.double.coffee",
+					"patterns": [
+						{
+							"match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
+							"name": "constant.character.escape.coffee"
+						},
+						{
+							"include": "#interpolated_coffee"
+						}
+					]
+				}
+			]
+		},
+		"embedded_comment": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.coffee"
+						}
+					},
+					"match": "(?<!\\\\)(#).*$\\n?",
+					"name": "comment.line.number-sign.coffee"
+				}
+			]
+		},
+		"instance_variable": {
+			"patterns": [
+				{
+					"match": "(@)([a-zA-Z_\\$]\\w*)?",
+					"name": "variable.other.readwrite.instance.coffee"
+				}
+			]
+		},
+		"interpolated_coffee": {
+			"patterns": [
+				{
+					"begin": "\\#\\{",
+					"captures": {
+						"0": {
+							"name": "punctuation.section.embedded.coffee"
+						}
+					},
+					"end": "\\}",
+					"name": "source.coffee.embedded.source",
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
+				}
+			]
+		},
+		"numeric": {
+			"patterns": [
+				{
+					"match": "(?<!\\$)\\b((0([box])[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?(e[+\\-]?[0-9]+)?))\\b",
+					"name": "constant.numeric.coffee"
+				}
+			]
+		},
+		"single_quoted_string": {
+			"patterns": [
+				{
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.coffee"
+						}
+					},
+					"end": "'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.coffee"
+						}
+					},
+					"name": "string.quoted.single.coffee",
+					"patterns": [
+						{
+							"match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
+							"name": "constant.character.escape.coffee"
+						}
+					]
+				}
+			]
+		},
+		"variable_name": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "variable.assignment.coffee"
+						}
+					},
+					"match": "([a-zA-Z\\$_]\\w*(\\.\\w+)*)",
+					"name": "variable.assignment.coffee"
+				}
+			]
+		},
+		"regex-character-class": {
+			"patterns": [
+				{
+					"match": "\\\\[wWsSdD]|\\.",
+					"name": "constant.character.character-class.regexp"
+				},
+				{
+					"match": "\\\\([0-7]{3}|x\\h\\h|u\\h\\h\\h\\h)",
+					"name": "constant.character.numeric.regexp"
+				},
+				{
+					"match": "\\\\c[A-Z]",
+					"name": "constant.character.control.regexp"
+				},
+				{
+					"match": "\\\\.",
+					"name": "constant.character.escape.backslash.regexp"
+				}
+			]
+		},
+		"heregexp": {
+			"patterns": [
+				{
+					"match": "\\\\[bB]|\\^|\\$",
+					"name": "keyword.control.anchor.regexp"
+				},
+				{
+					"match": "\\\\[1-9]\\d*",
+					"name": "keyword.other.back-reference.regexp"
+				},
+				{
+					"match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+					"name": "keyword.operator.quantifier.regexp"
+				},
+				{
+					"match": "\\|",
+					"name": "keyword.operator.or.regexp"
+				},
+				{
+					"begin": "(\\()((\\?=)|(\\?!))",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.group.regexp"
+						},
+						"3": {
+							"name": "meta.assertion.look-ahead.regexp"
+						},
+						"4": {
+							"name": "meta.assertion.negative-look-ahead.regexp"
+						}
+					},
+					"end": "(\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.group.regexp"
+						}
+					},
+					"name": "meta.group.assertion.regexp",
+					"patterns": [
+						{
+							"include": "#heregexp"
+						}
+					]
+				},
+				{
+					"begin": "\\((\\?:)?",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.regexp"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.regexp"
+						}
+					},
+					"name": "meta.group.regexp",
+					"patterns": [
+						{
+							"include": "#heregexp"
+						}
+					]
+				},
+				{
+					"begin": "(\\[)(\\^)?",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.character-class.regexp"
+						},
+						"2": {
+							"name": "keyword.operator.negation.regexp"
+						}
+					},
+					"end": "(\\])",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.character-class.regexp"
+						}
+					},
+					"name": "constant.other.character-class.set.regexp",
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "constant.character.numeric.regexp"
+								},
+								"2": {
+									"name": "constant.character.control.regexp"
+								},
+								"3": {
+									"name": "constant.character.escape.backslash.regexp"
+								},
+								"4": {
+									"name": "constant.character.numeric.regexp"
+								},
+								"5": {
+									"name": "constant.character.control.regexp"
+								},
+								"6": {
+									"name": "constant.character.escape.backslash.regexp"
+								}
+							},
+							"match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))",
+							"name": "constant.other.character-class.range.regexp"
+						},
+						{
+							"include": "#regex-character-class"
+						}
+					]
+				},
+				{
+					"include": "#regex-character-class"
+				},
+				{
+					"include": "#interpolated_coffee"
+				},
+				{
+					"include": "#embedded_comment"
+				}
+			]
+		}
+	},
+	"version": "https://github.com/atom/language-coffee-script/commit/062904ccd3f81bf3edcd8d21ba6ba38ffb615116"
+}
\ No newline at end of file
diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
index caa7c380ad0..22b844abc6f 100644
--- a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "regex",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -208,6 +208,72 @@
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
+	{
+		"c": "/",
+		"t": "source.coffee keyword.operator.coffee",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": "3",
+		"t": "source.coffee constant.numeric.coffee",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #09885A",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #09885A",
+			"hc_black": "constant.numeric: #B5CEA8"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.coffee variable.assignment.coffee",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.coffee",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.coffee keyword.operator.coffee",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": " b",
+		"t": "source.coffee",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "/",
 		"t": "source.coffee string.regexp.coffee punctuation.definition.string.begin.coffee",
@@ -220,18 +286,7 @@
 		}
 	},
 	{
-		"c": "3",
-		"t": "source.coffee string.regexp.coffee",
-		"r": {
-			"dark_plus": "string.regexp: #D16969",
-			"light_plus": "string.regexp: #811F3F",
-			"dark_vs": "string.regexp: #D16969",
-			"light_vs": "string.regexp: #811F3F",
-			"hc_black": "string.regexp: #D16969"
-		}
-	},
-	{
-		"c": "a = b/c ",
+		"c": "c ",
 		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
@@ -298,7 +353,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -353,7 +408,7 @@
 	},
 	{
 		"c": "test",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -375,7 +430,7 @@
 	},
 	{
 		"c": "///",
-		"t": "source.coffee string.regexp.block.coffee punctuation.definition.string.begin.coffee",
+		"t": "source.coffee string.regexp.coffee punctuation.definition.string.begin.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -386,7 +441,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -397,7 +452,7 @@
 	},
 	{
 		"c": "#{",
-		"t": "source.coffee string.regexp.block.coffee meta.embedded.line.coffee punctuation.section.embedded.begin.coffee",
+		"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -408,7 +463,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.coffee string.regexp.block.coffee meta.embedded.line.coffee source.coffee",
+		"t": "source.coffee string.regexp.coffee source.coffee.embedded.source",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -419,7 +474,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.coffee string.regexp.block.coffee meta.embedded.line.coffee punctuation.section.embedded.end.coffee source.coffee",
+		"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -430,7 +485,7 @@
 	},
 	{
 		"c": "fancyRegExp = ",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -441,7 +496,7 @@
 	},
 	{
 		"c": "///",
-		"t": "source.coffee string.regexp.block.coffee punctuation.definition.string.end.coffee",
+		"t": "source.coffee string.regexp.coffee punctuation.definition.string.end.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -661,7 +716,7 @@
 	},
 	{
 		"c": "///",
-		"t": "source.coffee string.regexp.block.coffee punctuation.definition.string.begin.coffee",
+		"t": "source.coffee string.regexp.coffee punctuation.definition.string.begin.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/coffeescript/test/colorize-results/test_coffee.json
index 5cdedf96e96..ddc88670619 100644
--- a/extensions/coffeescript/test/colorize-results/test_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test_coffee.json
@@ -110,18 +110,7 @@
 		}
 	},
 	{
-		"c": "(",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "@name",
+		"c": "(@name)",
 		"t": "source.coffee meta.inline.function.coffee variable.parameter.function.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
@@ -131,17 +120,6 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": ")",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.coffee meta.inline.function.coffee",
@@ -210,10 +188,10 @@
 	},
 	{
 		"c": "()",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
+		"t": "source.coffee meta.inline.function.coffee variable.parameter.function.coffee",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -298,7 +276,7 @@
 	},
 	{
 		"c": "#{",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee punctuation.section.embedded.begin.coffee",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -308,19 +286,8 @@
 		}
 	},
 	{
-		"c": "@",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee source.coffee variable.other.readwrite.instance.coffee punctuation.definition.variable.coffee",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "name",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee source.coffee variable.other.readwrite.instance.coffee",
+		"c": "@name",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source variable.other.readwrite.instance.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -331,7 +298,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee punctuation.section.embedded.end.coffee source.coffee",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -474,10 +441,10 @@
 	},
 	{
 		"c": "()",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
+		"t": "source.coffee meta.inline.function.coffee variable.parameter.function.coffee",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "default: #FFFFFF"
@@ -562,7 +529,7 @@
 	},
 	{
 		"c": "#{",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee punctuation.section.embedded.begin.coffee",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -572,19 +539,8 @@
 		}
 	},
 	{
-		"c": "@",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee source.coffee variable.other.readwrite.instance.coffee punctuation.definition.variable.coffee",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "name",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee source.coffee variable.other.readwrite.instance.coffee",
+		"c": "@name",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source variable.other.readwrite.instance.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -595,7 +551,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.coffee string.quoted.double.coffee meta.embedded.line.coffee punctuation.section.embedded.end.coffee source.coffee",
+		"t": "source.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -617,7 +573,7 @@
 	},
 	{
 		"c": "c",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -826,7 +782,7 @@
 	},
 	{
 		"c": "vehicles",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1034,7 +990,7 @@
 		}
 	},
 	{
-		"c": "startRace ",
+		"c": "startRace",
 		"t": "source.coffee meta.function.coffee entity.name.function.coffee",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
@@ -1044,6 +1000,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": " ",
+		"t": "source.coffee meta.function.coffee",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "=",
 		"t": "source.coffee keyword.operator.coffee",
@@ -1067,18 +1034,7 @@
 		}
 	},
 	{
-		"c": "(",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "vehicles",
+		"c": "(vehicles)",
 		"t": "source.coffee meta.inline.function.coffee variable.parameter.function.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
@@ -1088,17 +1044,6 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": ")",
-		"t": "source.coffee meta.inline.function.coffee punctuation.definition.parameters.begin.coffee",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.coffee meta.inline.function.coffee",
@@ -1255,7 +1200,7 @@
 	},
 	{
 		"c": "fancyRegExp",
-		"t": "source.coffee variable.other.assignment.coffee",
+		"t": "source.coffee variable.assignment.coffee",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1299,7 +1244,7 @@
 	},
 	{
 		"c": "///",
-		"t": "source.coffee string.regexp.block.coffee punctuation.definition.string.begin.coffee",
+		"t": "source.coffee string.regexp.coffee punctuation.definition.string.begin.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1310,7 +1255,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1321,7 +1266,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp punctuation.definition.group.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1332,7 +1277,7 @@
 	},
 	{
 		"c": "\\d",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp constant.character.character-class.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1343,7 +1288,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp keyword.operator.quantifier.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1354,7 +1299,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp punctuation.definition.group.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1365,7 +1310,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1376,7 +1321,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1387,7 +1332,7 @@
 	},
 	{
 		"c": " numbers",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1398,7 +1343,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1409,7 +1354,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp punctuation.definition.group.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1420,7 +1365,7 @@
 	},
 	{
 		"c": "\\w",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp constant.character.character-class.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1431,7 +1376,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp keyword.operator.quantifier.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1442,7 +1387,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.coffee string.regexp.block.coffee meta.group.regexp punctuation.definition.group.regexp",
+		"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1453,7 +1398,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1464,7 +1409,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1475,7 +1420,7 @@
 	},
 	{
 		"c": " letters",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1486,7 +1431,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1497,7 +1442,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.coffee string.regexp.block.coffee keyword.control.anchor.regexp",
+		"t": "source.coffee string.regexp.coffee keyword.control.anchor.regexp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1508,7 +1453,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.coffee string.regexp.block.coffee",
+		"t": "source.coffee string.regexp.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -1519,7 +1464,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee punctuation.definition.comment.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1530,7 +1475,7 @@
 	},
 	{
 		"c": " the end",
-		"t": "source.coffee string.regexp.block.coffee comment.line.number-sign.coffee",
+		"t": "source.coffee string.regexp.coffee comment.line.number-sign.coffee",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -1541,7 +1486,7 @@
 	},
 	{
 		"c": "///",
-		"t": "source.coffee string.regexp.block.coffee punctuation.definition.string.end.coffee",
+		"t": "source.coffee string.regexp.coffee punctuation.definition.string.end.coffee",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
diff --git a/extensions/markdown/test/colorize-results/test_md.json b/extensions/markdown/test/colorize-results/test_md.json
index da42b102670..fac438ae1e5 100644
--- a/extensions/markdown/test/colorize-results/test_md.json
+++ b/extensions/markdown/test/colorize-results/test_md.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "Header 1",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "Header 2",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": "Header 3 ###             (Hashes on right are optional)",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "Markdown plus h2 with a custom ID ##   {#id-goes-here}",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "Alternate heading styles:",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -1970,7 +1970,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -1981,7 +1981,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -1992,7 +1992,7 @@
 	},
 	{
 		"c": "Horizontal rules",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2146,7 +2146,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2157,7 +2157,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2168,7 +2168,7 @@
 	},
 	{
 		"c": "Markdown plus tables",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2179,7 +2179,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2190,7 +2190,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2311,7 +2311,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2322,7 +2322,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2333,7 +2333,7 @@
 	},
 	{
 		"c": "Markdown plus definition lists",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2344,7 +2344,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown",
+		"t": "text.html.markdown markup.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2355,7 +2355,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",