diff --git a/src/main/resources/themes/TokyoNightDark.theme.json b/src/main/resources/themes/TokyoNightDark.theme.json
index 8d34d5e..950a045 100644
--- a/src/main/resources/themes/TokyoNightDark.theme.json
+++ b/src/main/resources/themes/TokyoNightDark.theme.json
@@ -38,10 +38,13 @@
     },
     "ui": {
         "*": {
+            "acceleratorForeground": "blue",
+            "acceleratorSelectionForeground": "blue",
             "arc": "7",
             "background": "bg",
             "foreground": "fgDark",
             "caretForeground": "fgDark",
+            "infoForeground": "fgDark",
             "selectionForeground": "fg",
             "selectionInactiveForeground": "fg",
             "selectionBackground": "hoverBackground",
@@ -116,6 +119,7 @@
             "nonEditableBackground": "hoverBackground"
         },
         "CompletionPopup": {
+            "foreground": "fgDark",
             "selectionBackground": "hoverBackground",
             "selectionInactiveBackground": "selectionInactiveBackground",
             "matchForeground": "green1"
@@ -226,8 +230,14 @@
             "Header": {
                 "activeBackground": "hoverBackground",
                 "inactiveBackground": "hoverBackground"
+            },
+            "Advertiser": {
+                "foreground": "dark5"
             }
         },
+        "PopupMenu": {
+            "background": "hoverBackground"
+        },
         "RadioButtonMenuItem": {
             "selectionBackground": "hoverBackground"
         },
@@ -325,6 +335,7 @@
             "warningBackground": "bgHi",
             "warningBorderColor": "orange"
         },
