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