diff --git a/extensions/ruby/test/colorize-results/test_rb.json b/extensions/ruby/test/colorize-results/test_rb.json
index 66468920c99..bd2dccc2cbe 100644
--- a/extensions/ruby/test/colorize-results/test_rb.json
+++ b/extensions/ruby/test/colorize-results/test_rb.json
@@ -432,8 +432,8 @@
 		"c": "Models",
 		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -476,8 +476,8 @@
 		"c": "MsRestAzure",
 		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -1191,8 +1191,8 @@
 		"c": "ArgumentError",
 		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -1345,8 +1345,8 @@
 		"c": "ArgumentError",
 		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -1499,8 +1499,8 @@
 		"c": "ServiceClientCredentials",
 		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -2269,8 +2269,8 @@
 		"c": "MAVERICKS_PKG_PATH",
 		"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -2837,4 +2837,4 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index 03e62612d62..560fd159a0d 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -97,6 +97,16 @@
 				"foreground": "#9CDCFE"
 			}
 		},
+		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#D4D4D4",
+			}
+		},
 		{
 			"name": "Object keys, TS grammar specific",
 			"scope": [
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index faa2b836c2d..8f65dc5b4f0 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -97,6 +97,16 @@
 				"foreground": "#001080"
 			}
 		},
+		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#000000",
+			}
+		},
 		{
 			"name": "Object keys, TS grammar specific",
 			"scope": [
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
index d1146aa1288..05e1d341ea5 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
@@ -2962,8 +2962,8 @@
 		"c": "t",
 		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -3398,4 +3398,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
index 6a27304f24a..44c6c1a2593 100644
--- a/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
+++ b/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
@@ -190,8 +190,8 @@
 		"c": "timeRange",
 		"t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #D4D4D4",
+			"light_plus": "variable.other.constant: #000000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"