+        "ToolTip.shortcutForeground": "blue",
         "VersionControl": {
             "FileHistory": {
                 "Commit": {
diff --git a/src/main/resources/themes/TokyoNightDark.xml b/src/main/resources/themes/TokyoNightDark.xml
index 5b76272..14794a3 100644
--- a/src/main/resources/themes/TokyoNightDark.xml
+++ b/src/main/resources/themes/TokyoNightDark.xml
@@ -85,19 +85,30 @@
             </value>
         </option>
         <option name="BOOKMARKS_ATTRIBUTES">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="89ddff"/>
+            </value>
         </option>
         <option name="BREADCRUMBS_CURRENT">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="89ddff"/>
+                <option name="FONT_TYPE" value="2"/>
+            </value>
         </option>
         <option name="BREADCRUMBS_DEFAULT">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="737aa2"/>
+            </value>
         </option>
         <option name="BREADCRUMBS_HOVERED">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="7aa2f7"/>
+            </value>
         </option>
         <option name="BREADCRUMBS_INACTIVE">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="565f89"/>
+            </value>
         </option>
         <option name="BREAKPOINT_ATTRIBUTES">
             <value>
@@ -760,6 +771,7 @@
                 <option name="FOREGROUND" value="7aa2f7"/>
             </value>
         </option>
+        <option name="JSP_DIRECTIVE_NAME" baseAttributes="DEFAULT_KEYWORD"/>
         <option name="KOTLIN_BUILTIN_ANNOTATION">
             <value>
                 <option name="FOREGROUND" value="9d7cd8"/>
@@ -843,8 +855,8 @@
         </option>
         <option name="MARKDOWN_AUTO_LINK">
             <value>
-                <option name="FOREGROUND" value="73daca"/>
-                <option name="EFFECT_COLOR" value="73daca"/>
+                <option name="FOREGROUND" value="7297e5"/>
+                <option name="EFFECT_COLOR" value="7aa2f7"/>
                 <option name="EFFECT_TYPE" value="1"/>
             </value>
         </option>
@@ -860,12 +872,14 @@
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_1">
             <value>
-                <option name="FOREGROUND" value="89ddff"/>
+                <option name="FOREGROUND" value="7dcfff"/>
+                <option name="EFFECT_COLOR" value="172030"/>
+                <option name="EFFECT_TYPE" value="4"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_2">
             <value>
-                <option name="FOREGROUND" value="61bdf2"/>
+                <option name="FOREGROUND" value="bb9af7"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_3">
@@ -875,12 +889,12 @@
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_4">
             <value>
-                <option name="FOREGROUND" value="7aa2f7"/>
+                <option name="FOREGROUND" value="e0af68"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_5">
             <value>
-                <option name="FOREGROUND" value="7aa2f7"/>
+                <option name="FOREGROUND" value="7dcfff"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_6">
@@ -903,6 +917,12 @@
                 <option name="FOREGROUND" value="73daca"/>
             </value>
         </option>
+        <option name="MARKDOWN_LINK_LABEL">
+            <value>
+                <option name="FOREGROUND" value="f7768e"/>
+                <option name="FONT_TYPE" value="2"/>
+            </value>
+        </option>
         <option name="MARKDOWN_LINK_TITLE">
             <value>
                 <option name="FOREGROUND" value="a9b1d6"/>
@@ -1041,6 +1061,8 @@
             </value>
         </option>
         <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE"/>
+        <option name="PROPERTIES.INVALID_STRING_ESCAPE" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE"/>
+        <option name="PROPERTIES.KEY" baseAttributes="DEFAULT_KEYWORD"/>
         <option name="PROTO_IDENTIFIER">
             <value/>
         </option>
@@ -1193,6 +1215,8 @@
                 <option name="FOREGROUND" value="9aa5ce"/>
             </value>
         </option>
+        <option name="VELOCITY_DIRECTIVE" baseAttributes="JSP_DIRECTIVE_NAME"/>
+        <option name="VELOCITY_SCRIPTING_BACKGROUND" baseAttributes="JSP_SCRIPTING_BACKGROUND"/>
         <option name="WARNING_ATTRIBUTES">
             <value>
                 <option name="EFFECT_COLOR" value="e0af68"/>
@@ -1221,5 +1245,8 @@
                 <option name="FOREGROUND" value="7aa2f7"/>
             </value>
         </option>
+        <option name="XPATH.FUNCTION" baseAttributes="DEFAULT_FUNCTION_CALL"/>
+        <option name="XPATH.KEYWORD" baseAttributes="DEFAULT_KEYWORD"/>
+        <option name="XPATH.XPATH_NAME" baseAttributes="TEXT"/>
     </attributes>
 </scheme>
diff --git a/src/main/resources/themes/TokyoNightStorm.theme.json b/src/main/resources/themes/TokyoNightStorm.theme.json
index 57beefb..283041f 100644
--- a/src/main/resources/themes/TokyoNightStorm.theme.json
+++ b/src/main/resources/themes/TokyoNightStorm.theme.json
@@ -38,10 +38,13 @@
     },
     "ui": {
         "*": {
+            "acceleratorForeground": "blue",
+            "acceleratorSelectionForeground": "blue",
             "arc": "7",
             "background": "bg",
             "foreground": "fg",
             "caretForeground": "fg",
+            "infoForeground": "fgDark",
             "selectionForeground": "fg",
             "selectionInactiveForeground": "fg",
             "selectionBackground": "hoverBackground",
@@ -226,8 +229,14 @@
             "Header": {
                 "activeBackground": "hoverBackground",
                 "inactiveBackground": "hoverBackground"
+            },
+            "Advertiser": {
+                "foreground": "dark5"
             }
         },
+        "PopupMenu": {
+            "background": "hoverBackground"
+        },
         "RadioButtonMenuItem": {
             "selectionBackground": "hoverBackground"
         },
@@ -319,6 +328,7 @@
             "selectionBackground": "blue0",
             "selectionInactiveBackground": "selectionInactiveBackground"
         },
+        "ToolTip.shortcutForeground": "blue",
         "ValidationTooltip": {
             "errorBackground": "bgDark",
             "errorBorderColor": "red1",
diff --git a/src/main/resources/themes/TokyoNightStorm.xml b/src/main/resources/themes/TokyoNightStorm.xml
index 9ea0af1..42e4e94 100644
--- a/src/main/resources/themes/TokyoNightStorm.xml
+++ b/src/main/resources/themes/TokyoNightStorm.xml
@@ -84,19 +84,30 @@
             </value>
         </option>
         <option name="BOOKMARKS_ATTRIBUTES">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="89ddff"/>
+            </value>
         </option>
         <option name="BREADCRUMBS_CURRENT">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="89ddff" />
+                <option name="FONT_TYPE" value="2" />
+            </value>
         </option>
         <option name="BREADCRUMBS_DEFAULT">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="737aa2" />
+            </value>
         </option>
         <option name="BREADCRUMBS_HOVERED">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="7aa2f7" />
+            </value>
         </option>
         <option name="BREADCRUMBS_INACTIVE">
-            <value/>
+            <value>
+                <option name="FOREGROUND" value="565f89" />
+            </value>
         </option>
         <option name="BREAKPOINT_ATTRIBUTES">
             <value>
@@ -759,6 +770,7 @@
                 <option name="FOREGROUND" value="7aa2f7"/>
             </value>
         </option>
+        <option name="JSP_DIRECTIVE_NAME" baseAttributes="DEFAULT_KEYWORD"/>
         <option name="KOTLIN_BUILTIN_ANNOTATION">
             <value>
                 <option name="FOREGROUND" value="9d7cd8"/>
@@ -842,8 +854,8 @@
         </option>
         <option name="MARKDOWN_AUTO_LINK">
             <value>
-                <option name="FOREGROUND" value="73daca"/>
-                <option name="EFFECT_COLOR" value="73daca"/>
+                <option name="FOREGROUND" value="7297e5"/>
+                <option name="EFFECT_COLOR" value="7aa2f7"/>
                 <option name="EFFECT_TYPE" value="1"/>
             </value>
         </option>
@@ -859,12 +871,14 @@
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_1">
             <value>
-                <option name="FOREGROUND" value="89ddff"/>
+                <option name="FOREGROUND" value="7dcfff"/>
+                <option name="EFFECT_COLOR" value="172030"/>
+                <option name="EFFECT_TYPE" value="4"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_2">
             <value>
-                <option name="FOREGROUND" value="61bdf2"/>
+                <option name="FOREGROUND" value="bb9af7"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_3">
@@ -874,12 +888,12 @@
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_4">
             <value>
-                <option name="FOREGROUND" value="7aa2f7"/>
+                <option name="FOREGROUND" value="e0af68"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_5">
             <value>
-                <option name="FOREGROUND" value="7aa2f7"/>
+                <option name="FOREGROUND" value="7dcfff"/>
             </value>
         </option>
         <option name="MARKDOWN_HEADER_LEVEL_6">
@@ -902,6 +916,12 @@
                 <option name="FOREGROUND" value="73daca"/>
             </value>
         </option>
+        <option name="MARKDOWN_LINK_LABEL">
+            <value>
+                <option name="FOREGROUND" value="f7768e"/>
+                <option name="FONT_TYPE" value="2"/>
+            </value>
+        </option>
         <option name="MARKDOWN_LINK_TITLE">
             <value>
                 <option name="FOREGROUND" value="a9b1d6"/>
@@ -1040,6 +1060,8 @@
             </value>
         </option>
         <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE"/>
+        <option name="PROPERTIES.INVALID_STRING_ESCAPE" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
+        <option name="PROPERTIES.KEY" baseAttributes="DEFAULT_KEYWORD" />
         <option name="PROTO_IDENTIFIER">
             <value/>
         </option>
@@ -1192,6 +1214,8 @@
                 <option name="FOREGROUND" value="9aa5ce"/>
             </value>
         </option>
+        <option name="VELOCITY_DIRECTIVE" baseAttributes="JSP_DIRECTIVE_NAME"/>
+        <option name="VELOCITY_SCRIPTING_BACKGROUND" baseAttributes="JSP_SCRIPTING_BACKGROUND"/>
         <option name="WARNING_ATTRIBUTES">
             <value>
                 <option name="EFFECT_COLOR" value="e0af68"/>
@@ -1220,5 +1244,8 @@
                 <option name="FOREGROUND" value="7aa2f7"/>
             </value>
         </option>
+        <option name="XPATH.FUNCTION" baseAttributes="DEFAULT_FUNCTION_CALL"/>
+        <option name="XPATH.KEYWORD" baseAttributes="DEFAULT_KEYWORD"/>
+        <option name="XPATH.XPATH_NAME" baseAttributes="TEXT"/>
     </attributes>
 </scheme>