diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css
index 1900aa6..88aaf82 100644
--- a/gtk-3.0/apps/gnome-applications.css
+++ b/gtk-3.0/apps/gnome-applications.css
@@ -53,25 +53,25 @@ PanelApplet .button {
 PanelApplet .button:active {
     border-width: 0 1px;
     border-radius: 0;
-    border-color: mix(@panel_bg_color, @theme_bg_color, 0.23);
-    background-color: mix(@panel_bg_color, @theme_bg_color, 0.21);
+    border-color: mix(@panel_bg_color, @panel_fg_color, 0.23);
+    background-color: mix(@panel_bg_color, @panel_fg_color, 0.21);
     background-image: none;
-    color: mix(@panel_fg_color, @theme_base_color, 0.8);
+    color: shade(@panel_fg_color, 1.08);
 }
 
 PanelApplet .button:prelight {
     border-color: transparent;
-    border-color: mix(@panel_bg_color, @theme_bg_color, 0.13);
-    background-color: mix(@panel_bg_color, @theme_bg_color, 0.11);
+    border-color: mix(@panel_bg_color, @panel_fg_color, 0.13);
+    background-color: mix(@panel_bg_color, @panel_fg_color, 0.11);
     background-image: none;
-    color: mix(@panel_fg_color, @theme_base_color, 0.8);
+    color: shade(@panel_fg_color, 1.08);
 }
 
 PanelApplet .button:active:prelight {
-    border-color: mix(@panel_bg_color, @theme_bg_color, 0.33);
-    background-color: mix(@panel_bg_color, @theme_bg_color, 0.31);
+    border-color: mix(@panel_bg_color, @panel_fg_color, 0.33);
+    background-color: mix(@panel_bg_color, @panel_fg_color, 0.31);
     background-image: none;
-    color: mix(@panel_fg_color, @theme_base_color, 0.8);
+    color: shade(@panel_fg_color, 1.08);
 }
 
 WnckPager, WnckTasklist {
@@ -197,14 +197,14 @@ TerminalWindow .scrollbar.button:active:hover {
 }
 
 TerminalWindow .scrollbar.slider {
-    border-color: mix(@menubar_bg_color, @theme_bg_color, 0.33);
-    background-color: mix(@menubar_bg_color, @theme_bg_color, 0.31);
+    border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.33);
+    background-color: mix(@menubar_bg_color, @menubar_fg_color, 0.31);
 }
 
 TerminalWindow .scrollbar.slider:hover,
 TerminalWindow .scrollbar.slider.vertical:hover {
-    border-color: mix(@menubar_bg_color, @theme_bg_color, 0.23);
-    background-color: mix(@menubar_bg_color, @theme_bg_color, 0.21);
+    border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.23);
+    background-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21);
 }
 
 TerminalWindow .scrollbar.slider:active,
diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css
index d1f518a..6f83abb 100644
--- a/gtk-3.0/apps/unity.css
+++ b/gtk-3.0/apps/unity.css
@@ -20,8 +20,8 @@ UnityPanelWidget,
 
 .unity-panel.panel.menuitem:hover,
 .unity-panel.panel .menuitem *:hover {
-    border-color: mix(@panel_bg_color, @theme_bg_color, 0.23);
-    background-color: mix(@panel_bg_color, @theme_bg_color, 0.21);
+    border-color: mix(@panel_bg_color, @panel_fg_color, 0.23);
+    background-color: mix(@panel_bg_color, @panel_fg_color, 0.21);
     background-image: none;
-    color: mix(@panel_fg_color, @theme_base_color, 0.8);
+    color: shade(@panel_fg_color, 1.08);
 }
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 75b63bb..8394b2d 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -846,13 +846,13 @@ GtkComboBox .menu {
 
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
-    border-color: mix(@menubar_bg_color, @theme_bg_color, 0.23);
-    background-color: mix(@menubar_bg_color, @theme_bg_color, 0.21);
+    border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.23);
+    background-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21);
     background-image: none;
 }
 
 .menubar .menuitem *:hover {
-    color: mix(@menubar_fg_color, @theme_base_color, 0.8);
+    color: shade(@menubar_fg_color, 1.08);
 }
 
 /************