diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json
index 6f0ae3a254e..1a444370322 100644
--- a/extensions/shellscript/cgmanifest.json
+++ b/extensions/shellscript/cgmanifest.json
@@ -4,14 +4,13 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "atom/language-shellscript",
-					"repositoryUrl": "https://github.com/atom/language-shellscript",
-					"commitHash": "4f8d7bb5cc4d1643674551683df10fe552dd5a6f"
+					"name": "jeff-hykin/better-shell-syntax",
+					"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
+					"commitHash": "b05618771b35b4baa25661dff91170b4924fdac8"
 				}
 			},
 			"license": "MIT",
-			"description": "The file syntaxes/shell-unix-bash.tmLanguage.json was derived from the Atom package https://github.com/atom/language-shellscript which was originally converted from the TextMate bundle https://github.com/textmate/shellscript.tmbundle.",
-			"version": "0.28.2"
+			"version": "1.2.8"
 		}
 	],
 	"version": 1
diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json
index 7fa55ea680c..36031a33840 100644
--- a/extensions/shellscript/package.json
+++ b/extensions/shellscript/package.json
@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-shellscript grammars/shell-unix-bash.cson ./syntaxes/shell-unix-bash.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin jeff-hykin/better-shell-syntax autogenerated/shell.tmLanguage.json ./syntaxes/shell-unix-bash.tmLanguage.json"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index bfbb5f135d0..cedbdfad988 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
@@ -1,60 +1,184 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-shellscript/blob/master/grammars/shell-unix-bash.cson",
+		"This file has been converted from https://github.com/jeff-hykin/better-shell-syntax/blob/master/autogenerated/shell.tmLanguage.json",
 		"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/atom/language-shellscript/commit/4f8d7bb5cc4d1643674551683df10fe552dd5a6f",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/b05618771b35b4baa25661dff91170b4924fdac8",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
 		{
-			"include": "#comment"
-		},
-		{
-			"include": "#pipeline"
-		},
-		{
-			"include": "#list"
-		},
-		{
-			"include": "#compound-command"
-		},
-		{
-			"include": "#loop"
-		},
-		{
-			"include": "#string"
-		},
-		{
-			"include": "#function-definition"
-		},
-		{
-			"include": "#variable"
-		},
-		{
-			"include": "#interpolation"
-		},
-		{
-			"include": "#heredoc"
-		},
-		{
-			"include": "#herestring"
-		},
-		{
-			"include": "#redirection"
-		},
-		{
-			"include": "#pathname"
-		},
-		{
-			"include": "#keyword"
-		},
-		{
-			"include": "#support"
+			"include": "#initial_context"
 		}
 	],
 	"repository": {
+		"alias_statement": {
+			"begin": "(alias)(?:\\s)+\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+			"end": "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.alias.shell"
+				},
+				"2": {
+					"name": "variable.other.assignment.shell"
+				},
+				"3": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"4": {
+					"name": "variable.other.assignment.shell"
+				},
+				"5": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"6": {
+					"name": "keyword.operator.assignment.shell"
+				},
+				"7": {
+					"name": "keyword.operator.assignment.compound.shell"
+				},
+				"8": {
+					"name": "keyword.operator.assignment.compound.shell"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			},
+			"name": "meta.expression.assignment.shell",
+			"patterns": [
+				{
+					"include": "#statement_context"
+				}
+			]
+		},
+		"argument": {
+			"begin": "\\s++(?!(?:%|&|\\||\\(|\\[|#|\\n|$|;))",
+			"end": "(?=\\s|;|\\||&|$|\\n|\\)|\\`)",
+			"beginCaptures": {},
+			"endCaptures": {},
+			"name": "meta.argument.shell",
+			"patterns": [
+				{
+					"include": "#argument_context"
+				},
+				{
+					"include": "#line_continuation"
+				}
+			]
+		},
+		"argument_context": {
+			"patterns": [
+				{
+					"match": "[^ \n'&;<>\\(\\)\\$`\\\\\"\\|]+(?!>)",
+					"captures": {
+						"0": {
+							"patterns": [
+								{
+									"match": "\\*",
+									"name": "variable.language.special.wildcard.shell"
+								},
+								{
+									"include": "#variable"
+								},
+								{
+									"include": "#numeric_literal"
+								},
+								{
+									"match": "(?<!\\w)(\\b(?:true|false)\\b)(?!\\w)",
+									"captures": {
+										"1": {
+											"name": "constant.language.$1.shell"
+										}
+									}
+								}
+							]
+						}
+					},
+					"name": "string.unquoted.argument.shell"
+				},
+				{
+					"include": "#statement_context"
+				}
+			]
+		},
+		"assignment": {
+			"begin": "\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+			"end": "(?:(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)|(?= |$))",
+			"beginCaptures": {
+				"1": {
+					"name": "variable.other.assignment.shell"
+				},
+				"2": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"3": {
+					"name": "variable.other.assignment.shell"
+				},
+				"4": {
+					"name": "punctuation.definition.array.access.shell"
+				},
+				"5": {
+					"name": "keyword.operator.assignment.shell"
+				},
+				"6": {
+					"name": "keyword.operator.assignment.compound.shell"
+				},
+				"7": {
+					"name": "keyword.operator.assignment.compound.shell"
+				}
+			},
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			},
+			"name": "meta.expression.assignment.shell",
+			"patterns": [
+				{
+					"include": "#argument_context"
+				}
+			]
+		},
+		"block_comment": {
+			"begin": "\\s*+(\\/\\*)",
+			"end": "\\*\\/",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.comment.begin.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.comment.end.shell"
+				}
+			},
+			"name": "comment.block.shell"
+		},
+		"boolean": {
+			"match": "\\b(?:true|false)\\b",
+			"name": "constant.language.$0.shell"
+		},
 		"case-clause": {
 			"patterns": [
 				{
@@ -106,7 +230,7 @@
 							"name": "meta.scope.case-clause-body.shell",
 							"patterns": [
 								{
-									"include": "$self"
+									"include": "#initial_context"
 								}
 							]
 						}
@@ -114,34 +238,108 @@
 				}
 			]
 		},
