diff --git a/packages/shiki/themes/dark-plus.json b/packages/shiki/themes/dark-plus.json
index 155cd1f8d..254ee896d 100644
--- a/packages/shiki/themes/dark-plus.json
+++ b/packages/shiki/themes/dark-plus.json
@@ -72,7 +72,7 @@
       }
     },
     {
-      "scope": ["entity.name.tag.css", "entity.name.tag.less"],
+      "scope": "entity.name.tag.css",
       "settings": {
         "foreground": "#d7ba7d"
       }
@@ -86,11 +86,10 @@
     {
       "scope": [
         "entity.other.attribute-name.class.css",
-        "source.css entity.other.attribute-name.class",
+        "entity.other.attribute-name.class.mixin.css",
         "entity.other.attribute-name.id.css",
         "entity.other.attribute-name.parent-selector.css",
-        "entity.other.attribute-name.parent.less",
-        "source.css entity.other.attribute-name.pseudo-class",
+        "entity.other.attribute-name.pseudo-class.css",
         "entity.other.attribute-name.pseudo-element.css",
         "source.css.less entity.other.attribute-name.id",
         "entity.other.attribute-name.scss"
@@ -274,7 +273,9 @@
       "scope": [
         "support.type.vendored.property-name",
         "support.type.property-name",
-        "source.css variable",
+        "variable.css",
+        "variable.scss",
+        "variable.other.less",
         "source.coffee.embedded"
       ],
       "settings": {
diff --git a/packages/shiki/themes/hc_light.json b/packages/shiki/themes/hc_light.json
index 1aa9048ba..a4e40a00c 100644
--- a/packages/shiki/themes/hc_light.json
+++ b/packages/shiki/themes/hc_light.json
@@ -76,11 +76,10 @@
     {
       "scope": [
         "entity.other.attribute-name.class.css",
-        "source.css entity.other.attribute-name.class",
+        "entity.other.attribute-name.class.mixin.css",
         "entity.other.attribute-name.id.css",
         "entity.other.attribute-name.parent-selector.css",
-        "entity.other.attribute-name.parent.less",
-        "source.css entity.other.attribute-name.pseudo-class",
+        "entity.other.attribute-name.pseudo-class.css",
         "entity.other.attribute-name.pseudo-element.css",
         "source.css.less entity.other.attribute-name.id",
         "entity.other.attribute-name.scss"
@@ -276,7 +275,9 @@
       "scope": [
         "support.type.vendored.property-name",
         "support.type.property-name",
-        "source.css variable",
+        "variable.css",
+        "variable.scss",
+        "variable.other.less",
         "source.coffee.embedded"
       ],
       "settings": {
diff --git a/packages/shiki/themes/light-plus.json b/packages/shiki/themes/light-plus.json
index 86865544e..e51ed39ad 100644
--- a/packages/shiki/themes/light-plus.json
+++ b/packages/shiki/themes/light-plus.json
@@ -87,11 +87,10 @@
     {
       "scope": [
         "entity.other.attribute-name.class.css",
-        "source.css entity.other.attribute-name.class",
+        "entity.other.attribute-name.class.mixin.css",
         "entity.other.attribute-name.id.css",
         "entity.other.attribute-name.parent-selector.css",
-        "entity.other.attribute-name.parent.less",
-        "source.css entity.other.attribute-name.pseudo-class",
+        "entity.other.attribute-name.pseudo-class.css",
         "entity.other.attribute-name.pseudo-element.css",
         "source.css.less entity.other.attribute-name.id",
         "entity.other.attribute-name.scss"
@@ -290,7 +289,9 @@
       "scope": [
         "support.type.vendored.property-name",
         "support.type.property-name",
-        "source.css variable",
+        "variable.css",
+        "variable.scss",
+        "variable.other.less",
         "source.coffee.embedded"
       ],
       "settings": {