diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
index 1b6750d8..88153718 100644
--- a/TypeScript.YAML-tmLanguage
+++ b/TypeScript.YAML-tmLanguage
@@ -11,29 +11,30 @@ patterns:
 repository:
   var-expr:
     name: meta.var.expr.ts
-    begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*) 
+    begin: (?<!\()\s*\b(var|let|const(?!\s+enum)\b)
     beginCaptures:
       '1': { name: storage.type.ts }
-      '2': { name: variable.ts }
-    end: '(?=$|[;=\}\{])|(?<=\})'
+    end: (?=$|;)
+    patterns:
+    - include: '#var-single-variable'
+    - include: '#comment'
+
+  var-single-variable:
+    name: meta.var-single-variable.expr.ts
+    begin: \b([a-zA-Z_$][\w$]*)\s*(=?)
+    beginCaptures:
+      '1': { name: variable.ts }
+    end: (?=$|[;,])
     patterns:
     - include: '#type-annotation'
     - include: '#string'
     - include: '#comment'
+    - include: '#expression'
 
   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:
@@ -44,13 +45,16 @@ repository:
 
   type-declaration:
     name: meta.type.declaration.ts
-    begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*
+    begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
     beginCaptures:
       '1': { name: keyword.other.ts }
       '2': { name: storage.type.ts }
-    end: (?=[,);>]|var|type|function|class|interface)
+    end: (?=$|[,);>]|var|type|function|class|interface)
     patterns:
+      - include: '#type-parameters'
       - include: '#type'
+      - name: keyword.operator.ts
+        match: '=\s*'
 
   enum-declaration:
     name: meta.enum.declaration.ts
@@ -85,7 +89,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.ts
-    begin: '(?:\b(extends|implements))'
+    begin: '(?:\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.ts }
     end: (?=\{)
@@ -93,12 +97,13 @@ repository:
       '1': { name: brace.curly.ts }
     patterns:
     - include: '#comment'
+    - include: '#object-heritage'
     - include: '#type-parameters'
-    - include: '#object-heritage-parent'
+    - include: '#object-heritage-type'
 
-  object-heritage-parent:
+  object-heritage-type:
     name: meta.object.heritage.parent.ts
-    match: '(?:\s*([a-zA-Z_$][\w$]*))'
+    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: storage.type.ts }
 
@@ -139,24 +144,25 @@ repository:
 
   field-declaration:
     name: meta.field.declaration.ts
-    begin: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
+    begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
     beginCaptures:
       '1': { name: variable.ts }
       '2': { name: keyword.operator.ts }
-    end: '(?=\}|;|,|(?<!=)\n)|(?<=\})'
+    end: '(?=\}|;|,|$)|(?<=\})'
     patterns:
     - include: '#expression'
 
   method-declaration:
     name: meta.method.declaration.ts
-    begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
+    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.type.property.ts }
-      '4': { name: keyword.operator.ts }
-      '5': { name: entity.name.function.ts }
-      '6': { name: keyword.operator.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'
@@ -168,12 +174,15 @@ repository:
 
   method-overload-declaration:
     name: meta.method.overload.declaration.ts
-    match: '\b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
+    match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\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 }
+      '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 }
 
   indexer-declaration:
     name: meta.indexer.declaration.ts
@@ -194,14 +203,15 @@ repository:
     match: ([a-zA-Z_$][\w$]*)(?=\:)
     captures:
       '1': { name: variable.parameter.ts}
-      
+
   function-declaration:
     name: meta.function.ts
-    begin: \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
+    begin: \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*
     beginCaptures:
       '1': { name: storage.modifier.ts }
-      '2': { name: storage.type.function.ts }
-      '3': { name: entity.name.function.ts }
+      '2': { name: storage.modifier.ts }
+      '3': { name: storage.type.function.ts }
+      '4': { name: entity.name.function.ts }
     end: (?=;|\})|(?<=\})
     patterns:
     - include: '#comment'
@@ -228,8 +238,8 @@ repository:
     endCaptures:
       '0': { name: meta.brace.curly.ts }
     patterns:
-    - include: '#expression'
     - include: '#object-member'
+    - include: '#expression'
 
   decl-block:
     name: meta.decl.block.ts
@@ -313,7 +323,11 @@ repository:
     - include: '#comment'
     - include: '#type'
     - include: '#function-type-parameters'
-    
+
+  await-modifier:
+    name: storage.modifier.ts
+    match: '\bawait\b'
+
   type-operator:
     name: keyword.operator.type.ts
     match: '[.|]'
@@ -351,7 +365,7 @@ repository:
     beginCaptures:
       '1': { name: entity.name.type.ts }
       '2': { name: meta.brace.angle.ts }
