diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index e2f4268ed2f..afd2170851b 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -14,4 +14,4 @@
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index e9abbe63e63..6e21f3ea93f 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/atom/language-php",
-					"commitHash": "2bf736a814e1a58aa63470c1a29590bd02e924e7"
+					"commitHash": "4cdf06a944a3b3c8884a6085c6adc6b246911646"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index d8d7e067384..5d6554b264b 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/2bf736a814e1a58aa63470c1a29590bd02e924e7",
+	"version": "https://github.com/atom/language-php/commit/4cdf06a944a3b3c8884a6085c6adc6b246911646",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -390,7 +390,7 @@
 			}
 		},
 		{
-			"begin": "(?i)\\b((?:require|include)(?:_once)?)\\s+",
+			"begin": "(?i)\\b((?:require|include)(?:_once)?)(\\s+|(?=\\())",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.import.include.php"
@@ -2384,8 +2384,8 @@
 					"name": "punctuation.separator.delimiter.php"
 				},
 				{
-					"match": "(?i)\\b(null|int|float|bool|string|array|object|callable|iterable|false|mixed)\\b",
-					"name": "storage.type.php"
+					"match": "(?i)\\b(null|int|float|bool|string|array|object|callable|iterable|false|mixed|void)\\b",
+					"name": "keyword.other.type.php"
 				},
 				{
 					"match": "(?i)\\b(parent|self)\\b",
@@ -2809,7 +2809,7 @@
 			"name": "constant.character.escape.php"
 		},
 		"sql-string-double-quoted": {
-			"begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND)\\b)",
+			"begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND|WITH)\\b)",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.begin.php"
@@ -2883,7 +2883,7 @@
 			]
 		},
 		"sql-string-single-quoted": {
-			"begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND)\\b)",
+			"begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND|WITH)\\b)",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.begin.php"
diff --git a/extensions/r/cgmanifest.json b/extensions/r/cgmanifest.json
index 62f2751e6c9..07aa2c8b41c 100644
--- a/extensions/r/cgmanifest.json
+++ b/extensions/r/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "Ikuyadeu/vscode-R",
 					"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
-					"commitHash": "e03ba9cb9b19412f48c73ea73deb6746d50bbf23"
+					"commitHash": "866d7cbe0620d28948a89bca24d99efd6b74b9bb"
 				}
 			},
 			"license": "MIT",
-			"version": "1.3.0"
+			"version": "1.6.7"
 		}
 	],
 	"version": 1
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index ad947f62849..dad43adb073 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.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/Ikuyadeu/vscode-R/commit/e03ba9cb9b19412f48c73ea73deb6746d50bbf23",
+	"version": "https://github.com/Ikuyadeu/vscode-R/commit/866d7cbe0620d28948a89bca24d99efd6b74b9bb",
 	"name": "R",
 	"scopeName": "source.r",
 	"patterns": [
@@ -180,6 +180,10 @@
 					"match": "(!|&{1,2}|[|]{1,2})",
 					"name": "keyword.operator.logical.r"
 				},
+				{
+					"match": "(\\|>)",
+					"name": "keyword.operator.pipe.r"
+				},
 				{
 					"match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)",
 					"name": "keyword.operator.other.r"
diff --git a/extensions/rust/cgmanifest.json b/extensions/rust/cgmanifest.json
index bfd20614952..de79e1b7788 100644
--- a/extensions/rust/cgmanifest.json
+++ b/extensions/rust/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "rust-syntax",
 					"repositoryUrl": "https://github.com/dustypomerleau/rust-syntax",
-					"commitHash": "7b924664814131ae4509a537bb07960fe65dcaac"
+					"commitHash": "20462d50ff97338f42c6b64c3f421c634fd60734"
 				}
 			},
 			"license": "MIT",
 			"description": "A TextMate-style grammar for Rust.",
-			"version": "0.4.3"
+			"version": "0.5.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/rust/syntaxes/rust.tmLanguage.json b/extensions/rust/syntaxes/rust.tmLanguage.json
index 0bf85737864..875741a5a83 100644
--- a/extensions/rust/syntaxes/rust.tmLanguage.json
+++ b/extensions/rust/syntaxes/rust.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/dustypomerleau/rust-syntax/commit/7b924664814131ae4509a537bb07960fe65dcaac",
+	"version": "https://github.com/dustypomerleau/rust-syntax/commit/20462d50ff97338f42c6b64c3f421c634fd60734",
 	"name": "Rust",
 	"scopeName": "source.rust",
 	"patterns": [
@@ -657,8 +657,33 @@
 				},
 				{
 					"comment": "storage keywords",
-					"name": "storage.type.rust",
-					"match": "\\b(const|enum|extern|let|macro|mod|struct|trait|type)\\b"
+					"name": "keyword.other.rust storage.type.rust",
+					"match": "\\b(extern|let|macro|mod)\\b"
+				},
+				{
+					"comment": "const keyword",
+					"name": "storage.modifier.rust",
+					"match": "\\b(const)\\b"
+				},
+				{
+					"comment": "type keyword",
+					"name": "keyword.declaration.type.rust storage.type.rust",
+					"match": "\\b(type)\\b"
+				},
+				{
+					"comment": "enum keyword",
+					"name": "keyword.declaration.enum.rust storage.type.rust",
+					"match": "\\b(enum)\\b"
+				},
+				{
+					"comment": "trait keyword",
+					"name": "keyword.declaration.trait.rust storage.type.rust",
+					"match": "\\b(trait)\\b"
+				},
+				{
+					"comment": "struct keyword",
+					"name": "keyword.declaration.struct.rust storage.type.rust",
+					"match": "\\b(struct)\\b"
 				},
 				{
 					"comment": "storage modifiers",
@@ -940,7 +965,7 @@
 					"match": "\\b(trait)\\s+([A-Z][A-Za-z0-9]*)\\b",
 					"captures": {
 						"1": {
-							"name": "storage.type.rust"
+							"name": "keyword.declaration.trait.rust storage.type.rust"
 						},
 						"2": {
 							"name": "entity.name.type.trait.rust"
@@ -952,7 +977,7 @@
 					"match": "\\b(struct)\\s+([A-Z][A-Za-z0-9]*)\\b",
 					"captures": {
 						"1": {
-							"name": "storage.type.rust"
+							"name": "keyword.declaration.struct.rust storage.type.rust"
 						},
 						"2": {
 							"name": "entity.name.type.struct.rust"
@@ -964,7 +989,7 @@
 					"match": "\\b(enum)\\s+([A-Z][A-Za-z0-9_]*)\\b",
 					"captures": {
 						"1": {
-							"name": "storage.type.rust"
+							"name": "keyword.declaration.enum.rust storage.type.rust"
 						},
 						"2": {
 							"name": "entity.name.type.enum.rust"
@@ -976,7 +1001,7 @@
 					"match": "\\b(type)\\s+([A-Z][A-Za-z0-9_]*)\\b",
 					"captures": {
 						"1": {
-							"name": "storage.type.rust"
+							"name": "keyword.declaration.type.rust storage.type.rust"
 						},
 						"2": {
 							"name": "entity.name.type.declaration.rust"
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
index 598893df28f..49aff9c5061 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": "struct",
-		"t": "source.rust storage.type.rust",
+		"t": "source.rust keyword.declaration.struct.rust storage.type.rust",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "trait",
-		"t": "source.rust storage.type.rust",
+		"t": "source.rust keyword.declaration.trait.rust storage.type.rust",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
index 72f3f332437..c966130aa1a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": "let",
-		"t": "source.rust storage.type.rust",
+		"t": "source.rust keyword.other.rust storage.type.rust",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",