diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 4b7d6fe..0eefb23 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -161,11 +161,6 @@
 @define-color error_text_shadow alpha(black, 0.5);
 @define-color error_bg_color rgb (237, 54, 54);
 
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
 @define-color chrome_bg_color #1e1a17;
 @define-color chrome_fg_color #fff;
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index ed95632..b1e2ad3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -70,11 +70,6 @@
 @define-color sidebar_bg shade (@theme_bg_color, 1.025);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
 @define-color chrome_bg_color #1e1a17;
 @define-color chrome_fg_color #fff;
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index f555f1d..96e477c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2442,83 +2442,90 @@ PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-    color: @os_chrome_fg_color;
 }
 
 ClockBox,
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar {
-    font: bold;
 }
 
 .gnome-panel-menu-bar .menuitem:hover,
 PanelApplet > GtkMenuBar.menubar .menuitem:hover,
 .gnome-panel-menu-bar .menuitem *:hover,
 PanelApplet > GtkMenuBar.menubar .menuitem *:hover {
-    background-color: @os_chrome_selected_bg_color;
-    color: @os_chrome_selected_fg_color;
 }
 
 .gnome-panel-menu-bar .menuitem *:hover,
 PanelApplet > GtkMenuBar.menubar .menuitem *:hover {
-    color: @os_chrome_selected_fg_color;
-    text-shadow: @os_chrome_bg_color 0 1;
+}
+
+.gnome-panel-menu-bar {
+    -PanelMenuBar-icon-visible: true;
 }
 
 PanelApplet .button,
 PanelApplet .button:hover {
-    padding: 4px;
-
     border-image: none;
     border-width: 0;
     border-radius: 0;
 
-    background-image: none;
-    background-color: alpha(@theme_base_color, 0.0);
-
-    color: @os_chrome_fg_color;
+    color: @theme_fg_color;
 }
 
 PanelApplet .button:active:hover,
 PanelApplet .button:active {
     border-image: none;
-    background-image: none;
-    background-color: @os_chrome_selected_bg_color;
     border-width: 0;
     border-radius: 0;
 }
 
 PanelApplet *:hover {
-    color: @os_chrome_selected_fg_color;
 }
 
 PanelApplet *:active,
 PanelApplet *:hover:active {
-    color: @os_chrome_selected_fg_color;
-    text-shadow: @os_chrome_bg_color 0 1;
 }
 
 NaTrayApplet {
-    -NaTrayApplet-icon-padding: 12;
-    -NaTrayApplet-icon-size: 16;
+    -NaTrayApplet-icon-padding: 12px;
+    -NaTrayApplet-icon-size: 16px;
 }
 
 WnckPager, WnckTasklist {
-    background-color: @os_chrome_selected_bg_color;
+    background-color: @theme_bg_color;
     background-image: none;
-    color: @os_chrome_fg_color;
+    color: @theme_text_color;
+}
+
+WnckTasklist .button,
+WnckTasklist .button:hover,
+WnckTasklist .button:active,
+WnckTasklist .button:active:hover {
+    border-width: 2px;
+    border-radius: 4px;
+    border-color: transparent;
+}
+
+WnckTasklist .button:hover,
+WnckTasklist .button *:hover {
+    color: @theme_text_color;
+    text-shadow: @button_text_shadow 0 1;
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button *:active:hover {
+    color: @button_active_text;
+    text-shadow: @button_active_text_shadow 0 1;
 }
 
 GsmFailWhaleDialog {
-    background-color: @os_chrome_bg_color;
+    background-color: @theme_bg_color;
     background-image: none;
-    color: @os_chrome_fg_color;
+    color: @theme_fg_color;
 }
 
 GsmFailWhaleDialog * {
-    background-color: @os_chrome_bg_color;
+    background-color: @theme_bg_color;
     background-image: none;
 }
 
diff --git a/themes/Adwaita/index.theme.in b/themes/Adwaita/index.theme.in
index 30f8f98..6a978f8 100644
--- a/themes/Adwaita/index.theme.in
+++ b/themes/Adwaita/index.theme.in
@@ -1,5 +1,5 @@
 [X-GNOME-Metatheme]
-_Name=Adwaita
+_Name=Adwaita-fallback
 Type=X-GNOME-Metatheme
 _Comment=There is only one
 Encoding=UTF-8