diff --git a/extensions/clojure/syntaxes/clojure.tmLanguage.json b/extensions/clojure/syntaxes/clojure.tmLanguage.json
index 01960657b6a..033e3e2a178 100644
--- a/extensions/clojure/syntaxes/clojure.tmLanguage.json
+++ b/extensions/clojure/syntaxes/clojure.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-clojure/commit/71068a45499cace7a69c45e337860ebbc9b7fccc",
+	"version": "https://github.com/atom/language-clojure/commit/ecc790326bc8e14220e4d2d72a392a30876c3219",
 	"scopeName": "source.clojure",
 	"fileTypes": [
 		"boot",
@@ -326,7 +326,7 @@
 							"include": "#dynamic-variables"
 						},
 						{
-							"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
+							"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
 							"name": "entity.global.clojure"
 						},
 						{
@@ -404,7 +404,7 @@
 		"namespace-symbol": {
 			"patterns": [
 				{
-					"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)/",
+					"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/",
 					"captures": {
 						"1": {
 							"name": "meta.symbol.namespace.clojure"
@@ -416,7 +416,7 @@
 		"symbol": {
 			"patterns": [
 				{
-					"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
+					"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
 					"name": "meta.symbol.clojure"
 				}
 			]
diff --git a/extensions/clojure/test/colorize-results/test_clj.json b/extensions/clojure/test/colorize-results/test_clj.json
index 190c08af9f3..8a704fb9683 100644
--- a/extensions/clojure/test/colorize-results/test_clj.json
+++ b/extensions/clojure/test/colorize-results/test_clj.json
@@ -199,13 +199,13 @@
 	},
 	{
 		"c": "42",
-		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure constant.numeric.long.clojure",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #09885A",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #09885A",
+			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
 	{
@@ -1342,7 +1342,18 @@
 		}
 	},
 	{
-		"c": "+ ",
+		"c": "+",
+		"t": "source.clojure meta.quoted-expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.quoted-expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1870,7 +1881,29 @@
 		}
 	},
 	{
-		"c": " v   ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "v",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "   ",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2134,7 +2167,29 @@
 		}
 	},
 	{
-		"c": " v  ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "v",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "  ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2310,7 +2365,18 @@
 		}
 	},
 	{
-		"c": "v   ",
+		"c": "v",
+		"t": "source.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "   ",
 		"t": "source.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2431,7 +2497,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2574,7 +2662,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2684,7 +2794,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
diff --git a/extensions/cpp/package.json b/extensions/cpp/package.json
index 169cabff934..bb2f0b6aaab 100644
--- a/extensions/cpp/package.json
+++ b/extensions/cpp/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-c grammars/c.cson ./syntaxes/c.json grammars/c%2B%2B.cson ./syntaxes/c++.json"
+		"update-grammar": "node ./build/update-grammars.js"
 	},
 	"contributes": {
 		"languages": [{
@@ -22,16 +22,16 @@
 		"grammars": [{
 			"language": "c",
 			"scopeName": "source.c",
-			"path": "./syntaxes/c.json"
+			"path": "./syntaxes/c.tmLanguage.json"
 		},
 		{
 			"language": "cpp",
 			"scopeName": "source.cpp",
-			"path": "./syntaxes/c++.json"
+			"path": "./syntaxes/cpp.tmLanguage.json"
 		},
 		{
 			"scopeName": "source.c.platform",
-			"path": "./syntaxes/Platform.tmLanguage"
+			"path": "./syntaxes/platform.tmLanguage.json"
 		}],
 		"snippets": [{
 			"language": "c",