diff --git a/.config/bat/themes/Nord.tmTheme b/.config/bat/themes/Nord.tmTheme
index 40ae67e..e75e087 100644
--- a/.config/bat/themes/Nord.tmTheme
+++ b/.config/bat/themes/Nord.tmTheme
@@ -51,7 +51,7 @@
         <key>name</key>
         <string>Text &amp; variable names</string>
         <key>scope</key>
-        <string>text, source, variable.other.readwrite, punctuation.definition.variable</string>
+        <string>text, source, variable, variable.other, variable.other.readwrite, support.variable, meta.definition.variable, punctuation.definition.variable</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -128,7 +128,7 @@
         <key>name</key>
         <string>Boolean constants (true / false)</string>
         <key>scope</key>
-        <string>constant.language.boolean, constant.language.true, constant.language.false</string>
+        <string>constant.language.boolean, constant.language.true, constant.language.false, constant.other.boolean</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -138,9 +138,9 @@
 
       <dict>
         <key>name</key>
-        <string>Other language constants (null, undefined, …)</string>
+        <string>Other language constants (null, undefined, symbols, …)</string>
         <key>scope</key>
-        <string>constant.language, constant.language.null, constant.language.undefined, variable.other.constant, entity.name.constant</string>
+        <string>constant.language, constant.language.null, constant.language.undefined, variable.other.constant, entity.name.constant, constant.other.symbol, support.constant</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -180,7 +180,7 @@
         <key>name</key>
         <string>Operators</string>
         <key>scope</key>
-        <string>keyword.operator, punctuation.accessor, punctuation.definition.generic, punctuation.separator.key-value, punctuation.definition.tag</string>
+        <string>keyword.operator, punctuation.accessor, punctuation.definition.generic, punctuation.separator.key-value, punctuation.definition.tag, entity.other.attribute-name.id, punctuation.definition.entity</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -245,7 +245,7 @@
         <key>name</key>
         <string>Function names</string>
         <key>scope</key>
-        <string>entity.name.function, meta.function-call, meta.function-call.method, variable.function, support.function</string>
+        <string>entity.name.function, meta.function-call, meta.function-call.method, variable.function, support.function, keyword.other.special-method</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -308,9 +308,9 @@
       <!-- ── Tags (HTML / XML / JSX) ──────────────────────────────────── -->
       <dict>
         <key>name</key>
-        <string>Tag names</string>
+        <string>Tag names &amp; generic entity names</string>
         <key>scope</key>
-        <string>entity.name.tag</string>
+        <string>entity.name.tag, entity.name.label</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -359,7 +359,7 @@
         <key>name</key>
         <string>CSS selectors</string>
         <key>scope</key>
-        <string>entity.other.attribute-name.class.css, entity.other.attribute-name.id.css, entity.other.attribute-name.pseudo-class.css, entity.other.attribute-name.pseudo-element.css</string>
+        <string>meta.selector, entity.other.attribute-name.class.css, entity.other.attribute-name.id.css, entity.other.attribute-name.pseudo-class.css, entity.other.attribute-name.pseudo-element.css</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -369,9 +369,9 @@
 
       <dict>
         <key>name</key>
-        <string>CSS units &amp; numeric values</string>
+        <string>Units &amp; CSS numeric values</string>
         <key>scope</key>
-        <string>keyword.other.unit, constant.numeric.css</string>
+        <string>keyword.other.unit</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -535,9 +535,9 @@
       <!-- ── Errors & Invalid ──────────────────────────────────────────── -->
       <dict>
         <key>name</key>
-        <string>Invalid / deprecated</string>
+        <string>Invalid / deprecated / broken</string>
         <key>scope</key>
-        <string>invalid, invalid.illegal, invalid.deprecated</string>
+        <string>invalid, invalid.illegal, invalid.deprecated, invalid.broken, invalid.unimplemented</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -630,6 +630,30 @@
         </dict>
       </dict>
 
+      <dict>
+        <key>name</key>
+        <string>Color constants (CSS hex colors, etc.)</string>
+        <key>scope</key>
+        <string>constant.other.color</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#8FBCBB</string>
+        </dict>
+      </dict>
+
+      <dict>
+        <key>name</key>
+        <string>Separators (horizontal rules, etc.)</string>
+        <key>scope</key>
+        <string>meta.separator</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#4C566A</string>
+        </dict>
+      </dict>
+
     </array>
   </dict>
 </plist>