diff --git a/extras/PlainTasks/Material-Theme-Darker.hidden-tmTheme b/extras/PlainTasks/Material-Theme-Darker.hidden-tmTheme
index 339a8faa4..445096c50 100644
--- a/extras/PlainTasks/Material-Theme-Darker.hidden-tmTheme
+++ b/extras/PlainTasks/Material-Theme-Darker.hidden-tmTheme
@@ -28,7 +28,7 @@
 				<key>gutter</key>
 				<string>#212121</string>
 				<key>invisibles</key>
-				<string></string>
+				<string>#4A4A4A</string>
 				<key>lineHighlight</key>
 				<string>#00000050</string>
 				<key>selection</key>
@@ -49,7 +49,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -73,7 +73,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string></string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#EEFFFFFFaa</string>
+				<string>#EEFFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -132,7 +132,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -143,7 +143,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -158,7 +158,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#EEFFFFFFdd</string>
+				<string>#EEFFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -171,7 +171,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -184,7 +184,7 @@
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#4A4A4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -230,9 +230,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#FFCB6Bbf</string>
+				<string>#FFCB6B</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -243,9 +243,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -256,9 +256,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -269,11 +269,11 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#89DDFFbf</string>
+				<string>#89DDFF</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -284,9 +284,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,9 +297,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>bf</string>
+				<string>#4A4A4A</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -312,7 +312,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -323,9 +323,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#F07178bf</string>
+				<string>#F07178</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -368,7 +368,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#EEFFFFFFcc</string>
+				<string>#EEFFFFFF</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/extras/PlainTasks/Material-Theme-Lighter.hidden-tmTheme b/extras/PlainTasks/Material-Theme-Lighter.hidden-tmTheme
index de775af21..a65bf6316 100644
--- a/extras/PlainTasks/Material-Theme-Lighter.hidden-tmTheme
+++ b/extras/PlainTasks/Material-Theme-Lighter.hidden-tmTheme
@@ -28,7 +28,7 @@
 				<key>gutter</key>
 				<string>#FAFAFA</string>
 				<key>invisibles</key>
-				<string></string>
+				<string>#CCD7DA</string>
 				<key>lineHighlight</key>
 				<string>#90A4AE20</string>
 				<key>selection</key>
@@ -49,7 +49,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -73,7 +73,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string></string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#80CBC4aa</string>
+				<string>#80CBC4</string>
 			</dict>
 		</dict>
 		<dict>
@@ -132,7 +132,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -143,7 +143,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -158,7 +158,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#80CBC4dd</string>
+				<string>#80CBC4</string>
 			</dict>
 		</dict>
 		<dict>
@@ -171,7 +171,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -184,7 +184,7 @@
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#CCD7DA</string>
 			</dict>
 		</dict>
 		<dict>
@@ -230,9 +230,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#FFB62Cbf</string>
+				<string>#FFB62C</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -243,9 +243,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#91B859bf</string>
+				<string>#91B859</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -256,9 +256,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6182B8bf</string>
+				<string>#6182B8</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -269,11 +269,11 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#39ADB5bf</string>
+				<string>#39ADB5</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -284,9 +284,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#91B859bf</string>
+				<string>#91B859</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,9 +297,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>bf</string>
+				<string>#CCD7DA</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -312,7 +312,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#6182B8bf</string>
+				<string>#6182B8</string>
 			</dict>
 		</dict>
 		<dict>
@@ -323,9 +323,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#FF5370bf</string>
+				<string>#FF5370</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -368,7 +368,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#80CBC4cc</string>
+				<string>#80CBC4</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/extras/PlainTasks/Material-Theme-Palenight.hidden-tmTheme b/extras/PlainTasks/Material-Theme-Palenight.hidden-tmTheme
index bfa7420c6..fa8f3f4e2 100644
--- a/extras/PlainTasks/Material-Theme-Palenight.hidden-tmTheme
+++ b/extras/PlainTasks/Material-Theme-Palenight.hidden-tmTheme
@@ -28,7 +28,7 @@
 				<key>gutter</key>
 				<string>#292D3E</string>
 				<key>invisibles</key>