-		"comment": {
-			"begin": "(^\\s+)?(?<=^|\\W)(?<!-)(?=#)(?!#{)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.comment.leading.shell"
-				}
-			},
-			"end": "(?!\\G)",
+		"command_call": {
+			"begin": "(?!^ *+$)(?<=(?:^|;|\\||&|!|\\(|\\{|\\`))\\s*+(?!nocorrect\\W|nocorrect\\$|readonly\\W|readonly\\$|function\\W|function\\$|foreach\\W|foreach\\$|coproc\\W|coproc\\$|logout\\W|logout\\$|export\\W|export\\$|select\\W|select\\$|repeat\\W|repeat\\$|pushd\\W|pushd\\$|until\\W|until\\$|while\\W|while\\$|local\\W|local\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
+			"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
+			"beginCaptures": {},
+			"endCaptures": {},
+			"name": "meta.statement.shell",
 			"patterns": [
 				{
-					"begin": "#!",
+					"begin": "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+					"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\)",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.comment.shebang.shell"
+							"name": "meta.command_name.shell"
+						},
+						"1": {
+							"name": "entity.name.command.shell",
+							"patterns": [
+								{
+									"match": "(?<!\\w)(?:return|break)(?!\\w)",
+									"name": "keyword.control.$0.shell"
+								},
+								{
+									"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
+									"name": "support.function.builtin.shell"
+								},
+								{
+									"include": "#variable"
+								}
+							]
 						}
 					},
-					"end": "$",
-					"name": "comment.line.number-sign.shebang.shell"
+					"endCaptures": {},
+					"name": "meta.command.shell",
+					"patterns": [
+						{
+							"include": "#line_continuation"
+						},
+						{
+							"include": "#option"
+						},
+						{
+							"include": "#argument"
+						},
+						{
+							"include": "#statement_context"
+						}
+					]
 				},
 				{
-					"begin": "#",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.comment.shell"
+					"include": "#line_continuation"
+				},
+				{
+					"include": "#statement_context"
+				}
+			]
+		},
+		"command_name": {
+			"match": "\\s*+(?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s))(.+?)(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+			"captures": {
+				"1": {
+					"name": "entity.name.command.shell",
+					"patterns": [
+						{
+							"match": "(?<!\\w)(?:return|break)(?!\\w)",
+							"name": "keyword.control.$0.shell"
+						},
+						{
+							"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|unlimit|bindkey|builtin|command|getopts|history|declare|unalias|typeset|suspend|return|source|ulimit|unhash|disown|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|hash|jobs|kill|stat|exit|test|trap|true|pwd|let|set|cd|fg|bg|fc|:|\\.)(?!\\w)",
+							"name": "support.function.builtin.shell"
+						},
+						{
+							"include": "#variable"
 						}
-					},
-					"end": "$",
+					]
+				}
+			},
+			"name": "meta.command_name.shell"
+		},
+		"comment": {
+			"match": "(?<=^|\\s)(?:((#!).*)|((#).*))",
+			"captures": {
+				"1": {
+					"name": "comment.line.number-sign.shell meta.shebang.shell"
+				},
+				"2": {
+					"name": "punctuation.definition.comment.shebang.shell"
+				},
+				"3": {
 					"name": "comment.line.number-sign.shell"
+				},
+				"4": {
+					"name": "punctuation.definition.comment.shell"
+				}
+			}
+		},
+		"comments": {
+			"patterns": [
+				{
+					"include": "#block_comment"
+				},
+				{
+					"include": "#line_comment"
 				}
 			]
 		},
@@ -166,7 +364,7 @@
 							"include": "#logical-expression"
 						},
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -206,7 +404,7 @@
 					"name": "meta.scope.subshell.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -226,16 +424,26 @@
 					"name": "meta.scope.group.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
 			]
 		},
+		"custom_command_names": {
+			"patterns": []
+		},
+		"custom_commands": {
+			"patterns": []
+		},
+		"double_quote_escape_char": {
+			"match": "\\\\[\\$`\"\\\\\\n]",
+			"name": "constant.character.escape.shell"
+		},
 		"function-definition": {
 			"patterns": [
 				{
-					"begin": "(?<=^|;|&|\\s)(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
+					"begin": "(?:^\\s*|(?<=^|;|&|\\s))(function)\\s+([^\\s\\\\]+)(?:\\s*(\\(\\)))?",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.type.function.shell"
@@ -256,12 +464,12 @@
 					"name": "meta.function.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
 				{
-					"begin": "(?<=^|;|&|\\s)([^\\s\\\\=]+)\\s*(\\(\\))",
+					"begin": "(?:^\\s*|(?<=^|;|&|\\s))([^\\s\\\\=]+)\\s*(\\(\\))",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.shell"
@@ -279,7 +487,7 @@
 					"name": "meta.function.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -288,398 +496,65 @@
 		"heredoc": {
 			"patterns": [
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<-)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+					"end": "^\\t*\\3(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
+						"2": {},
 						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^\\t*(RUBY)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.no-indent.ruby.shell",
-					"contentName": "source.ruby.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.ruby"
-						}
-					]
+					"name": "string.quoted.heredoc.indent.shell",
+					"patterns": []
 				},
 				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*+(\"|')\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')\\2",
+					"end": "^\\3(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
+						"2": {},
 						"3": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^(RUBY)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.ruby.shell",
-					"contentName": "source.ruby.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.ruby"
-						}
-					]
+					"name": "string.quoted.heredoc.no-indent.shell",
+					"patterns": []
 				},
 				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(PYTHON)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.python.shell",