-    end: '(?=$)|(>)'  
+    end: '(?=$)|(>)'
     endCaptures:
       '2': { name: meta.brace.angle.ts }
     patterns:
@@ -366,7 +380,7 @@ repository:
       '1': { name: keyword.operator.ts }
     end: (?=$|[,);=])
     patterns:
-      - include: '#expression'  
+      - include: '#expression'
 
   expression:
     name: meta.expression.ts
@@ -382,6 +396,7 @@ repository:
     - include: '#declaration'
     - include: '#cast'
     - include: '#new-expr'
+    - include: '#switch-statement'
     - include: '#block'
     - include: '#expression-operator'
     - include: '#relational-operator'
@@ -390,9 +405,42 @@ repository:
     - include: '#assignment-operator'
     - include: '#storage-keyword'
     - include: '#function-call'
-    - include: '#switch-case'
+    - include: '#case-clause'
     - include: '#control-statement'
-    
+
+  switch-expression:
+    name: switch-expression.expr.ts
+    begin: \b(switch)\b\s*\(
+    beginCaptures:
+      '1': { name: keyword.operator.ts }
+    end: \)
+    patterns:
+    - include: '#expression'
+
+  switch-block:
+    name: switch-block.expr.ts
+    begin: '{'
+    end: (?=\})
+    patterns:
+    - include: '#expression'
+
+  case-clause:
+    name: case-clause.expr.ts
+    begin: '(?<!\.)\b(case|default)\b'
+    beginCaptures:
+      '1': { name: keyword.control.ts }
+    end: ':'
+    patterns:
+    - include: '#expression'
+
+  switch-statement:
+    name: switch-statement.expr.ts
+    begin: (?=\bswitch\b\s*\()
+    end: '}'
+    patterns:
+    - include: '#switch-expression'
+    - include: '#switch-block'
+
   for-in-simple:
     name: forin.expr.ts
     match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b
@@ -403,16 +451,17 @@ repository:
   function-call:
     name: functioncall.expr.ts
     patterns:
+    - include: '#await-modifier'
     - include: '#type-parameters'
     - include: '#paren-expression'
 
   cast:
     name: cast.expr.ts
-    # To differentiate a cast vs a relational <, this regexp tries to use the surrounding context
-    # If < is preceeded by 'return', 'throw', 'yield' its most likely a type assertion
-    # An '=', '(', ',', ':', or '>' character followed by '<' is likely a type assertion, as otherwise its a syntax error
-    # '<=' and '<<=' are definately not type assertions, as they are assignment operators.
-    begin: '(?:(?<=return|throw|yield|[=(,:>]))\s*(<)(?!<?\=)'
+    # We need to differentiate between the relational '<' operator and the beginning of a type assertion/cast using the surrounding context.
+    # If '<' is preceeded by 'return', 'throw', 'yield', or 'await', it's most likely a type assertion
+    # If '=', '(', ',', ':', or '>' are followed by a '<', it is also likely a type assertion as otherwise it would be a syntax error
+    # '<=' and '<<=' are cannot be type assertions, as they are assignment operators.
+    begin: '(?:(?<=return|throw|yield|await|[=(,:>]))\s*(<)(?!<?\=)'
     beginCaptures:
       '1': { name: meta.brace.angle.ts }
     end: '>'
@@ -441,7 +490,7 @@ repository:
 
   expression-operator:
     name: keyword.operator.ts
-    match: =>|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void)\b
+    match: =>|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b
 
   arithmetic-operator:
     name: keyword.operator.arithmetic.ts