-				<string></string>
+				<string>#676E95</string>
 				<key>lineHighlight</key>
 				<string>#00000030</string>
 				<key>selection</key>
@@ -49,7 +49,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -73,7 +73,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string></string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#959DCBaa</string>
+				<string>#959DCB</string>
 			</dict>
 		</dict>
 		<dict>
@@ -132,7 +132,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -143,7 +143,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -158,7 +158,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#959DCBdd</string>
+				<string>#959DCB</string>
 			</dict>
 		</dict>
 		<dict>
@@ -171,7 +171,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -184,7 +184,7 @@
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#676E95</string>
 			</dict>
 		</dict>
 		<dict>
@@ -230,9 +230,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#FFCB6Bbf</string>
+				<string>#FFCB6B</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -243,9 +243,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -256,9 +256,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -269,11 +269,11 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#89DDFFbf</string>
+				<string>#89DDFF</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -284,9 +284,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,9 +297,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>bf</string>
+				<string>#676E95</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -312,7 +312,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -323,9 +323,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#F07178bf</string>
+				<string>#F07178</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -368,7 +368,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#959DCBcc</string>
+				<string>#959DCB</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/extras/PlainTasks/Material-Theme.hidden-tmTheme b/extras/PlainTasks/Material-Theme.hidden-tmTheme
index 3b5f4b44c..feebd3c51 100644
--- a/extras/PlainTasks/Material-Theme.hidden-tmTheme
+++ b/extras/PlainTasks/Material-Theme.hidden-tmTheme
@@ -28,7 +28,7 @@
 				<key>gutter</key>
 				<string>#263238</string>
 				<key>invisibles</key>
-				<string></string>
+				<string>#546E7A</string>
 				<key>lineHighlight</key>
 				<string>#00000050</string>
 				<key>selection</key>
@@ -49,7 +49,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -73,7 +73,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string></string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#EEFFFFaa</string>
+				<string>#EEFFFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -132,7 +132,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -143,7 +143,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -158,7 +158,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#EEFFFFdd</string>
+				<string>#EEFFFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -171,7 +171,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string></string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -184,7 +184,7 @@
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>aa</string>
+				<string>#546E7A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -230,9 +230,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#FFCB6Bbf</string>
+				<string>#FFCB6B</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -243,9 +243,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -256,9 +256,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -269,11 +269,11 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#89DDFFbf</string>
+				<string>#89DDFF</string>
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -284,9 +284,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#C3E88Dbf</string>
+				<string>#C3E88D</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,9 +297,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>bf</string>
+				<string>#546E7A</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -312,7 +312,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#82AAFFbf</string>
+				<string>#82AAFF</string>
 			</dict>
 		</dict>
 		<dict>
@@ -323,9 +323,9 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#F07178bf</string>
+				<string>#F07178</string>
 				<key>foreground</key>
-				<string>#000000bf</string>
+				<string>#000000</string>
 			</dict>
 		</dict>
 		<dict>
@@ -368,7 +368,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#EEFFFFcc</string>
+				<string>#EEFFFF</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/sources/extras/PlainTasks/scheme.YAML-tmTheme b/sources/extras/PlainTasks/scheme.YAML-tmTheme
index 139c4dc91..e6b98b5eb 100644
--- a/sources/extras/PlainTasks/scheme.YAML-tmTheme
+++ b/sources/extras/PlainTasks/scheme.YAML-tmTheme
@@ -14,7 +14,7 @@ settings:
     caret: '<%= scheme.caret %>'
     foreground: '<%= scheme.foreground %>'
     gutter: '<%= scheme.background %>'
-    invisibles: '<%= scheme.comment %>'
+    invisibles: '<%= scheme.comments %>'
     lineHighlight: '<%= scheme.highlight %>'
     selection: '<%= scheme.highlight %>'
     selectionBorder: '<%= scheme.highlight %>'