-					"contentName": "source.python.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.python"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(PYTHON)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.python.shell",
-					"contentName": "source.python.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.python"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(APPLESCRIPT)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.applescript.shell",
-					"contentName": "source.applescript.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.applescript"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(APPLESCRIPT)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.applescript.shell",
-					"contentName": "source.applescript.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.applescript"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(HTML)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.html.shell",
-					"contentName": "text.html.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.basic"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(HTML)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.html.shell",
-					"contentName": "text.html.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.basic"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(MARKDOWN)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.markdown.shell",
-					"contentName": "text.html.markdown.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.markdown"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(MARKDOWN)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.markdown.shell",
-					"contentName": "text.html.markdown.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.markdown"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(TEXTILE)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.textile.shell",
-					"contentName": "text.html.textile.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.textile"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(TEXTILE)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.textile.shell",
-					"contentName": "text.html.textile.embedded.shell",
-					"patterns": [
-						{
-							"include": "text.html.textile"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(\\3)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"contentName": "source.shell.embedded.shell",
-					"name": "string.unquoted.heredoc.no-indent.shell.shell",
-					"patterns": [
-						{
-							"include": "source.shell"
-						}
-					]
-				},
-				{
-					"begin": "(<<)\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(\\3)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.shell.shell",
-					"contentName": "source.shell.embedded.shell",
-					"patterns": [
-						{
-							"include": "source.shell"
-						}
-					]
-				},
-				{
-					"begin": "(<<)-\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^\\t*(\\3)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.no-indent.shell"
-				},
-				{
-					"begin": "(<<)\\s*(\"|')\\s*\\\\?([^;&<\\s]+)\\2",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.heredoc.shell"
-						},
-						"3": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"end": "^(\\3)(?=\\s|;|&|$)",
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
-						}
-					},
-					"name": "string.unquoted.heredoc.shell"
-				},
-				{
-					"begin": "(<<)-\\s*\\\\?([^;&<\\s]+)",
+					"begin": "(<<-)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+					"end": "^\\t*\\2(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
 						"2": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^\\t*(\\2)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.expanded.no-indent.shell",
+					"name": "string.unquoted.heredoc.indent.shell",
 					"patterns": [
 						{
-							"match": "\\\\[\\$`\\\\\\n]",
-							"name": "constant.character.escape.shell"
+							"include": "#double_quote_escape_char"
 						},
 						{
 							"include": "#variable"
@@ -690,26 +565,25 @@
 					]
 				},
 				{
-					"begin": "(<<)\\s*\\\\?([^;&<\\s]+)",
+					"begin": "(<<)\\s*+((?<!\\w)[a-zA-Z_][a-zA-Z_0-9]*(?!\\w))(?=\\s|;|&|<|\"|')",
+					"end": "^\\2(?=\\s|;|&|$)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
 						},
 						"2": {
-							"name": "keyword.control.heredoc-token.shell"
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"end": "^(\\2)(?=\\s|;|&|$)",
 					"endCaptures": {
-						"1": {
-							"name": "keyword.control.heredoc-token.shell"
+						"0": {
+							"name": "punctuation.definition.string.heredoc.shell"
 						}
 					},
-					"name": "string.unquoted.heredoc.expanded.shell",
+					"name": "string.unquoted.heredoc.no-indent.shell",
 					"patterns": [
 						{
-							"match": "\\\\[\\$`\\\\\\n]",
-							"name": "constant.character.escape.shell"
+							"include": "#double_quote_escape_char"
 						},
 						{
 							"include": "#variable"
@@ -782,7 +656,7 @@
 							"name": "string.unquoted.herestring.shell",
 							"patterns": [
 								{
-									"include": "$self"
+									"include": "#initial_context"
 								}
 							]
 						}
@@ -792,19 +666,112 @@
 				}
 			]
 		},
+		"initial_context": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#loop"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#function-definition"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#alias_statement"
+				},
+				{
+					"include": "#assignment"
+				},
+				{
+					"include": "#command_call"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"inline_comment": {
+			"match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
+			"captures": {
+				"1": {
+					"name": "comment.block.shell punctuation.definition.comment.begin.shell"
+				},
+				"2": {
+					"name": "comment.block.shell"
+				},
+				"3": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.shell punctuation.definition.comment.end.shell"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.shell"
+						}
+					]
+				}
+			}
+		},
 		"interpolation": {
 			"patterns": [
 				{
 					"begin": "\\$\\({2}",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.arithmetic.begin.shell"
 						}
 					},
-					"end": "\\){2}",
+					"end": "\\)\\s*\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.arithmetic.end.shell"
 						}
 					},
 					"name": "string.other.math.shell",