@@ -457,11 +506,11 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.ts
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.ts
-    match: \b(number|boolean|string|any|var|let|function|const)\b
+    match: \b(number|boolean|string|any|var|let|function|const|module|namespace)\b
 
   paren-expression:
     begin: \(
@@ -476,14 +525,14 @@ repository:
   qstring-double:
     name: string.double.ts
     begin: '"'
-    end: '"|(?=$)'
+    end: '"|(?:[^\\\n]$)'
     patterns:
     - include: '#string-character-escape'
 
   qstring-single:
     name: string.single.ts
     begin: "'"
-    end: "'|(?=$)"
+    end: \'|(?:[^\\\n]$)
     patterns:
     - include: '#string-character-escape'
 
@@ -556,7 +605,7 @@ repository:
 
   comment-line:
     name: comment.line.ts
-    match: (//).*$
+    match: (//).*$\n?
 
   literal:
     name: literal.ts
@@ -580,7 +629,7 @@ repository:
     - include: '#expression'
 
   numeric-literal:
-    name: constant.numeric.ts 
+    name: constant.numeric.ts
     match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
 
   boolean-literal:
@@ -590,11 +639,11 @@ repository:
   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
@@ -602,7 +651,7 @@ repository:
   access-modifier:
     name: storage.modifier.ts
     match: \b(public|protected|private)\b
-    
+
   static-modifier:
     name: keyword.other.ts
     match: \b(static)\b
@@ -611,4 +660,4 @@ repository:
     name: storage.type.property.ts
     match: \b(get|set)\b
 
-...
\ No newline at end of file
+...
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
index ef3dcac9..a267eb14 100644
--- a/TypeScript.tmLanguage
+++ b/TypeScript.tmLanguage
@@ -70,6 +70,13 @@
 			<key>name</key>
 			<string>keyword.operator.assignment.ts</string>
 		</dict>
+		<key>await-modifier</key>
+		<dict>
+			<key>match</key>
+			<string>\bawait\b</string>
+			<key>name</key>
+			<string>storage.modifier.ts</string>
+		</dict>
 		<key>block</key>
 		<dict>
 			<key>begin</key>
@@ -98,11 +105,11 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#expression</string>
+					<string>#object-member</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-member</string>
+					<string>#expression</string>
 				</dict>
 			</array>
 		</dict>
@@ -113,10 +120,34 @@
 			<key>name</key>
 			<string>constant.language.boolean.ts</string>
 		</dict>
+		<key>case-clause</key>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;!\.)\b(case|default)\b</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.control.ts</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>:</string>
+			<key>name</key>
+			<string>case-clause.expr.ts</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
+			</array>
+		</dict>
 		<key>cast</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:(?&lt;=return|throw|yield|[=(,:&gt;]))\s*(&lt;)(?!&lt;?\=)</string>
+			<string>(?:(?&lt;=return|throw|yield|await|[=(,:&gt;]))\s*(&lt;)(?!&lt;?\=)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -186,7 +217,7 @@
 		<key>comment-line</key>
 		<dict>
 			<key>match</key>
-			<string>(//).*$</string>
+			<string>(//).*$\n?</string>
 			<key>name</key>
 			<string>comment.line.ts</string>
 		</dict>
@@ -328,6 +359,10 @@
 					<key>include</key>
 					<string>#new-expr</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#switch-statement</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#block</string>
@@ -362,7 +397,7 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#switch-case</string>
+					<string>#case-clause</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -373,14 +408,14 @@
 		<key>expression-operator</key>
 		<dict>
 			<key>match</key>
-			<string>=&gt;|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void)\b</string>
+			<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
 			<key>name</key>
 			<string>keyword.operator.ts</string>
 		</dict>
 		<key>field-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
+			<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -395,7 +430,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=\}|;|,|(?&lt;!=)\n)|(?&lt;=\})</string>
+			<string>(?=\}|;|,|$)|(?&lt;=\})</string>
 			<key>name</key>
 			<string>meta.field.declaration.ts</string>
 			<key>patterns</key>
@@ -432,6 +467,10 @@
 			<string>functioncall.expr.ts</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#await-modifier</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
@@ -445,7 +484,7 @@
 		<key>function-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
+			<string>\b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -456,9 +495,14 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.function.ts</string>
+					<string>storage.modifier.ts</string>
 				</dict>
 				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>storage.type.function.ts</string>
+				</dict>
+				<key>4</key>
 				<dict>
 					<key>name</key>
 					<string>entity.name.function.ts</string>
@@ -660,14 +704,14 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.ts</string>
 		</dict>
 		<key>method-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
+			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -683,19 +727,24 @@
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.property.ts</string>
+					<string>storage.modifier.ts</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.ts</string>
+					<string>storage.type.property.ts</string>
 				</dict>
 				<key>5</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.ts</string>
+					<string>keyword.operator.ts</string>
 				</dict>
 				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.ts</string>
+				</dict>
+				<key>7</key>
 				<dict>
 					<key>name</key>
 					<string>keyword.operator.ts</string>
@@ -745,21 +794,36 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.ts</string>
+					<string>storage.modifier.ts</string>
 				</dict>
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.ts</string>
+					<string>storage.modifier.ts</string>
 				</dict>
 				<key>4</key>
+				<dict>
+					<key>name</key>
+					<string>storage.type.property.ts</string>
+				</dict>
+				<key>5</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.ts</string>
+				</dict>
+				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.ts</string>
+				</dict>
+				<key>7</key>
 				<dict>
 					<key>name</key>
 					<string>keyword.operator.ts</string>
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>\b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
+			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
 			<key>name</key>
 			<string>meta.method.overload.declaration.ts</string>
 		</dict>
