diff -Nru elementary-theme-4.0.6/debian/bzr-builder.manifest elementary-theme-4.0.6/debian/bzr-builder.manifest
--- elementary-theme-4.0.6/debian/bzr-builder.manifest	2015-09-26 03:31:28.000000000 +0000
+++ elementary-theme-4.0.6/debian/bzr-builder.manifest	2015-09-27 03:31:54.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~r529+pkg304~daily
-lp:egtk revid:daniel@elementary.io-20150926031816-d1mxp6fr2x8wghfy
+# bzr-builder format 0.3 deb-version {debupstream}-0~r534+pkg304~daily
+lp:egtk revid:daniel@elementary.io-20150926232729-jw2c3i1uc9th4cmw
 nest-part packaging lp:~elementary-os/egtk/deb-packaging debian debian revid:cody@elementary.io-20150903110642-wblza1rftpdr9821
diff -Nru elementary-theme-4.0.6/debian/changelog elementary-theme-4.0.6/debian/changelog
--- elementary-theme-4.0.6/debian/changelog	2015-09-26 03:31:28.000000000 +0000
+++ elementary-theme-4.0.6/debian/changelog	2015-09-27 03:31:54.000000000 +0000
@@ -1,8 +1,8 @@
-elementary-theme (4.0.6-0~r529+pkg304~daily~ubuntu0.3.1.1) trusty; urgency=low
+elementary-theme (4.0.6-0~r534+pkg304~daily~ubuntu0.3.1.1) trusty; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 26 Sep 2015 03:31:28 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sun, 27 Sep 2015 03:31:54 +0000
 
 elementary-theme (4.0.6) trusty; urgency=medium
 
diff -Nru elementary-theme-4.0.6/gtk-3.0/gtk-widgets.css elementary-theme-4.0.6/gtk-3.0/gtk-widgets.css
--- elementary-theme-4.0.6/gtk-3.0/gtk-widgets.css	2015-09-26 03:31:27.000000000 +0000
+++ elementary-theme-4.0.6/gtk-3.0/gtk-widgets.css	2015-09-27 03:31:51.000000000 +0000
@@ -1741,8 +1741,7 @@
 .scrollbar.trough,
 .scrollbar.trough:backdrop {
     background-image: none;
-    background-color: @bg_color;
-    background-image: none;
+    background-color: transparent;
     border-width: 0;
     border-radius: 0;
     border-image: none;
@@ -1777,9 +1776,9 @@
                                   alpha (@bg_color, 0.98) 80%,
                                   alpha (shade(@bg_color, 0.94), 0.98)
                                   );
-    box-shadow: inset 0 0 0 1px alpha (#fff, 0.10),
-                inset 0 1px 0 0 alpha (#fff, 0.90),
-                inset 0 -1px 0 0 alpha (#fff, 0.30);
+    box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.10),
+                inset 0 1px 0 0 alpha (@bg_highlight_color, 0.90),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30);
 }
 
 .menu.button {
@@ -1966,15 +1965,15 @@
     border: 1px solid shade (@titlebar_color, 0.56);
     border-width: 0 0 1px 0;
 
-    box-shadow: inset 0 -1px 0 0 alpha (#fff, 0.20);
+    box-shadow: inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.20);
 
     background-image: linear-gradient(to bottom,
                                   @titlebar_color,
                                   shade (@titlebar_color, 0.84)
                                   );
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 }
 
 GtkHandleBox:backdrop,
@@ -1985,7 +1984,7 @@
                               );
     border-color: shade (@titlebar_color, 0.64);
 
-    box-shadow: inset 0 -1px 0 0 alpha (#fff, 0.40);
+    box-shadow: inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.40);
 
     -gtk-image-effect: dim;
 }
@@ -2011,13 +2010,13 @@
                                   shade (@titlebar_color, 0.84)
                                   );
 