@@ -818,13 +785,13 @@
 					"begin": "`",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.backticks.shell"
 						}
 					},
 					"end": "`",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.backticks.shell"
 						}
 					},
 					"name": "string.interpolated.backtick.shell",
@@ -855,7 +822,7 @@
 							]
 						},
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -863,19 +830,19 @@
 					"begin": "\\$\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.shell"
+							"name": "punctuation.definition.evaluation.parens.begin.shell"
 						}
 					},
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.shell"
+							"name": "punctuation.definition.evaluation.parens.end.shell"
 						}
 					},
 					"name": "string.interpolated.dollar.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -884,23 +851,35 @@
 		"keyword": {
 			"patterns": [
 				{
-					"match": "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
-					"name": "keyword.control.shell"
+					"match": "(?<=^|;|&|\\s)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?=\\s|;|&|$)",
+					"name": "keyword.control.$0.shell"
 				},
 				{
 					"match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
-					"name": "storage.modifier.shell"
+					"name": "storage.modifier.$0.shell"
 				}
 			]
 		},
-		"list": {
+		"line_comment": {
+			"begin": "\\s*+(\\/\\/)",
+			"end": "(?<=\\n)(?<!\\\\\\n)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.comment.shell"
+				}
+			},
+			"endCaptures": {},
+			"name": "comment.line.double-slash.shell",
 			"patterns": [
 				{
-					"match": ";|&&|&|\\|\\|",
-					"name": "keyword.operator.list.shell"
+					"include": "#line_continuation_character"
 				}
 			]
 		},
+		"line_continuation": {
+			"match": "\\\\(?=\\n)",
+			"name": "constant.character.escape.line-continuation.shell"
+		},
 		"logical-expression": {
 			"patterns": [
 				{
@@ -909,11 +888,202 @@
 					"name": "keyword.operator.logical.shell"
 				},
 				{
-					"match": "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])",
+					"match": "(?<!\\S)-(nt|ot|ef|eq|ne|l[te]|g[te]|[a-hknoprstuwxzOGLSN])\\b",
 					"name": "keyword.operator.logical.shell"
 				}
 			]
 		},