@@ -934,7 +998,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements))</string>
+			<string>(?:\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -961,17 +1025,21 @@
 					<key>include</key>
 					<string>#comment</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#object-heritage</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-heritage-parent</string>
+					<string>#object-heritage-type</string>
 				</dict>
 			</array>
 		</dict>
-		<key>object-heritage-parent</key>
+		<key>object-heritage-type</key>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -982,7 +1050,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*))</string>
+			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.ts</string>
 		</dict>
@@ -1089,7 +1157,7 @@
 			<key>begin</key>
 			<string>"</string>
 			<key>end</key>
-			<string>"|(?=$)</string>
+			<string>"|(?:[^\\\n]$)</string>
 			<key>name</key>
 			<string>string.double.ts</string>
 			<key>patterns</key>
@@ -1105,7 +1173,7 @@
 			<key>begin</key>
 			<string>'</string>
 			<key>end</key>
-			<string>'|(?=$)</string>
+			<string>\'|(?:[^\\\n]$)</string>
 			<key>name</key>
 			<string>string.single.ts</string>
 			<key>patterns</key>
@@ -1173,7 +1241,7 @@
 		<key>storage-keyword</key>
 		<dict>
 			<key>match</key>
-			<string>\b(number|boolean|string|any|var|let|function|const)\b</string>
+			<string>\b(number|boolean|string|any|var|let|function|const|module|namespace)\b</string>
 			<key>name</key>
 			<string>storage.type.ts</string>
 		</dict>
@@ -1200,22 +1268,38 @@
 			<key>name</key>
 			<string>constant.character.escape</string>
 		</dict>
-		<key>switch-case</key>
+		<key>switch-block</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\.)\b(case|default)\b</string>
+			<string>{</string>
+			<key>end</key>
+			<string>(?=\})</string>
+			<key>name</key>
+			<string>switch-block.expr.ts</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
+			</array>
+		</dict>
+		<key>switch-expression</key>
+		<dict>
+			<key>begin</key>
+			<string>\b(switch)\b\s*\(</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.control.ts</string>
+					<string>keyword.operator.ts</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>:</string>
+			<string>\)</string>
 			<key>name</key>
-			<string>case.expr.ts</string>
+			<string>switch-expression.expr.ts</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -1224,6 +1308,26 @@
 				</dict>
 			</array>
 		</dict>
+		<key>switch-statement</key>
+		<dict>
+			<key>begin</key>
+			<string>(?=\bswitch\b\s*\()</string>
+			<key>end</key>
+			<string>}</string>
+			<key>name</key>
+			<string>switch-statement.expr.ts</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#switch-expression</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#switch-block</string>
+				</dict>
+			</array>
+		</dict>
 		<key>template</key>
 		<dict>
 			<key>begin</key>
@@ -1382,7 +1486,7 @@
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
+			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1397,15 +1501,25 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
+			<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
 			<key>name</key>
 			<string>meta.type.declaration.ts</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>=\s*</string>
+					<key>name</key>
+					<string>keyword.operator.ts</string>
+				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>
@@ -1642,7 +1756,7 @@
 		<key>var-expr</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)</string>
+			<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1650,16 +1764,39 @@
 					<key>name</key>
 					<string>storage.type.ts</string>
 				</dict>
-				<key>2</key>
+			</dict>
+			<key>end</key>
+			<string>(?=$|;)</string>
+			<key>name</key>
+			<string>meta.var.expr.ts</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#var-single-variable</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#comment</string>
+				</dict>
+			</array>
+		</dict>
+		<key>var-single-variable</key>
+		<dict>
+			<key>begin</key>
+			<string>\b([a-zA-Z_$][\w$]*)\s*(=?)</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>variable.ts</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=$|[;=\}\{])|(?&lt;=\})</string>
+			<string>(?=$|[;,])</string>
 			<key>name</key>
-			<string>meta.var.expr.ts</string>
+			<string>meta.var-single-variable.expr.ts</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -1674,6 +1811,10 @@
 					<key>include</key>
 					<string>#comment</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
 			</array>
 		</dict>
 		<key>variable-initializer</key>
diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage
index dc57aafa..19eab7f4 100644
--- a/TypeScriptReact.YAML-tmLanguage
+++ b/TypeScriptReact.YAML-tmLanguage
@@ -1,6 +1,5 @@
 # Similar to TypeScript.YAML-tmLanguage except:
-#   - Remove type assertion (cast.expr.ts)
-#   - Add the "as" keyword.
+#   - Remove type assertion (cast.expr.tsx)
 #   - Add JSX expression (HTML-like expression).
 ---
 name: TypeScriptReact
@@ -14,28 +13,29 @@ patterns:
 repository:
   var-expr:
     name: meta.var.expr.tsx
