diff --git a/CHANGELOG.md b/CHANGELOG.md
index 471ae60..69769fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Release Notes
+## 0.6.7
+`2020-10-24`
+- Update component tag color
+- Added Duckduckgo porting (Thanks to [Grafikart](https://github.com/Grafikart))
+
 ## 0.6.6
 `2020-10-16`
 - Add link to Tokyo Night Alfred theme
diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index eb59a1c..f045425 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -595,15 +595,21 @@
         },
         {
             "name": "Tag",
-            "scope": [
-                "entity.name.tag",
-                "entity.name.tag support.class.component",
-                "meta.tag"
-            ],
+            "scope": "entity.name.tag",
             "settings": {
                 "foreground": "#f7768e"
             }
         },
+        {
+            "name": "Tag Component",
+            "scope": [
+                "entity.name.tag support.class.component",
+                 "meta.tag"
+            ],
+            "settings": {
+                "foreground": "#de5971"
+            }
+        },
         {
             "name": "Tag Punctuation",
             "scope": "punctuation.definition.tag",
diff --git a/themes/tokyo-night-light-color-theme.json b/themes/tokyo-night-light-color-theme.json
index adcf14e..41d7ed5 100644
--- a/themes/tokyo-night-light-color-theme.json
+++ b/themes/tokyo-night-light-color-theme.json
@@ -613,15 +613,21 @@
         },
         {
             "name": "Tag",
-            "scope": [
-                "entity.name.tag",
-                "entity.name.tag support.class.component",
-                "meta.tag"
-            ],
+            "scope": "entity.name.tag",
             "settings": {
                 "foreground": "#8c4351"
             }
         },
+        {
+            "name": "Tag Component",
+            "scope": [
+                "entity.name.tag support.class.component",
+                 "meta.tag"
+            ],
+            "settings": {
+                "foreground": "#69323d"
+            }
+        },
         {
             "name": "Tag Punctuation",
             "scope": "punctuation.definition.tag",
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index 4cc6903..30480d6 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -594,15 +594,21 @@
         },
         {
             "name": "Tag",
-            "scope": [
-                "entity.name.tag",
-                "entity.name.tag support.class.component",
-                "meta.tag"
-            ],
+            "scope": "entity.name.tag",
             "settings": {
                 "foreground": "#f7768e"
             }
         },
+        {
+            "name": "Tag Component",
+            "scope": [
+                "entity.name.tag support.class.component",
+                 "meta.tag"
+            ],
+            "settings": {
+                "foreground": "#de5971"
+            }
+        },
         {
             "name": "Tag Punctuation",
             "scope": "punctuation.definition.tag",