+		"logical_expression_context": {
+			"patterns": [
+				{
+					"include": "#regex_comparison"
+				},
+				{
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"logical_expression_double": {
+			"begin": "\\[\\[",
+			"end": "\\]\\]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"name": "meta.scope.logical-expression.shell",
+			"patterns": [
+				{
+					"include": "#regex_comparison"
+				},
+				{
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"logical_expression_single": {
+			"begin": "\\[",
+			"end": "\\]",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.logical-expression.shell"
+				}
+			},
+			"name": "meta.scope.logical-expression.shell",
+			"patterns": [
+				{
+					"include": "#regex_comparison"
+				},
+				{
+					"include": "#logical-expression"
+				},
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#boolean"
+				},
+				{
+					"include": "#numeric_literal"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
 		"loop": {
 			"patterns": [
 				{
@@ -923,7 +1093,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -932,7 +1102,7 @@
 					"name": "meta.scope.for-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -954,7 +1124,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -963,7 +1133,7 @@
 					"name": "meta.scope.for-in-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -974,7 +1144,7 @@
 							"name": "keyword.control.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"0": {
 							"name": "keyword.control.shell"
@@ -983,7 +1153,7 @@
 					"name": "meta.scope.while-loop.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -997,7 +1167,7 @@
 							"name": "variable.other.loop.shell"
 						}
 					},
-					"end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$)",
+					"end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$|\\))",
 					"endCaptures": {
 						"1": {
 							"name": "keyword.control.shell"
@@ -1006,7 +1176,7 @@
 					"name": "meta.scope.select-block.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1040,14 +1210,11 @@
 								},
 								{
 									"include": "#case-clause"
-								},
-								{
-									"include": "$self"
 								}
 							]
 						},
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1067,7 +1234,7 @@
 					"name": "meta.scope.if-block.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -1100,6 +1267,380 @@
 				}
 			]
 		},
+		"misc_ranges": {
+			"patterns": [
+				{
+					"include": "#logical_expression_single"
+				},
+				{
+					"include": "#logical_expression_double"
+				},
+				{
+					"begin": "\\(\\(",
+					"end": "\\)\\)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.arithmetic.shell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arithmetic.shell"
+						}
+					},
+					"name": "meta.arithmetic.shell",
+					"patterns": [
+						{
+							"include": "#math"
+						}
+					]
+				},
+				{
+					"begin": "(?<!=)\\(",
+					"end": "\\)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.subshell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.subshell"
+						}
+					},
+					"name": "meta.scope.subshell",
+					"patterns": [
+						{
+							"include": "#initial_context"
+						}
+					]
+				},
+				{
+					"begin": "{",
+					"end": "}",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.shell"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.shell"
+						}
+					},
+					"name": "meta.scope.group.shell",
+					"patterns": [
+						{
+							"include": "#initial_context"
+						}
+					]
+				}
+			]
+		},
+		"numeric_literal": {
+			"match": "(?<!\\w)((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)(?!\\w)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"begin": "(?=.)",
+							"end": "$",
+							"beginCaptures": {},
+							"endCaptures": {},
+							"patterns": [
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "constant.numeric.hexadecimal.shell"
+										},
+										"5": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"6": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"7": {
+											"name": "keyword.other.unit.exponent.hexadecimal.shell"
+										},
+										"8": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.shell"
+										},
+										"9": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.shell"
+										},
+										"10": {
+											"name": "constant.numeric.exponent.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"11": {
+											"name": "keyword.other.unit.suffix.floating-point.shell"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"3": {
+											"name": "constant.numeric.decimal.point.shell"
+										},
+										"4": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"5": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"6": {
+											"name": "keyword.other.unit.exponent.decimal.shell"
+										},
+										"7": {
+											"name": "keyword.operator.plus.exponent.decimal.shell"
+										},
+										"8": {
+											"name": "keyword.operator.minus.exponent.decimal.shell"
+										},
+										"9": {
+											"name": "constant.numeric.exponent.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"10": {
+											"name": "keyword.other.unit.suffix.floating-point.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.binary.shell"
+										},
+										"2": {
+											"name": "constant.numeric.binary.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.octal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.octal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.shell"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"4": {
+											"name": "keyword.other.unit.exponent.hexadecimal.shell"
+										},
+										"5": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.shell"
+										},
+										"6": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.shell"
+										},
+										"7": {
+											"name": "constant.numeric.exponent.hexadecimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"8": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.shell"
+										},
+										"3": {
+											"name": "keyword.other.unit.exponent.decimal.shell"
+										},
+										"4": {
+											"name": "keyword.operator.plus.exponent.decimal.shell"
+										},
+										"5": {
+											"name": "keyword.operator.minus.exponent.decimal.shell"
+										},
+										"6": {
+											"name": "constant.numeric.exponent.decimal.shell",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.shell"
+												}
+											]
+										},
+										"7": {
+											"name": "keyword.other.unit.suffix.integer.shell"
+										}
+									}
+								}
+							]
+						}
+					]
+				}
+			}
+		},
+		"option": {
+			"begin": "\\s++(-)((?!(?:!|%|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|\\s)))",
+			"end": "(?:(?=\\s)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|#|\\])(?<!\\\\))",
+			"beginCaptures": {
+				"1": {
+					"name": "string.unquoted.argument.shell constant.other.option.dash.shell"
+				},
+				"2": {
+					"name": "string.unquoted.argument.shell constant.other.option.shell"
+				}
+			},
+			"endCaptures": {},
+			"contentName": "string.unquoted.argument constant.other.option",
+			"patterns": [
+				{
+					"include": "#option_context"
+				}
+			]
+		},
+		"option_context": {
+			"patterns": [
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
 		"pathname": {
 			"patterns": [
 				{
@@ -1129,7 +1670,7 @@
 					"name": "meta.structure.extglob.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				}
@@ -1165,7 +1706,7 @@
 					"name": "string.interpolated.process-substitution.shell",
 					"patterns": [
 						{
-							"include": "$self"
+							"include": "#initial_context"
 						}
 					]
 				},
@@ -1175,6 +1716,97 @@
 				}
 			]
 		},
+		"regex_comparison": {
+			"match": "\\=~",
+			"name": "keyword.operator.logical.regex.shell"
+		},
+		"regexp": {
+			"patterns": [
+				{
+					"match": ".+"
+				}
+			]
+		},
+		"simple_options": {
+			"match": "(?:\\s++\\-\\w+)*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"match": "\\s++(\\-)(\\w+)",
+							"captures": {
+								"1": {
+									"name": "string.unquoted.argument.shell constant.other.option.dash.shell"
+								},
+								"2": {
+									"name": "string.unquoted.argument.shell constant.other.option.shell"
+								}
+							}
+						}
+					]
+				}
+			}
+		},
+		"statement_context": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#pipeline"
+				},
+				{
+					"include": "#statement_seperator"
+				},
+				{
+					"include": "#misc_ranges"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#variable"
+				},
+				{
+					"include": "#interpolation"
+				},
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#herestring"
+				},
+				{
+					"include": "#redirection"
+				},
+				{
+					"include": "#pathname"
+				},
+				{
+					"include": "#keyword"
+				},
+				{
+					"include": "#support"
+				}
+			]
+		},
+		"statement_seperator": {
+			"match": "(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n)",
+			"captures": {
+				"1": {
+					"name": "punctuation.terminator.statement.semicolon.shell"
+				},
+				"2": {
+					"name": "punctuation.separator.statement.and.shell"
+				},
+				"3": {
+					"name": "punctuation.separator.statement.or.shell"
+				},
+				"4": {
+					"name": "punctuation.separator.statement.background.shell"
+				}
+			}
+		},
 		"string": {
 			"patterns": [
 				{
@@ -1197,7 +1829,7 @@
 					"name": "string.quoted.single.shell"
 				},
 				{
-					"begin": "\\$?\"",
+					"begin": " *\\$?\"",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.shell"
@@ -1258,76 +1890,83 @@
 				}
 			]
 		},
-		"support": {
-			"patterns": [
-				{
-					"match": "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
-					"name": "support.function.builtin.shell"
-				},
-				{
-					"match": "(?<=^|;|&|\\s)(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)(?=\\s|;|&|$)",
-					"name": "support.function.builtin.shell"
-				}
-			]
-		},
 		"variable": {
 			"patterns": [
 				{
+					"match": "(\\$)(\\@(?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.all.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.all.shell"
 						}
-					},
-					"match": "(\\$)[a-zA-Z_][a-zA-Z0-9_]*",
-					"name": "variable.other.normal.shell"
+					}
 				},
 				{
+					"match": "(\\$)([0-9](?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.shell"
 						}
