From 53cfd4e21e0a819a4ec0b89fb07c872dcb6d2f0a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 15 Aug 2018 18:38:23 +0200
Subject: [PATCH] VS Code Hangs When Opening Specific PowerShell File. Fixes
 #56430

---
 .../syntaxes/powershell.tmLanguage.json       | 212 +++-----
 .../test/colorize-results/test_ps1.json       | 514 ++++++------------
 2 files changed, 254 insertions(+), 472 deletions(-)

diff --git a/extensions/powershell/syntaxes/powershell.tmLanguage.json b/extensions/powershell/syntaxes/powershell.tmLanguage.json
index 0e3c0dbe84a..60dee137b19 100644
--- a/extensions/powershell/syntaxes/powershell.tmLanguage.json
+++ b/extensions/powershell/syntaxes/powershell.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/PowerShell/EditorSyntax/commit/472c9447da4e3160bef211d5e1a0c2dee3cce497",
+	"version": "https://github.com/PowerShell/EditorSyntax/commit/6f5438611c54922ea94c81532a2dcfee72190039",
 	"name": "PowerShell",
 	"scopeName": "source.powershell",
 	"patterns": [
@@ -71,17 +71,7 @@
 		},
 		{
 			"begin": "(?<!')'",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.powershell"
-				}
-			},
 			"end": "'(?!')",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.end.powershell"
-				}
-			},
 			"name": "string.quoted.single.powershell",
 			"patterns": [
 				{
@@ -147,7 +137,7 @@
 			"begin": "(\\$)(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.variable.powershell"
+					"name": "keyword.other.variable.definition.powershell"
 				},
 				"2": {
 					"name": "punctuation.section.group.begin.powershell"
@@ -180,20 +170,8 @@
 			"name": "keyword.control.powershell"
 		},
 		{
-			"begin": "(?<!\\w)(--%)(?!\\w)",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.powershell"
-				}
-			},
-			"end": "$",
-			"patterns": [
-				{
-					"match": ".+",
-					"name": "string.unquoted.powershell"
-				}
-			],
-			"comment": "This should be moved to the repository at some point."
+			"match": "(?<!\\w)(--%)(?!\\w)",
+			"name": "keyword.control.powershell"
 		},
 		{
 			"comment": "This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.",
@@ -242,7 +220,7 @@
 		},
 		{
 			"match": "\\|{2}|&{2}|;",
-			"name": "punctuation.terminator.statement.powershell"
+			"name": "keyword.other.statement-separator.powershell"
 		},
 		{
 			"match": "&|(?<!\\w)\\.(?= )|`|,|\\|",
@@ -262,7 +240,7 @@
 					"name": "punctuation.definition.comment.powershell"
 				}
 			},
-			"end": "$\\n?",
+			"end": "$",
 			"name": "comment.line.powershell",
 			"patterns": [
 				{
@@ -348,17 +326,7 @@
 						},
 						{
 							"begin": "(?<!')'",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.definition.string.begin.powershell"
-								}
-							},
 							"end": "'(?!')",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.string.end.powershell"
-								}
-							},
 							"name": "string.quoted.single.powershell",
 							"patterns": [
 								{
@@ -411,7 +379,7 @@
 							"name": "keyword.operator.documentation.powershell"
 						}
 					},
-					"match": "^(?i:(?:\\s*|#)+(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
+					"match": "(?i:\\s*(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
 					"name": "comment.documentation.embedded.powershell"
 				},
 				{
@@ -496,7 +464,7 @@
 			"begin": "(\\$)(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.variable.powershell"
+					"name": "keyword.other.variable.definition.powershell"
 				},
 				"2": {
 					"name": "punctuation.section.group.begin.powershell"
@@ -649,11 +617,11 @@
 			"patterns": [
 				{
 					"captures": {
-						"0": {
-							"name": "constant.language.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
+							"name": "constant.language.powershell"
 						}
 					},
 					"comment": "These are special constants.",
@@ -661,14 +629,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "support.constant.variable.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "These are the other built-in constants.",
@@ -676,14 +644,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "support.constant.automatic.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.",
@@ -691,14 +659,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "variable.language.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "Style preference variables as language variables so that they stand out.",
@@ -706,28 +674,25 @@
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "storage.modifier.scope.powershell"
 						},
+						"3": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"4": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "punctuation.section.braces.begin.powershell"
@@ -735,39 +700,39 @@
 						"3": {
 							"name": "storage.modifier.scope.powershell"
 						},
+						"4": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"5": {
 							"name": "punctuation.section.braces.end.powershell"
 						},
 						"6": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "support.variable.drive.powershell"
 						},
+						"3": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"4": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$|@)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "punctuation.section.braces.begin.powershell"
@@ -775,11 +740,14 @@
 						"3": {
 							"name": "support.variable.drive.powershell"
 						},
