diff --git a/themes/theme-theraiwy-dark.css b/themes/theme-theraiwy-dark.css
index 2be5b07..ce7e195 100644
--- a/themes/theme-theraiwy-dark.css
+++ b/themes/theme-theraiwy-dark.css
@@ -879,6 +879,10 @@ tr:not(.x-grid-tree-node-expanded) .x-tree-expander::before {
 .x-keyboard-mode .x-btn-default-small.x-btn-focus {
     background-color: var(--pm-accent-hover);
 }
+.x-btn-default-small.x-btn-over .x-btn-inner,
+.x-keyboard-mode .x-btn-default-small.x-btn-focus .x-btn-inner {
+    color: #ffffff !important;
+}
 
 /* Pressed state */
 .x-btn-default-small.x-btn-pressed,
@@ -937,16 +941,20 @@ tr:not(.x-grid-tree-node-expanded) .x-tree-expander::before {
 
 .x-btn-default-toolbar-small.x-btn-over,
 .x-keyboard-mode .x-btn-default-toolbar-small.x-btn-focus {
-    background-color: #34383D;
+    background-color: var(--pm-bg-elevated);
+}
+.x-btn-default-toolbar-small.x-btn-over .x-btn-inner-default-toolbar-small,
+.x-keyboard-mode .x-btn-default-toolbar-small.x-btn-focus .x-btn-inner-default-toolbar-small {
+    color: var(--pm-text-bright) !important;
 }
 
 .x-btn-default-toolbar-small.x-btn.x-btn-disabled {
     opacity: 1 !important;
-    background-color: rgba(40, 43, 47, 0.5) !important;
-    border-color: #282B2F !important;
+    background-color: var(--pm-bg-surface) !important;
+    border-color: var(--pm-border) !important;
 }
 .x-btn-default-toolbar-small.x-btn.x-btn-disabled .x-btn-inner {
-    color: #555B63 !important;
+    color: var(--pm-text-disabled) !important;
 }
 
 .x-btn-default-toolbar-small.x-btn.x-btn-menu-active,