diff --git a/CHANGELOG.md b/CHANGELOG.md
index da37cae..5c80be5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Release Notes
+
+## 0.5.4
+`2020-20-04`
+- Update comment doc colors
+
 ## 0.5.3
 `2020-11-04`
 - Update welcome page button background color
diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json
index e4a8303..5db35a9 100644
--- a/themes/tokyo-night-color-theme.json
+++ b/themes/tokyo-night-color-theme.json
@@ -327,7 +327,8 @@
 			"scope": [
                 "comment",
                 "comment.block.documentation",
-				"punctuation.definition.comment"
+				"punctuation.definition.comment",
+                "comment.block.documentation punctuation",
 			],
 			"settings": {
 				"foreground": "#444b6a"
@@ -338,15 +339,15 @@
             "scope": [
                 "comment.block.documentation variable",
                 "comment.block.documentation storage",
-                "comment.block.documentation punctuation",
                 "comment.block.documentation keyword",
                 "comment.block.documentation support",
                 "comment.block.documentation markup",
                 "comment.block.documentation markup.inline.raw.string.markdown",
+                "meta.other.type.phpdoc.php keyword.other.type.php",
 				"keyword.other.phpdoc.php"
             ],
             "settings": {
-                "foreground": "#7982a9"
+                "foreground": "#5a638c"
             }
         },
         {
diff --git a/themes/tokyo-night-light-color-theme.json b/themes/tokyo-night-light-color-theme.json
index 9a7ba8a..e40a3eb 100644
--- a/themes/tokyo-night-light-color-theme.json
+++ b/themes/tokyo-night-light-color-theme.json
@@ -349,7 +349,8 @@
 			"scope": [
                 "comment",
                 "comment.block.documentation",
-				"punctuation.definition.comment"
+				"punctuation.definition.comment",
+                "comment.block.documentation punctuation",
 			],
 			"settings": {
 				"foreground": "#9699a3"
@@ -360,15 +361,15 @@
             "scope": [
                 "comment.block.documentation variable",
                 "comment.block.documentation storage",
-                "comment.block.documentation punctuation",
                 "comment.block.documentation keyword",
                 "comment.block.documentation support",
                 "comment.block.documentation markup",
                 "comment.block.documentation markup.inline.raw.string.markdown",
+                "meta.other.type.phpdoc.php keyword.other.type.php",
 				"keyword.other.phpdoc.php"
             ],
             "settings": {
-                "foreground": "#4c505e"
+                "foreground": "#7c7f87"
             }
         },
         {
diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json
index 47b8060..60b3a11 100644
--- a/themes/tokyo-night-storm-color-theme.json
+++ b/themes/tokyo-night-storm-color-theme.json
@@ -326,7 +326,8 @@
 			"scope": [
                 "comment",
                 "comment.block.documentation",
-				"punctuation.definition.comment"
+				"punctuation.definition.comment",
+                "comment.block.documentation punctuation",
 			],
 			"settings": {
 				"foreground": "#565f89"
@@ -337,15 +338,15 @@
             "scope": [
                 "comment.block.documentation variable",
                 "comment.block.documentation storage",
-                "comment.block.documentation punctuation",
                 "comment.block.documentation keyword",
                 "comment.block.documentation support",
                 "comment.block.documentation markup",
                 "comment.block.documentation markup.inline.raw.string.markdown",
+                "meta.other.type.phpdoc.php keyword.other.type.php",
 				"keyword.other.phpdoc.php"
             ],
             "settings": {
-                "foreground": "#7982a9"
+                "foreground": "#6a75a8" //"#7982a9"
             }
         },
         {