diff --git a/grammars/ts.cson b/grammars/ts.cson
new file mode 100644
index 000000000..bc9d3bb2e
--- /dev/null
+++ b/grammars/ts.cson
@@ -0,0 +1,974 @@
+name: "TypeScript"
+scopeName: "source.ts"
+fileTypes: [
+  "ts"
+]
+uuid: "ef98eb90-bf9b-11e4-bb52-0800200c9a66"
+patterns: [
+  {
+    include: "#expression"
+  }
+]
+repository:
+  "var-expr":
+    name: "meta.var.expr.ts"
+    begin: "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\s+([a-zA-Z_$][\\w$]*)"
+    beginCaptures:
+      "1":
+        name: "storage.type.ts"
+      "2":
+        name: "variable.ts"
+    end: "(?=$|[;=\\}\\{])|(?<=\\})"
+    patterns: [
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  "control-statement":
+    name: "keyword.control.ts"
+    match: "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\\b"
+  "switch-case":
+    name: "case.expr.ts"
+    begin: "(?<!\\.)\\b(case|default)\\b"
+    beginCaptures:
+      "1":
+        name: "keyword.control.ts"
+    end: ":"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  declaration:
+    name: "meta.declaration.ts"
+    patterns: [
+      {
+        include: "#function-declaration"
+      }
+      {
+        include: "#object-declaration"
+      }
+      {
+        include: "#type-declaration"
+      }
+      {
+        include: "#enum-declaration"
+      }
+    ]
+  "type-declaration":
+    name: "meta.type.declaration.ts"
+    begin: "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*=\\s*"
+    beginCaptures:
+      "1":
+        name: "keyword.other.ts"
+      "2":
+        name: "storage.type.ts"
+    end: "(?=[,);>]|var|type|function|class|interface)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "enum-declaration":
+    name: "meta.enum.declaration.ts"
+    match: "(?:\\b(const)\\s+)?\\b(enum)\\s+([a-zA-Z_$][\\w$]*)"
+    captures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "storage.type.ts"
+      "3":
+        name: "entity.name.class.ts"
+  "object-declaration":
+    name: "meta.declaration.object.ts"
+    begin: "\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?<!\\.)(class|interface)\\b"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "storage.modifier.ts"
+      "3":
+        name: "storage.type.ts"
+    end: "(?<=\\})"
+    endCaptures:
+      "1":
+        name: "brace.curly.ts"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#object-heritage"
+      }
+      {
+        include: "#object-name"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#object-body"
+      }
+    ]
+  "object-name":
+    name: "meta.object.name.ts"
+    match: "[a-zA-Z_$][\\w$]*"
+    captures:
+      "0":
+        name: "entity.name.class.ts"
+  "object-heritage":
+    name: "meta.object.heritage.ts"
+    begin: "(?:\\b(extends|implements))"
+    beginCaptures:
+      "1":
+        name: "keyword.other.ts"
+    end: "(?=\\{)"
+    endCaptures:
+      "1":
+        name: "brace.curly.ts"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#object-heritage-parent"
+      }
+    ]
+  "object-heritage-parent":
+    name: "meta.object.heritage.parent.ts"
+    match: "(?:\\s*([a-zA-Z_$][\\w$]*))"
+    captures:
+      "1":
+        name: "storage.type.ts"
+  "object-body":
+    name: "meta.object.body.ts"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    patterns: [
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#field-declaration"
+      }
+      {
+        include: "#method-declaration"
+      }
+      {
+        include: "#indexer-declaration"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#variable-initializer"
+      }
+      {
+        include: "#access-modifier"
+      }
+      {
+        include: "#static-modifier"
+      }
+      {
+        include: "#property-accessor"
+      }
+    ]
+  "type-object":
+    name: "meta.object.type.ts"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#field-declaration"
+      }
+      {
+        include: "#method-declaration"
+      }
+      {
+        include: "#indexer-declaration"
+      }
+      {
+        include: "#type-annotation"
+      }
+    ]
+  "field-declaration":
+    name: "meta.field.declaration.ts"
+    begin: "(?<!\\()\\s*((?:\\b[a-zA-Z_$][\\w$]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\"))\\s*(\\?\\s*)?(?=(=|:))"
+    beginCaptures:
+      "1":
+        name: "variable.ts"
+      "2":
+        name: "keyword.operator.ts"
+    end: "(?=\\}|;|,)|(?<=\\})"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "method-declaration":
+    name: "meta.method.declaration.ts"
+    begin: "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "storage.modifier.ts"
+      "3":
+        name: "storage.modifier.ts"
+      "4":
+        name: "storage.type.property.ts"
+      "5":
+        name: "keyword.operator.ts"
+      "6":
+        name: "entity.name.function.ts"
+      "7":
+        name: "keyword.operator.ts"
+    end: "(?=\\}|;|,)|(?<=\\})"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#method-overload-declaration"
+      }
+      {
+        include: "#decl-block"
+      }
+    ]
+  "method-overload-declaration":
+    name: "meta.method.overload.declaration.ts"
+    match: "\\b(?:(public|private|protected)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
+    captures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "keyword.operator.ts"
+      "3":
+        name: "entity.name.function.ts"
+      "4":
+        name: "keyword.operator.ts"
+  "indexer-declaration":
+    name: "meta.indexer.declaration.ts"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.ts"
+    end: "(\\])\\s*(\\?\\s*)?|$"
+    endCaptures:
+      "1":
+        name: "meta.brace.square.ts"
+      "2":
+        name: "keyword.operator.ts"
+    patterns: [
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#indexer-parameter"
+      }
+      {
+        include: "#expression"
+      }
+    ]
+  "indexer-parameter":
+    name: "meta.indexer.parameter.ts"
+    match: "([a-zA-Z_$][\\w$]*)(?=\\:)"
+    captures:
+      "1":
+        name: "variable.parameter.ts"
+  "function-declaration":
+    name: "meta.function.ts"
+    begin: "\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "storage.modifier.ts"
+      "3":
+        name: "storage.type.function.ts"
+      "4":
+        name: "entity.name.function.ts"
+    end: "(?=;|\\})|(?<=\\})"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+      {
+        include: "#return-type"
+      }
+      {
+        include: "#function-overload-declaration"
+      }
+      {
+        include: "#decl-block"
+      }
+    ]
+  "function-overload-declaration":
+    name: "meta.function.overload.ts"
+    match: "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
+    captures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "storage.type.function.ts"
+      "3":
+        name: "entity.name.function.ts"
+  block:
+    name: "meta.block.ts"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    patterns: [
+      {
+        include: "#object-member"
+      }
+      {
+        include: "#expression"
+      }
+    ]
+  "decl-block":
+    name: "meta.decl.block.ts"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.ts"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "parameter-name":
+    name: "parameter.name.ts"
+    match: "(?:\\s*\\b(public|private|protected)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)"
+    captures:
+      "1":
+        name: "storage.modifier.ts"
+      "2":
+        name: "keyword.operator.ts"
+      "3":
+        name: "variable.parameter.ts"
+      "4":
+        name: "keyword.operator.ts"
+  "return-type":
+    name: "meta.return.type.ts"
+    begin: "(?<=\\))\\s*:"
+    end: "(?=$)|(?=\\{|;|//)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "type-annotation":
+    name: "meta.type.annotation.ts"
+    begin: ":"
+    end: "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[a-zA-Z_$])\\s*(?=\\{)"
+    patterns: [
+      {
+        include: "#type"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  type:
+    name: "meta.type.ts"
+    patterns: [
+      {
+        include: "#type-primitive"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#type-tuple"
+      }
+      {
+        include: "#type-object"
+      }
+      {
+        include: "#type-operator"
+      }
+      {
+        include: "#type-paren-or-function-type-parameters"
+      }
+      {
+        include: "#type-function-return-type"
+      }
+      {
+        include: "#type-name"
+      }
+    ]
+  "function-type-parameters":
+    name: "meta.function.type.parameter.ts"
+    begin: "\\("
+    beginCaptures:
+      "0":
+        name: "meta.brace.round.ts"
+    end: "\\)"
+    endCaptures:
+      "0":
+        name: "meta.brace.round.ts"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#parameter-name"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#variable-initializer"
+      }
+    ]
+  "type-primitive":
+    name: "meta.type.primitive.ts"
+    match: "\\b(string|number|boolean|symbol|any|void)\\b"
+    captures:
+      "1":
+        name: "storage.type.ts"
+  "type-paren-or-function-type-parameters":
+    name: "meta.type.paren.cover.ts"
+    begin: "(?:\\b(new)\\b)?\\s*\\("
+    beginCaptures:
+      "1":
+        name: "keyword.control.ts"
+    end: "\\)"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+    ]
+  "await-modifier":
+    name: "storage.modifier.ts"
+    match: "await"
+  "type-operator":
+    name: "keyword.operator.type.ts"
+    match: "[.|]"
+  "type-function-return-type":
+    name: "meta.type.function.return.ts"
+    begin: "=>"
+    beginCaptures:
+      "0":
+        name: "keyword.operator.ts"
+    end: "(?=\\s*[,\\)\\{=;>]|//|$)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "type-tuple":
+    name: "meta.type.tuple.ts"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.ts"
+    end: "\\]"
+    endCaptures:
+      "0":
+        name: "meta.brace.square.ts"
+    patterns: [
+      {
+        include: "#type"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  "type-name":
+    name: "meta.type.name.ts"
+    match: "[a-zA-Z_$][.\\w$]*"
+    captures:
+      "1":
+        name: "entity.name.type.ts"
+  "type-parameters":
+    name: "meta.type.parameters.ts"
+    begin: "([a-zA-Z_$][\\w$]*)?(<)"
+    beginCaptures:
+      "1":
+        name: "entity.name.type.ts"
+      "2":
+        name: "meta.brace.angle.ts"
+    end: "(?=$)|(>)"
+    endCaptures:
+      "2":
+        name: "meta.brace.angle.ts"
+    patterns: [
+      {
+        name: "keyword.other.ts"
+        match: "\\b(extends)\\b"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type"
+      }
+    ]
+  "variable-initializer":
+    begin: "(=)"
+    beginCaptures:
+      "1":
+        name: "keyword.operator.ts"
+    end: "(?=$|[,);=])"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  expression:
+    name: "meta.expression.ts"
+    patterns: [
+      {
+        comment: "Match ES6 \"import from\" syntax"
+        match: "(import).*(from)\\s+((['\"`]).*\\4)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "keyword.other.ts"
+          "3":
+            name: "es6import.path.string"
+      }
+      {
+        comment: "Match import = require"
+        match: "(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\s*=\\s*(require)\\s*\\((.*)\\)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "variable.type.ts"
+          "3":
+            name: "keyword.other.ts"
+          "4":
+            name: "require.path.string"
+      }
+      {
+        comment: "Match <amd-module"
+        match: "(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "amd.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match <amd-dependency"
+        match: "(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "amd.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match full triple slash reference comments"
+        match: "(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "reference.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match debugger statement"
+        match: "\\b(debugger)\\b"
+        captures:
+          "1":
+            name: "keyword.debugger.ts"
+      }
+      {
+        include: "#for-in-simple"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#regex"
+      }
+      {
+        include: "#template"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#literal"
+      }
+      {
+        include: "#paren-expression"
+      }
+      {
+        include: "#var-expr"
+      }
+      {
+        include: "#declaration"
+      }
+      {
+        include: "#cast"
+      }
+      {
+        include: "#new-expr"
+      }
+      {
+        include: "#block"
+      }
+      {
+        include: "#expression-operator"
+      }
+      {
+        include: "#relational-operator"
+      }
+      {
+        include: "#arithmetic-operator"
+      }
+      {
+        include: "#logic-operator"
+      }
+      {
+        include: "#assignment-operator"
+      }
+      {
+        include: "#storage-keyword"
+      }
+      {
+        include: "#function-call"
+      }
+      {
+        include: "#switch-case"
+      }
+      {
+        include: "#control-statement"
+      }
+    ]
+  "for-in-simple":
+    name: "forin.expr.ts"
+    match: "(?<=\\()\\s*\\b(var|let|const)\\s+([a-zA-Z_$][\\w$]*)\\s+(in|of)\\b"
+    captures:
+      "1":
+        name: "storage.type.ts"
+      "3":
+        name: "keyword.operator.ts"
+  "function-call":
+    name: "functioncall.expr.ts"
+    patterns: [
+      {
+        include: "#await-modifier"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#paren-expression"
+      }
+    ]
+  cast:
+    name: "cast.expr.ts"
+    begin: "(?:(?<=return|throw|yield|await|[=(,:>]))\\s*(<)(?!<?\\=)"
+    beginCaptures:
+      "1":
+        name: "meta.brace.angle.ts"
+    end: ">"
+    endCaptures:
+      "0":
+        name: "meta.brace.angle.ts"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "new-expr":
+    name: "new.expr.ts"
+    begin: "\\b(new)\\b"
+    beginCaptures:
+      "1":
+        name: "keyword.operator.ts"
+    end: "(?=[(;]|$)"
+    patterns: [
+      {
+        include: "#type"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  "object-member":
+    name: "meta.object.member.ts"
+    begin: "[a-zA-Z_$][\\w$]*\\s*:"
+    end: "(?=,|\\})"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "expression-operator":
+    name: "keyword.operator.ts"
+    match: "=>|\\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void)\\b"
+  "arithmetic-operator":
+    name: "keyword.operator.arithmetic.ts"
+    match: "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%"
+  "relational-operator":
+    name: "keyword.operator.comparison.ts"
+    match: "===|==|=|!=|!==|<=|>=|<>|<|>"
+  "assignment-operator":
+    name: "keyword.operator.assignment.ts"
+    match: "<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
+  "logic-operator":
+    name: "keyword.operator.arithmetic.ts"
+    match: "\\!|&|~|\\||&&|\\|\\|"
+  "storage-keyword":
+    name: "storage.type.ts"
+    match: "\\b(number|boolean|string|any|var|let|function|const)\\b"
+  "paren-expression":
+    begin: "\\("
+    beginCaptures:
+      "0":
+        name: "meta.brace.paren.ts"
+    end: "\\)"
+    endCaptures:
+      "0":
+        name: "meta.brace.paren.ts"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "qstring-double":
+    name: "string.double.ts"
+    begin: "\""
+    end: "\"|(?=$)"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  "qstring-single":
+    name: "string.single.ts"
+    begin: "'"
+    end: "'|(?=$)"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  regex:
+    name: "string.regex.ts"
+    begin: "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])"
+    end: "$|(/)[igm]*"
+    patterns: [
+      {
+        name: "constant.character.escape.ts"
+        match: "\\\\."
+      }
+      {
+        name: "constant.character.class.ts"
+        match: "\\[(\\\\\\]|[^\\]])*\\]"
+      }
+    ]
+  string:
+    name: "string.ts"
+    patterns: [
+      {
+        include: "#qstring-single"
+      }
+      {
+        include: "#qstring-double"
+      }
+    ]
+  template:
+    name: "meta.template.ts"
+    begin: "`"
+    beginCaptures:
+      "0":
+        name: "string.template.ts"
+    end: "`"
+    endCaptures:
+      "0":
+        name: "string.template.ts"
+    patterns: [
+      {
+        include: "#template-substitution-element"
+      }
+      {
+        include: "#template-string-contents"
+      }
+    ]
+  "template-string-contents":
+    name: "string.template.ts"
+    begin: ".*?"
+    end: "(?=(\\$\\{|`))"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  "string-character-escape":
+    name: "constant.character.escape"
+    match: "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
+  "template-substitution-element":
+    name: "template.element.ts"
+    begin: "\\$\\{"
+    beginCaptures:
+      "0":
+        name: "keyword.operator.ts"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "keyword.operator.ts"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  comment:
+    name: "comment.ts"
+    patterns: [
+      {
+        include: "#comment-block-doc"
+      }
+      {
+        include: "#comment-block"
+      }
+      {
+        include: "#comment-line"
+      }
+    ]
+  "comment-block-doc":
+    name: "comment.block.documentation.ts"
+    begin: "/\\*\\*(?!/)"
+    end: "\\*/"
+  "comment-block":
+    name: "comment.block.ts"
+    begin: "/\\*"
+    end: "\\*/"
+  "comment-line":
+    name: "comment.line.ts"
+    match: "(//).*$\\n?"
+  literal:
+    name: "literal.ts"
+    patterns: [
+      {
+        include: "#numeric-literal"
+      }
+      {
+        include: "#boolean-literal"
+      }
+      {
+        include: "#null-literal"
+      }
+      {
+        include: "#undefined-literal"
+      }
+      {
+        include: "#array-literal"
+      }
+      {
+        include: "#this-literal"
+      }
+    ]
+  "array-literal":
+    name: "meta.array.literal.ts"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.ts"
+    end: "\\]"
+    endCaptures:
+      "0":
+        name: "meta.brace.square.ts"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "numeric-literal":
+    name: "constant.numeric.ts"
+    match: "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
+  "boolean-literal":
+    name: "constant.language.boolean.ts"
+    match: "\\b(false|true)\\b"
+  "null-literal":
+    name: "constant.language.null.ts"
+    match: "\\b(null)\\b"
+  "this-literal":
+    name: "constant.language.this.ts"
+    match: "\\b(this)\\b"
+  "undefined-literal":
+    name: "constant.language.ts"
+    match: "\\b(undefined)\\b"
+  "access-modifier":
+    name: "storage.modifier.ts"
+    match: "\\b(public|protected|private)\\b"
+  "static-modifier":
+    name: "keyword.other.ts"
+    match: "\\b(static)\\b"
+  "property-accessor":
+    name: "storage.type.property.ts"
+    match: "\\b(get|set)\\b"
\ No newline at end of file
diff --git a/grammars/tsx.cson b/grammars/tsx.cson
index 2a10dbc62..01118169e 100644
--- a/grammars/tsx.cson
+++ b/grammars/tsx.cson
@@ -1,1169 +1,1160 @@
-name: "TypeScript (TSX)"
+name: "TypeScriptReact"
 scopeName: "source.tsx"
 fileTypes: [
-	"tsx"
+  "tsx"
 ]
+uuid: "805375ec-d614-41f5-8993-5843fe63ea82"
 patterns: [
-	{
-		include: "#expression"
-	}
+  {
+    include: "#expression"
+  }
 ]
 repository:
-	"var-expr":
-		name: "meta.var.expr.tsx"
-		begin: "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\s+([a-zA-Z_$][\\w$]*)"
-		beginCaptures:
-			"1":
-				name: "storage.type.tsx"
-			"2":
-				name: "variable.tsx"
-		end: "(?=$|[;=\\}\\{])|(?<=\\})"
-		patterns: [
-			{
-				include: "#type-annotation"
-			}
-			{
-				include: "#string"
-			}
-			{
-				include: "#comment"
-			}
-		]
-	"control-statement":
-		name: "keyword.control.tsx"
-		match: "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|switch|case)\\b"
-	"switch-case":
-		name: "case.expr.tsx"
-		begin: "(?<!\\.)\\b(case|default)\\b"
-		beginCaptures:
-			"1":
-				name: "keyword.control.tsx"
-		end: ":"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	declaration:
-		name: "meta.declaration.tsx"
-		patterns: [
-			{
-				include: "#function-declaration"
-			}
-			{
-				include: "#object-declaration"
-			}
-			{
-				include: "#type-declaration"
-			}
-			{
-				include: "#enum-declaration"
-			}
-		]
-	"type-declaration":
-		name: "meta.type.declaration.tsx"
-		begin: "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*=\\s*"
-		beginCaptures:
-			"1":
-				name: "keyword.other.tsx"
-			"2":
-				name: "storage.type.tsx"
-		end: "(?=[,);>]|var|type|function|class|interface)"
-		patterns: [
-			{
-				include: "#type"
-			}
-		]
-	"enum-declaration":
-		name: "meta.enum.declaration.tsx"
-		match: "(?:\\b(const)\\s+)?\\b(enum)\\s+([a-zA-Z_$][\\w$]*)"
-		captures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "storage.type.tsx"
-			"3":
-				name: "entity.name.class.tsx"
-	"object-declaration":
-		name: "meta.declaration.object.tsx"
-		begin: "\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?<!\\.)(class|interface)\\b"
-		beginCaptures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "storage.modifier.tsx"
-			"3":
-				name: "storage.type.tsx"
-		end: "(?<=\\})"
-		endCaptures:
-			"1":
-				name: "brace.curly.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#object-heritage"
-			}
-			{
-				include: "#object-name"
-			}
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#object-body"
-			}
-		]
-	"object-name":
-		name: "meta.object.name.tsx"
-		match: "[a-zA-Z_$][\\w$]*"
-		captures:
-			"0":
-				name: "entity.name.class.tsx"
-	"object-heritage":
-		name: "meta.object.heritage.tsx"
-		begin: "(?:\\b(extends|implements))"
-		beginCaptures:
-			"1":
-				name: "keyword.other.tsx"
-		end: "(?=\\{)"
-		endCaptures:
-			"1":
-				name: "brace.curly.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#object-heritage-parent"
-			}
-		]
-	"object-heritage-parent":
-		name: "meta.object.heritage.parent.tsx"
-		match: "(?:\\s*([a-zA-Z_$][\\w$]*))"
-		captures:
-			"1":
-				name: "storage.type.tsx"
-	"object-body":
-		name: "meta.object.body.tsx"
-		begin: "\\{"
-		beginCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		end: "\\}"
-		endCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		patterns: [
-			{
-				include: "#string"
-			}
-			{
-				include: "#comment"
-			}
-			{
-				include: "#field-declaration"
-			}
-			{
-				include: "#method-declaration"
-			}
-			{
-				include: "#indexer-declaration"
-			}
-			{
-				include: "#type-annotation"
-			}
-			{
-				include: "#variable-initializer"
-			}
-			{
-				include: "#access-modifier"
-			}
-			{
-				include: "#static-modifier"
-			}
-			{
-				include: "#property-accessor"
-			}
-		]
-	"type-object":
-		name: "meta.object.type.tsx"
-		begin: "\\{"
-		beginCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		end: "\\}"
-		endCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#field-declaration"
-			}
-			{
-				include: "#method-declaration"
-			}
-			{
-				include: "#indexer-declaration"
-			}
-			{
-				include: "#type-annotation"
-			}
-		]
-	"field-declaration":
-		name: "meta.field.declaration.tsx"
-		begin: "(?<!\\()\\s*\\b([a-zA-Z_$][\\w$]*)\\s*(\\?\\s*)?(?=(=|:))"
-		beginCaptures:
-			"1":
-				name: "variable.tsx"
-			"2":
-				name: "keyword.operator.tsx"
-		end: "(?=\\}|;|,)|(?<=\\})"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"method-declaration":
-		name: "meta.method.declaration.tsx"
-		begin: "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
-		beginCaptures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "storage.modifier.tsx"
-			"3":
-				name: "storage.type.property.tsx"
-			"4":
-				name: "keyword.operator.tsx"
-			"5":
-				name: "entity.name.function.tsx"
-			"6":
-				name: "keyword.operator.tsx"
-		end: "(?=\\}|;|,)|(?<=\\})"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#function-type-parameters"
-			}
-			{
-				include: "#type-annotation"
-			}
-			{
-				include: "#method-overload-declaration"
-			}
-			{
-				include: "#decl-block"
-			}
-		]
-	"method-overload-declaration":
-		name: "meta.method.overload.declaration.tsx"
-		match: "\\b(?:(public|private|protected)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
-		captures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "keyword.operator.tsx"
-			"3":
-				name: "entity.name.function.tsx"
-			"4":
-				name: "keyword.operator.tsx"
-	"indexer-declaration":
-		name: "meta.indexer.declaration.tsx"
-		begin: "\\["
-		beginCaptures:
-			"0":
-				name: "meta.brace.square.tsx"
-		end: "(\\])\\s*(\\?\\s*)?|$"
-		endCaptures:
-			"1":
-				name: "meta.brace.square.tsx"
-			"2":
-				name: "keyword.operator.tsx"
-		patterns: [
-			{
-				include: "#type-annotation"
-			}
-			{
-				include: "#indexer-parameter"
-			}
-			{
-				include: "#expression"
-			}
-		]
-	"indexer-parameter":
-		name: "meta.indexer.parameter.tsx"
-		match: "([a-zA-Z_$][\\w$]*)(?=\\:)"
-		captures:
-			"1":
-				name: "variable.parameter.tsx"
-	"function-declaration":
-		name: "meta.function.tsx"
-		begin: "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
-		beginCaptures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "storage.type.function.tsx"
-			"3":
-				name: "entity.name.function.tsx"
-		end: "(?=;|\\})|(?<=\\})"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#function-type-parameters"
-			}
-			{
-				include: "#return-type"
-			}
-			{
-				include: "#function-overload-declaration"
-			}
-			{
-				include: "#decl-block"
-			}
-		]
-	"function-overload-declaration":
-		name: "meta.function.overload.tsx"
-		match: "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
-		captures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "storage.type.function.tsx"
-			"3":
-				name: "entity.name.function.tsx"
-	block:
-		name: "meta.block.tsx"
-		begin: "\\{"
-		beginCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		end: "\\}"
-		endCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-			{
-				include: "#object-member"
-			}
-		]
-	"decl-block":
-		name: "meta.decl.block.tsx"
-		begin: "\\{"
-		beginCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		end: "\\}"
-		endCaptures:
-			"0":
-				name: "meta.brace.curly.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"parameter-name":
-		name: "parameter.name.tsx"
-		match: "(?:\\s*\\b(public|private|protected)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)"
-		captures:
-			"1":
-				name: "storage.modifier.tsx"
-			"2":
-				name: "keyword.operator.tsx"
-			"3":
-				name: "variable.parameter.tsx"
-			"4":
-				name: "keyword.operator.tsx"
-	"return-type":
-		name: "meta.return.type.tsx"
-		begin: "(?<=\\))\\s*:"
-		end: "(?=$)|(?=\\{|;|//)"
-		patterns: [
-			{
-				include: "#type"
-			}
-		]
-	"type-annotation":
-		name: "meta.type.annotation.tsx"
-		begin: ":"
-		end: "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[a-zA-Z_$])\\s*(?=\\{)"
-		patterns: [
-			{
-				include: "#type"
-			}
-			{
-				include: "#string"
-			}
-			{
-				include: "#comment"
-			}
-		]
-	type:
-		name: "meta.type.tsx"
-		patterns: [
-			{
-				include: "#type-primitive"
-			}
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#type-tuple"
-			}
-			{
-				include: "#type-object"
-			}
-			{
-				include: "#type-operator"
-			}
-			{
-				include: "#type-paren-or-function-type-parameters"
-			}
-			{
-				include: "#type-function-return-type"
-			}
-			{
-				include: "#type-name"
-			}
-		]
-	"function-type-parameters":
-		name: "meta.function.type.parameter.tsx"
-		begin: "\\("
-		beginCaptures:
-			"0":
-				name: "meta.brace.round.tsx"
-		end: "\\)"
-		endCaptures:
-			"0":
-				name: "meta.brace.round.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#parameter-name"
-			}
-			{
-				include: "#type-annotation"
-			}
-			{
-				include: "#variable-initializer"
-			}
-		]
-	"type-primitive":
-		name: "meta.type.primitive.tsx"
-		match: "\\b(string|number|boolean|symbol|any|void)\\b"
-		captures:
-			"1":
-				name: "storage.type.tsx"
-	"type-paren-or-function-type-parameters":
-		name: "meta.type.paren.cover.tsx"
-		begin: "(?:\\b(new)\\b)?\\s*\\("
-		beginCaptures:
-			"1":
-				name: "keyword.control.tsx"
-		end: "\\)"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#type"
-			}
-			{
-				include: "#function-type-parameters"
-			}
-		]
-	"type-operator":
-		name: "keyword.operator.type.tsx"
-		match: "[.|]"
-	"type-function-return-type":
-		name: "meta.type.function.return.tsx"
-		begin: "=>"
-		beginCaptures:
-			"0":
-				name: "keyword.operator.tsx"
-		end: "(?=\\s*[,\\)\\{=;>]|//|$)"
-		patterns: [
-			{
-				include: "#type"
-			}
-		]
-	"type-tuple":
-		name: "meta.type.tuple.tsx"
-		begin: "\\["
-		beginCaptures:
-			"0":
-				name: "meta.brace.square.tsx"
-		end: "\\]"
-		endCaptures:
-			"0":
-				name: "meta.brace.square.tsx"
-		patterns: [
-			{
-				include: "#type"
-			}
-			{
-				include: "#comment"
-			}
-		]
-	"type-name":
-		name: "meta.type.name.tsx"
-		match: "[a-zA-Z_$][.\\w$]*"
-		captures:
-			"1":
-				name: "entity.name.type.tsx"
-	"type-parameters":
-		name: "meta.type.parameters.tsx"
-		begin: "([a-zA-Z_$][\\w$]*)?(<)"
-		beginCaptures:
-			"1":
-				name: "entity.name.type.tsx"
-			"2":
-				name: "meta.brace.angle.tsx"
-		end: "(?=$)|(>)"
-		endCaptures:
-			"2":
-				name: "meta.brace.angle.tsx"
-		patterns: [
-			{
-				name: "keyword.other.tsx"
-				match: "\\b(extends)\\b"
-			}
-			{
-				include: "#comment"
-			}
-			{
-				include: "#type"
-			}
-		]
-	"variable-initializer":
-		begin: "(=)"
-		beginCaptures:
-			"1":
-				name: "keyword.operator.tsx"
-		end: "(?=$|[,);=])"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	expression:
-		name: "meta.expression.tsx"
-		patterns: [
-			{
-				include: "#jsx"
-			}
-			{
-				include: "#for-in-simple"
-			}
-			{
-				include: "#string"
-			}
-			{
-				include: "#regex"
-			}
-			{
-				include: "#template"
-			}
-			{
-				include: "#comment"
-			}
-			{
-				include: "#literal"
-			}
-			{
-				include: "#paren-expression"
-			}
-			{
-				include: "#var-expr"
-			}
-			{
-				include: "#declaration"
-			}
-			{
-				include: "#new-expr"
-			}
-			{
-				include: "#block"
-			}
-			{
-				include: "#expression-operator"
-			}
-			{
-				include: "#relational-operator"
-			}
-			{
-				include: "#arithmetic-operator"
-			}
-			{
-				include: "#logic-operator"
-			}
-			{
-				include: "#assignment-operator"
-			}
-			{
-				include: "#storage-keyword"
-			}
-			{
-				include: "#function-call"
-			}
-			{
-				include: "#switch-case"
-			}
-			{
-				include: "#control-statement"
-			}
-		]
-	"for-in-simple":
-		name: "forin.expr.tsx"
-		match: "(?<=\\()\\s*\\b(var|let|const)\\s+([a-zA-Z_$][\\w$]*)\\s+(in|of)\\b"
-		captures:
-			"1":
-				name: "storage.type.tsx"
-			"3":
-				name: "keyword.operator.tsx"
-	"function-call":
-		name: "functioncall.expr.tsx"
-		patterns: [
-			{
-				include: "#type-parameters"
-			}
-			{
-				include: "#paren-expression"
-			}
-		]
-	"new-expr":
-		name: "new.expr.tsx"
-		begin: "\\b(new)\\b"
-		beginCaptures:
-			"1":
-				name: "keyword.operator.tsx"
-		end: "(?=[(;]|$)"
-		patterns: [
-			{
-				include: "#type"
-			}
-		]
-	"object-member":
-		name: "meta.object.member.tsx"
-		begin: "[a-zA-Z_$][\\w$]*\\s*:"
-		end: "(?=,|\\})"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"expression-operator":
-		name: "keyword.operator.tsx"
-		match: "=>|\\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\\b"
-	"arithmetic-operator":
-		name: "keyword.operator.arithmetic.tsx"
-		match: "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%"
-	"relational-operator":
-		name: "keyword.operator.comparison.tsx"
-		match: "===|==|=|!=|!==|<=|>=|<>|<|>"
-	"assignment-operator":
-		name: "keyword.operator.assignment.tsx"
-		match: "<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
-	"logic-operator":
-		name: "keyword.operator.arithmetic.tsx"
-		match: "\\!|&|~|\\||&&|\\|\\|"
-	"storage-keyword":
-		name: "storage.type.tsx"
-		match: "\\b(number|boolean|string|any|var|let|function|const)\\b"
-	"paren-expression":
-		begin: "\\("
-		beginCaptures:
-			"0":
-				name: "meta.brace.paren.tsx"
-		end: "\\)"
-		endCaptures:
-			"0":
-				name: "meta.brace.paren.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"qstring-double":
-		name: "string.double.tsx"
-		begin: "\""
-		end: "\"|(?=$)"
-		patterns: [
-			{
-				include: "#string-character-escape"
-			}
-		]
-	"qstring-single":
-		name: "string.single.tsx"
-		begin: "'"
-		end: "'|(?=$)"
-		patterns: [
-			{
-				include: "#string-character-escape"
-			}
-		]
-	regex:
-		name: "string.regex.tsx"
-		begin: "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])"
-		end: "$|(/)[igm]*"
-		patterns: [
-			{
-				name: "constant.character.escape.tsx"
-				match: "\\\\."
-			}
-			{
-				name: "constant.character.class.tsx"
-				match: "\\[(\\\\\\]|[^\\]])*\\]"
-			}
-		]
-	string:
-		name: "string.tsx"
-		patterns: [
-			{
-				include: "#qstring-single"
-			}
-			{
-				include: "#qstring-double"
-			}
-		]
-	template:
-		name: "meta.template.tsx"
-		begin: "`"
-		beginCaptures:
-			"0":
-				name: "string.template.tsx"
-		end: "`"
-		endCaptures:
-			"0":
-				name: "string.template.tsx"
-		patterns: [
-			{
-				include: "#template-substitution-element"
-			}
-			{
-				include: "#template-string-contents"
-			}
-		]
-	"template-string-contents":
-		name: "string.template.tsx"
-		begin: ".*?"
-		end: "(?=(\\$\\{|`))"
-		patterns: [
-			{
-				include: "#string-character-escape"
-			}
-		]
-	"string-character-escape":
-		name: "constant.character.escape"
-		match: "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
-	"template-substitution-element":
-		name: "template.element.tsx"
-		begin: "\\$\\{"
-		beginCaptures:
-			"0":
-				name: "keyword.operator.tsx"
-		end: "\\}"
-		endCaptures:
-			"0":
-				name: "keyword.operator.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	comment:
-		name: "comment.tsx"
-		patterns: [
-			{
-				include: "#comment-block-doc"
-			}
-			{
-				include: "#comment-block"
-			}
-			{
-				include: "#comment-line"
-			}
-		]
-	"comment-block-doc":
-		name: "comment.block.documentation.tsx"
-		begin: "/\\*\\*(?!/)"
-		end: "\\*/"
-	"comment-block":
-		name: "comment.block.tsx"
-		begin: "/\\*"
-		end: "\\*/"
-	"comment-line":
-		name: "comment.line.tsx"
-		match: "(//).*$\\n?"
-	literal:
-		name: "literal.tsx"
-		patterns: [
-			{
-				include: "#numeric-literal"
-			}
-			{
-				include: "#boolean-literal"
-			}
-			{
-				include: "#null-literal"
-			}
-			{
-				include: "#undefined-literal"
-			}
-			{
-				include: "#array-literal"
-			}
-			{
-				include: "#this-literal"
-			}
-		]
-	"array-literal":
-		name: "meta.array.literal.tsx"
-		begin: "\\["
-		beginCaptures:
-			"0":
-				name: "meta.brace.square.tsx"
-		end: "\\]"
-		endCaptures:
-			"0":
-				name: "meta.brace.square.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"numeric-literal":
-		name: "constant.numeric.tsx"
-		match: "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
-	"boolean-literal":
-		name: "constant.language.boolean.tsx"
-		match: "\\b(false|true)\\b"
-	"null-literal":
-		name: "constant.language.null.tsx"
-		match: "\\b(null)\\b"
-	"this-literal":
-		name: "constant.language.this.tsx"
-		match: "\\b(this)\\b"
-	"undefined-literal":
-		name: "constant.language.tsx"
-		match: "\\b(undefined)\\b"
-	"access-modifier":
-		name: "storage.modifier.tsx"
-		match: "\\b(public|protected|private)\\b"
-	"static-modifier":
-		name: "keyword.other.tsx"
-		match: "\\b(static)\\b"
-	"property-accessor":
-		name: "storage.type.property.tsx"
-		match: "\\b(get|set)\\b"
-	"jsx-tag-attributes":
-		patterns: [
-			{
-				include: "#jsx-tag-attribute-name"
-			}
-			{
-				include: "#jsx-tag-attribute-assignment"
-			}
-			{
-				include: "#jsx-string-double-quoted"
-			}
-			{
-				include: "#jsx-string-single-quoted"
-			}
-			{
-				include: "#jsx-evaluated-code"
-			}
-		]
-	"jsx-tag-attribute-name":
-		name: "meta.tag.attribute-name.tsx"
-		match: '''
-			(?x)
-			  \\s*
-			  ([_$a-zA-Z][-$\\w\\.]*)
-			  (?=\\s|=|/?>|/\\*|//)
-		'''
-		captures:
-			"1":
-				name: "entity.other.attribute-name.tsx"
-	"jsx-tag-attribute-assignment":
-		name: "keyword.operator.assignment.tsx"
-		match: "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))"
-	"jsx-string-double-quoted":
-		name: "string.quoted.double.tsx"
-		begin: "\""
-		end: "\""
-		beginCaptures:
-			"0":
-				name: "punctuation.definition.string.begin.tsx"
-		endCaptures:
-			"0":
-				name: "punctuation.definition.string.end.tsx"
-		patterns: [
-			{
-				include: "#jsx-entities"
-			}
-		]
-	"jsx-string-single-quoted":
-		name: "string.quoted.single.tsx"
-		begin: "'"
-		end: "'"
-		beginCaptures:
-			"0":
-				name: "punctuation.definition.string.begin.tsx"
-		endCaptures:
-			"0":
-				name: "punctuation.definition.string.end.tsx"
-		patterns: [
-			{
-				include: "#jsx-entities"
-			}
-		]
-	"jsx-entities":
-		patterns: [
-			{
-				name: "constant.character.entity.tsx"
-				match: "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)"
-				captures:
-					"1":
-						name: "punctuation.definition.entity.tsx"
-					"3":
-						name: "punctuation.definition.entity.tsx"
-			}
-			{
-				name: "invalid.illegal.bad-ampersand.tsx"
-				match: "&"
-			}
-		]
-	"jsx-evaluated-code":
-		name: "meta.brace.curly.tsx"
-		begin: "{"
-		end: "}"
-		beginCaptures:
-			"0":
-				name: "punctuation.definition.brace.curly.start.tsx"
-		endCaptures:
-			"0":
-				name: "punctuation.definition.brace.curly.end.tsx"
-		patterns: [
-			{
-				include: "#expression"
-			}
-		]
-	"jsx-tag-attributes-illegal":
-		name: "invalid.illegal.attribute.tsx"
-		match: "\\S+"
-	"jsx-tag-without-attributes":
-		name: "tag.without-attributes.tsx"
-		begin: "(<)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))(>)"
-		end: "(</)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))(>)"
-		beginCaptures:
-			"1":
-				name: "punctuation.definition.tag.begin.tsx"
-			"2":
-				name: "entity.name.tag.tsx"
-			"3":
-				name: "punctuation.definition.tag.end.tsx"
-		endCaptures:
-			"1":
-				name: "punctuation.definition.tag.begin.tsx"
-			"2":
-				name: "entity.name.tag.tsx"
-			"3":
-				name: "punctuation.definition.tag.end.tsx"
-		patterns: [
-			{
-				include: "#jsx-children"
-			}
-		]
-	"jsx-tag-open":
-		name: "tag.open.tsx"
-		begin: '''
-			(?x)
-			  (<)
-			  ([_$a-zA-Z][-$\\w.]*(?<!\\.|-))
-			  (?=\\s+(?!\\?)|/?>)
-		'''
-		end: "(/?>)"
-		beginCaptures:
-			"1":
-				name: "punctuation.definition.tag.begin.tsx"
-			"2":
-				name: "entity.name.tag.tsx"
-		endCaptures:
-			"1":
-				name: "punctuation.definition.tag.end.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-			{
-				include: "#jsx-tag-attributes"
-			}
-			{
-				include: "#jsx-tag-attributes-illegal"
-			}
-		]
-	"jsx-tag-close":
-		name: "tag.close.tsx"
-		begin: "(</)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))"
-		end: "(>)"
-		beginCaptures:
-			"1":
-				name: "punctuation.definition.tag.begin.tsx"
-			"2":
-				name: "entity.name.tag.tsx"
-		endCaptures:
-			"1":
-				name: "punctuation.definition.tag.end.tsx"
-		patterns: [
-			{
-				include: "#comment"
-			}
-		]
-	"jsx-tag-invalid":
-		name: "invalid.illegal.tag.incomplete.tsx"
-		match: "<\\s*>"
-	"jsx-children":
-		patterns: [
-			{
-				include: "#jsx-tag-without-attributes"
-			}
-			{
-				include: "#jsx-tag-open"
-			}
-			{
-				include: "#jsx-tag-close"
-			}
-			{
-				include: "#jsx-tag-invalid"
-			}
-			{
-				include: "#jsx-evaluated-code"
-			}
-			{
-				include: "#jsx-entities"
-			}
-		]
-	jsx:
-		name: "meta.jsx.tsx"
-		patterns: [
-			####
-		    # Rules that no one should change
-		    # These are used by code to provide fancy completions
-		    ####
-
-		    {
-		        'comment': 'Match debugger statement'
-		        'match': '\\s*(debugger)[\\s;]+'
-		        'captures':
-		          '1':
-		            'name':'keyword.debugger.ts'
-		    }
-		    {
-		        'comment': 'Match full triple slash reference comments'
-		        'match': '(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)'
-		        'captures':
-		          '1':
-		            'name':'keyword.other.ts'
-		          '2':
-		            'name':'reference.path.string'
-		          '3':
-		            'name':'keyword.other.ts'
-		    }
-		    {
-		        'comment': 'Match <amd-dependency'
-		        'match': '(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)'
-		        'captures':
-		          '1':
-		            'name':'keyword.other.ts'
-		          '2':
-		            'name':'amd.path.string'
-		          '3':
-		            'name':'keyword.other.ts'
-		    }
-		    {
-		        'comment': 'Match <amd-module'
-		        'match': '(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)'
-		        'captures':
-		          '1':
-		            'name':'keyword.other.ts'
-		          '2':
-		            'name':'amd.path.string'
-		          '3':
-		            'name':'keyword.other.ts'
-		    }
-		    {
-		        'comment': 'Match import = require'
-		        'match': '(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)?\\s*=\\s*(require)\\s*\\((.*)\\)'
-		        'captures':
-		          '1':
-		             'name':'keyword.other.ts'
-		          '2':
-		            'name':'variable.type.ts'
-		          '3':
-		             'name':'keyword.other.ts'
-		          '4':
-		            'name':'require.path.string'
-		    }
-		    {
-		        'comment': 'Match ES6 "import from" syntax'
-		        'match': '(import).*(from)\\s*(.*[\'"])'
-		        'captures':
-		          '1':
-		             'name':'keyword.other.ts'
-		          '2':
-		             'name':'keyword.other.ts'
-		          '3':
-		            'name':'es6import.path.string'
-		    }
-
-		    ####
-		    # Other rules
-		    ####
-
-			{
-				include: "#jsx-tag-without-attributes"
-			}
-			{
-				include: "#jsx-tag-open"
-			}
-			{
-				include: "#jsx-tag-close"
-			}
-			{
-				include: "#jsx-tag-invalid"
-			}
-			{
-				name: "meta.jsx.children.tsx"
-				begin: "(?<=(?:'|\"|})>)"
-				end: "(?=</)"
-				patterns: [
-					{
-						include: "#jsx-children"
-					}
-				]
-			}
-		]
+  "var-expr":
+    name: "meta.var.expr.tsx"
+    begin: "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\s+([a-zA-Z_$][\\w$]*)"
+    beginCaptures:
+      "1":
+        name: "storage.type.tsx"
+      "2":
+        name: "variable.tsx"
+    end: "(?=$|[;=\\}\\{])|(?<=\\})"
+    patterns: [
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  "control-statement":
+    name: "keyword.control.tsx"
+    match: "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|switch|case)\\b"
+  "switch-case":
+    name: "case.expr.tsx"
+    begin: "(?<!\\.)\\b(case|default)\\b"
+    beginCaptures:
+      "1":
+        name: "keyword.control.tsx"
+    end: ":"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  declaration:
+    name: "meta.declaration.tsx"
+    patterns: [
+      {
+        include: "#function-declaration"
+      }
+      {
+        include: "#object-declaration"
+      }
+      {
+        include: "#type-declaration"
+      }
+      {
+        include: "#enum-declaration"
+      }
+    ]
+  "type-declaration":
+    name: "meta.type.declaration.tsx"
+    begin: "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*=\\s*"
+    beginCaptures:
+      "1":
+        name: "keyword.other.tsx"
+      "2":
+        name: "storage.type.tsx"
+    end: "(?=[,);>]|var|type|function|class|interface)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "enum-declaration":
+    name: "meta.enum.declaration.tsx"
+    match: "(?:\\b(const)\\s+)?\\b(enum)\\s+([a-zA-Z_$][\\w$]*)"
+    captures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "storage.type.tsx"
+      "3":
+        name: "entity.name.class.tsx"
+  "object-declaration":
+    name: "meta.declaration.object.tsx"
+    begin: "\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?<!\\.)(class|interface)\\b"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "storage.modifier.tsx"
+      "3":
+        name: "storage.type.tsx"
+    end: "(?<=\\})"
+    endCaptures:
+      "1":
+        name: "brace.curly.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#object-heritage"
+      }
+      {
+        include: "#object-name"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#object-body"
+      }
+    ]
+  "object-name":
+    name: "meta.object.name.tsx"
+    match: "[a-zA-Z_$][\\w$]*"
+    captures:
+      "0":
+        name: "entity.name.class.tsx"
+  "object-heritage":
+    name: "meta.object.heritage.tsx"
+    begin: "(?:\\b(extends|implements))"
+    beginCaptures:
+      "1":
+        name: "keyword.other.tsx"
+    end: "(?=\\{)"
+    endCaptures:
+      "1":
+        name: "brace.curly.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#object-heritage-parent"
+      }
+    ]
+  "object-heritage-parent":
+    name: "meta.object.heritage.parent.tsx"
+    match: "(?:\\s*([a-zA-Z_$][\\w$]*))"
+    captures:
+      "1":
+        name: "storage.type.tsx"
+  "object-body":
+    name: "meta.object.body.tsx"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    patterns: [
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#field-declaration"
+      }
+      {
+        include: "#method-declaration"
+      }
+      {
+        include: "#indexer-declaration"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#variable-initializer"
+      }
+      {
+        include: "#access-modifier"
+      }
+      {
+        include: "#static-modifier"
+      }
+      {
+        include: "#property-accessor"
+      }
+    ]
+  "type-object":
+    name: "meta.object.type.tsx"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#field-declaration"
+      }
+      {
+        include: "#method-declaration"
+      }
+      {
+        include: "#indexer-declaration"
+      }
+      {
+        include: "#type-annotation"
+      }
+    ]
+  "field-declaration":
+    name: "meta.field.declaration.tsx"
+    begin: "(?<!\\()\\s*((?:\\b[a-zA-Z_$][\\w$]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\"))\\s*(\\?\\s*)?(?=(=|:))"
+    beginCaptures:
+      "1":
+        name: "variable.tsx"
+      "2":
+        name: "keyword.operator.tsx"
+    end: "(?=\\}|;|,)|(?<=\\})"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "method-declaration":
+    name: "meta.method.declaration.tsx"
+    begin: "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "storage.modifier.tsx"
+      "3":
+        name: "storage.type.property.tsx"
+      "4":
+        name: "keyword.operator.tsx"
+      "5":
+        name: "entity.name.function.tsx"
+      "6":
+        name: "keyword.operator.tsx"
+    end: "(?=\\}|;|,)|(?<=\\})"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#method-overload-declaration"
+      }
+      {
+        include: "#decl-block"
+      }
+    ]
+  "method-overload-declaration":
+    name: "meta.method.overload.declaration.tsx"
+    match: "\\b(?:(public|private|protected)\\s+)?(?:(new)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)"
+    captures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "keyword.operator.tsx"
+      "3":
+        name: "entity.name.function.tsx"
+      "4":
+        name: "keyword.operator.tsx"
+  "indexer-declaration":
+    name: "meta.indexer.declaration.tsx"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.tsx"
+    end: "(\\])\\s*(\\?\\s*)?|$"
+    endCaptures:
+      "1":
+        name: "meta.brace.square.tsx"
+      "2":
+        name: "keyword.operator.tsx"
+    patterns: [
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#indexer-parameter"
+      }
+      {
+        include: "#expression"
+      }
+    ]
+  "indexer-parameter":
+    name: "meta.indexer.parameter.tsx"
+    match: "([a-zA-Z_$][\\w$]*)(?=\\:)"
+    captures:
+      "1":
+        name: "variable.parameter.tsx"
+  "function-declaration":
+    name: "meta.function.tsx"
+    begin: "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
+    beginCaptures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "storage.type.function.tsx"
+      "3":
+        name: "entity.name.function.tsx"
+    end: "(?=;|\\})|(?<=\\})"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+      {
+        include: "#return-type"
+      }
+      {
+        include: "#function-overload-declaration"
+      }
+      {
+        include: "#decl-block"
+      }
+    ]
+  "function-overload-declaration":
+    name: "meta.function.overload.tsx"
+    match: "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*"
+    captures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "storage.type.function.tsx"
+      "3":
+        name: "entity.name.function.tsx"
+  block:
+    name: "meta.block.tsx"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    patterns: [
+      {
+        include: "#object-member"
+      }
+      {
+        include: "#expression"
+      }
+    ]
+  "decl-block":
+    name: "meta.decl.block.tsx"
+    begin: "\\{"
+    beginCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "meta.brace.curly.tsx"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "parameter-name":
+    name: "parameter.name.tsx"
+    match: "(?:\\s*\\b(public|private|protected)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)"
+    captures:
+      "1":
+        name: "storage.modifier.tsx"
+      "2":
+        name: "keyword.operator.tsx"
+      "3":
+        name: "variable.parameter.tsx"
+      "4":
+        name: "keyword.operator.tsx"
+  "return-type":
+    name: "meta.return.type.tsx"
+    begin: "(?<=\\))\\s*:"
+    end: "(?=$)|(?=\\{|;|//)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "type-annotation":
+    name: "meta.type.annotation.tsx"
+    begin: ":"
+    end: "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[a-zA-Z_$])\\s*(?=\\{)"
+    patterns: [
+      {
+        include: "#type"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  type:
+    name: "meta.type.tsx"
+    patterns: [
+      {
+        include: "#type-primitive"
+      }
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#type-tuple"
+      }
+      {
+        include: "#type-object"
+      }
+      {
+        include: "#type-operator"
+      }
+      {
+        include: "#type-paren-or-function-type-parameters"
+      }
+      {
+        include: "#type-function-return-type"
+      }
+      {
+        include: "#type-name"
+      }
+    ]
+  "function-type-parameters":
+    name: "meta.function.type.parameter.tsx"
+    begin: "\\("
+    beginCaptures:
+      "0":
+        name: "meta.brace.round.tsx"
+    end: "\\)"
+    endCaptures:
+      "0":
+        name: "meta.brace.round.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#parameter-name"
+      }
+      {
+        include: "#type-annotation"
+      }
+      {
+        include: "#variable-initializer"
+      }
+    ]
+  "type-primitive":
+    name: "meta.type.primitive.tsx"
+    match: "\\b(string|number|boolean|symbol|any|void)\\b"
+    captures:
+      "1":
+        name: "storage.type.tsx"
+  "type-paren-or-function-type-parameters":
+    name: "meta.type.paren.cover.tsx"
+    begin: "(?:\\b(new)\\b)?\\s*\\("
+    beginCaptures:
+      "1":
+        name: "keyword.control.tsx"
+    end: "\\)"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type"
+      }
+      {
+        include: "#function-type-parameters"
+      }
+    ]
+  "type-operator":
+    name: "keyword.operator.type.tsx"
+    match: "[.|]"
+  "type-function-return-type":
+    name: "meta.type.function.return.tsx"
+    begin: "=>"
+    beginCaptures:
+      "0":
+        name: "keyword.operator.tsx"
+    end: "(?=\\s*[,\\)\\{=;>]|//|$)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "type-tuple":
+    name: "meta.type.tuple.tsx"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.tsx"
+    end: "\\]"
+    endCaptures:
+      "0":
+        name: "meta.brace.square.tsx"
+    patterns: [
+      {
+        include: "#type"
+      }
+      {
+        include: "#comment"
+      }
+    ]
+  "type-name":
+    name: "meta.type.name.tsx"
+    match: "[a-zA-Z_$][.\\w$]*"
+    captures:
+      "1":
+        name: "entity.name.type.tsx"
+  "type-parameters":
+    name: "meta.type.parameters.tsx"
+    begin: "([a-zA-Z_$][\\w$]*)?(<)"
+    beginCaptures:
+      "1":
+        name: "entity.name.type.tsx"
+      "2":
+        name: "meta.brace.angle.tsx"
+    end: "(?=$)|(>)"
+    endCaptures:
+      "2":
+        name: "meta.brace.angle.tsx"
+    patterns: [
+      {
+        name: "keyword.other.tsx"
+        match: "\\b(extends)\\b"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#type"
+      }
+    ]
+  "variable-initializer":
+    begin: "(=)"
+    beginCaptures:
+      "1":
+        name: "keyword.operator.tsx"
+    end: "(?=$|[,);=])"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  expression:
+    name: "meta.expression.tsx"
+    patterns: [
+      {
+        comment: "Match ES6 \"import from\" syntax"
+        match: "(import).*(from)\\s+((['\"`]).*\\4)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "keyword.other.ts"
+          "3":
+            name: "es6import.path.string"
+      }
+      {
+        comment: "Match import = require"
+        match: "(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\s*=\\s*(require)\\s*\\((.*)\\)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "variable.type.ts"
+          "3":
+            name: "keyword.other.ts"
+          "4":
+            name: "require.path.string"
+      }
+      {
+        comment: "Match <amd-module"
+        match: "(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "amd.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match <amd-dependency"
+        match: "(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "amd.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match full triple slash reference comments"
+        match: "(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)"
+        captures:
+          "1":
+            name: "keyword.other.ts"
+          "2":
+            name: "reference.path.string"
+          "3":
+            name: "keyword.other.ts"
+      }
+      {
+        comment: "Match debugger statement"
+        match: "\\b(debugger)\\b"
+        captures:
+          "1":
+            name: "keyword.debugger.ts"
+      }
+      {
+        include: "#jsx"
+      }
+      {
+        include: "#for-in-simple"
+      }
+      {
+        include: "#string"
+      }
+      {
+        include: "#regex"
+      }
+      {
+        include: "#template"
+      }
+      {
+        include: "#comment"
+      }
+      {
+        include: "#literal"
+      }
+      {
+        include: "#paren-expression"
+      }
+      {
+        include: "#var-expr"
+      }
+      {
+        include: "#declaration"
+      }
+      {
+        include: "#new-expr"
+      }
+      {
+        include: "#block"
+      }
+      {
+        include: "#expression-operator"
+      }
+      {
+        include: "#relational-operator"
+      }
+      {
+        include: "#arithmetic-operator"
+      }
+      {
+        include: "#logic-operator"
+      }
+      {
+        include: "#assignment-operator"
+      }
+      {
+        include: "#storage-keyword"
+      }
+      {
+        include: "#function-call"
+      }
+      {
+        include: "#switch-case"
+      }
+      {
+        include: "#control-statement"
+      }
+    ]
+  "for-in-simple":
+    name: "forin.expr.tsx"
+    match: "(?<=\\()\\s*\\b(var|let|const)\\s+([a-zA-Z_$][\\w$]*)\\s+(in|of)\\b"
+    captures:
+      "1":
+        name: "storage.type.tsx"
+      "3":
+        name: "keyword.operator.tsx"
+  "function-call":
+    name: "functioncall.expr.tsx"
+    patterns: [
+      {
+        include: "#type-parameters"
+      }
+      {
+        include: "#paren-expression"
+      }
+    ]
+  "new-expr":
+    name: "new.expr.tsx"
+    begin: "\\b(new)\\b"
+    beginCaptures:
+      "1":
+        name: "keyword.operator.tsx"
+    end: "(?=[(;]|$)"
+    patterns: [
+      {
+        include: "#type"
+      }
+    ]
+  "object-member":
+    name: "meta.object.member.tsx"
+    begin: "[a-zA-Z_$][\\w$]*\\s*:"
+    end: "(?=,|\\})"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "expression-operator":
+    name: "keyword.operator.tsx"
+    match: "=>|\\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\\b"
+  "arithmetic-operator":
+    name: "keyword.operator.arithmetic.tsx"
+    match: "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%"
+  "relational-operator":
+    name: "keyword.operator.comparison.tsx"
+    match: "===|==|=|!=|!==|<=|>=|<>|<|>"
+  "assignment-operator":
+    name: "keyword.operator.assignment.tsx"
+    match: "<<=|>>=|>>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
+  "logic-operator":
+    name: "keyword.operator.arithmetic.tsx"
+    match: "\\!|&|~|\\||&&|\\|\\|"
+  "storage-keyword":
+    name: "storage.type.tsx"
+    match: "\\b(number|boolean|string|any|var|let|function|const)\\b"
+  "paren-expression":
+    begin: "\\("
+    beginCaptures:
+      "0":
+        name: "meta.brace.paren.tsx"
+    end: "\\)"
+    endCaptures:
+      "0":
+        name: "meta.brace.paren.tsx"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "qstring-double":
+    name: "string.double.tsx"
+    begin: "\""
+    end: "\"|(?=$)"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  "qstring-single":
+    name: "string.single.tsx"
+    begin: "'"
+    end: "'|(?=$)"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  regex:
+    name: "string.regex.tsx"
+    begin: "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])"
+    end: "$|(/)[igm]*"
+    patterns: [
+      {
+        name: "constant.character.escape.tsx"
+        match: "\\\\."
+      }
+      {
+        name: "constant.character.class.tsx"
+        match: "\\[(\\\\\\]|[^\\]])*\\]"
+      }
+    ]
+  string:
+    name: "string.tsx"
+    patterns: [
+      {
+        include: "#qstring-single"
+      }
+      {
+        include: "#qstring-double"
+      }
+    ]
+  template:
+    name: "meta.template.tsx"
+    begin: "`"
+    beginCaptures:
+      "0":
+        name: "string.template.tsx"
+    end: "`"
+    endCaptures:
+      "0":
+        name: "string.template.tsx"
+    patterns: [
+      {
+        include: "#template-substitution-element"
+      }
+      {
+        include: "#template-string-contents"
+      }
+    ]
+  "template-string-contents":
+    name: "string.template.tsx"
+    begin: ".*?"
+    end: "(?=(\\$\\{|`))"
+    patterns: [
+      {
+        include: "#string-character-escape"
+      }
+    ]
+  "string-character-escape":
+    name: "constant.character.escape"
+    match: "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
+  "template-substitution-element":
+    name: "template.element.tsx"
+    begin: "\\$\\{"
+    beginCaptures:
+      "0":
+        name: "keyword.operator.tsx"
+    end: "\\}"
+    endCaptures:
+      "0":
+        name: "keyword.operator.tsx"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  comment:
+    name: "comment.tsx"
+    patterns: [
+      {
+        include: "#comment-block-doc"
+      }
+      {
+        include: "#comment-block"
+      }
+      {
+        include: "#comment-line"
+      }
+    ]
+  "comment-block-doc":
+    name: "comment.block.documentation.tsx"
+    begin: "/\\*\\*(?!/)"
+    end: "\\*/"
+  "comment-block":
+    name: "comment.block.tsx"
+    begin: "/\\*"
+    end: "\\*/"
+  "comment-line":
+    name: "comment.line.tsx"
+    match: "(//).*$\\n?"
+  literal:
+    name: "literal.tsx"
+    patterns: [
+      {
+        include: "#numeric-literal"
+      }
+      {
+        include: "#boolean-literal"
+      }
+      {
+        include: "#null-literal"
+      }
+      {
+        include: "#undefined-literal"
+      }
+      {
+        include: "#array-literal"
+      }
+      {
+        include: "#this-literal"
+      }
+    ]
+  "array-literal":
+    name: "meta.array.literal.tsx"
+    begin: "\\["
+    beginCaptures:
+      "0":
+        name: "meta.brace.square.tsx"
+    end: "\\]"
+    endCaptures:
+      "0":
+        name: "meta.brace.square.tsx"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "numeric-literal":
+    name: "constant.numeric.tsx"
+    match: "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
+  "boolean-literal":
+    name: "constant.language.boolean.tsx"
+    match: "\\b(false|true)\\b"
+  "null-literal":
+    name: "constant.language.null.tsx"
+    match: "\\b(null)\\b"
+  "this-literal":
+    name: "constant.language.this.tsx"
+    match: "\\b(this)\\b"
+  "undefined-literal":
+    name: "constant.language.tsx"
+    match: "\\b(undefined)\\b"
+  "access-modifier":
+    name: "storage.modifier.tsx"
+    match: "\\b(public|protected|private)\\b"
+  "static-modifier":
+    name: "keyword.other.tsx"
+    match: "\\b(static)\\b"
+  "property-accessor":
+    name: "storage.type.property.tsx"
+    match: "\\b(get|set)\\b"
+  "jsx-tag-attributes":
+    patterns: [
+      {
+        include: "#jsx-tag-attribute-name"
+      }
+      {
+        include: "#jsx-tag-attribute-assignment"
+      }
+      {
+        include: "#jsx-string-double-quoted"
+      }
+      {
+        include: "#jsx-string-single-quoted"
+      }
+      {
+        include: "#jsx-evaluated-code"
+      }
+    ]
+  "jsx-tag-attribute-name":
+    name: "meta.tag.attribute-name.tsx"
+    match: '''
+      (?x)
+        \\s*
+        ([_$a-zA-Z][-$\\w]*)
+        (?=\\s|=|/?>|/\\*|//)
+    '''
+    captures:
+      "1":
+        name: "entity.other.attribute-name.tsx"
+  "jsx-tag-attribute-assignment":
+    name: "keyword.operator.assignment.tsx"
+    match: "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))"
+  "jsx-string-double-quoted":
+    name: "string.quoted.double.tsx"
+    begin: "\""
+    end: "\""
+    beginCaptures:
+      "0":
+        name: "punctuation.definition.string.begin.tsx"
+    endCaptures:
+      "0":
+        name: "punctuation.definition.string.end.tsx"
+    patterns: [
+      {
+        include: "#jsx-entities"
+      }
+    ]
+  "jsx-string-single-quoted":
+    name: "string.quoted.single.tsx"
+    begin: "'"
+    end: "'"
+    beginCaptures:
+      "0":
+        name: "punctuation.definition.string.begin.tsx"
+    endCaptures:
+      "0":
+        name: "punctuation.definition.string.end.tsx"
+    patterns: [
+      {
+        include: "#jsx-entities"
+      }
+    ]
+  "jsx-entities":
+    patterns: [
+      {
+        name: "constant.character.entity.tsx"
+        match: "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)"
+        captures:
+          "1":
+            name: "punctuation.definition.entity.tsx"
+          "3":
+            name: "punctuation.definition.entity.tsx"
+      }
+      {
+        name: "invalid.illegal.bad-ampersand.tsx"
+        match: "&"
+      }
+    ]
+  "jsx-evaluated-code":
+    name: "meta.brace.curly.tsx"
+    begin: "{"
+    end: "}"
+    beginCaptures:
+      "0":
+        name: "punctuation.definition.brace.curly.start.tsx"
+    endCaptures:
+      "0":
+        name: "punctuation.definition.brace.curly.end.tsx"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
+  "jsx-tag-attributes-illegal":
+    name: "invalid.illegal.attribute.tsx"
+    match: "\\S+"
+  "jsx-tag-without-attributes":
+    name: "tag.without-attributes.tsx"
+    begin: "(<)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))(>)"
+    end: "(</)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))(>)"
+    beginCaptures:
+      "1":
+        name: "punctuation.definition.tag.begin.tsx"
+      "2":
+        name: "entity.name.tag.tsx"
+      "3":
+        name: "punctuation.definition.tag.end.tsx"
+    endCaptures:
+      "1":
+        name: "punctuation.definition.tag.begin.tsx"
+      "2":
+        name: "entity.name.tag.tsx"
+      "3":
+        name: "punctuation.definition.tag.end.tsx"
+    patterns: [
+      {
+        include: "#jsx-children"
+      }
+    ]
+  "jsx-tag-open":
+    name: "tag.open.tsx"
+    begin: '''
+      (?x)
+        (<)
+        ([_$a-zA-Z][-$\\w.]*(?<!\\.|-))
+        (?=\\s+(?!\\?)|/?>)
+    '''
+    end: "(/?>)"
+    beginCaptures:
+      "1":
+        name: "punctuation.definition.tag.begin.tsx"
+      "2":
+        name: "entity.name.tag.tsx"
+    endCaptures:
+      "1":
+        name: "punctuation.definition.tag.end.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+      {
+        include: "#jsx-tag-attributes"
+      }
+      {
+        include: "#jsx-tag-attributes-illegal"
+      }
+    ]
+  "jsx-tag-close":
+    name: "tag.close.tsx"
+    begin: "(</)([_$a-zA-Z][-$\\w.]*(?<!\\.|-))"
+    end: "(>)"
+    beginCaptures:
+      "1":
+        name: "punctuation.definition.tag.begin.tsx"
+      "2":
+        name: "entity.name.tag.tsx"
+    endCaptures:
+      "1":
+        name: "punctuation.definition.tag.end.tsx"
+    patterns: [
+      {
+        include: "#comment"
+      }
+    ]
+  "jsx-tag-invalid":
+    name: "invalid.illegal.tag.incomplete.tsx"
+    match: "<\\s*>"
+  "jsx-children":
+    patterns: [
+      {
+        include: "#jsx-tag-without-attributes"
+      }
+      {
+        include: "#jsx-tag-open"
+      }
+      {
+        include: "#jsx-tag-close"
+      }
+      {
+        include: "#jsx-tag-invalid"
+      }
+      {
+        include: "#jsx-evaluated-code"
+      }
+      {
+        include: "#jsx-entities"
+      }
+    ]
+  jsx:
+    name: "meta.jsx.tsx"
+    patterns: [
+      {
+        include: "#jsx-tag-without-attributes"
+      }
+      {
+        include: "#jsx-tag-open"
+      }
+      {
+        include: "#jsx-tag-close"
+      }
+      {
+        include: "#jsx-tag-invalid"
+      }
+      {
+        name: "meta.jsx.children.tsx"
+        begin: "(?<=(?:'|\"|})>)"
+        end: "(?=</)"
+        patterns: [
+          {
+            include: "#jsx-children"
+          }
+        ]
+      }
+    ]
\ No newline at end of file
diff --git a/grammars/typescript.cson b/grammars/typescript.cson
deleted file mode 100644
index 9695e5078..000000000
--- a/grammars/typescript.cson
+++ /dev/null
@@ -1,1389 +0,0 @@
-'scopeName': 'source.ts'
-'comment': 'TypeScript Syntax: version 1.0'
-'fileTypes': [
-  'ts'
-  'str'
-  'tst'
-]
-'name': 'TypeScript'
-
-'patterns': [
-  ####
-  # Rules that no one should change
-  # These are used by code to provide fancy completions
-  ####
-  {
-      'comment': 'Match debugger statement'
-      'match': '\\s*(debugger)[\\s;]+'
-      'captures':
-        '1':
-          'name':'keyword.debugger.ts'
-  }
-  {
-      'comment': 'Match full triple slash reference comments'
-      'match': '(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)'
-      'captures':
-        '1':
-          'name':'keyword.other.ts'
-        '2':
-          'name':'reference.path.string'
-        '3':
-          'name':'keyword.other.ts'
-  }
-  {
-      'comment': 'Match <amd-dependency'
-      'match': '(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)'
-      'captures':
-        '1':
-          'name':'keyword.other.ts'
-        '2':
-          'name':'amd.path.string'
-        '3':
-          'name':'keyword.other.ts'
-  }
-  {
-      'comment': 'Match <amd-module'
-      'match': '(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)'
-      'captures':
-        '1':
-          'name':'keyword.other.ts'
-        '2':
-          'name':'amd.path.string'
-        '3':
-          'name':'keyword.other.ts'
-  }
-  {
-      'comment': 'Match import = require'
-      'match': '(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)?\\s*=\\s*(require)\\s*\\((.*)\\)'
-      'captures':
-        '1':
-           'name':'keyword.other.ts'
-        '2':
-          'name':'variable.type.ts'
-        '3':
-           'name':'keyword.other.ts'
-        '4':
-          'name':'require.path.string'
-  }
-  {
-      'comment': 'Match ES6 "import from" syntax'
-      'match': '(import).*(from)\\s*(.*[\'"])'
-      'captures':
-        '1':
-           'name':'keyword.other.ts'
-        '2':
-           'name':'keyword.other.ts'
-        '3':
-          'name':'es6import.path.string'
-  }
-
-  ####
-  # Other rules
-  ####
-
-  {
-    'comment': 'Match stuff like: namespace name {...}'
-    'match': '(?:^|(;)|\\s)(module|namespace)\\s+([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\s*'
-    'captures':
-      '1':
-        'name': 'meta.delimiter.semicolon.js'
-      '2':
-        'name': 'keyword.other.ts'
-      '3':
-        'patterns': [
-          {
-            'match': '[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*'
-            'name': 'entity.name.type.namespace.ts'
-          }
-        ]
-  }
-  {
-    'comment': 'Match types in variable definitions.'
-    'begin': '(var|const|let)\\s+'
-    'beginCaptures':
-      '1':
-        'name': 'storage.modifier.js'
-    'end': '(;)|\\b(in|of)\\b|(?<!,|^)$'
-    'endCaptures':
-      '1':
-        'name': 'punctuation.terminator.statement.js'
-      '2':
-        'name': 'keyword.other.js'
-    'patterns': [
-      {
-        'begin': '(?<=^|,|\\G)'
-        'end': '(,)|(?=;|\\b(?:in|of)\\b)|(?<!,|^)$'
-        'endCaptures':
-          '1':
-            'include': '#comma'
-        'patterns': [
-          {
-            'begin': '(?={)'
-            'end': '(?!\\G)(?!:)'
-            'patterns': [
-              {
-                'include': '#objecttype'
-              }
-              {
-                'begin': '(?<=}):\\s*'
-                'end': '(?!\\G)'
-                'patterns': [
-                  {
-                    'include': '#type'
-                  }
-                ]
-              }
-              {
-                'include': '#comments'
-              }
-            ]
-          }
-          {
-            'begin': '(\\[)[\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D},\\s]+(\\]):?'
-            'beginCaptures':
-              '0':
-                'patterns': [
-                  {
-                    'include': '#comma'
-                  }
-                ]
-              '1':
-                'name': 'meta.brace.square.js'
-              '2':
-                'name': 'meta.brace.square.js'
-            'end': '(?<!:)'
-            'patterns': [
-              {
-                'begin': '\\s*'
-                'end': '(?!\\G)'
-                'patterns': [
-                  {
-                    'include': '#type'
-                  }
-                  {
-                    'include': '#comments'
-                  }
-                ]
-              }
-            ]
-          }
-          {
-            'include': '#typedvariable'
-          }
-          {
-            'begin': '\\s*(=)'
-            'end': '(?=[,;])|$'
-            'beginCaptures':
-              '1':
-                'name': 'keyword.operator.js'
-            'patterns': [
-              {
-                'include': '$base'
-              }
-            ]
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-    ]
-  }
-  {
-    'begin': '(?:^|(;)|\\s)(?:(interface)|(class))\\s'
-    'beginCaptures':
-      '1':
-        'name': 'meta.delimiter.semicolon.js'
-      '2':
-        'name': 'storage.type.interface.js'
-      '3':
-        'name': 'storage.type.class.js'
-    'end': '}'
-    'patterns': [
-      {
-        # Grammar rule originally taken from JavaScript grammar, but heavily modified (https://github.com/atom/language-javascript/blob/517019cdc8e9114b13c2edcebf4ec49cf27e7a64/grammars/javascript.cson#L263-L279)
-        'begin': '\\G\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*(?:\\.(?:[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)?)?(?:<[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*(?:\\s*,\\s*[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)*>)?)?(?:\\s+(extends|implements)\\s)?'
-        'beginCaptures':
-          '1':
-            'patterns': [
-              {
-                'match': '[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*'
-                'name': 'meta.class.ts'
-              }
-              {
-                'match': ','
-                'name': 'meta.delimiter.object.comma.js'
-              }
-            ]
-          '2':
-            'name': 'storage.modifier.ts'
-        'end': '(?<!extends\\s|implements\\s)\\s*{'
-        'patterns': [
-          {
-            'include': '#typeinheritedfrom'
-          }
-          {
-            'include': '#comments'
-          }
-          {
-            'include': '#comma'
-          }
-        ]
-      }
-      {
-        'include': '#typeindexable'
-      }
-      {
-        'include': '#decorator'
-      }
-      {
-        'comment': 'Matches class method names and styles as function, even if marked private, or getters/setters'
-        'begin': '((?:(?:private|public|protected|static)\\s+){0,2})((?:[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)?)<'
-        'beginCaptures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'entity.name.function.js'
-        'end': '>(?=\\()'
-        'patterns': [
-          {
-            'include': '#typeextend'
-          }
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comma'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'match': '((?:(?:private|public|protected|static)\\s+){0,2})(?:(get|set)\\s+)?([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)(?=\\()'
-        'captures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'storage.modifier.ts'
-          '3':
-            'name': 'entity.name.function.js'
-      }
-      {
-        'include': '#functionargumentstype'
-      }
-      {
-        'comment': 'Match function return type'
-        'begin': '(?<=\\))\\s*:\\s*'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'begin': '((?:(?:private|public|protected|static)\\s+){0,2})([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)(\\??)\\s*:\\s*'
-        'beginCaptures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'entity.name.variable.ts'
-          '3':
-            'name': 'keyword.operator.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'match': '((?:(?:private|public|protected|static)\\s+){0,2})([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)(\\??)'
-        'captures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'entity.name.variable.ts'
-          '3':
-            'name': 'keyword.operator.js'
-      }
-      {
-        'begin': '\\s*(=)\\s*'
-        'beginCaptures':
-          '1':
-            'name': 'keyword.operator.js'
-        'end': '(;)|$'
-        'endCaptures':
-          '1':
-            'name': 'meta.delimiter.semicolon.js'
-        'patterns': [
-          'include': '$base'
-        ]
-      }
-      {
-        'include': '#curlybracerecursion'
-      }
-      {
-        'include': '$base'
-      }
-      {
-        'match': ';'
-        'name': 'meta.delimiter.semicolon.js'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\.(prototype)\\.([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\s*(=)\\s*(?=(?:(?:async\\s+)?function)|(?:(?:<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>)?\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>))'
-    'beginCaptures':
-      '1':
-        'name': 'support.class.js'
-      '2':
-        'name': 'support.constant.js'
-      '3':
-        'name': 'entity.name.function.js'
-      '4':
-        'name': 'keyword.operator.js'
-    'comment': 'match stuff like: Sound.prototype.play = function() { … }'
-    'end': '(?!\\G)'
-    'name': 'meta.function.prototype.js'
-    'patterns': [
-      {
-        'include': '#functionnolookahead'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\.([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\s*(=)\\s*(?=(?:(?:async\\s+)?function)|(?:(?:<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>)?\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>))'
-    'beginCaptures':
-      '0':
-        'name': 'meta.function.js'
-      '1':
-        'name': 'support.class.js'
-      '2':
-        'name': 'entity.name.function.js'
-      '3':
-        'name': 'keyword.operator.js'
-    'comment': 'match stuff like: Sound.play = function() { … }'
-    'end': '(?!\\G)'
-    'patterns': [
-      {
-        'include': '#functionnolookahead'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\s*(=)\\s*(?=(?:(?:async\\s+)?function)|(?:(?:<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>)?\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>))'
-    'beginCaptures':
-      '0':
-        'name': 'meta.function.js'
-      '1':
-        'name': 'entity.name.function.js'
-      '2':
-        'name': 'keyword.operator.js'
-    'comment': 'match stuff like: play = function() { … }'
-    'end': '(?!\\G)'
-    'patterns': [
-      {
-        'include': '#functionnolookahead'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '\\b([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)\\s*(:)\\s*(?=(?:(?:async\\s+)?function)|(?:(?:<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>)?\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>))'
-    'beginCaptures':
-      '1':
-        'name': 'entity.name.function.js'
-      '2':
-        'name': 'keyword.operator.js'
-    'comment': 'match stuff like: foobar: function() { … }'
-    'end': '(?!\\G)'
-    'name': 'meta.function.json.js'
-    'patterns': [
-      {
-        'include': '#functionnolookahead'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '(?:((\')(.*?)(\'))|((")(.*?)(")))\\s*(:)\\s*(?=(?:(?:async\\s+)?function)|(?:(?:<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>)?\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>))'
-    'beginCaptures':
-      '1':
-        'name': 'string.quoted.single.js'
-      '2':
-        'name': 'punctuation.definition.string.begin.js'
-      '3':
-        'name': 'entity.name.function.js'
-      '4':
-        'name': 'punctuation.definition.string.end.js'
-      '5':
-        'name': 'string.quoted.double.js'
-      '6':
-        'name': 'punctuation.definition.string.begin.js'
-      '7':
-        'name': 'entity.name.function.js'
-      '8':
-        'name': 'punctuation.definition.string.end.js'
-      '9':
-        'name': 'keyword.operator.js'
-    'comment': 'Attempt to match "foo": function'
-    'end': '(?!\\G)'
-    'name': 'meta.function.json.js'
-    'patterns': [
-      {
-        'include': '#functionnolookahead'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'include': '#decorator'
-  }
-  {
-    'include': '#function'
-  }
-  {
-    'match': '(new)\\s+([\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*(?:\\.[\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*)*)'
-    'captures':
-      '1':
-        'name': 'keyword.operator.new.js'
-      '2':
-        'patterns': [
-          {
-            'name': 'entity.name.type.instance.js'
-            'match': '[\\p{L}\\p{Nl}$_.][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}.]*'
-          }
-        ]
-    'name': 'meta.class.instance.constructor'
-  }
-  {
-    'begin': '(?:(?<=[\\)\\]])|\\b([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*))(\\()'
-    'beginCaptures':
-      '1':
-        'patterns': [
-          {
-            'match': '\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|scrollByLines|scrollY|scrollTo|stop|strike|sin|sizeToContent|sidebar|signText|sort|sup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|Month|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|Time|Hotkeys|Cursor|Timeout|Interval|ZOptions|Active|Resizable|RequestHeader)|search|sqrt|slice|savePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|cos|concat|contextual|confirm|compile|ceil|clear|clearTimeout|clearInterval|captureEvents|call|createStyleSheet|createPopup|createEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|test|tan|taint|taintEnabled|isNaN|isFinite|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|untaint|unescape|unwatch|updateCommands|join|javaEnabled|pop|pow|push|plugins.refresh|paddings|parse|parseInt|parseFloat|print|prompt|preference|escape|enableExternalCapture|eval|elementFromPoint|exp|exec|execScript|execCommand|valueOf|UTC|queryCommandState|queryCommandIndeterm|queryCommandEnabled|queryCommandValue|find|file|fileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|forward|floor|fromCharCode|watch|link|load|log|lastIndexOf|asin|anchor|acos|attachEvent|atob|atan|atan2|apply|alert|abs|abort|round|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|releaseCapture|releaseEvents|random|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|Time|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|Attention|Selection|ResponseHeader|AllResponseHeaders)|min|moveBy|moveBelow|moveTo|moveToAbsolute|moveAbove|mergeAttributes|match|margins|max|btoa|big|bold|borderWidths|blink|back)\\b'
-            'name': 'support.function.js'
-          }
-          {
-            'match': '\\b(substringData|submit|splitText|setNamedItem|setAttribute|setAttributeNode|select|hasChildNodes|hasFeature|namedItem|click|close|cloneNode|createComment|createCDATASection|createCaption|createTHead|createTextNode|createTFoot|createDocumentFragment|createProcessingInstruction|createEntityReference|createElement|createAttribute|tabIndex|insertRow|insertBefore|insertCell|insertData|item|open|deleteRow|deleteCell|deleteCaption|deleteTHead|deleteTFoot|deleteData|focus|write|writeln|add|appendChild|appendData|reset|replaceChild|replaceData|move|moveNamedItem|moveChild|moveAttribute|moveAttributeNode|getNamedItem|getElementsByName|getElementsByTagName|getElementById|getAttribute|getAttributeNode|blur)\\b'
-            'name': 'support.function.dom.js'
-          }
-          {
-            'match': '\\bsuper\\b'
-            'name': 'keyword.other.ts'
-          }
-        ]
-      '2':
-        'name': 'punctuation.definition.parameters.begin.js'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.end.js'
-    'patterns': [
-      {
-        'begin': '(?=)'
-        'end': '(,)\\s*|(?=\\))'
-        'endCaptures':
-          '1':
-            'include': '#comma'
-        'patterns': [
-          {
-            'include': '$base'
-          }
-        ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'comment': 'Prevent built-in types from being highlighted if accessed as property'
-    'match': '(\\.)(?:Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)'
-    'captures':
-      '1':
-        'name': 'meta.delimiter.method.period.js'
-  }
-  {
-      'comment': 'Match export, declare and constructor'
-      'match': '\\b(?:export|declare|constructor)\\b'
-      'name': 'keyword.other.ts'
-  }
-  {
-    'comment': 'Match stuff like: as'
-    'match': '\\b(?:as|AS)\\b'
-    'name': 'keyword.operator.ts'
-  }
-  {
-    'comment': 'Match type SomeType = OtherType'
-    'begin': '(type)\\s+([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)'
-    'beginCaptures':
-      '1':
-        'name': 'storage.modifier.ts'
-      '2':
-        'name': 'meta.class.ts'
-    'end': '(?<!>)(?!\\G)'
-    'patterns': [
-      {
-        'begin': '\\G<'
-        'end': '>'
-        'patterns': [
-          {
-            'include': '#typeextend'
-          }
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comma'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'begin': '\\s*(=)\\s*'
-        'beginCaptures':
-          '1':
-            'name': 'keyword.operator.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-         ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'comment': 'Match types in template instantiation'
-    'begin': '(?<=[\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}])<(?=(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>\\()'
-    'end': '>'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'comment': 'Match type assertions'
-    'begin': '(?<![\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}])<(?=(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>[\\p{L}\\p{Nl}$_\\(\\[\\d\\{])'
-    'end': '>'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-  }
-  {
-    'begin': '\\?'
-    'beginCaptures':
-      '0':
-        'name': 'keyword.operator.js'
-    'end': ':'
-    'endCaptures':
-      '0':
-        'name': 'keyword.operator.js'
-    'patterns': [
-      {
-        'include': '$base'
-      }
-    ]
-  }
-
-  {
-    'include': '#curlybracerecursion'
-  }
-  {
-    'comment': 'Match all [] pairs'
-    'begin': '\\['
-    'end': '\\]'
-    'captures':
-      '0':
-        'name': 'meta.brace.square.js'
-    'patterns': [
-      {
-        'include': '$base'
-      }
-    ]
-  }
-  {
-    'comment': 'Match all () pairs'
-    'begin': '\\('
-    'end': '\\)'
-    'captures':
-      '0':
-        'name': 'meta.brace.round.js'
-    'patterns': [
-      {
-        'include': '$base'
-      }
-    ]
-  }
-  {
-    'include': 'source.js'
-  }
-
-  # TRANSFORMS
-  {
-      'comment': 'Embedded Syntaxes support'
-      'begin': '(transform):(null){'
-      'beginCaptures':
-        '1':
-          'name': 'keyword.other.ts'
-        '2':
-          'name': 'meta.support.constant.ts'
-      'end': '}(transform):(null)'
-      'endCaptures':
-          '1':
-            'name': 'keyword.other.ts'
-          '2':
-            'name': 'meta.support.constant.ts'
-      'patterns': [
-        {
-          'include': 'source.ts'
-        }
-      ]
-  }
-  {
-      'comment': 'Embedded Syntax for JSX'
-      'begin': '(transform):(jsx){'
-      'beginCaptures':
-        '1':
-          'name': 'keyword.other.ts'
-        '2':
-          'name': 'meta.support.constant.ts'
-      'end': '}(transform):(jsx)'
-      'endCaptures':
-          '1':
-            'name': 'keyword.other.ts'
-          '2':
-            'name': 'meta.support.constant.ts'
-      'patterns': [
-        {
-          'include': 'text.html.basic'
-        }
-      ]
-  }
-]
-
-'repository':
-  'curlybracerecursion':
-    'comment': 'Match all {} pairs'
-    'begin': '{'
-    'end': '}'
-    'captures':
-      '0':
-        'name': 'meta.brace.curly.js'
-    'patterns': [
-      {
-        'include': '$base'
-      }
-    ]
-
-  'type':
-    'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'
-    'end': '(?<!\\*\\/)(?<!\\|)(?<!\\s)(?<!\\.)(?!\\G)(?!\\.)(?!\\s*\\|)'
-    'patterns': [
-      {
-          'begin': '\\((?!\\s*[\\p{L}\\p{Nl}$_\\)][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*\\s*(?:[,:]|\\)\\s*=>))'
-          'end': '\\)(?:\\[\\])*'
-          'patterns': [
-              {
-                  'include': '#type'
-              }
-          ]
-      }
-      {
-        'include': '#keytype'
-      }
-      {
-        'include': '#typetemplate'
-      }
-      {
-        'include': '#typenontemplate'
-      }
-      {
-        'include': '#functiontype'
-      }
-      {
-        'include': '#tuple'
-      }
-      {
-        'include': '#objecttype'
-      }
-      {
-        'match': '\\s*(\\|)\\s*'
-        'captures':
-          '1':
-            'name': 'keyword.operator.union.ts'
-      }
-      {
-        'include': '#comments'
-      }
-      {
-        'match': '\\.'
-        'captures':
-          '0':
-            'name': 'meta.delimiter.period.type.ts'
-      }
-    ]
-
-  'typeinheritedfrom':
-    'begin': '(?=[\\(\\{\\p{L}\\p{Nl}$_])'
-    'end': '(?<!\\*\\/)(?<!\\|)(?<!\\.)(?!\\G)(?!\\.)(?!\\|)'
-    'patterns': [
-      {
-          'begin': '\\((?!\\s*[\\p{L}\\p{Nl}$_\\)][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*\\s*(?:[,:]|\\)\\s*=>))'
-          'end': '\\)(?:\\[\\])*'
-          'patterns': [
-              {
-                  'include': '#typeinheritedfrom'
-              }
-          ]
-      }
-      {
-        'include': '#keytype'
-      }
-      {
-        'include': '#functiontype'
-      }
-      {
-        'include': '#objecttype'
-      }
-      {
-        'include': '#tuple'
-      }
-      {
-        'include': '#typetemplateinheritedfrom'
-      }
-      {
-        'include': '#typenontemplateinheritedfrom'
-      }
-      {
-        'match': '\\|'
-        'captures':
-          '0':
-            'name': 'keyword.operator.union.ts'
-      }
-      {
-        'match': '\\.'
-        'captures':
-          '0':
-            'name': 'meta.delimiter.period.type.ts'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'typenontemplate':
-    'comment': 'Matches a simple type without template specification'
-    'match': '([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\b((?:\\[\\])*)(?!<)'
-    'captures':
-      '1':
-        'name': 'support.class.ts'
-
-  'typetemplate':
-    'begin': '([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)<'
-    'beginCaptures':
-      '1':
-        'name': 'support.class.template.ts'
-    'end': '>((?:\\[\\])*)'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'typenontemplateinheritedfrom':
-    'comment': 'Matches a simple type without template specification'
-    'match': '([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\b((?:\\[\\])*)(?!<)'
-    'captures':
-      '1':
-        'name': 'entity.other.inherited-class.ts'
-
-  'typetemplateinheritedfrom':
-    'begin': '([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)<'
-    'beginCaptures':
-      '1':
-        'name': 'entity.other.template.inherited-class.ts'
-    'end': '>((?:\\[\\])*)'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'keytype':
-    'comment': 'Match key types.'
-    'match': '(number|string|boolean|any|void)(?:\\[\\])*'
-    'captures':
-      '1':
-        'name': 'storage.type.variable.ts'
-
-  'functiontype':
-    'patterns': [
-      {
-        'include': '#functionargumentreturntype'
-      }
-      {
-        'begin': '(?=<)'
-        'end': '(?<!>)(?!\\G)'
-        'patterns': [
-          {
-            'begin': '\\G<'
-            'end': '>'
-            'patterns': [
-              {
-                'include': '#typeextend'
-              }
-              {
-                'include': '#type'
-              }
-              {
-                'include': '#comma'
-              }
-              {
-                'include': '#comments'
-              }
-            ]
-          }
-          {
-            'include': '#functionargumentreturntype'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-    ]
-
-  'functionargumentreturntype':
-    'begin': '(?=\\()'
-    'end': '(?<!\\))(?!\\G)'
-    'patterns': [
-      {
-        'include': '#functionargumentstype'
-      }
-      {
-        'begin': '(?<=\\))\\s*(=>)\\s*'
-        'beginCaptures':
-          '1':
-            'name': 'storage.type.arrow.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'functionargumentstype':
-    'comment': 'Matches the types for functions.'
-    'begin': '\\('
-    'beginCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.begin.js'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.end.js'
-    'patterns': [
-      {
-        'include': '#args'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'objecttype':
-    'comment': 'Matches anonymous object types.'
-    'begin': '{'
-    'beginCaptures':
-      '0':
-        'name': 'meta.brace.curly.js'
-    'end': '(})(\\[\\])?'
-    'endCaptures':
-      '1':
-        'name': 'meta.brace.curly.js'
-    'patterns': [
-      {
-        'include': '#typeindexable'
-      }
-      {
-        'include': '#typedvariable'
-      }
-      {
-        'match': ';'
-        'name': 'meta.delimiter.semicolon.js'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'typeindexable':
-    'begin': '\\[[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*:\\s*(string|number)\\s*\\]:\\s*'
-    'beginCaptures':
-      '1':
-        'name': 'storage.type.variable.ts'
-    'end': '(?!\\G)'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'tuple':
-    'begin': '\\['
-    'end': '\\]'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'typedvariable':
-    'begin': '[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*\\??\\s*:\\s*'
-    'end': '(?!\\G)'
-    'patterns': [
-      {
-        'include': '#type'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'decorator':
-    'begin': '(\\@[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)(\\()'
-    'beginCaptures':
-      '1':
-        'name': 'storage.type.annotation.js'
-      '2':
-        'name': 'punctuation.definition.parameters.begin.js'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.end.js'
-    'patterns': [
-      {
-        'include': '#angulartemplate'
-      }
-    ]
-
-  'args':
-    'comment': 'Match the arguments in a function'
-    'patterns': [
-      {
-        'match': '(?:\\.\\.\\.)?[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*(?=\\??\\s*[,\\)])'
-        'name': 'variable.parameter.function.ts'
-      }
-      {
-        'begin': '((?:\\.\\.\\.)?[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\??\\s*:\\s*'
-        'beginCaptures':
-          '1':
-            'name': 'variable.parameter.function.ts'
-        'end': '(?=\\s*[,\\)])'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#comma'
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'function':
-    'patterns': [
-      {
-        'include': '#oldstylefunction'
-      }
-      {
-        'include': '#newstylefunction'
-      }
-    ]
-
-  'functionnolookahead':
-    'patterns': [
-      {
-        'include': '#oldstylefunction'
-      }
-      {
-        'include': '#newstylefunctionnolookahead'
-      }
-    ]
-
-  'newstylefunction':
-    'patterns': [
-      {
-        'include': '#newstylefunctionnontemplate'
-      }
-      {
-        'begin': '(?<![\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}\\)\\]])(?=<.+>\\([^\\(].+=>)(?=<(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+>\\((?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>)'
-        'end': '(?<!>)(?!\\G)'
-        'patterns': [
-          {
-            'begin': '\\G<'
-            'end': '>'
-            'patterns': [
-              {
-                'include': '#typeextend'
-              }
-              {
-                'include': '#type'
-              }
-              {
-                'include': '#comma'
-              }
-              {
-                'include': '#comments'
-              }
-            ]
-          }
-          {
-            'include': '#newstylefunctionnontemplatenolookahead'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-    ]
-
-  'newstylefunctionnolookahead':
-    'patterns': [
-      {
-        'begin': '(?=<)'
-        'end': '(?<!>)(?!\\G)'
-        'patterns': [
-          {
-            'begin': '\\G<'
-            'end': '>'
-            'patterns': [
-              {
-                'include': '#typeextend'
-              }
-              {
-                'include': '#type'
-              }
-              {
-                'include': '#comma'
-              }
-              {
-                'include': '#comments'
-              }
-            ]
-          }
-          {
-            'include': '#newstylefunctionnontemplatenolookahead'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#newstylefunctionnontemplatenolookahead'
-      }
-    ]
-
-  'newstylefunctionnontemplate':
-    'begin': '(?<![\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}\\)\\]])(?=\\([^\\(].+=>)(?=(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))*\\)(?:\\:\\s*(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/|\\|(?:[^&|*/+\\-\\)]|\\)(?=[\\[\\)|>])|\\/\\*\\*?(?:[^*]*?\\*)*\\/))+)?\\s*=>)'
-    'end': '(?!\\:)\\s*(=>)'
-    'endCaptures':
-      '1':
-        'name': 'storage.type.arrow.js'
-    'patterns': [
-      {
-        'include': '#functionargumentstype'
-      }
-      {
-        'begin': '\\:\\s*'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'newstylefunctionnontemplatenolookahead':
-    'begin': '(?=\\()'
-    'end': '(?!\\:)\\s*(=>)'
-    'endCaptures':
-      '1':
-        'name': 'storage.type.arrow.js'
-    'patterns': [
-      {
-        'include': '#functionargumentstype'
-      }
-      {
-        'begin': '\\:\\s*'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'oldstylefunction':
-    'begin': '(?=(?:(async)(?:\\s+))?(function))'
-    'end': '(?!\\G)(?!:)'
-    'name': 'meta.function.js'
-    'patterns': [
-      {
-        'begin': '\\G(?:(async)(?:\\s+))?(function)(?:\\s+([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*))?(\\*?)\\s*(\\*?)(?=\\()'
-        'beginCaptures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'storage.type.function.js'
-          '3':
-            'name': 'entity.name.function.js'
-          '4':
-            'name': 'storage.type.function.js'
-          '5':
-            'name': 'storage.type.function.js'
-        'end': '(?<=\\))'
-        'patterns': [
-          {
-            'include': '#functionargumentstype'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'begin': '\\G(?:(async)(?:\\s+))?(function)(?:\\s+([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*))?(?=<)'
-        'beginCaptures':
-          '1':
-            'name': 'storage.modifier.js'
-          '2':
-            'name': 'storage.type.function.js'
-          '3':
-            'name': 'entity.name.function.js'
-        'end': '(?<=\\))'
-        'patterns': [
-          {
-            'begin': '(?<=\\G)<'
-            'end': '>(?:(\\*)\\s*|\\s*(\\*)|\\s*)(?=\\()'
-            'endCaptures':
-              '1':
-                'name': 'storage.type.function.js'
-              '2':
-                'name': 'storage.type.function.js'
-            'patterns': [
-              {
-                'include': '#typeextend'
-              }
-              {
-                'include': '#type'
-              }
-              {
-                'include': '#comma'
-              }
-              {
-                'include': '#comments'
-              }
-            ]
-          }
-          {
-            'include': '#functionargumentstype'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'begin': '(?<=\\)):\\s*'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'include': '#type'
-          }
-          {
-            'include': '#comments'
-          }
-        ]
-      }
-      {
-        'include': '#comments'
-      }
-    ]
-
-  'typeextend':
-    'begin': '(extends)\\s+'
-    'beginCaptures':
-      '1':
-        'name': 'storage.type.modifier.ts'
-    'end': '(?!\\G)'
-    'patterns': [
-      {
-        'include': '#typeinheritedfrom'
-      }
-    ]
-
-  # Taken from JS grammar (https://github.com/atom/language-javascript/blob/897e999910fb001780286778a20b7e5c02eb59dd/grammars/javascript.cson#L631-L661)
-  'docblock':
-    'patterns': [
-      {
-        'match': '(?<!\\w)@(abstract|access|alias|augments|author|async|attribute|arg|argument|beta|borrows|bubbes|callback|class|classdesc|config|const|constant|constructs|constructor|copyright|chainable|default|defaultvalue|deprecated|desc|description|enum|emits|event|example|exports|external|extends|extension|extensionfor|extension_for|for|file|fileoverview|fires|final|function|global|host|ignore|implements|inheritdoc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixin|module|name|namespace|override|overview|param|private|prop|property|protected|readonly|readOnly|requires|required|return|returns|see|since|static|summary|submodule|this|throws|todo|tutorial|type|typedef|var|variation|version|virtual|uses|writeOnce)\\b'
-        'name': 'storage.type.class.jsdoc'
-      }
-    ]
-
-  'comments':
-    'patterns': [
-      {
-        'begin': '/\\*\\*(?!/)'
-        'captures':
-          '0':
-            'name': 'punctuation.definition.comment.js'
-        'patterns': [
-          {
-            'include': '#docblock'
-          }
-        ]
-        'end': '\\*/'
-        'name': 'comment.block.documentation.js'
-      }
-      {
-        'begin': '/\\*'
-        'captures':
-          '0':
-            'name': 'punctuation.definition.comment.js'
-        'end': '\\*/'
-        'name': 'comment.block.js'
-      }
-      {
-        'begin': '(^[ \\t]+)?(?=//)'
-        'beginCaptures':
-          '1':
-            'name': 'punctuation.whitespace.comment.leading.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'begin': '//'
-            'beginCaptures':
-              '0':
-                'name': 'punctuation.definition.comment.js'
-            'end': '\\n'
-            'name': 'comment.line.double-slash.js'
-          }
-        ]
-      }
-    ]
-
-  'comma':
-    'match': ','
-    'name': 'meta.delimiter.object.comma.js'
-
-  'angulartemplate':
-    'begin': '\\b(template:\\s*`)'
-    'end': '(`)'
-    'patterns': [
-      { 'include': 'text.html.basic' }
-    ]
diff --git a/package.json b/package.json
index 9622673f1..cb584009e 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "description": "The only TypeScript plugin you will ever need.",
   "scripts": {
     "test": "ntsc -p ./lib",
+    "build": "node scripts/grammar.js",
     "prepublish": "typings install"
   },
   "engines": {
@@ -66,6 +67,10 @@
     "xtend": "^4.0.0"
   },
   "devDependencies": {
+    "cson": "^3.0.2",
+    "js-yaml": "^3.5.2",
+    "mz": "^2.1.0",
+    "popsicle": "^3.0.1",
     "typings": "^0.2.3"
   },
   "package-deps": [
diff --git a/scripts/grammar.js b/scripts/grammar.js
new file mode 100644
index 000000000..2e3315520
--- /dev/null
+++ b/scripts/grammar.js
@@ -0,0 +1,118 @@
+var cson = require('cson')
+var yaml = require('js-yaml')
+var fs = require('mz/fs')
+var join = require('path').join
+var request = require('popsicle').request
+
+var atomPatterns = [
+  {
+    comment: 'Match debugger statement',
+    match: '\\b(debugger)\\b',
+    captures: {
+      '1': {
+        name: 'keyword.debugger.ts'
+      }
+    }
+  },
+  {
+    comment: 'Match full triple slash reference comments',
+    match: '(\\/\\/\\/\\s*<reference\\s*path\\s*=)(.*)(\\/>)',
+    captures: {
+      '1': {
+        name: 'keyword.other.ts'
+      },
+      '2': {
+        name: 'reference.path.string'
+      },
+      '3': {
+        name: 'keyword.other.ts'
+      }
+    }
+  },
+  {
+    comment: 'Match <amd-dependency',
+    match: '(\\/\\/\\/\\s*<amd-dependency\\s*path\\s*=)(.*)(\\/>)',
+    captures: {
+      '1': {
+        name: 'keyword.other.ts'
+      },
+      '2': {
+        name: 'amd.path.string'
+      },
+      '3': {
+        name: 'keyword.other.ts'
+      }
+    }
+  },
+  {
+    comment: 'Match <amd-module',
+    match: '(\\/\\/\\/\\s*<amd-module\\s*name\\s*=)(.*)(\\/>)',
+    captures: {
+      '1': {
+        name: 'keyword.other.ts'
+      },
+      '2': {
+        name: 'amd.path.string'
+      },
+      '3': {
+        name: 'keyword.other.ts'
+      }
+    }
+  },
+  {
+    comment: 'Match import = require',
+    match: '(import)\\s*([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\s*=\\s*(require)\\s*\\((.*)\\)',
+    captures: {
+      '1': {
+        name: 'keyword.other.ts'
+      },
+      '2': {
+        name: 'variable.type.ts'
+      },
+      '3': {
+        name: 'keyword.other.ts'
+      },
+      '4': {
+        name: 'require.path.string'
+      }
+    }
+  },
+  {
+    comment: 'Match ES6 "import from" syntax',
+    match: '(import).*(from)\\s+(([\'"`]).*\\4)',
+    captures: {
+      '1': {
+        name: 'keyword.other.ts'
+      },
+      '2': {
+        name: 'keyword.other.ts'
+      },
+      '3': {
+        name: 'es6import.path.string'
+      }
+    }
+  }
+]
+
+Promise.all([
+  request('https://raw.githubusercontent.com/Microsoft/TypeScript-TmLanguage/master/TypeScript.YAML-tmLanguage'),
+  request('https://raw.githubusercontent.com/Microsoft/TypeScript-TmLanguage/master/TypeScriptReact.YAML-tmLanguage')
+])
+  .then(function (result) {
+    var ts = yaml.safeLoad(result[0].body)
+    var tsx = yaml.safeLoad(result[1].body)
+
+    atomPatterns.forEach(function (pattern) {
+      ts.repository.expression.patterns.unshift(pattern)
+      tsx.repository.expression.patterns.unshift(pattern)
+    })
+
+    return Promise.all([
+      fs.writeFile(join(__dirname, '../grammars/ts.cson'), cson.stringify(ts, null, '  ')),
+      fs.writeFile(join(__dirname, '../grammars/tsx.cson'), cson.stringify(tsx, null, '  '))
+    ])
+  })
+  .catch(function (err) {
+    console.error(err.stack)
+    process.exit(1)
+  })