+						"4": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"5": {
 							"name": "punctuation.section.braces.end.powershell"
 						},
 						"6": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
@@ -827,11 +795,11 @@
 			"patterns": [
 				{
 					"captures": {
-						"0": {
-							"name": "constant.language.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
+							"name": "constant.language.powershell"
 						}
 					},
 					"comment": "These are special constants.",
@@ -839,14 +807,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "support.constant.variable.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "These are the other built-in constants.",
@@ -854,14 +822,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "support.variable.automatic.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "Automatic variables are not constants, but they are read-only...",
@@ -869,14 +837,14 @@
 				},
 				{
 					"captures": {
-						"0": {
+						"1": {
+							"name": "keyword.other.variable.definition.powershell"
+						},
+						"2": {
 							"name": "variable.language.powershell"
 						},
-						"1": {
-							"name": "punctuation.definition.variable.powershell"
-						},
 						"3": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"comment": "Style preference variables as language variables so that they stand out.",
@@ -884,65 +852,62 @@
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "storage.modifier.scope.powershell"
 						},
+						"3": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"4": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "storage.modifier.scope.powershell"
 						},
+						"3": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"4": {
 							"name": "keyword.other.powershell"
 						},
 						"5": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "support.variable.drive.powershell"
 						},
+						"3": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"4": {
-							"name": "variable.other.member.powershell"
+							"name": "entity.name.function.invocation.powershell"
 						}
 					},
 					"match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))"
 				},
 				{
 					"captures": {
-						"0": {
-							"name": "variable.other.readwrite.powershell"
-						},
 						"1": {
-							"name": "punctuation.definition.variable.powershell"
+							"name": "keyword.other.variable.definition.powershell"
 						},
 						"2": {
 							"name": "punctuation.section.braces.begin"
@@ -950,6 +915,9 @@
 						"3": {
 							"name": "support.variable.drive.powershell"
 						},
+						"4": {
+							"name": "variable.other.readwrite.powershell"
+						},
 						"5": {
 							"name": "punctuation.section.braces.end"
 						}
@@ -1004,17 +972,7 @@
 		},
 		"doubleQuotedString": {
 			"begin": "(?<!(?<!`)\")\"",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.begin.powershell"
-				}
-			},
 			"end": "\"(?!\")",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.string.end.powershell"
-				}
-			},
 			"name": "string.quoted.double.powershell",
 			"patterns": [
 				{
diff --git a/extensions/powershell/test/colorize-results/test_ps1.json b/extensions/powershell/test/colorize-results/test_ps1.json
index fd82cda536b..b09a52ebc66 100644
--- a/extensions/powershell/test/colorize-results/test_ps1.json
+++ b/extensions/powershell/test/colorize-results/test_ps1.json
@@ -155,13 +155,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -287,13 +287,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -386,13 +386,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -441,13 +441,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -463,13 +463,13 @@
 	},
 	{
 		"c": ".IsInRole",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell variable.other.readwrite.powershell variable.other.member.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell entity.name.function.invocation.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
@@ -649,18 +649,7 @@
 		}
 	},
 	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "Failed to determine if the current user has elevated privileges. The error was: '{0}'.",
+		"c": "\"Failed to determine if the current user has elevated privileges. The error was: '{0}'.\"",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -670,17 +659,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell",
@@ -716,13 +694,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell support.constant.automatic.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1013,13 +991,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1090,13 +1068,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell support.constant.automatic.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1167,7 +1145,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell punctuation.definition.string.begin.powershell",
+		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1178,13 +1156,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1199,7 +1177,7 @@
 		}
 	},
 	{
-		"c": "  2>&1 & set",
+		"c": "  2>&1 & set\"",
 		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1209,17 +1187,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.double.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": ")",
 		"t": "source.powershell meta.scriptblock.powershell punctuation.section.group.end.powershell",