-    begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*) 
+    begin: (?<!\()\s*\b(var|let|const(?!\s+enum)\b)
     beginCaptures:
       '1': { name: storage.type.tsx }
-      '2': { name: variable.tsx }
-    end: '(?=$|[;=\}\{])|(?<=\})'
+    end: (?=$|;)
+    patterns:
+    - include: '#var-single-variable'
+    - include: '#comment'
+
+  var-single-variable:
+    name: meta.var-single-variable.expr.tsx
+    begin: \b([a-zA-Z_$][\w$]*)\s*(=?)
+    beginCaptures:
+      '1': { name: variable.tsx }
+    end: (?=$|[;,])
     patterns:
     - include: '#type-annotation'
     - include: '#string'
     - include: '#comment'
+    - include: '#expression'
 
   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'
+    match: (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\b
 
   declaration:
     name: meta.declaration.tsx
@@ -47,13 +47,16 @@ repository:
 
   type-declaration:
     name: meta.type.declaration.tsx
-    begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*
+    begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
     beginCaptures:
       '1': { name: keyword.other.tsx }
       '2': { name: storage.type.tsx }
-    end: (?=[,);>]|var|type|function|class|interface)
+    end: (?=$|[,);>]|var|type|function|class|interface)
     patterns:
+      - include: '#type-parameters'
       - include: '#type'
+      - name: keyword.operator.tsx
+        match: '=\s*'
 
   enum-declaration:
     name: meta.enum.declaration.tsx
@@ -88,7 +91,7 @@ repository:
 
   object-heritage:
     name: meta.object.heritage.tsx
-    begin: '(?:\b(extends|implements))'
+    begin: '(?:\b(extends|implements)\b)'
     beginCaptures:
       '1': { name: keyword.other.tsx }
     end: (?=\{)
@@ -96,12 +99,13 @@ repository:
       '1': { name: brace.curly.tsx }
     patterns:
     - include: '#comment'
+    - include: '#object-heritage'
     - include: '#type-parameters'
-    - include: '#object-heritage-parent'
+    - include: '#object-heritage-type'
 
-  object-heritage-parent:
+  object-heritage-type:
     name: meta.object.heritage.parent.tsx
-    match: '(?:\s*([a-zA-Z_$][\w$]*))'
+    match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
     captures:
       '1': { name: storage.type.tsx }
 
@@ -142,24 +146,25 @@ repository:
 
   field-declaration:
     name: meta.field.declaration.tsx
-    begin: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
+    begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
     beginCaptures:
       '1': { name: variable.tsx }
       '2': { name: keyword.operator.tsx }
-    end: '(?=\}|;|,|(?<!=)\n)|(?<=\})'
+    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*(?=\(|\<)'
+    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.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 }
+      '3': { name: storage.modifier.tsx }
+      '4': { name: storage.type.property.tsx }
+      '5': { name: keyword.operator.tsx }
+      '6': { name: entity.name.function.tsx }
+      '7': { name: keyword.operator.tsx }
     end: '(?=\}|;|,)|(?<=\})'
     patterns:
     - include: '#comment'
@@ -171,12 +176,15 @@ repository:
 
   method-overload-declaration:
     name: meta.method.overload.declaration.tsx
-    match: '\b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
+    match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\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 }
+      '2': { name: storage.modifier.tsx }
+      '3': { name: storage.modifier.tsx }
+      '4': { name: storage.type.property.tsx }
+      '5': { name: keyword.operator.tsx }
+      '6': { name: entity.name.function.tsx }
+      '7': { name: keyword.operator.tsx }
 
   indexer-declaration:
     name: meta.indexer.declaration.tsx
@@ -197,14 +205,15 @@ repository:
     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*
+    begin: \b(?:(export)\s+)?(?:(async)\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 }
+      '2': { name: storage.modifier.tsx }
+      '3': { name: storage.type.function.tsx }
+      '4': { name: entity.name.function.tsx }
     end: (?=;|\})|(?<=\})
     patterns:
     - include: '#comment'
@@ -231,8 +240,8 @@ repository:
     endCaptures:
       '0': { name: meta.brace.curly.tsx }
     patterns:
-    - include: '#expression'
     - include: '#object-member'
+    - include: '#expression'
 
   decl-block:
     name: meta.decl.block.tsx
@@ -316,7 +325,11 @@ repository:
     - include: '#comment'
     - include: '#type'
     - include: '#function-type-parameters'
-    
+
+  await-modifier:
+    name: storage.modifier.tsx
+    match: '\bawait\b'
+
   type-operator:
     name: keyword.operator.type.tsx
     match: '[.|]'