@@ -27,7 +27,7 @@ settings:
 - name: Comments
   scope: comment
   settings:
-    foreground: '<%= scheme.comment %>'
+    foreground: '<%= scheme.comments %>'
     fontStyle: 'italic'
 
 - name: Tags
@@ -39,7 +39,7 @@ settings:
 - name: Notes
   scope: notes.todo
   settings:
-    foreground: '<%= scheme.comment %>'
+    foreground: '<%= scheme.comments %>'
 
 - name: Meta
   scope: meta
@@ -55,7 +55,7 @@ settings:
 - name: Pending Bullet
   scope: punctuation.definition.bullet.pending
   settings:
-    foreground: '<%= scheme.foreground %>aa'
+    foreground: '<%= scheme.foreground %>'
 
 - name: Cancelled Bullet
   scope: punctuation.definition.bullet.cancelled
@@ -65,31 +65,31 @@ settings:
 - name: Cancelled Task
   scope: meta.item.todo.cancelled
   settings:
-    foreground: '<%= scheme.comment %>'
+    foreground: '<%= scheme.comments %>'
     fontStyle: 'italic'
 
 - name: Meta Info
   scope: meta.tag.todo.completed, meta.tag.todo.cancelled
   settings:
-    foreground: '<%= scheme.comment %>aa'
+    foreground: '<%= scheme.comments %>'
 
 - name: Keyword
   scope: keyword
   settings:
     background: '<%= scheme.highlight %>'
-    foreground: '<%= scheme.foreground %>dd'
+    foreground: '<%= scheme.foreground %>'
     fontStyle: 'bold'
 
 - name: Separator
   scope: meta.punctuation.archive.todo, meta.punctuation.separator.todo
   settings:
-    foreground: '<%= scheme.comment %>'
+    foreground: '<%= scheme.comments %>'
     fontStyle: 'bold'
 
 - name: Font Style Punctuation
   scope: punctuation.definition.italic, punctuation.definition.bold
   settings:
-    foreground: '<%= scheme.comment %>aa'
+    foreground: '<%= scheme.comments %>'
     fontStyle: 'normal'
 
 - name: Italic
@@ -111,51 +111,51 @@ settings:
 - name: String
   scope: string
   settings:
-    background: '<%= scheme.base.yellow %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.yellow %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Number
   scope: constant.numeric
   settings:
-    background: '<%= scheme.base.green %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.green %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Constant
   scope: constant.language, constant.character, constant.other
   settings:
-    background: '<%= scheme.base.blue %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.blue %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Variable
   scope: variable.language, variable.other
   settings:
-    background: '<%= scheme.base.cyan %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.cyan %>'
+    foreground: '<%= scheme.base.black %>'
     fontStyle: ''
 
 - name: Entity
   scope: constant.character.entity
   settings:
-    background: '<%= scheme.base.green %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.green %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Storage
   scope: storage
   settings:
-    background: '<%= scheme.comment %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.comments %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Class Name
   scope: entity.name.type.class, support.class
   settings:
-    foreground: '<%= scheme.base.blue %>bf'
+    foreground: '<%= scheme.base.blue %>'
     fontStyle: ''
 
 - name: Tag Name
   scope: entity.name.tag, entity.other.attribute-name.class.css, entity.other.attribute-name.id.css
   settings:
-    background: '<%= scheme.base.pink %>bf'
-    foreground: '<%= scheme.base.black %>bf'
+    background: '<%= scheme.base.pink %>'
+    foreground: '<%= scheme.base.black %>'
 
 - name: Invalid
   scope: invalid
@@ -174,7 +174,7 @@ settings:
   scope: string.other.tag.todo.low
   settings:
     background: '<%= scheme.highlight %>'
-    foreground: '<%= scheme.foreground %>cc'
+    foreground: '<%= scheme.foreground %>'
     fontStyle: 'bold'
 
 - name: High