-    box-shadow: inset 0 1px 0 0 alpha (#fff, 0.30),
-                inset 0 -1px 0 0 alpha (#fff, 0.20);
+    box-shadow: inset 0 1px 0 0 alpha (@bg_highlight_color, 0.30),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.20);
 
     border-color: shade (@titlebar_color, 0.54);
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 }
 
 .secondary-toolbar.toolbar:backdrop {
@@ -2035,8 +2034,8 @@
 .secondary-toolbar.toolbar .button {
     border-color: alpha (#000, 0.3);
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 }
 
 
@@ -2055,8 +2054,8 @@
                                   shade (@titlebar_color, 0.88)
                                   );
 
-    box-shadow: inset 0 1px 0 0 alpha (#fff, 0.50),
-                inset 0 -1px 0 0 alpha (#fff, 0.20);
+    box-shadow: inset 0 1px 0 0 alpha (@bg_highlight_color, 0.50),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.20);
 }
 
 .bottom-toolbar.toolbar .button {
@@ -2121,8 +2120,8 @@
 .action-bar {
     padding: 1px 6px;
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 
     background-image: linear-gradient(to bottom,
                                   @titlebar_color,
@@ -2133,9 +2132,9 @@
     border-width: 1px 0 0 0;
     border-top-color: shade (@bg_color, 0.52);
 
-    box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
-                inset 0 1px 0 0 alpha (#fff, 0.45),
-                inset 0 -1px 0 0 alpha (#fff, 0.15);
+    box-shadow: inset 0 0 0 1px alpha (@bg_highlight_color, 0.05),
+                inset 0 1px 0 0 alpha (@bg_highlight_color, 0.45),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.15);
 }
 
 GtkDialog .action-bar {
@@ -2213,8 +2212,8 @@
     background-color: transparent;
     box-shadow: none;
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 
     color: shade (@text_color, 1.25);
 }
@@ -2259,13 +2258,13 @@
                                   shade (@titlebar_color, 0.84)
                                   );
 
-    box-shadow: inset 0 1px 0 0 alpha (#fff, 0.30),
-                inset 0 -1px 0 0 alpha (#fff, 0.20);
+    box-shadow: inset 0 1px 0 0 alpha (@bg_highlight_color, 0.30),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.20);
 
     border-color: shade (@titlebar_color, 0.54);
 
-    text-shadow: 0 1px alpha (#fff, 0.4);
-    icon-shadow: 0 1px alpha (#fff, 0.4);
+    text-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
+    icon-shadow: 0 1px alpha (@bg_highlight_color, 0.4);
 }
 
 EggFindBar.toolbar:backdrop,
@@ -3185,15 +3184,14 @@
 .popover,
 .popover.osd,
 .popover_bg {
-    border-radius: 4px;
     background-clip: border-box;
     background-color: @bg_color;
 
-    border-color: alpha (#000, 0.2);
-    border-width: 1px;
-    border-style: solid;
+    border: 1px solid alpha (#000, 0.2);
+    border-radius: 4px;
 
-    box-shadow: 0 3px 6px alpha (#000, 0.16),
+    box-shadow: inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30),
+                0 3px 6px alpha (#000, 0.16),
                 0 3px 6px alpha (#000, 0.23);
     margin: 10px 6px;
 
@@ -3349,7 +3347,7 @@
                                   );
     border-width: 0;
 
-    box-shadow: inset 0 1px 0 0 alpha (#fff, 0.60);
+    box-shadow: inset 0 1px 0 0 alpha (@bg_highlight_color, 0.60);
 }
 
 GtkDialog .titlebar,
@@ -3361,9 +3359,9 @@
     background-image: none;
     background-color: @bg_color;
 
-    box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20),
-                inset -1px 0 0 0 alpha (#fff, 0.20),
-                inset 0 1px 0 0 #fff;
+    box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset -1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset 0 1px 0 0 @bg_highlight_color;
 }
 
 GtkDialog .titlebar:backdrop,
@@ -3375,9 +3373,9 @@
     background-image: none;
     background-color: @bg_color;
 
-    box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20),
-                inset -1px 0 0 0 alpha (#fff, 0.20),
-                inset 0 1px 0 0 #fff;
+    box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset -1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset 0 1px 0 0 @bg_highlight_color;
 
     color: shade (@titlebar_color, 1.20);
 }
@@ -3509,9 +3507,9 @@
     background-image: none;
     background-color: @bg_color;
 
-    box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20),
-                inset -1px 0 0 0 alpha (#fff, 0.20),
-                inset 0 1px 0 0 #fff;
+    box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset -1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset 0 1px 0 0 @bg_highlight_color;
 }
 
 GtkDialog .titlebar:backdrop,
@@ -3521,9 +3519,9 @@
     background-image: none;
     background-color: @bg_color;
 
-    box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20),
-                inset -1px 0 0 0 alpha (#fff, 0.20),
-                inset 0 1px 0 0 #fff;
+    box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset -1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset 0 1px 0 0 @bg_highlight_color;
 
     color: shade (@titlebar_color, 1.20);
 }
@@ -3537,9 +3535,9 @@
 
 GtkDialog,
 GtkMessageDialog {
-    box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20),
-                inset -1px 0 0 0 alpha (#fff, 0.20),
-                inset 0 -1px 0 0 alpha (#fff, 0.30);
+    box-shadow: inset 1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset -1px 0 0 0 alpha (@bg_highlight_color, 0.20),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.30);
 }
 
 GtkDialog .toolbar {