@@ -354,7 +367,7 @@ repository:
     beginCaptures:
       '1': { name: entity.name.type.tsx }
       '2': { name: meta.brace.angle.tsx }
-    end: '(?=$)|(>)'  
+    end: '(?=$)|(>)'
     endCaptures:
       '2': { name: meta.brace.angle.tsx }
     patterns:
@@ -369,7 +382,7 @@ repository:
       '1': { name: keyword.operator.tsx }
     end: (?=$|[,);=])
     patterns:
-      - include: '#expression'  
+      - include: '#expression'
 
   expression:
     name: meta.expression.tsx
@@ -385,6 +398,7 @@ repository:
     - include: '#var-expr'
     - include: '#declaration'
     - include: '#new-expr'
+    - include: '#switch-statement'
     - include: '#block'
     - include: '#expression-operator'
     - include: '#relational-operator'
@@ -393,9 +407,43 @@ repository:
     - include: '#assignment-operator'
     - include: '#storage-keyword'
     - include: '#function-call'
-    - include: '#switch-case'
+    - include: '#case-clause'
     - include: '#control-statement'
-    
+
+  switch-expression:
+    name: switch-expression.expr.tsx
+    begin: \b(switch)\b\s*\(
+    beginCaptures:
+      '1': { name: keyword.operator.tsx }
+    end: \)
+    patterns:
+    - include: '#expression'
+
+  switch-block:
+    name: switch-block.expr.tsx
+    begin: '{'
+    end: (?=\})
+    patterns:
+    - include: '#expression'
+
+  case-clause:
+    name: case-clause.expr.tsx
+    begin: '(?<!\.)\b(case|default)\b'
+    beginCaptures:
+      '1': { name: keyword.control.tsx }
+    end: ':'
+    patterns:
+    - include: '#expression'
+
+  switch-statement:
+    name: switch-statement.expr.tsx
+    begin: (?=\bswitch\b\s*\()
+    end: '}'
+    patterns:
+    - include: '#switch-expression'
+    - include: '#switch-block'
+
+
   for-in-simple:
     name: forin.expr.tsx
     match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b
@@ -406,6 +454,7 @@ repository:
   function-call:
     name: functioncall.expr.tsx
     patterns:
+    - include: '#await-modifier'
     - include: '#type-parameters'
     - include: '#paren-expression'
 
@@ -418,6 +467,7 @@ repository:
     end: '(?=[(;]|$)'
     patterns:
     - include: '#type'
+    - include: '#comment'
 
   object-member:
     name: meta.object.member.tsx
@@ -428,7 +478,7 @@ repository:
 
   expression-operator:
     name: keyword.operator.tsx
-    match: =>|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\b
+    match: =>|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b
 
   arithmetic-operator:
     name: keyword.operator.arithmetic.tsx
@@ -444,11 +494,11 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.tsx
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.tsx
-    match: \b(number|boolean|string|any|var|let|function|const)\b
+    match: \b(number|boolean|string|any|var|let|function|const|module|namespace)\b
 
   paren-expression:
     begin: \(
@@ -463,14 +513,14 @@ repository:
   qstring-double:
     name: string.double.tsx
     begin: '"'
-    end: '"|(?=$)'
+    end: '"|(?:[^\\\n]$)'
     patterns:
     - include: '#string-character-escape'
 
   qstring-single:
     name: string.single.tsx
     begin: "'"
-    end: "'|(?=$)"
+    end: \'|(?:[^\\\n]$)
     patterns:
     - include: '#string-character-escape'
 
@@ -543,7 +593,7 @@ repository:
 
   comment-line:
     name: comment.line.tsx
-    match: (//).*$
+    match: (//).*$\n?
 
   literal:
     name: literal.tsx
@@ -567,7 +617,7 @@ repository:
     - include: '#expression'
 
   numeric-literal:
-    name: constant.numeric.tsx 
+    name: constant.numeric.tsx
     match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
 
   boolean-literal:
@@ -577,11 +627,11 @@ repository:
   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
@@ -589,7 +639,7 @@ repository:
   access-modifier:
     name: storage.modifier.tsx
     match: \b(public|protected|private)\b
-    
+
   static-modifier:
     name: keyword.other.tsx
     match: \b(static)\b
@@ -740,4 +790,4 @@ repository:
       patterns:
       - include: '#jsx-children'
 
-...
\ No newline at end of file
+...
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
index 73cab2f1..dff86244 100644
--- a/TypeScriptReact.tmLanguage
+++ b/TypeScriptReact.tmLanguage
@@ -70,6 +70,13 @@
 			<key>name</key>
 			<string>keyword.operator.assignment.tsx</string>
 		</dict>
+		<key>await-modifier</key>
+		<dict>
+			<key>match</key>
+			<string>\bawait\b</string>
+			<key>name</key>
+			<string>storage.modifier.tsx</string>
+		</dict>
 		<key>block</key>
 		<dict>
 			<key>begin</key>
@@ -98,11 +105,11 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#expression</string>
+					<string>#object-member</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-member</string>
+					<string>#expression</string>
 				</dict>
 			</array>
 		</dict>
@@ -113,6 +120,30 @@
 			<key>name</key>
 			<string>constant.language.boolean.tsx</string>
 		</dict>
+		<key>case-clause</key>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;!\.)\b(case|default)\b</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.control.tsx</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>:</string>
+			<key>name</key>
+			<string>case-clause.expr.tsx</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
+			</array>
+		</dict>
 		<key>comment</key>
 		<dict>
 			<key>name</key>
@@ -154,14 +185,14 @@
 		<key>comment-line</key>
 		<dict>
 			<key>match</key>
-			<string>(//).*$</string>
+			<string>(//).*$\n?</string>
 			<key>name</key>
 			<string>comment.line.tsx</string>
 		</dict>
 		<key>control-statement</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|switch|case)\b</string>
+			<string>(?&lt;!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default)\b</string>
 			<key>name</key>
 			<string>keyword.control.tsx</string>
 		</dict>
@@ -296,6 +327,10 @@
 					<key>include</key>
 					<string>#new-expr</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#switch-statement</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#block</string>
@@ -330,7 +365,7 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#switch-case</string>
+					<string>#case-clause</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -341,14 +376,14 @@
 		<key>expression-operator</key>
 		<dict>
 			<key>match</key>
-			<string>=&gt;|\b(delete|export|import|in|instanceof|module|namespace|new|typeof|void|as)\b</string>
+			<string>=&gt;|\b(delete|export|import|from|in|instanceof|new|typeof|void|as)\b</string>
 			<key>name</key>
 			<string>keyword.operator.tsx</string>
 		</dict>
 		<key>field-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
+			<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -363,7 +398,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=\}|;|,|(?&lt;!=)\n)|(?&lt;=\})</string>
+			<string>(?=\}|;|,|$)|(?&lt;=\})</string>
 			<key>name</key>
 			<string>meta.field.declaration.tsx</string>
 			<key>patterns</key>
