diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index 76c5fdc..7c762d0 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -684,13 +684,14 @@
             }
         },
         {
-            "name": "Tag Component",
+            "name": "Tag - Custom",
             "scope": [
                 "entity.name.tag support.class.component",
+                "meta.tag.custom entity.name.tag",
                  "meta.tag"
             ],
             "settings": {
-                "foreground": "#de5971"
+                "foreground": "#fc91a3"
             }
         },
         {
@@ -700,6 +701,16 @@
                 "foreground": "#ba3c97"
             }
         },
+        {
+            "name": "Tag Punctuation - Custom",
+            "scope": [
+                "meta.tag.custom punctuation.definition.tag",
+                "meta.jsx punctuation.definition.tag"
+            ],
+            "settings": {
+                "foreground": "#e362be"
+            }
+        },
         {
             "name": "Globals, PHP Constants, etc",
             "scope": [
diff --git a/themes/tokyo-night-light-color-theme.json b/themes/tokyo-night-light-color-theme.json
index 52eccd1..50f2206 100644
--- a/themes/tokyo-night-light-color-theme.json
+++ b/themes/tokyo-night-light-color-theme.json
@@ -67,8 +67,8 @@
         "inputOption.activeBackground": "#34548a44",
 
         "inputValidation.infoForeground": "#000000",
-        "inputValidation.infoBackground": "#0da0ba",
-        "inputValidation.infoBorder": "#0db9d7",
+        "inputValidation.infoBackground": "#3d59a15c",
+        "inputValidation.infoBorder": "#3d59a1",
         "inputValidation.warningForeground": "#000000",
         "inputValidation.warningBackground": "#c2985b",
         "inputValidation.warningBorder": "#8f5e15",
@@ -704,10 +704,11 @@
             }
         },
         {
-            "name": "Tag Component",
+            "name": "Tag - Custom",
             "scope": [
                 "entity.name.tag support.class.component",
-                 "meta.tag"
+                "meta.tag.custom entity.name.tag",
+                "meta.tag"
             ],
             "settings": {
                 "foreground": "#69323d"
@@ -720,6 +721,16 @@
                 "foreground": "#b05467"
             }
         },
+        {
+            "name": "Tag Punctuation - Custom",
+            "scope": [
+                "meta.tag.custom punctuation.definition.tag",
+                "meta.jsx punctuation.definition.tag"
+            ],
+            "settings": {
+                "foreground": "#69323d"
+            }
+        },
         {
             "name": "Globals, PHP Constants, etc",
             "scope": [
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index dd713f5..284ebc3 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -683,13 +683,14 @@
             }
         },
         {
-            "name": "Tag Component",
+            "name": "Tag - Custom",
             "scope": [
                 "entity.name.tag support.class.component",
+                "meta.tag.custom entity.name.tag",
                  "meta.tag"
             ],
             "settings": {
-                "foreground": "#de5971"
+                "foreground": "#fc91a3"
             }
         },
         {
@@ -699,6 +700,16 @@
                 "foreground": "#ba3c97"
             }
         },
+        {
+            "name": "Tag Punctuation - Custom",
+            "scope": [
+                "meta.tag.custom punctuation.definition.tag",
+                "meta.jsx punctuation.definition.tag"
+            ],
+            "settings": {
+                "foreground": "#e362be"
+            }
+        },
         {
             "name": "Globals, PHP Constants, etc",
             "scope": [