-					},
-					"match": "(\\$)[-*@#?$!0_]",
-					"name": "variable.other.special.shell"
+					}
 				},
 				{
+					"match": "(\\$)(\\{[0-9]+\\}(?!\\w))",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.definition.variable.shell variable.parameter.positional.shell"
+						},
+						"2": {
+							"name": "variable.parameter.positional.shell"
 						}
-					},
-					"match": "(\\$)[1-9]",
-					"name": "variable.other.positional.shell"
+					}
 				},
 				{
-					"begin": "\\${",
+					"match": "(\\$)([-*#?$!0_](?!\\w))",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.shell variable.language.special.shell"
+						},
+						"2": {
+							"name": "variable.language.special.shell"
+						}
+					}
+				},
+				{
+					"begin": "(\\$)(\\{)",
+					"end": "\\}",
 					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.variable.shell"
+						"1": {
+							"name": "punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell"
+						},
+						"2": {
+							"name": "punctuation.section.bracket.curly.variable.begin.shell"
 						}
 					},
-					"end": "}",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.variable.shell"
+							"name": "punctuation.section.bracket.curly.variable.end.shell"
 						}
 					},
-					"name": "variable.other.bracket.shell",
 					"patterns": [
 						{
-							"match": "!|:[-=?]?|\\*|@|#{1,2}|%{1,2}|/",
+							"match": "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
 							"name": "keyword.operator.expansion.shell"
 						},
 						{
+							"match": "(\\[)[^\\]]+(\\])",
 							"captures": {
 								"1": {
 									"name": "punctuation.section.array.shell"
 								},
-								"3": {
+								"2": {
 									"name": "punctuation.section.array.shell"
 								}
-							},
-							"match": "(\\[)([^\\]]+)(\\])"
+							}
 						},
 						{
 							"include": "#variable"
@@ -1336,6 +1975,17 @@
 							"include": "#string"
 						}
 					]
+				},
+				{
+					"match": "(\\$)(\\w+(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.shell variable.other.normal.shell"
+						},
+						"2": {
+							"name": "variable.other.normal.shell"
+						}
+					}
 				}
 			]
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
index 098a999bc63..529003d7667 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html meta.embedded.line.js string.quoted.double.html punctuation.definition.string.end.html source.js-ignored-vscode",
+		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html meta.embedded.line.js string.quoted.double.html punctuation.definition.string.end.html source.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -659,7 +659,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html meta.embedded.line.js string.quoted.single.html punctuation.definition.string.end.html source.js-ignored-vscode",
+		"t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html meta.embedded.line.js string.quoted.single.html punctuation.definition.string.end.html source.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
@@ -897,7 +897,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.double.html punctuation.definition.string.end.html source.css-ignored-vscode",
+		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.double.html punctuation.definition.string.end.html source.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1065,7 +1065,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.single.html punctuation.definition.string.end.html source.css-ignored-vscode",
+		"t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html meta.embedded.line.css string.quoted.single.html punctuation.definition.string.end.html source.css",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.html: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
index 44d036df8ae..ab9dd18269e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#!",
-		"t": "source.shell comment.line.number-sign.shebang.shell punctuation.definition.comment.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shell meta.shebang.shell punctuation.definition.comment.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "/usr/bin/env bash",
-		"t": "source.shell comment.line.number-sign.shebang.shell",
+		"t": "source.shell comment.line.number-sign.shell meta.shebang.shell",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -70,21 +70,7 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -99,7 +85,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -168,21 +154,7 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -267,16 +239,16 @@
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.scope.if-block.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_plus_experimental": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_plus_experimental": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -295,7 +267,7 @@
 	},
 	{
 		"c": "then",
-		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -309,7 +281,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +351,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -392,8 +364,22 @@
 		}
 	},
 	{
-		"c": "[[",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"c": "[",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,7 +393,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -421,7 +407,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell variable.other.positional.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -435,7 +421,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell variable.other.positional.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -449,7 +435,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +449,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell keyword.operator.logical.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell keyword.operator.logical.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -477,7 +463,7 @@
 	},
 	{
 		"c": " /",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -491,7 +477,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell keyword.operator.glob.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell keyword.operator.glob.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -505,7 +491,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,8 +504,22 @@
 		}
 	},
 	{
-		"c": "]]",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"c": "]",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.scope.logical-expression.shell punctuation.definition.logical-expression.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -533,7 +533,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -547,21 +547,21 @@
 	},
 	{
 		"c": "&&",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell punctuation.separator.statement.and.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_plus_experimental": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_plus_experimental": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -575,7 +575,7 @@
 	},
 	{
 		"c": "echo",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -589,7 +589,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -603,7 +603,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.positional.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -631,7 +631,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.positional.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -659,7 +659,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -687,7 +687,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -701,7 +701,7 @@
 	},
 	{
 		"c": "echo",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -715,7 +715,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -743,7 +743,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -757,7 +757,7 @@
 	},
 	{
 		"c": "PWD",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.normal.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -784,36 +784,50 @@
 		}
 	},
 	{
-		"c": "${",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell punctuation.definition.variable.shell",
+		"c": "$",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell punctuation.section.bracket.curly.variable.begin.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"dark_plus_experimental": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_plus_experimental": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.section.bracket.curly.variable.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "1",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"dark_plus_experimental": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_plus_experimental": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "#",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell keyword.operator.expansion.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell keyword.operator.expansion.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -827,21 +841,21 @@
 	},
 	{
 		"c": ".",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"dark_plus_experimental": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_plus_experimental": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "/",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell keyword.operator.expansion.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell keyword.operator.expansion.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -855,21 +869,21 @@
 	},
 	{
 		"c": "}",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell variable.other.bracket.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.section.bracket.curly.variable.end.shell",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
 			"dark_vs": "string: #CE9178",
 			"light_vs": "string: #A31515",
-			"hc_black": "variable: #9CDCFE",
-			"dark_plus_experimental": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_plus_experimental": "variable: #001080"
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -883,21 +897,21 @@
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell keyword.operator.list.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_plus_experimental": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_plus_experimental": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -924,8 +938,8 @@
 		}
 	},
 	{
-		"c": "\tROOT=",
-		"t": "source.shell meta.scope.if-block.shell",
+		"c": "\t",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -937,9 +951,37 @@
 			"light_plus_experimental": "default: #000000E4"
 		}
 	},
