diff --git a/extensions/clojure/syntaxes/clojure.tmLanguage.json b/extensions/clojure/syntaxes/clojure.tmLanguage.json
index 437a0c5b5e1..01960657b6a 100644
--- a/extensions/clojure/syntaxes/clojure.tmLanguage.json
+++ b/extensions/clojure/syntaxes/clojure.tmLanguage.json
@@ -4,6 +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-clojure/commit/71068a45499cace7a69c45e337860ebbc9b7fccc",
 	"scopeName": "source.clojure",
 	"fileTypes": [
 		"boot",
@@ -15,7 +16,9 @@
 		"cljx",
 		"clojure",
 		"edn",
-		"org"
+		"org",
+		"joke",
+		"joker"
 	],
 	"foldingStartMarker": "\\(\\s*$",
 	"foldingStopMarker": "^\\s*\\)",
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index dae4475161a..51dc4821a3b 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.tmLanguage.json
@@ -4,6 +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-css/commit/23dcdee3372050eb3f07374fbe9188884bd545d1",
 	"scopeName": "source.css",
 	"name": "CSS",
 	"fileTypes": [
diff --git a/extensions/diff/syntaxes/diff.tmLanguage.json b/extensions/diff/syntaxes/diff.tmLanguage.json
index e259c46be42..e0d60de1081 100644
--- a/extensions/diff/syntaxes/diff.tmLanguage.json
+++ b/extensions/diff/syntaxes/diff.tmLanguage.json
@@ -4,6 +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/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7",
 	"fileTypes": [
 		"patch",
 		"diff",
diff --git a/extensions/docker/syntaxes/docker.tmLanguage.json b/extensions/docker/syntaxes/docker.tmLanguage.json
index d8c2d0fd766..699e29eb2f4 100644
--- a/extensions/docker/syntaxes/docker.tmLanguage.json
+++ b/extensions/docker/syntaxes/docker.tmLanguage.json
@@ -4,6 +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/moby/moby/commit/8523e9d108a0e98865673701a7bd0a7929c5260b",
 	"fileTypes": [
 		"Dockerfile"
 	],
diff --git a/extensions/fsharp/syntaxes/fsharp.json b/extensions/fsharp/syntaxes/fsharp.json
index f7abe7e8a52..d48f35550e4 100644
--- a/extensions/fsharp/syntaxes/fsharp.json
+++ b/extensions/fsharp/syntaxes/fsharp.json
@@ -4,6 +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/f2e3c30f0ebfcc89fb78ad908701159f20516812",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"fileTypes": [
diff --git a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json b/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json
index ffe1561f727..5b2ccacd56d 100644
--- a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json
+++ b/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json
@@ -4,6 +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/textmate/git.tmbundle/commit/93897a78c6e52bef13dadc0d4091d203c5facb40",
 	"fileTypes": [
 		"COMMIT_EDITMSG",
 		"MERGE_MSG"
diff --git a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json b/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json
index 15bac0d8d09..89ef957a1b9 100644
--- a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json
+++ b/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json
@@ -4,6 +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/textmate/git.tmbundle/commit/d1db42c2d71948662098183a6df519fb53a7a15b",
 	"fileTypes": [
 		"git-rebase-todo"
 	],
diff --git a/extensions/go/syntaxes/go.json b/extensions/go/syntaxes/go.json
index 098c8710482..5adc522e0a4 100644
--- a/extensions/go/syntaxes/go.json
+++ b/extensions/go/syntaxes/go.json
@@ -4,6 +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-go/commit/c413bc93966c03031cd114c53c54bc7927eea25b",
 	"scopeName": "source.go",
 	"name": "Go",
 	"comment": "Go language",
@@ -308,16 +309,46 @@
 		"brackets": {
 			"patterns": [
 				{
-					"match": "\\{|\\}",
-					"name": "punctuation.other.bracket.curly.go"
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.begin.bracket.curly.go"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.end.bracket.curly.go"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
 				},
 				{
-					"match": "\\(|\\)",
-					"name": "punctuation.other.bracket.round.go"
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.begin.bracket.round.go"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.end.bracket.round.go"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
 				},
 				{
 					"match": "\\[|\\]",
-					"name": "punctuation.other.bracket.square.go"
+					"name": "punctuation.definition.bracket.square.go"
 				}
 			]
 		},
@@ -387,13 +418,13 @@
 					"begin": "\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.other.bracket.round.go"
+							"name": "punctuation.definition.imports.begin.bracket.round.go"
 						}
 					},
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.other.bracket.round.go"
+							"name": "punctuation.definition.imports.end.bracket.round.go"
 						}
 					},
 					"patterns": [
@@ -488,12 +519,29 @@
 		"runes": {
 			"patterns": [
 				{
-					"match": "\\'(\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})|\\p{Any})\\'",
-					"name": "constant.other.rune.go"
-				},
-				{
-					"match": "\\'.*\\'",
-					"name": "invalid.illegal.unknown-rune.go"
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.go"
+						}
+					},
+					"end": "'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.go"
+						}
+					},
+					"name": "string.quoted.rune.go",
+					"patterns": [
+						{
+							"match": "\\G(\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})|.)(?=')",
+							"name": "constant.other.rune.go"
+						},
+						{
+							"match": "[^']+",
+							"name": "invalid.illegal.unknown-rune.go"
+						}
+					]
 				}
 			]
 		},