@@ -400,6 +435,10 @@
 			<string>functioncall.expr.tsx</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#await-modifier</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
@@ -413,7 +452,7 @@
 		<key>function-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
+			<string>\b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -424,9 +463,14 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.function.tsx</string>
+					<string>storage.modifier.tsx</string>
 				</dict>
 				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>storage.type.function.tsx</string>
+				</dict>
+				<key>4</key>
 				<dict>
 					<key>name</key>
 					<string>entity.name.function.tsx</string>
@@ -1026,14 +1070,14 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.tsx</string>
 		</dict>
 		<key>method-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
+			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1049,19 +1093,24 @@
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.property.tsx</string>
+					<string>storage.modifier.tsx</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.tsx</string>
+					<string>storage.type.property.tsx</string>
 				</dict>
 				<key>5</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.tsx</string>
+					<string>keyword.operator.tsx</string>
 				</dict>
 				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.tsx</string>
+				</dict>
+				<key>7</key>
 				<dict>
 					<key>name</key>
 					<string>keyword.operator.tsx</string>
@@ -1111,21 +1160,36 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.operator.tsx</string>
+					<string>storage.modifier.tsx</string>
 				</dict>
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.tsx</string>
+					<string>storage.modifier.tsx</string>
 				</dict>
 				<key>4</key>