+	{
+		"c": "ROOT",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -952,8 +994,22 @@
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -967,7 +1023,7 @@
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -980,8 +1036,22 @@
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -995,7 +1065,7 @@
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1008,8 +1078,22 @@
 		}
 	},
 	{
-		"c": "realpath ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "realpath",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1023,7 +1107,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1037,7 +1121,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1051,7 +1135,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1065,7 +1149,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1079,7 +1163,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1093,7 +1177,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1107,7 +1191,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1121,7 +1205,7 @@
 	},
 	{
 		"c": "else",
-		"t": "source.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1134,8 +1218,8 @@
 		}
 	},
 	{
-		"c": "\tROOT=",
-		"t": "source.shell meta.scope.if-block.shell",
+		"c": "\t",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1147,9 +1231,37 @@
 			"light_plus_experimental": "default: #000000E4"
 		}
 	},
+	{
+		"c": "ROOT",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1162,8 +1274,22 @@
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1177,7 +1303,7 @@
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1190,8 +1316,22 @@
 		}
 	},
 	{
-		"c": "dirname ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "dirname",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1205,7 +1345,7 @@
 	},
 	{
 		"c": "$(",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1218,8 +1358,64 @@
 		}
 	},
 	{
-		"c": "readlink -f ",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell",
+		"c": "readlink",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "f",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1233,7 +1429,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell punctuation.definition.variable.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1247,7 +1443,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell variable.other.special.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell variable.parameter.positional.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1261,7 +1457,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1275,7 +1471,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1289,7 +1485,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.shell meta.scope.if-block.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.scope.if-block.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1316,134 +1512,22 @@
 		}
 	},
 	{
-		"c": "DEVELOPER=",
-		"t": "source.shell",
+		"c": "DEVELOPER",
+		"t": "source.shell meta.expression.assignment.shell variable.other.assignment.shell",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
 		}
 	},
 	{
-		"c": "$(",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": "xcode-select -print-path",
-		"t": "source.shell string.interpolated.dollar.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": ")",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": "LIPO=",
-		"t": "source.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "$(",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.begin.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": "xcrun -sdk iphoneos -find lipo",
-		"t": "source.shell string.interpolated.dollar.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": ")",
-		"t": "source.shell string.interpolated.dollar.shell punctuation.definition.string.end.shell",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178",
-			"dark_plus_experimental": "string: #CE9178",
-			"hc_light": "string: #0F4A85",
-			"light_plus_experimental": "string: #A31515"
-		}
-	},
-	{
-		"c": "cat ",
-		"t": "source.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "<<",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.operator.heredoc.shell",
+		"c": "=",
+		"t": "source.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1456,8 +1540,8 @@
 		}
 	},
 	{
-		"c": "-",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"c": "$(",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1470,22 +1554,344 @@
 		}
 	},
 	{
-		"c": "EOF",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.control.heredoc-token.shell",
+		"c": "xcode-select",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_plus_experimental": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_plus_experimental": "keyword.control: #AF00DB"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "print-path",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "LIPO",
+		"t": "source.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "$(",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.begin.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "xcrun",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "sdk",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "iphoneos",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "find",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "lipo",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.shell meta.expression.assignment.shell string.interpolated.dollar.shell punctuation.definition.evaluation.parens.end.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "cat",
+		"t": "source.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "<<-",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell keyword.operator.heredoc.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "EOF",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.string.heredoc.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
 		"c": " > /path/file",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1499,7 +1905,7 @@
 	},
 	{
 		"c": "\t# A heredoc with a variable ",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1513,7 +1919,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1527,7 +1933,7 @@
 	},
 	{
 		"c": "DEVELOPER",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell variable.other.normal.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1541,7 +1947,7 @@
 	},
 	{
 		"c": "\tsome more file",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1555,16 +1961,16 @@
 	},
 	{
 		"c": "EOF",
-		"t": "source.shell string.unquoted.heredoc.expanded.no-indent.shell keyword.control.heredoc-token.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.heredoc.indent.shell punctuation.definition.string.heredoc.shell",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_plus_experimental": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_plus_experimental": "keyword.control: #AF00DB"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
 		}
 	},
 	{
@@ -1639,7 +2045,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1653,7 +2059,7 @@
 	},
 	{
 		"c": "cd",
-		"t": "source.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1667,7 +2073,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1681,7 +2087,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1695,7 +2101,7 @@
 	},
 	{
 		"c": "ROOT",
-		"t": "source.shell meta.function.shell meta.scope.group.shell variable.other.normal.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1709,7 +2115,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1751,7 +2157,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1765,7 +2171,7 @@
 	},
 	{
 		"c": "test",
-		"t": "source.shell meta.function.shell meta.scope.group.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -1778,8 +2184,78 @@
 		}
 	},
 	{
-		"c": " -d node_modules ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell string.unquoted.argument.shell constant.other.option.dash.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": "d",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell string.unquoted.argument constant.other.option",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "node_modules",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1806,8 +2282,8 @@
 		}
 	},
 	{
-		"c": " ./scripts/npm.sh install",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1819,9 +2295,65 @@
 			"light_plus_experimental": "default: #000000E4"
 		}
 	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA",