@@ -609,13 +657,13 @@
 					"begin": "\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.other.bracket.round.go"
+							"name": "punctuation.definition.variables.begin.bracket.round.go"
 						}
 					},
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.other.bracket.round.go"
+							"name": "punctuation.definition.variables.end.bracket.round.go"
 						}
 					},
 					"patterns": [
diff --git a/extensions/go/test/colorize-results/test-13777_go.json b/extensions/go/test/colorize-results/test-13777_go.json
index b893f1333e3..7012da53227 100644
--- a/extensions/go/test/colorize-results/test-13777_go.json
+++ b/extensions/go/test/colorize-results/test-13777_go.json
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "[][]",
-		"t": "source.go punctuation.other.bracket.square.go",
+		"t": "source.go punctuation.definition.bracket.square.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/go/test/colorize-results/test_go.json b/extensions/go/test/colorize-results/test_go.json
index 0aa2e9063d9..0a876071e60 100644
--- a/extensions/go/test/colorize-results/test_go.json
+++ b/extensions/go/test/colorize-results/test_go.json
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.imports.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.imports.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -198,8 +198,19 @@
 		}
 	},
 	{
-		"c": "()",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"c": "(",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -221,7 +232,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.go punctuation.other.bracket.curly.go",
+		"t": "source.go punctuation.definition.begin.bracket.curly.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,7 +529,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +617,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +705,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.go punctuation.other.bracket.curly.go",
+		"t": "source.go punctuation.definition.begin.bracket.curly.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +738,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +760,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +782,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.go punctuation.other.bracket.curly.go",
+		"t": "source.go punctuation.definition.end.bracket.curly.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -892,7 +903,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -936,7 +947,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -980,7 +991,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1101,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1233,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1288,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.go punctuation.other.bracket.round.go",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1288,7 +1299,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.go punctuation.other.bracket.curly.go",
+		"t": "source.go punctuation.definition.end.bracket.curly.go",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/groovy/syntaxes/groovy.tmLanguage.json b/extensions/groovy/syntaxes/groovy.tmLanguage.json
index 3dc8af7d0a1..9e8be43b53b 100644
--- a/extensions/groovy/syntaxes/groovy.tmLanguage.json
+++ b/extensions/groovy/syntaxes/groovy.tmLanguage.json
@@ -4,6 +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/textmate/groovy.tmbundle/commit/85d8f7c97ae473ccb9473f6c8d27e4ec957f4be1",
 	"fileTypes": [
 		"groovy",
 		"gvy"
diff --git a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
index e915b691d7f..ddd7547935f 100644
--- a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
+++ b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
@@ -4,6 +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/daaain/Handlebars/commit/790f2b0222098a3a236bd9e91bb9a039eeca4d8e",
 	"name": "Handlebars",
 	"repository": {
 		"html_tags": {
@@ -332,7 +333,7 @@
 			]
 		},
 		"end_block": {
-			"begin": "(\\{\\{~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
+			"begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
 			"end": "(~?\\}\\})",
 			"name": "meta.function.block.end.handlebars",
 			"endCaptures": {
@@ -345,7 +346,10 @@
 					"name": "support.constant.handlebars"
 				},
 				"2": {
-					"name": "support.constant.handlebars"
+					"name": "support.constant.handlebars keyword.control"
+				},
+				"3": {
+					"name": "support.constant.handlebars keyword.control"
 				}
 			},
 			"patterns": []
@@ -433,7 +437,7 @@
 			]
 		},
 		"block_helper": {
-			"begin": "(\\{\\{~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+			"begin": "(\\{\\{)(~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
 			"end": "(~?\\}\\})",
 			"name": "meta.function.block.start.handlebars",
 			"endCaptures": {
@@ -446,18 +450,21 @@
 					"name": "support.constant.handlebars"
 				},
 				"2": {
-					"name": "support.constant.handlebars"
+					"name": "support.constant.handlebars keyword.control"
 				},
 				"3": {
-					"name": "variable.parameter.handlebars"
+					"name": "support.constant.handlebars keyword.control"
 				},
 				"4": {
-					"name": "support.constant.handlebars"
-				},
-				"5": {
 					"name": "variable.parameter.handlebars"
 				},
+				"5": {
+					"name": "support.constant.handlebars"
+				},
 				"6": {
+					"name": "variable.parameter.handlebars"
+				},
+				"7": {
 					"name": "support.constant.handlebars"
 				}
 			},
@@ -610,13 +617,16 @@
 			]
 		},
 		"else_token": {
-			"begin": "(\\{\\{~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
+			"begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
 			"end": "(~?\\}\\}\\}*)",
 			"name": "meta.function.inline.else.handlebars",
 			"beginCaptures": {
 				"1": {
 					"name": "support.constant.handlebars"
 				},
+				"2": {
+					"name": "support.constant.handlebars keyword.control"
+				},
 				"3": {
 					"name": "support.constant.handlebars"
 				},
diff --git a/extensions/handlebars/test/colorize-results/test_handlebars.json b/extensions/handlebars/test/colorize-results/test_handlebars.json
index a14353771e5..a507eeddd14 100644
--- a/extensions/handlebars/test/colorize-results/test_handlebars.json
+++ b/extensions/handlebars/test/colorize-results/test_handlebars.json
@@ -220,7 +220,7 @@
 		}
 	},
 	{
-		"c": "{{#if",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -230,6 +230,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#if",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -429,7 +440,29 @@
 		}
 	},
 	{
-		"c": "{{else}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.inline.else.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "else",
+		"t": "text.html.handlebars meta.function.inline.else.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.inline.else.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -539,7 +572,29 @@
 		}
 	},
 	{
-		"c": "{{/if}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/if",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -627,7 +682,7 @@
 		}
 	},
 	{
-		"c": "{{#unless",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -637,6 +692,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#unless",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -825,7 +891,29 @@
 		}
 	},
 	{
-		"c": "{{/unless}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/unless",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -990,7 +1078,7 @@
 		}
 	},
 	{
-		"c": "{{#each",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1000,6 +1088,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#each",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -1155,7 +1254,29 @@
 		}
 	},
 	{
-		"c": "{{/each}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/each",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1430,7 +1551,7 @@
 		}
 	},
 	{
-		"c": "{{#each",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1440,6 +1561,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#each",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -1914,7 +2046,29 @@
 		}
 	},
 	{
-		"c": "{{/each}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/each",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
diff --git a/extensions/handlebars/test/colorize-results/test_hbs.json b/extensions/handlebars/test/colorize-results/test_hbs.json
index 466499b590c..8774d4f3885 100644
--- a/extensions/handlebars/test/colorize-results/test_hbs.json
+++ b/extensions/handlebars/test/colorize-results/test_hbs.json
@@ -187,7 +187,7 @@
 		}
 	},
 	{
-		"c": "{{#each",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -197,6 +197,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#each",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -671,7 +682,29 @@
 		}
 	},
 	{
-		"c": "{{/each}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/each",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1045,7 +1078,7 @@
 		}
 	},
 	{
-		"c": "{{#if",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1055,6 +1088,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#if",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -1254,7 +1298,29 @@
 		}
 	},
 	{
-		"c": "{{/if}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/if",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1628,7 +1694,7 @@
 		}
 	},
 	{
-		"c": "{{#each",
+		"c": "{{",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
@@ -1638,6 +1704,17 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA"
 		}
 	},
