diff --git a/modules/bat/base16-stylix.mustache b/modules/bat/base16-stylix.mustache
index cdcd941f3..13591549d 100644
--- a/modules/bat/base16-stylix.mustache
+++ b/modules/bat/base16-stylix.mustache
@@ -134,7 +134,7 @@
                 <key>name</key>
                 <string>Classes</string>
                 <key>scope</key>
-                <string>support.class, entity.name.class, entity.name.type.class</string>
+                <string>support.class, entity.name.class, entity.name.type.class, entity.name</string>
                 <key>settings</key>
                 <dict>
                     <key>foreground</key>
@@ -299,7 +299,7 @@
                 <key>name</key>
                 <string>Headings</string>
                 <key>scope</key>
-                <string>markup.heading punctuation.definition.heading, entity.name.section</string>
+                <string>markup.heading, punctuation.definition.heading, entity.name.section</string>
                 <key>settings</key>
                 <dict>
                     <key>fontStyle</key>