diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index 358d1b76ce8cdbe806af01f8dd423b979878f036..31fb9c6b81849af84d9a2e3779286bf5a4ba9334 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/822c147f65d9b009096d7163f7d624379812cd63",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/b95e4044ff1ac52e03f622de76f459dc5388954c",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -2607,10 +2607,14 @@
 			},
 			"patterns": [
 				{
-					"include": "#string-character-escape"
+					"include": "#char-character-escape"
 				}
 			]
 		},
+		"char-character-escape": {
+			"name": "constant.character.escape.cs",
+			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4})"
+		},
 		"string-literal": {
 			"name": "string.quoted.double.cs",
 			"begin": "(?<!@)\"",
@@ -2636,7 +2640,7 @@
 		},
 		"string-character-escape": {
 			"name": "constant.character.escape.cs",
-			"match": "\\\\."
+			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4})"
 		},
 		"verbatim-string-literal": {
 			"name": "string.quoted.double.cs",
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index 32bcaa2864b53738f62470b2ab9537d9018dae13..067389b165066448db2ecdd2d0483f6a00fa621f 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/ionide/ionide-fsgrammar/commit/a20d836fa67d6daf81fd63e8baa97aa5e1516006",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/24c1588529af144d205f66fbcec6889500f9aaa9",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@@ -276,6 +276,15 @@
 						}
 					}
 				},
+				{
+					"match": "(\\|)",
+					"comments": "Prevent captures of `|>` as a keyword when defining custom operator like `<|>`",
+					"captures": {
+						"1": {
+							"name": "keyword.symbol.fsharp"
+						}
+					}
+				},
 				{
 					"include": "#keywords"
 				}
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index b0ecaec639ff3b011b3a3c1be3a8c7b2a57c2307..2ccdc0733dedcfad7087b9a23feab64408b83910 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/295af4375e4a5da4a4352fa08a8bb3e17145ec47",
+	"version": "https://github.com/atom/language-java/commit/95ebcd0b15c369666ecc4d1593495466132dd5bf",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@@ -373,7 +373,7 @@
 					"include": "#static-initializer"
 				},
 				{
-					"include": "#methods"
+					"include": "#class-fields-and-methods"
 				},
 				{
 					"include": "#annotations"
@@ -389,6 +389,22 @@
 				}
 			]
 		},
+		"class-fields-and-methods": {
+			"patterns": [
+				{
+					"begin": "(?=\\=)",
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				},
+				{
+					"include": "#methods"
+				}
+			]
+		},
 		"code": {
 			"patterns": [
 				{
@@ -442,6 +458,9 @@
 				{
 					"include": "#variables"
 				},
+				{
+					"include": "#variables-local"
+				},
 				{
 					"include": "#objects"
 				},
@@ -479,9 +498,6 @@
 					"match": "/\\*\\*/",
 					"name": "comment.block.empty.java"
 				},
-				{
-					"include": "text.html.javadoc"
-				},
 				{
 					"include": "#comments-inline"
 				}
@@ -911,7 +927,7 @@
 							"include": "#parens"
 						},
 						{
-							"include": "#comments-inline"
+							"include": "#comments"
 						}
 					]
 				},
@@ -928,6 +944,9 @@
 						},
 						{
 							"include": "#parens"
+						},
+						{
+							"include": "#comments"
 						}
 					]
 				},
@@ -1496,12 +1515,12 @@
 			]
 		},
 		"variables": {
-			"begin": "(?x)\n(?=\n  (\n    \\b(void|boolean|byte|char|short|int|float|long|double)\\b\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
-			"end": "(?=\\=|;)",
+			"begin": "(?x)\n(?=\n  (\n    \\b(void|boolean|byte|char|short|int|float|long|double)\\b\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|:|;)\n)",
+			"end": "(?=\\=|:|;)",
 			"name": "meta.definition.variable.java",
 			"patterns": [
 				{
-					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|=|,))",
+					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|:|=|,))",
 					"captures": {
 						"1": {
 							"name": "variable.other.definition.java"
@@ -1515,6 +1534,28 @@
 					"include": "#code"
 				}
 			]