+	{
+		"c": "#each",
+		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
 	{
 		"c": " ",
 		"t": "text.html.handlebars meta.function.block.start.handlebars",
@@ -1815,7 +1892,29 @@
 		}
 	},
 	{
-		"c": "{{/each}}",
+		"c": "{{",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
+		"r": {
+			"dark_plus": "support.constant.handlebars: #DCDCAA",
+			"light_plus": "support.constant.handlebars: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.constant.handlebars: #DCDCAA"
+		}
+	},
+	{
+		"c": "/each",
+		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
+		"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"
+		}
+	},
+	{
+		"c": "}}",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars",
 		"r": {
 			"dark_plus": "support.constant.handlebars: #DCDCAA",
diff --git a/extensions/hlsl/syntaxes/hlsl.json b/extensions/hlsl/syntaxes/hlsl.json
index 20565922c53..475923aaca5 100644
--- a/extensions/hlsl/syntaxes/hlsl.json
+++ b/extensions/hlsl/syntaxes/hlsl.json
@@ -4,6 +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/tgjones/shaders-tmLanguage/commit/cd1ef40f549f9ce2b9e6b73498688de114a85382",
 	"scopeName": "source.hlsl",
 	"name": "HLSL",
 	"fileTypes": [
diff --git a/extensions/html/syntaxes/html.json b/extensions/html/syntaxes/html.json
index 4192c824703..0efe7ca55f0 100644
--- a/extensions/html/syntaxes/html.json
+++ b/extensions/html/syntaxes/html.json
@@ -4,6 +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/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93",
 	"fileTypes": [
 		"html",
 		"htm",
diff --git a/extensions/ini/syntaxes/ini.tmLanguage.json b/extensions/ini/syntaxes/ini.tmLanguage.json
index 34679c1bee0..ff87d4c6dc8 100644
--- a/extensions/ini/syntaxes/ini.tmLanguage.json
+++ b/extensions/ini/syntaxes/ini.tmLanguage.json
@@ -4,6 +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/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6",
 	"fileTypes": [
 		"ini",
 		"conf"
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index 654bf8e2ba8..a63b731e54d 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -4,6 +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/0e0ec7966059e3e363868311b3d855014bca95dd",
 	"scopeName": "source.java",
 	"name": "Java",
 	"fileTypes": [
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
index cd1543fd7d3..a9053fd46bd 100644
--- a/extensions/less/syntaxes/less.tmLanguage.json
+++ b/extensions/less/syntaxes/less.tmLanguage.json
@@ -4,6 +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-less/commit/b0531d05ce01a1e04e0f086807b101a1fd31783f",
 	"name": "Less",
 	"scopeName": "source.css.less",
 	"fileTypes": [
@@ -444,7 +445,7 @@
 					"name": "string.quoted.double.css",
 					"patterns": [
 						{
-							"match": "\\\\(\\h{1,6}|.)",
+							"match": "\\\\([0-9A-Fa-f]{1,6}|.)",
 							"name": "constant.character.escape.css"
 						},
 						{
@@ -468,7 +469,7 @@
 					"name": "string.quoted.single.css",
 					"patterns": [
 						{
-							"match": "\\\\(\\h{1,6}|.)",
+							"match": "\\\\([0-9A-Fa-f]{1,6}|.)",
 							"name": "constant.character.escape.css"
 						},
 						{
diff --git a/extensions/lua/syntaxes/lua.json b/extensions/lua/syntaxes/lua.json
index efea9819bde..5e82e236cb7 100644
--- a/extensions/lua/syntaxes/lua.json
+++ b/extensions/lua/syntaxes/lua.json
@@ -4,13 +4,12 @@
 		"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/textmate/lua.tmbundle/commit/42da2c6ff5d86c068f72520f856190f413911a80",
 	"comment": "Lua Syntax: version 0.8",
 	"fileTypes": [
 		"lua",
 		"p8",
-		"rockspec",
-		"luacheckrc",
-		"lakefile"
+		"rockspec"
 	],
 	"firstLineMatch": "\\A#!.*?\\blua(\\d+(\\.\\d+)?)?\\b|\\A--\\s+-\\*-\\s*lua\\s*-\\*-",
 	"keyEquivalent": "^~L",
@@ -47,11 +46,11 @@
 			]
 		},
 		{
-			"match": "(?<![\\w\\d.])0[xX]\\h+(?![pPeE.0-9])",
+			"match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(?![pPeE.0-9])",
 			"name": "constant.numeric.integer.hexadecimal.lua"
 		},
 		{
-			"match": "(?<![\\w\\d.])0[xX]\\h+(\\.\\h+)?([eE]-?\\d*)?([pP][-+]\\d+)?",
+			"match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(\\.[0-9A-Fa-f]+)?([eE]-?\\d*)?([pP][-+]\\d+)?",
 			"name": "constant.numeric.float.hexadecimal.lua"
 		},
 		{
@@ -265,11 +264,11 @@
 					"name": "constant.character.escape.byte.lua"
 				},
 				{
-					"match": "\\\\x\\h\\h",
+					"match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
 					"name": "constant.character.escape.byte.lua"
 				},
 				{
-					"match": "\\\\u\\{\\h+\\}",
+					"match": "\\\\u\\{[0-9A-Fa-f]+\\}",
 					"name": "constant.character.escape.unicode.lua"
 				},
 				{
diff --git a/extensions/make/syntaxes/Makefile.json b/extensions/make/syntaxes/Makefile.json
index 1562efc5c17..5aa193dae36 100644
--- a/extensions/make/syntaxes/Makefile.json
+++ b/extensions/make/syntaxes/Makefile.json
@@ -4,6 +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/textmate/make.tmbundle/commit/1a1827da81e20fdce56e2658451340c070ca44b7",
 	"fileTypes": [
 		"Makefile",
 		"makefile",
diff --git a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
index a07e0ba7f43..8ebc5c8a136 100644
--- a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
+++ b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
@@ -4,6 +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-objective-c/commit/0727e04544f3414c1c339cf15a39a05ea3938cb4",
 	"scopeName": "source.objc",
 	"fileTypes": [
 		"m",
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index aa2c4165302..a653400baa8 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.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-php/commit/16d8c3ea6f30c808e270a7be02a33e27ed19eed0",
+	"version": "https://github.com/atom/language-php/commit/9cb0db1e4fcb14532e93c873187406e6ba829af4",
 	"scopeName": "text.html.php",
 	"name": "PHP",
 	"fileTypes": [
@@ -1704,6 +1704,9 @@
 						}
 					]
 				},
+				{
+					"include": "#switch_statement"
+				},
 				{
 					"match": "(?x)\n\\b(\n  break|case|continue|declare|default|die|do|\n  else(if)?|end(declare|for(each)?|if|switch|while)|exit|\n  for(each)?|if|return|switch|use|while|yield\n)\\b",
 					"name": "keyword.control.php"
@@ -2311,6 +2314,27 @@
 					},
 					"match": "(@xlink)\\s+(.+)\\s*$"
 				},
+				{
+					"begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x{7f}-\\x{ff}]|\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.other.phpdoc.php"
+						}
+					},
+					"end": "(?=\\s|\\*/)",
+					"contentName": "meta.other.type.phpdoc.php",
+					"patterns": [
+						{
+							"include": "#php_doc_types_array_multiple"
+						},
+						{
+							"include": "#php_doc_types_array_single"
+						},
+						{
+							"include": "#php_doc_types"
+						}
+					]
+				},
 				{
 					"match": "(?x)\n@\n(\n  api|abstract|author|category|copyright|example|global|inherit[Dd]oc|internal|\n  license|link|method|property(-(read|write))?|package|param|return|see|since|source|\n  static|subpackage|throws|todo|var|version|uses|deprecated|final|ignore\n)\\b",
 					"name": "keyword.other.phpdoc.php"
@@ -2326,6 +2350,73 @@
 				}
 			]
 		},
+		"php_doc_types": {
+			"match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*(\\|[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"match": "(?x)\\b\n(string|integer|int|boolean|bool|float|double|object|mixed\n|array|resource|void|null|callback|false|true|self)\\b",
+							"name": "keyword.other.type.php"
+						},
+						{
+							"include": "#class-name"
+						},
+						{
+							"match": "\\|",
+							"name": "punctuation.separator.delimiter.php"
+						}
+					]
+				}
+			}
+		},
+		"php_doc_types_array_multiple": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.type.begin.bracket.round.phpdoc.php"
+				}
+			},
+			"end": "(\\))(\\[\\])",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.type.end.bracket.round.phpdoc.php"
+				},
+				"2": {
+					"name": "keyword.other.array.phpdoc.php"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#php_doc_types_array_multiple"
+				},
+				{
+					"include": "#php_doc_types_array_single"
+				},
+				{
+					"include": "#php_doc_types"
+				},
+				{
+					"match": "\\|",
+					"name": "punctuation.separator.delimiter.php"
+				}
+			]
+		},
+		"php_doc_types_array_single": {
+			"match": "(?i)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(\\[\\])",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#php_doc_types"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.other.array.phpdoc.php"
+				}
+			}
+		},
 		"regex-double-quoted": {
 			"begin": "\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
 			"beginCaptures": {
@@ -3148,6 +3239,90 @@
 				}
 			]
 		},