+				<dict>
+					<key>name</key>
+					<string>storage.type.property.tsx</string>
+				</dict>
+				<key>5</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.tsx</string>
+				</dict>
+				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.tsx</string>
+				</dict>
+				<key>7</key>
 				<dict>
 					<key>name</key>
 					<string>keyword.operator.tsx</string>
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>\b(?:(public|private|protected)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
+			<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
 			<key>name</key>
 			<string>meta.method.overload.declaration.tsx</string>
 		</dict>
@@ -1151,6 +1215,10 @@
 					<key>include</key>
 					<string>#type</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#comment</string>
+				</dict>
 			</array>
 		</dict>
 		<key>null-literal</key>
@@ -1296,7 +1364,7 @@
 		<key>object-heritage</key>
 		<dict>
 			<key>begin</key>
-			<string>(?:\b(extends|implements))</string>
+			<string>(?:\b(extends|implements)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1323,17 +1391,21 @@
 					<key>include</key>
 					<string>#comment</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#object-heritage</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type-parameters</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-heritage-parent</string>
+					<string>#object-heritage-type</string>
 				</dict>
 			</array>
 		</dict>
-		<key>object-heritage-parent</key>
+		<key>object-heritage-type</key>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -1344,7 +1416,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\s*([a-zA-Z_$][\w$]*))</string>
+			<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
 			<key>name</key>
 			<string>meta.object.heritage.parent.tsx</string>
 		</dict>
@@ -1451,7 +1523,7 @@
 			<key>begin</key>
 			<string>"</string>
 			<key>end</key>
-			<string>"|(?=$)</string>
+			<string>"|(?:[^\\\n]$)</string>
 			<key>name</key>
 			<string>string.double.tsx</string>
 			<key>patterns</key>
@@ -1467,7 +1539,7 @@
 			<key>begin</key>
 			<string>'</string>
 			<key>end</key>
-			<string>'|(?=$)</string>
+			<string>\'|(?:[^\\\n]$)</string>
 			<key>name</key>
 			<string>string.single.tsx</string>
 			<key>patterns</key>
@@ -1535,7 +1607,7 @@
 		<key>storage-keyword</key>
 		<dict>
 			<key>match</key>
-			<string>\b(number|boolean|string|any|var|let|function|const)\b</string>
+			<string>\b(number|boolean|string|any|var|let|function|const|module|namespace)\b</string>
 			<key>name</key>
 			<string>storage.type.tsx</string>
 		</dict>
@@ -1562,22 +1634,38 @@
 			<key>name</key>
 			<string>constant.character.escape</string>
 		</dict>
-		<key>switch-case</key>
+		<key>switch-block</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\.)\b(case|default)\b</string>
+			<string>{</string>
+			<key>end</key>
+			<string>(?=\})</string>
+			<key>name</key>
+			<string>switch-block.expr.tsx</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
+			</array>
+		</dict>
+		<key>switch-expression</key>
+		<dict>
+			<key>begin</key>
+			<string>\b(switch)\b\s*\(</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.control.tsx</string>
+					<string>keyword.operator.tsx</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>:</string>
+			<string>\)</string>
 			<key>name</key>
-			<string>case.expr.tsx</string>
+			<string>switch-expression.expr.tsx</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -1586,6 +1674,26 @@
 				</dict>
 			</array>
 		</dict>
+		<key>switch-statement</key>
+		<dict>
+			<key>begin</key>
+			<string>(?=\bswitch\b\s*\()</string>
+			<key>end</key>
+			<string>}</string>
+			<key>name</key>
+			<string>switch-statement.expr.tsx</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#switch-expression</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#switch-block</string>
+				</dict>
+			</array>
+		</dict>
 		<key>template</key>
 		<dict>
 			<key>begin</key>
@@ -1744,7 +1852,7 @@
 		<key>type-declaration</key>
 		<dict>
 			<key>begin</key>
-			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*=\s*</string>
+			<string>\b(type)\b\s+([a-zA-Z_$][\w$]*)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1759,15 +1867,25 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=[,);&gt;]|var|type|function|class|interface)</string>
+			<string>(?=$|[,);&gt;]|var|type|function|class|interface)</string>
 			<key>name</key>
 			<string>meta.type.declaration.tsx</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#type-parameters</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#type</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>=\s*</string>
+					<key>name</key>
+					<string>keyword.operator.tsx</string>
+				</dict>
 			</array>
 		</dict>
 		<key>type-function-return-type</key>
@@ -2004,7 +2122,7 @@
 		<key>var-expr</key>
 		<dict>
 			<key>begin</key>
-			<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum))\s+([a-zA-Z_$][\w$]*)</string>
+			<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum)\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -2012,16 +2130,39 @@
 					<key>name</key>
 					<string>storage.type.tsx</string>
 				</dict>
-				<key>2</key>
+			</dict>
+			<key>end</key>
+			<string>(?=$|;)</string>
+			<key>name</key>
+			<string>meta.var.expr.tsx</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#var-single-variable</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#comment</string>
+				</dict>
+			</array>
+		</dict>
+		<key>var-single-variable</key>
+		<dict>
+			<key>begin</key>
+			<string>\b([a-zA-Z_$][\w$]*)\s*(=?)</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>variable.tsx</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=$|[;=\}\{])|(?&lt;=\})</string>
+			<string>(?=$|[;,])</string>
 			<key>name</key>
-			<string>meta.var.expr.tsx</string>
+			<string>meta.var-single-variable.expr.tsx</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -2036,6 +2177,10 @@
 					<key>include</key>
 					<string>#comment</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#expression</string>
+				</dict>
 			</array>
 		</dict>
 		<key>variable-initializer</key>