+		},
+		"variables-local": {
+			"begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*(=|:|;))",
+			"end": "(?=\\=|:|;)",
+			"name": "meta.definition.variable.local.java",
+			"patterns": [
+				{
+					"match": "\\bvar\\b",
+					"name": "storage.type.local.java"
+				},
+				{
+					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(=|:|;))",
+					"captures": {
+						"1": {
+							"name": "variable.other.definition.java"
+						}
+					}
+				},
+				{
+					"include": "#code"
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json
index acfd8adea233afcf8845fe71ca8da125613cc7fa..cae70e5ec98de8c632b01b904caac546b36ce0aa 100644
--- a/extensions/make/syntaxes/make.tmLanguage.json
+++ b/extensions/make/syntaxes/make.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/fadeevab/make.tmbundle/commit/d94d403d6d31623763a4ff86b656886fa699ef60",
+	"version": "https://github.com/fadeevab/make.tmbundle/commit/c6b3ae6e4f22e01fc483be5bb34a9682c28f3219",
 	"name": "Makefile",
 	"scopeName": "source.makefile",
 	"patterns": [
@@ -17,6 +17,9 @@
 		{
 			"include": "#variable-assignment"
 		},
+		{
+			"include": "#target"
+		},
 		{
 			"include": "#recipe"
 		},
@@ -288,7 +291,7 @@
 				}
 			]
 		},
