diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/cpp/test/colorize-results/test-23630_cpp.json
index 08d81e6afff..26da4333e92 100644
--- a/extensions/cpp/test/colorize-results/test-23630_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23630_cpp.json
@@ -3,8 +3,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -14,8 +14,8 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -36,8 +36,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -58,8 +58,8 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -69,8 +69,8 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -91,8 +91,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -102,8 +102,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -113,8 +113,8 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
diff --git a/extensions/cpp/test/colorize-results/test-23850_cpp.json b/extensions/cpp/test/colorize-results/test-23850_cpp.json
index 4ba6b59dc9b..9a0466d8c29 100644
--- a/extensions/cpp/test/colorize-results/test-23850_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23850_cpp.json
@@ -3,8 +3,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -14,8 +14,8 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -36,8 +36,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -47,8 +47,8 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -58,8 +58,8 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -80,8 +80,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -91,8 +91,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -102,8 +102,8 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
diff --git a/extensions/cpp/test/colorize-results/test-78769_cpp.json b/extensions/cpp/test/colorize-results/test-78769_cpp.json
index e714cf5e26b..da4cbdd99b2 100644
--- a/extensions/cpp/test/colorize-results/test-78769_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-78769_cpp.json
@@ -3,8 +3,8 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -14,8 +14,8 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -36,8 +36,8 @@
 		"c": "DOCTEST_IMPLEMENT_FIXTURE",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -58,8 +58,8 @@
 		"c": "der",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@@ -91,8 +91,8 @@
 		"c": "base",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@@ -124,8 +124,8 @@
 		"c": "func",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@@ -157,8 +157,8 @@
 		"c": "decorators",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json
index 902ef645164..6c3e21a12a3 100644
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@@ -3,8 +3,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -14,8 +14,8 @@
 		"c": "if",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -36,8 +36,8 @@
 		"c": "B4G_DEBUG_CHECK",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -652,8 +652,8 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -663,8 +663,8 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -751,8 +751,8 @@
 		"c": "obj",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -1037,7 +1037,7 @@
 		"c": "x",
 		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.property.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
+			"dark_plus": "source.cpp variable.other.property: #DADADA",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json
index f84d916afa3..9a6fe977b57 100644
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@@ -25,8 +25,8 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -36,8 +36,8 @@
 		"c": "include",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -157,8 +157,8 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -168,8 +168,8 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
+			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
+			"light_plus": "source.cpp keyword.control.directive: #808080",
 			"dark_vs": "keyword.control: #569CD6",
 			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
@@ -190,8 +190,8 @@
 		"c": "EXTERN_C",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "entity.name.function: #DCDCAA",
-			"light_plus": "entity.name.function: #795E26",
+			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
+			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@@ -817,8 +817,8 @@
 		"c": "x",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@@ -872,8 +872,8 @@
 		"c": "y",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
+			"light_plus": "source.cpp variable.parameter: #808080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index f12d3d7633e..3efcc124ff0 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -170,6 +170,73 @@
 			"settings": {
 				"foreground": "#d7ba7d"
 			}
+		},
+		// Scopes that are potentially C++ only follow
+		{
+			"scope": "source.cpp entity.name",
+			"settings": {
+				"foreground": "#C8C8C8"
+			}
+		},
+		{
+			"scope": "source.cpp keyword.control.directive",
+			"settings": {
+				"foreground": "#9B9B9B"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.operator",
+			"settings": {
+				"foreground": "#B4B4B4"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.preprocessor",
+			"settings": {
+				"foreground": "#C586C0"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.label",
+			"settings": {
+				"foreground": "#C8C8C8"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal",
+			"settings": {
+				"foreground": "#DADADA"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.number",
+			"settings": {
+				"foreground": "#B5CEA8"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.string",
+			"settings": {
+				"foreground": "#ce9178"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.enummember",
+			"settings": {
+				"foreground": "#B8D7A3"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.property",
+			"settings": {
+				"foreground": "#DADADA"
+			}
+		},
+		{
+			"scope": "source.cpp variable.parameter",
+			"settings": {
+				"foreground": "#7F7F7F"
+			}
 		}
 	]
 }
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 3d30c5d17fb..e6a4c922357 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -170,7 +170,55 @@
 			"settings": {
 				"foreground": "#ff0000"
 			}
+		},
+		// Scopes that are potentially C++ only follow
+		{
+			"scope": "source.cpp entity.name",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": "source.cpp keyword.control.directive",
+			"settings": {
+				"foreground": "#808080"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.operator",
+			"settings": {
+				"foreground": "#008080"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.preprocessor",
+			"settings": {
+				"foreground": "#AF00DB"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.label",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.string",
+			"settings": {
+				"foreground": "#0451a5"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.enummember",
+			"settings": {
+				"foreground": "#2F4F4F"
+			}
+		},
+		{
+			"scope": "source.cpp variable.parameter",
+			"settings": {
+				"foreground": "#808080"
+			}
 		}
-
 	]
 }