@@ -1299,13 +1266,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell support.constant.automatic.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1353,18 +1320,7 @@
 		}
 	},
 	{
-		"c": "'",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.single.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "^([^=]+)=(.*)",
+		"c": "'^([^=]+)=(.*)'",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.single.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1374,17 +1330,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "'",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell string.quoted.single.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": ")",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell punctuation.section.group.end.powershell",
@@ -1486,13 +1431,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell support.constant.automatic.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1563,13 +1508,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell support.constant.automatic.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1727,18 +1672,7 @@
 		}
 	},
 	{
-		"c": "'",
-		"t": "source.powershell string.quoted.single.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "Initializing Azure PowerShell environment...",
+		"c": "'Initializing Azure PowerShell environment...'",
 		"t": "source.powershell string.quoted.single.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1748,26 +1682,15 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "'",
-		"t": "source.powershell string.quoted.single.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": ";",
-		"t": "source.powershell punctuation.terminator.statement.powershell",
+		"t": "source.powershell keyword.other.statement-separator.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1947,18 +1870,7 @@
 		}
 	},
 	{
-		"c": "'",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.single.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "Please launch command under administrator account. It is needed for environment setting up and unit test.",
+		"c": "'Please launch command under administrator account. It is needed for environment setting up and unit test.'",
 		"t": "source.powershell meta.scriptblock.powershell string.quoted.single.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1968,17 +1880,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "'",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.single.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.powershell meta.scriptblock.powershell",
@@ -2014,13 +1915,13 @@
 	},
 	{
 		"c": ";",
-		"t": "source.powershell meta.scriptblock.powershell punctuation.terminator.statement.powershell",
+		"t": "source.powershell meta.scriptblock.powershell keyword.other.statement-separator.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2036,18 +1937,18 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": "env:",
-		"t": "source.powershell variable.other.readwrite.powershell support.variable.drive.powershell",
+		"t": "source.powershell support.variable.drive.powershell",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -2168,18 +2069,18 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": "env:",
-		"t": "source.powershell variable.other.readwrite.powershell support.variable.drive.powershell",
+		"t": "source.powershell support.variable.drive.powershell",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -2201,13 +2102,13 @@
 	},
 	{
 		"c": ";",
-		"t": "source.powershell punctuation.terminator.statement.powershell",
+		"t": "source.powershell keyword.other.statement-separator.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2289,7 +2190,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell punctuation.definition.string.begin.powershell",
+		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2300,18 +2201,18 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": "env:",
-		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell variable.other.readwrite.powershell support.variable.drive.powershell",
+		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell support.variable.drive.powershell",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -2332,7 +2233,7 @@
 		}
 	},
 	{
-		"c": "\\Microsoft Visual Studio 12.0",
+		"c": "\\Microsoft Visual Studio 12.0\"",
 		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2342,17 +2243,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "\"",
-		"t": "source.powershell interpolated.simple.source.powershell string.quoted.double.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": ")",
 		"t": "source.powershell punctuation.section.group.end.powershell",
@@ -2399,13 +2289,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2431,18 +2321,7 @@
 		}
 	},
 	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "12.0",
+		"c": "\"12.0\"",
 		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2452,17 +2331,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": "}",
 		"t": "source.powershell meta.scriptblock.powershell punctuation.section.braces.end.powershell",
@@ -2531,13 +2399,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell meta.scriptblock.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell meta.scriptblock.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2563,18 +2431,7 @@
 		}
 	},
 	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "11.0",
+		"c": "\"11.0\"",
 		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2584,17 +2441,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "\"",
-		"t": "source.powershell meta.scriptblock.powershell string.quoted.double.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": "}",
 		"t": "source.powershell meta.scriptblock.powershell punctuation.section.braces.end.powershell",
@@ -2608,13 +2454,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2662,18 +2508,7 @@
 		}
 	},
 	{
-		"c": "'",
-		"t": "source.powershell string.quoted.single.powershell punctuation.definition.string.begin.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "\"{0}\\Microsoft Visual Studio {1}\\VC\\vcvarsall.bat\" x64",
+		"c": "'\"{0}\\Microsoft Visual Studio {1}\\VC\\vcvarsall.bat\" x64'",
 		"t": "source.powershell string.quoted.single.powershell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2683,17 +2518,6 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
-	{
-		"c": "'",
-		"t": "source.powershell string.quoted.single.powershell punctuation.definition.string.end.powershell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.powershell",
@@ -2729,18 +2553,18 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
 		"c": "env:",
-		"t": "source.powershell variable.other.readwrite.powershell support.variable.drive.powershell",
+		"t": "source.powershell support.variable.drive.powershell",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
@@ -2784,13 +2608,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2806,13 +2630,13 @@
 	},
 	{
 		"c": ";",
-		"t": "source.powershell punctuation.terminator.statement.powershell",
+		"t": "source.powershell keyword.other.statement-separator.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2861,13 +2685,13 @@
 	},
 	{
 		"c": "$",
-		"t": "source.powershell variable.other.readwrite.powershell punctuation.definition.variable.powershell",
+		"t": "source.powershell keyword.other.variable.definition.powershell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -2883,13 +2707,13 @@
 	},
 	{
 		"c": ";",
-		"t": "source.powershell punctuation.terminator.statement.powershell",
+		"t": "source.powershell keyword.other.statement-separator.powershell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	}
 ]
\ No newline at end of file