-		"recipe": {
+		"target": {
 			"begin": "^(?!\\t)([^:]*)(:)(?!\\=)",
 			"beginCaptures": {
 				"1": {
@@ -344,37 +347,28 @@
 							"include": "#variables"
 						}
 					]
+				}
+			]
+		},
+		"recipe": {
+			"begin": "^\\t",
+			"end": "[^\\\\]$",
+			"name": "meta.scope.recipe.makefile",
+			"patterns": [
+				{
+					"match": "\\\\\\n",
+					"name": "constant.character.escape.continuation.makefile"
 				},
 				{
-					"begin": "^\\t",
-					"name": "meta.scope.recipe.makefile",
-					"patterns": [
-						{
-							"captures": {
-								"0": {
-									"patterns": [
-										{
-											"match": "\\\\\\n",
-											"name": "constant.character.escape.continuation.makefile"
-										},
-										{
-											"include": "#variables"
-										},
-										{
-											"include": "source.shell"
-										}
-									]
-								}
-							},
-							"match": ".+\\n?"
-						}
-					],
-					"while": "^\\t"
+					"include": "#variables"
+				},
+				{
+					"include": "source.shell"
 				}
 			]
 		},
 		"variable-assignment": {
-			"begin": "(^[ ]*|\\G\\s*)([^\\s]+)\\s*(=|\\?=|:=|\\+=)",
+			"begin": "(^[ ]*|\\G\\s*)([^\\s]+)\\s*((?<![?:+!])=|\\?=|:=|\\+=|!=)",
 			"beginCaptures": {
 				"2": {
 					"name": "variable.other.makefile"
diff --git a/extensions/make/test/colorize-results/makefile.json b/extensions/make/test/colorize-results/makefile.json
index 1e2cee1cb1c91076e1fc1cb0080f1bd29a640bb7..d654e509ac420477aa7cd3ebdde48f87a66e8b05 100644
--- a/extensions/make/test/colorize-results/makefile.json
+++ b/extensions/make/test/colorize-results/makefile.json
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "\tg++ main.o factorial.o hello.o -o hello",
-		"t": "source.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "\tg++ -c main.cpp",
-		"t": "source.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "\tg++ -c factorial.cpp ",
-		"t": "source.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "$(",
-		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "fake_variable",
-		"t": "source.makefile string.interpolated.makefile variable.other.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile string.interpolated.makefile variable.other.makefile",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": "\tg++ -c hello.cpp -o ",
-		"t": "source.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "$@",
-		"t": "source.makefile variable.language.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile variable.language.makefile",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -682,8 +682,30 @@
 		}
 	},
 	{
-		"c": "\trm *o hello",
-		"t": "source.makefile",
+		"c": "\trm ",
+		"t": "source.makefile meta.scope.recipe.makefile",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "source.makefile meta.scope.recipe.makefile keyword.operator.glob.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"
+		}
+	},
+	{
+		"c": "o hello",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +771,7 @@
 	},
 	{
 		"c": "\tsome_shell_var=",
-		"t": "source.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -760,7 +782,7 @@
 	},
 	{
 		"c": "$$",
-		"t": "source.makefile variable.language.makefile",
+		"t": "source.makefile meta.scope.recipe.makefile variable.language.makefile",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -770,8 +792,63 @@
 		}
 	},
 	{
-		"c": "(sed -nre 's/some regex with (group)/\\1/p')",
-		"t": "source.makefile",
+		"c": "(",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell punctuation.definition.subshell.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "sed -nre ",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell string.quoted.single.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"
+		}
+	},
+	{
+		"c": "s/some regex with (group)/\\1/p",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell string.quoted.single.shell",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell string.quoted.single.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"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.makefile meta.scope.recipe.makefile meta.scope.subshell.shell punctuation.definition.subshell.shell",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
index 59db289a2d5ffaa2eba71378ce8be6b846dba7d7..809b1120530035a103a3d368538d477efacacfea 100644
--- a/extensions/php/syntaxes/html.tmLanguage.json
+++ b/extensions/php/syntaxes/html.tmLanguage.json
@@ -4,10 +4,17 @@
 		"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-php/commit/72bfa9592e689fdcb70562ff7d882ad5308e79f7",
+	"version": "https://github.com/atom/language-php/commit/b6c5e83016b52311cdc622c2579462861ee91587",
 	"name": "PHP",
 	"scopeName": "text.html.php",
 	"injections": {
+		"text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js.embedded.html - (meta.embedded.block.php | meta.embedded.line.php))": {
+			"patterns": [
+				{
+					"include": "#php-tag"
+				}
+			]
+		},
 		"L:source.php string.quoted.single.sql.php source.sql.embedded.php": {
 			"patterns": [
 				{
@@ -108,13 +115,6 @@
 					"include": "source.php#interpolation_double_quoted"
 				}
 			]
-		},
-		"text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js": {
-			"patterns": [
-				{
-					"include": "#php-tag"
-				}
-			]
 		}
 	},
 	"patterns": [
diff --git a/extensions/php/test/colorize-results/issue-28354_php.json b/extensions/php/test/colorize-results/issue-28354_php.json
index 12e439430fbbff51a3fd2eb408f2c78412d7c4c7..329c9d6f9985d92452aa5ad85f301134e7b0c78d 100644
--- a/extensions/php/test/colorize-results/issue-28354_php.json
+++ b/extensions/php/test/colorize-results/issue-28354_php.json
@@ -66,19 +66,41 @@
 		}
 	},
 	{
-		"c": "<?php",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php punctuation.section.embedded.begin.php",
+		"c": "<",
+		"t": "text.html.php meta.embedded.block.html source.js keyword.operator.relational.js",
+		"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"
+		}
+	},
+	{
+		"c": "?",
+		"t": "text.html.php meta.embedded.block.html source.js keyword.operator.ternary.js",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.begin.php: #569CD6",
-			"light_plus": "punctuation.section.embedded.begin.php: #800000",
-			"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
-			"light_vs": "punctuation.section.embedded.begin.php: #800000",
-			"hc_black": "punctuation.section.embedded: #569CD6"
+			"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"
+		}
+	},
+	{
+		"c": "php",
+		"t": "text.html.php meta.embedded.block.html source.js variable.other.readwrite.js",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "meta.embedded: #D4D4D4",
+			"light_vs": "meta.embedded: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": "            ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"t": "text.html.php meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -89,18 +111,18 @@
 	},
 	{
 		"c": "foreach",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.control.foreach.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.function-call.js entity.name.function.js",
 		"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": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "meta.embedded: #D4D4D4",
+			"light_vs": "meta.embedded: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
 		"c": "(",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.begin.bracket.round.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -110,19 +132,8 @@
 		}
 	},
 	{
-		"c": "$",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php punctuation.definition.variable.php",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "variable: #9CDCFE"
-		}
-	},
-	{
-		"c": "actID",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php",
+		"c": "$actID",
+		"t": "text.html.php meta.embedded.block.html source.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -133,7 +144,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"t": "text.html.php meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -144,18 +155,18 @@
 	},
 	{
 		"c": "AS",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.logical.php",
+		"t": "text.html.php meta.embedded.block.html source.js variable.other.constant.js",
 		"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": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "meta.embedded: #D4D4D4",
+			"light_vs": "meta.embedded: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": " ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"t": "text.html.php meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -165,19 +176,8 @@
 		}
 	},
 	{
-		"c": "$",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php punctuation.definition.variable.php",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "variable: #9CDCFE"
-		}
-	},
-	{
-		"c": "act",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php",
+		"c": "$act",
+		"t": "text.html.php meta.embedded.block.html source.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.end.bracket.round.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.brace.round.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"t": "text.html.php meta.embedded.block.html source.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.begin.bracket.curly.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -220,30 +220,8 @@
 		}
 	},
 	{
-		"c": "                ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
-		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
-		}
-	},
-	{
-		"c": "echo",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php support.function.construct.output.php",
-		"r": {
-			"dark_plus": "support.function: #DCDCAA",
-			"light_plus": "support.function: #795E26",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "support.function: #DCDCAA"
-		}
-	},
-	{
-		"c": " ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"c": "                echo ",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -254,7 +232,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php punctuation.definition.string.begin.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -265,7 +243,7 @@
 	},
 	{
 		"c": "divNames.push(",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -276,7 +254,7 @@
 	},
 	{
 		"c": "\\'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js constant.character.escape.js",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #FF0000",
@@ -287,7 +265,7 @@
 	},
 	{
 		"c": "[nid=",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -298,7 +276,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php punctuation.definition.string.end.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -308,52 +286,19 @@
 		}
 	},
 	{
-		"c": ".",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.string.php",
+		"c": ".$act.",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"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"
-		}
-	},
-	{
-		"c": "$",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php punctuation.definition.variable.php",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "variable: #9CDCFE"
-		}
-	},
-	{
-		"c": "act",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php variable.other.php",
-		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "variable: #9CDCFE"
-		}
-	},
-	{
-		"c": ".",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.string.php",
-		"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"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	},
 	{
 		"c": "'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php punctuation.definition.string.begin.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -364,7 +309,7 @@
 	},
 	{
 		"c": "]",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -375,7 +320,7 @@
 	},
 	{
 		"c": "\\'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js constant.character.escape.js",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #FF0000",
@@ -386,7 +331,7 @@
 	},
 	{
 		"c": ");",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -397,7 +342,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php punctuation.definition.string.end.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -408,134 +353,57 @@
 	},
 	{
 		"c": ";",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.terminator.expression.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	},
 	{
-		"c": "             ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"c": "             }",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	},
 	{
-		"c": "}",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php punctuation.definition.end.bracket.curly.php",
+		"c": "        ?>",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	},
 	{
-		"c": "        ",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php",
+		"c": "    ...",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
-		}
-	},
-	{
-		"c": "?",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php punctuation.section.embedded.end.php source.php",
-		"r": {
-			"dark_plus": "punctuation.section.embedded.end.php: #569CD6",
-			"light_plus": "punctuation.section.embedded.end.php: #800000",
-			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
-			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "punctuation.section.embedded: #569CD6"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	},
 	{
-		"c": ">",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php punctuation.section.embedded.end.php",
+		"c": "</script>",
+		"t": "text.html.php meta.embedded.block.html source.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.end.php: #569CD6",
-			"light_plus": "punctuation.section.embedded.end.php: #800000",
-			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
-			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "punctuation.section.embedded: #569CD6"
-		}
-	},
-	{
-		"c": "    ",
-		"t": "text.html.php meta.embedded.block.html source.js",
-		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
-			"hc_black": "meta.embedded: #FFFFFF"
-		}
-	},
-	{
-		"c": "...",
-		"t": "text.html.php meta.embedded.block.html source.js keyword.operator.spread.js",
-		"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"
-		}
-	},
-	{
-		"c": "<",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "/",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "script",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html entity.name.tag.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
+			"hc_black": "meta.object-literal.key: #9CDCFE"
 		}
 	}
 ]
\ No newline at end of file