+		"switch_statement": {
+			"patterns": [
+				{
+					"begin": "\\bswitch\\b(?!\\s*\\(.*\\)\\s*:)",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.switch.php"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.section.switch-block.end.bracket.curly.php"
+						}
+					},
+					"name": "meta.switch-statement.php",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.switch-expression.begin.bracket.round.php"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.switch-expression.end.bracket.round.php"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#language"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
+								}
+							},
+							"end": "(?=})",
+							"patterns": [
+								{
+									"begin": "\\bcase\\b",
+									"beginCaptures": {
+										"0": {
+											"name": "keyword.control.case.php"
+										}
+									},
+									"end": ":",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.terminator.statement.php"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#language"
+										}
+									]
+								},
+								{
+									"match": "(?:^\\s*)?\\b(default)\\s*(:)",
+									"captures": {
+										"1": {
+											"name": "keyword.control.default.php"
+										},
+										"2": {
+											"name": "punctuation.terminator.statement.php"
+										}
+									}
+								},
+								{
+									"include": "#language"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
 		"var_basic": {
 			"patterns": [
 				{
diff --git a/extensions/pug/syntaxes/pug.tmLanguage.json b/extensions/pug/syntaxes/pug.tmLanguage.json
index 8a3d17a81dc..5d5a3db110c 100644
--- a/extensions/pug/syntaxes/pug.tmLanguage.json
+++ b/extensions/pug/syntaxes/pug.tmLanguage.json
@@ -4,6 +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/davidrios/jade-tmbundle/commit/f311a516bb29296fcebfdc7da8149b1c79dfb0a1",
 	"fileTypes": [
 		"jade"
 	],
diff --git a/extensions/python/syntaxes/MagicPython.tmLanguage.json b/extensions/python/syntaxes/MagicPython.tmLanguage.json
index 29e51b920fa..3a9f24cc41e 100644
--- a/extensions/python/syntaxes/MagicPython.tmLanguage.json
+++ b/extensions/python/syntaxes/MagicPython.tmLanguage.json
@@ -4,6 +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/MagicStack/MagicPython/commit/976e59dcb78cb577e79c8f2117216c06718337e0",
 	"name": "MagicPython",
 	"scopeName": "source.python",
 	"fileTypes": [
diff --git a/extensions/python/syntaxes/MagicRegExp.tmLanguage.json b/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
index 34d1a973578..c6c74610836 100644
--- a/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
+++ b/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
@@ -4,6 +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/MagicStack/MagicPython/commit/df5bb18c64252f2e7b1aa87e2ed124666d314f1d",
 	"name": "MagicRegExp",
 	"scopeName": "source.regexp.python",
 	"fileTypes": [
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index 025877c7ab4..0ba828e6eb2 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.tmLanguage.json
@@ -4,6 +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/textmate/r.tmbundle/commit/6b04ff3424f3f1cdfe64a9cfb71d8765959be250",
 	"fileTypes": [
 		"R",
 		"r",
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
index 827722f1683..43f0d35aaed 100644
--- a/extensions/ruby/package.json
+++ b/extensions/ruby/package.json
@@ -3,6 +3,9 @@
 	"version": "0.2.1",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/ruby.tmbundle Syntaxes/Ruby.plist ./syntaxes/ruby.tmLanguage.json"
+	  },
 	"contributes": {
 		"languages": [{
 			"id": "ruby",
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index a6e0c01b7b9..745d3bde514 100644
--- a/extensions/ruby/syntaxes/ruby.tmLanguage.json
+++ b/extensions/ruby/syntaxes/ruby.tmLanguage.json
@@ -4,6 +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/textmate/ruby.tmbundle/commit/4e14bd0a8ffa98a242dc365fb1e26f14e8c5974c",
 	"comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <<end\n\tprint me!\n\tend\"\n\tsymptoms:\n\tnot recognized as a heredoc\n\tsolution:\n\tthere is no way to distinguish perfectly between the << operator and the start\n\tof a heredoc. Currently, we require assignment to recognize a heredoc. More\n\trefinement is possible.\n\t• Heredocs with indented terminators (<<-) are always distinguishable, however.\n\t• Nested heredocs are not really supportable at present\n\n\ttext:\n\tprint <<-'THERE' \n\tThis is single quoted. \n\tThe above used #{Time.now} \n\tTHERE \n\tsymtoms:\n\tFrom Programming Ruby p306; should be a non-interpolated heredoc.\n\t\n    text:\n    val?(a):p(b)\n    val?'a':'b'\n    symptoms:\n    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.\n    :'b' has same problem.\n    solution:\n    ternary operator rule, precedence stuff, symbol rule.\n    but also consider 'a.b?(:c)' ??\n",
 	"fileTypes": [
 		"rb",
@@ -19,7 +20,6 @@
 		"ru",
 		"prawn",
 		"Cheffile",
-		"Gemfile",
 		"Guardfile",
 		"Hobofile",
 		"Vagrantfile",
@@ -39,9 +39,10 @@
 		"Matchfile",
 		"Scanfile",
 		"Snapfile",
-		"Gymfile"
+		"Gymfile",
+		"jb"
 	],
-	"firstLineMatch": "^#!/.*\\bruby|^#\\s+-\\*-\\s*ruby\\s*-\\*-",
+	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n(?:ruby[\\.\\d]*|macruby|rake|jruby|rbx|ruby_executable_hooks)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n    # Emacs\n    -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    ruby\n    (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n    # Vim\n    (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)\n    (?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))\n    (?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*\n    [\\s:]\n    (?:filetype|ft|syntax)\\s*=\n    ruby\n    (?=\\s|:|$)\n)",
 	"keyEquivalent": "^~R",
 	"name": "Ruby",
 	"patterns": [
@@ -161,7 +162,7 @@
 			"name": "keyword.other.special-method.ruby"
 		},
 		{
-			"begin": "\\b(?<!\\.|::)(require|require_relative|gem)\\b",
+			"begin": "\\b(?<!\\.|::)(require|require_relative)\\b",
 			"captures": {
 				"1": {
 					"name": "keyword.other.special-method.ruby"
@@ -235,7 +236,7 @@
 			"name": "support.function.kernel.ruby"
 		},
 		{
-			"match": "\\b[A-Z]\\w*\\b",
+			"match": "\\b[_A-Z]\\w*\\b",
 			"name": "variable.other.constant.ruby"
 		},
 		{
@@ -618,6 +619,44 @@
 				}
 			]
 		},
+		{
+			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1))",
+			"comment": "Heredoc with embedded xml",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.xml",
+			"patterns": [
+				{
+					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "text.xml",
+					"end": "\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "text.xml"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
 		{
 			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1))",
 			"comment": "Heredoc with embedded sql",
diff --git a/extensions/rust/syntaxes/rust.tmLanguage.json b/extensions/rust/syntaxes/rust.tmLanguage.json
index 31dcab1d887..7b269276123 100644
--- a/extensions/rust/syntaxes/rust.tmLanguage.json
+++ b/extensions/rust/syntaxes/rust.tmLanguage.json
@@ -4,6 +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/zargony/atom-language-rust/commit/d4a0a7f2d6affc79806aef0be53b90fa690a7e27",
 	"name": "Rust",
 	"scopeName": "source.rust",
 	"fileTypes": [
@@ -52,7 +53,7 @@
 		},
 		"escaped_character": {
 			"name": "constant.character.escape.rust",
-			"match": "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
+			"match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
 		},
 		"string_literal": {
 			"comment": "Double-quote string literal",
@@ -304,7 +305,7 @@
 		{
 			"comment": "Single-quote string literal (character)",
 			"name": "string.quoted.single.rust",
-			"match": "b?'([^'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'"
+			"match": "b?'([^'\\\\]|\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'"
 		},
 		{
 			"include": "#string_literal"
@@ -365,7 +366,12 @@
 		{
 			"comment": "Keyword",
 			"name": "keyword.other.rust",
-			"match": "\\b(crate|extern|mod|let|proc|ref|use|super|as|move)\\b"
+			"match": "\\b(crate|extern|mod|let|ref|use|super|move)\\b"
+		},
+		{
+			"comment": "Reserved keyword",
+			"name": "invalid.deprecated.rust",
+			"match": "\\b(abstract|alignof|become|do|final|macro|offsetof|override|priv|proc|pure|sizeof|typeof|virtual|yield)\\b"
 		},
 		{
 			"include": "#unsafe"
diff --git a/extensions/shaderlab/syntaxes/shaderlab.json b/extensions/shaderlab/syntaxes/shaderlab.json
index 8a293ee3347..047ba15cc3b 100644
--- a/extensions/shaderlab/syntaxes/shaderlab.json
+++ b/extensions/shaderlab/syntaxes/shaderlab.json
@@ -4,6 +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/tgjones/shaders-tmLanguage/commit/a6ee9f41e4b99812c6698462cae4868c80f82a3b",
 	"scopeName": "source.shaderlab",
 	"name": "ShaderLab",
 	"fileTypes": [
diff --git a/extensions/shellscript/syntaxes/Shell-Unix-Bash.tmLanguage.json b/extensions/shellscript/syntaxes/Shell-Unix-Bash.tmLanguage.json
index 1ac065388d8..88cf23c6868 100644
--- a/extensions/shellscript/syntaxes/Shell-Unix-Bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/Shell-Unix-Bash.tmLanguage.json
@@ -4,6 +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/textmate/shellscript.tmbundle/commit/ba95d7b742caef130911d878f42f66bdd80181e4",
 	"fileTypes": [
 		"sh",
 		"bash",
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index ea83040609c..e2327fa20df 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -4,6 +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/freebroccolo/atom-language-swift/commit/fb7c93e0174dea69c8685c00deeb53d480d1d202",
 	"scopeName": "source.swift",
 	"fileTypes": [
 		"swift"
diff --git a/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json b/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
index 1df56b22df8..3ae4a18ccb0 100644
--- a/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
+++ b/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
@@ -4,6 +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/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69",
 	"comment": "Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com",
 	"fileTypes": [
 		"vb"
diff --git a/extensions/xml/syntaxes/xml.json b/extensions/xml/syntaxes/xml.json
index a2006a0d265..dd66c8df2b8 100644
--- a/extensions/xml/syntaxes/xml.json
+++ b/extensions/xml/syntaxes/xml.json
@@ -4,6 +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-xml/commit/27352842917b911383122bdcf98ed0d69d55c179",
 	"scopeName": "text.xml",
 	"name": "XML",
 	"fileTypes": [
@@ -418,7 +419,7 @@
 							"name": "entity.other.attribute-name.localname.xml"
 						}
 					},
-					"match": "(?:^|\\s+)(?:([-\\w.]+)((:)))?([-\\w.:]+)="
+					"match": "(?:^|\\s+)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*="
 				},
 				{
 					"include": "#doublequotedString"
diff --git a/extensions/xml/syntaxes/xsl.json b/extensions/xml/syntaxes/xsl.json
index 2193c1a9570..116fe42ea46 100644
--- a/extensions/xml/syntaxes/xsl.json
+++ b/extensions/xml/syntaxes/xsl.json
@@ -4,6 +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-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280",
 	"scopeName": "text.xml.xsl",
 	"name": "XSL",
 	"fileTypes": [
diff --git a/extensions/yaml/syntaxes/yaml.json b/extensions/yaml/syntaxes/yaml.json
index 82cd7d840db..9d755531ed0 100644
--- a/extensions/yaml/syntaxes/yaml.json
+++ b/extensions/yaml/syntaxes/yaml.json
@@ -4,6 +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/textmate/yaml.tmbundle/commit/efc96efafe5e48480cf55a2ed124b388cbea4440",
 	"fileTypes": [
 		"yaml",
 		"yml",