diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json
index 01664064..eadab125 100644
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json
@@ -92,9 +92,6 @@
       "Rose": "#ff79c6",
       "Violet": "#bd93f9"
     },
-    "HelpTooltip": {
-      "shortcutForeground": "#ff79c6"
-    },
     "Label": {
       "foreground": "#f8f8f2",
       "errorForeground": "#ff5554"
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json
index 31e82391..ece94dd1 100644
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/MaterialTheme.theme.json
@@ -5,6 +5,7 @@
   "editorScheme": "/Material Theme.xml",
   "colors": {
     "mySelectionColor": "#3E6183",
+    "myHoverColor": "#415E83",
     "mySelectionAccentColor": "#212E43",
     "myTabBlueColor": "#314763",
     "myAccentRedColor": "#FF666F",
@@ -12,31 +13,29 @@
     "myThemeBackgroundColor": "#1F292E",
     "myHlightControlsColor": "#21384E",
     "myControlsColor": "#293840",
-    "myDisableGreyColor": "#32424A"
+    "myDisableGreyColor": "#32424A",
+    "myDisableTxtColor": "#8C8C8C"
   },
   "ui": {
     "*": {
       "separatorColor": "#2B3940",
-      "background": "#1F292E",
-      "borderColor": "#1F292E",
-      "selectionBackground": "#3E6183",
-      "disabledForeground": "#8C8C8C",
-      "modifiedItemForeground": "#FF666F",
-      "disabledText": "#8C8C8C",
-      "inactiveForeground": "#8C8C8C",
+      "background": "myThemeBackgroundColor",
+      "borderColor": "myThemeBackgroundColor",
+      "disabledForeground": "myDisableTxtColor",
+      "disabledText": "myDisableTxtColor",
+      "inactiveForeground": "myDisableTxtColor",
       "infoForeground": "#808080",
-      "highlight": "#FF666F",
-      "underlineColor": "#FF666F",
-      "focusColor": "#FF666F",
-      "selectedBackground": "#3E6183",
-      "underlinedTabBackground": "#2B4057",
-      "hoverColor": "#415E83",
-      "pressedBackground": "#3E6183"
+      "modifiedItemForeground": "myAccentRedColor",
+      "highlight": "myAccentRedColor",
+      "underlineColor": "myAccentRedColor",
+      "focusColor": "myAccentRedColor",
+      "underlinedTabBackground": "myTabBlueColor",
+      "hoverColor": "myHoverColor",
+      "selectionBackground": "mySelectionColor",
+      "selectedBackground": "mySelectionColor",
+      "pressedBackground": "mySelectionColor"
     },
     "Tree.rowHeight": 24,
-    "ToolWindow.HeaderTab.hoverInactiveBackground": "mySelectionColor",
-    "ToolWindow.Button.hoverBackground": "mySelectionColor",
-    "StatusBar.hoverBackground": "mySelectionColor",
     "DefaultTabs.hoverBackground": "mySelectionColor",
     "ActionButton.hoverBackground": "mySelectionColor",
     "Separator.separatorColor": "myDisableGreyColor",
@@ -63,7 +62,8 @@
         "hoverInactiveBackground": "mySelectionColor"
       },
       "Button": {
-        "selectedBackground": "mySelectionColor"
+        "selectedBackground": "mySelectionColor",
+        "hoverBackground": "mySelectionColor"
       }
     },
     "TextArea": {
@@ -102,7 +102,10 @@
     "TextField": {
       "background": "myDisableGreyColor"
     },
-    "StatusBar.borderColor": "myThemeBackgroundColor",
+    "StatusBar": {
+      "hoverBackground": "mySelectionColor",
+      "borderColor": "myThemeBackgroundColor"
+    },
     "SplitPane.highlight": "myThemeBackgroundColor",
     "ProgressBar": {
       "progressColor": "myAccentRedColor",
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json
index 0a43295f..ee1f247b 100644
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_dark_theme.theme.json
@@ -212,7 +212,7 @@
         "informativeBorderColor": "#17254d",
 
         "warningForeground": "primaryText",
-        "warningBackground": "#735822",
+        "warningBackground": "backgroundHighlights",
         "warningBorderColor": "#403013",
 
         "errorForeground": "primaryText",
@@ -229,7 +229,7 @@
       "background": "backgroundHighlightsShade1",
       "foreground": "primaryText",
       "infoForeground": "ababb3",
-      "currentOverloadBackground": "#6A6173",
+      "currentOverloadBackground": "backgroundHighlights",
       "currentParameterForeground": "primaryText"
     },
 
diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json
index 157d73d1..e8960754 100644
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/solarized_light_theme.theme.json
@@ -212,7 +212,7 @@
         "informativeBorderColor": "#17254d",
 
         "warningForeground": "primaryText",
-        "warningBackground": "#735822",
+        "warningBackground": "backgroundHighlights",
         "warningBorderColor": "#403013",
 
         "errorForeground": "primaryText",
@@ -229,7 +229,7 @@
       "background": "backgroundHighlightsShade1",
       "foreground": "primaryText",
       "infoForeground": "ababb3",
-      "currentOverloadBackground": "#6A6173",
+      "currentOverloadBackground": "backgroundHighlights",
       "currentParameterForeground": "primaryText"
     },