+			"dark_plus_experimental": "support.function: #DCDCAA",
+			"hc_light": "support.function: #5E2CBC",
+			"light_plus_experimental": "support.function: #795E26"
+		}
+	},
+	{
+		"c": "/scripts/npm.sh",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "install",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1877,7 +2409,7 @@
 	},
 	{
 		"c": "export",
-		"t": "source.shell meta.function.shell meta.scope.group.shell storage.modifier.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell storage.modifier.export.shell",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1890,8 +2422,8 @@
 		}
 	},
 	{
-		"c": " NODE_ENV=development",
-		"t": "source.shell meta.function.shell meta.scope.group.shell",
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1903,9 +2435,51 @@
 			"light_plus_experimental": "default: #000000E4"
 		}
 	},
+	{
+		"c": "NODE_ENV",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell variable.other.assignment.shell",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_plus_experimental": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_plus_experimental": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell keyword.operator.assignment.shell",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_plus_experimental": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_plus_experimental": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "development",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.expression.assignment.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
 	{
 		"c": "\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell punctuation.whitespace.comment.leading.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2002,21 +2576,7 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2031,7 +2591,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell variable.other.normal.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.variable.shell variable.other.normal.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2100,21 +2660,7 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": "\"",
+		"c": " \"",
 		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.scope.logical-expression.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -2199,16 +2745,16 @@
 	},
 	{
 		"c": ";",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.operator.list.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell punctuation.terminator.statement.semicolon.shell",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_plus_experimental": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_plus_experimental": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
 		}
 	},
 	{
@@ -2227,7 +2773,7 @@
 	},
 	{
 		"c": "then",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2241,7 +2787,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2255,35 +2801,7 @@
 	},
 	{
 		"c": "exec",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "support.function: #DCDCAA",
-			"dark_plus_experimental": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC",
-			"light_plus_experimental": "support.function: #795E26"
-		}
-	},
-	{
-		"c": " ./.build/electron/Electron.app/Contents/MacOS/Electron ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": ".",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -2297,7 +2815,63 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "./.build/electron/Electron.app/Contents/MacOS/Electron",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2311,7 +2885,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2325,7 +2899,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2339,7 +2913,7 @@
 	},
 	{
 		"c": "@",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2353,7 +2927,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2381,7 +2955,7 @@
 	},
 	{
 		"c": "else",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2395,7 +2969,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2409,35 +2983,7 @@
 	},
 	{
 		"c": "exec",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "support.function: #DCDCAA",
-			"dark_plus_experimental": "support.function: #DCDCAA",
-			"hc_light": "support.function: #5E2CBC",
-			"light_plus_experimental": "support.function: #795E26"
-		}
-	},
-	{
-		"c": " ./.build/electron/electron ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_plus_experimental": "default: #FFFFFFD3",
-			"hc_light": "default: #292929",
-			"light_plus_experimental": "default: #000000E4"
-		}
-	},
-	{
-		"c": ".",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell support.function.builtin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell entity.name.command.shell support.function.builtin.shell",
 		"r": {
 			"dark_plus": "support.function: #DCDCAA",
 			"light_plus": "support.function: #795E26",
@@ -2451,7 +2997,63 @@
 	},
 	{
 		"c": " ",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": "./.build/electron/electron",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.unquoted.argument.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_plus_experimental": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_plus_experimental": "string: #A31515"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2465,7 +3067,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2479,7 +3081,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2493,7 +3095,7 @@
 	},
 	{
 		"c": "@",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2507,7 +3109,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.function.shell meta.scope.group.shell meta.scope.if-block.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2562,8 +3164,22 @@
 		}
 	},
 	{
-		"c": "code ",
-		"t": "source.shell",
+		"c": "code",
+		"t": "source.shell meta.statement.shell meta.command.shell entity.name.command.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_plus_experimental": "default: #FFFFFFD3",
+			"hc_light": "default: #292929",
+			"light_plus_experimental": "default: #000000E4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2577,7 +3193,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.begin.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2591,7 +3207,7 @@
 	},
 	{
 		"c": "$",
-		"t": "source.shell string.quoted.double.shell variable.other.special.shell punctuation.definition.variable.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.variable.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2605,7 +3221,7 @@
 	},
 	{
 		"c": "@",
-		"t": "source.shell string.quoted.double.shell variable.other.special.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell variable.parameter.positional.all.shell",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2619,7 +3235,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.shell string.quoted.double.shell punctuation.definition.string.end.shell",
+		"t": "source.shell meta.statement.shell meta.command.shell meta.argument.shell string.quoted.double.shell punctuation.definition.string.end.shell",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",