diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/debian/bzr-builder.manifest numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/debian/bzr-builder.manifest
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/debian/bzr-builder.manifest	2016-04-18 22:17:01.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/debian/bzr-builder.manifest	2016-04-23 04:16:52.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+422~201604182216
-lp:numix revid:git-v1:a0736e4c8bde17bee2eff1e394e1587fe7fbccb1
+# bzr-builder format 0.3 deb-version {debupstream}+432~201604230416
+lp:numix revid:git-v1:3c82d31944793e125f54ca443be6d4b01c6a67d7
 merge packaging lp:~numix/numix/deb-packaging revid:khurshid.alam@linuxmail.org-20160209060321-t730k8dbyrxku19s
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/debian/changelog numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/debian/changelog
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/debian/changelog	2016-04-18 22:17:01.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/debian/changelog	2016-04-23 04:16:52.000000000 +0000
@@ -1,8 +1,8 @@
-numix-gtk-theme (2.4ubuntu1+422~201604182216~ubuntu15.04.1) vivid; urgency=low
+numix-gtk-theme (2.4ubuntu1+432~201604230416~ubuntu15.04.1) vivid; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Mon, 18 Apr 2016 22:17:01 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 23 Apr 2016 04:16:52 +0000
 
 numix-gtk-theme (2.4ubuntu1) UNRELEASED; urgency=medium
 
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/apps/_nemo.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/apps/_nemo.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/apps/_nemo.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/apps/_nemo.scss	2016-04-23 04:16:50.000000000 +0000
@@ -108,16 +108,6 @@
             border: 0;
         }
 
-        paned {
-            border-width: 0 1px 0 0;
-            border-style: solid;
-
-            &, &:hover {
-                border-color: shade($bg_color, ($contrast + .1));
-                background-color: $bg_color;
-            }
-        }
-
         notebook {
             border-width: 0;
 
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/_functions.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/_functions.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/_functions.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/_functions.scss	2016-04-23 04:16:50.000000000 +0000
@@ -77,3 +77,19 @@
 
     &:active:disabled, &:checked:disabled { border-color: border_normal($color); }
 }
+
+@function _text_shadow_color($tc: $fg_color, $bg: $bg_color) {
+    //
+    // calculate the color of text shadows
+    //
+    // $tc is the text color
+    // $bg is the background color
+    //
+    $_lbg: lightness($bg) / 100%;
+
+    @if lightness($tc) < 50% {
+        @return transparentize(white, 1 - $_lbg / ($_lbg * 1.3));
+    } @else {
+        @return transparentize(black, $_lbg * .8);
+    }
+}
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/_global.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/_global.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/_global.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/_global.scss	2016-04-23 04:16:50.000000000 +0000
@@ -12,7 +12,7 @@
 $tooltip_bg_color: #444;
 $tooltip_fg_color: #eee;
 
-$selected_borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
+$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
 $borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
 
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_actionbar.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_actionbar.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_actionbar.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_actionbar.scss	2016-04-23 04:16:50.000000000 +0000
@@ -6,37 +6,11 @@
 ***************/
 
 @include exports("actionbar") {
-    actionbar {
-        @include linear-gradient($bg_color);
-
+    actionbar > revealer > box {
         padding: $spacing;
-        border-width: 1px 0 0;
-        border-style: solid;
-        border-color: border_normal($bg_color);
-        color: $fg_color;
-
-        .button {
-            &.text-button { padding: $spacing - 1px; }
-
-            &.image-button { padding: $spacing + 1px; }
-        }
-
-        .title {
-            font: bold;
-            padding: 0 ($spacing * 2);
-        }
-
-        .subtitle {
-            font: smaller;
-            padding: 0 ($spacing * 2);
-        }
-
-        > revealer >  box {
-            padding: 6px;
-            border-top: 1px solid $borders_color;
+        border-top: 1px solid $borders_color;
 
-            &:backdrop { border-color: $backdrop_borders_color; }
-        }
+        &:backdrop { border-color: $backdrop_borders_color; }
     }
 }
 
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_entry.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_entry.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_entry.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_entry.scss	2016-04-23 04:16:50.000000000 +0000
@@ -71,8 +71,9 @@
     @include border($bg);
 
     color: $fg;
+    caret-color: $fg;
 
-    &:focus, &:active { border-color: border_focus($selected_borders_color); }
+    &:focus, &:active { border-color: border_focus($borders_color); }
 
     &:disabled {
         @include linear-gradient(shade($bg, .9), to top);
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_menu.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_menu.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_menu.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_menu.scss	2016-04-23 04:16:50.000000000 +0000
@@ -114,7 +114,7 @@
             }
 
             calendar {
-                &:inconsistent { color: mix($menu_fg_color, $menu_bg_color, .5); }
+                &:indeterminate { color: mix($menu_fg_color, $menu_bg_color, .5); }
 
                 .button {
                     border-style: none;
@@ -158,6 +158,8 @@
         }
     }
 
+    .context-menu { font: initial; }
+
     menuitem {
         accelerator {
             color: alpha($menu_fg_color, .6);
@@ -196,23 +198,20 @@
 **********/
 
 @include exports("popover") {
-    popover {
-        @include border($menu_bg_color);
+    popover.background {
         margin: 10px;
         padding: $spacing;
         border-radius: $roundness;
-        border-width: 1px;
-        border-style: solid;
         background-clip: border-box;
         background-color: $menu_bg_color;
         background-image: none;
         color: $menu_fg_color;
         box-shadow: 0 3px 6px alpha($black, .16);
 
-        &.background {
-            background-image: none;
-            background-color: $menu_bg_color;
-            color: $menu_fg_color;
+        .csd &, & {
+            @include border($menu_bg_color);
+            border-width: 1px;
+            border-style: solid;
         }
 
         &:backdrop { box-shadow: none; }
@@ -272,7 +271,10 @@
 
         button { @include button($menu_bg_color, $menu_fg_color);  }
 
-        > list, > view, > toolbar { background-color: transparent; }
+        > list, > .view, > toolbar {
+            border-style: none;
+            background-color: transparent;
+        }
     }
 
     modelbutton {
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_misc.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_misc.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_misc.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_misc.scss	2016-04-23 04:16:50.000000000 +0000
@@ -143,9 +143,6 @@
         }
 
         .button {
-
-            -GtkButton-inner-border: 0;
-
             border: 0;
             background-color: transparent;
             background-image: none;
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_progress.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_progress.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_progress.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_progress.scss	2016-04-23 04:16:50.000000000 +0000
@@ -56,16 +56,18 @@
     }
 
     levelbar {
-        min-width: 34px;
-        min-height: 3px;
+        block {
+            min-width: 34px;
+            min-height: 3px;
+        }
 
-        &.vertical {
+        &.vertical block {
             min-width: 3px;
             min-height: 34px;
         }
-    }
 
-    levelbar {
+        &:backdrop { transition: 200ms ease-out; }
+
         trough {
             @include linear-gradient(shade($bg_color, 1.08), to top);
 
@@ -73,13 +75,18 @@
             border-radius: $roundness;
         }
 
-        &.discrete {
-            &.horizontal { margin-right: 1px; }
+        &.horizontal.discrete { margin-right: 1px; }
 
-            &.vertical { margin-bottom: 1px; }
+        &.vertical.discrete { margin-bottom: 1px; }
+
+        block:not(.empty) {
+            @include linear-gradient($selected_bg_color);
+
+            border-color: transparent;
+            border-radius: 0;
         }
 
-        block.filled {
+        block {
             @include linear-gradient($selected_bg_color);
 
             // FIXME: it would be nice to set make fill blocks bigger, but we'd need
@@ -87,17 +94,22 @@
             border-color: transparent;
             border-radius: 0;
 
-            &.level-high {
-                background-color: $success_color;
+            &.low {
+                background-color: $warning_color;
                 border-color: transparent;
             }
 
-            &.level-low {
-                background-color: $warning_color;
+            &.high {
+                background-color: $selected_bg_color;
+                border-color: transparent;
+            }
+
+            &.full {
+                background-color: $success_color;
                 border-color: transparent;
             }
 
-            &.empty-fill-block {
+            &.empty {
                 background-color: transparent;
                 border-color: transparent;
                 box-shadow: none;
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_sidebar.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_sidebar.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_sidebar.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_sidebar.scss	2016-04-23 04:16:50.000000000 +0000
@@ -164,6 +164,7 @@
             // workaround, using background istead of a border since the border will get rendered twice (?)
             background-image: image(shade($bg_color, .9));
             background-size: 1px 1px;
+            background-position: center center;
 
             &:selected { background-image: image($selected_bg_color); } // FIXME is this needed?
 
@@ -186,18 +187,8 @@
 
         &.horizontal > separator {
             background-repeat: repeat-y;
-
-            &:dir(ltr) {
-                margin: 0 -8px 0 0;
-                padding: 0 8px 0 0;
-                background-position: left;
-            }
-
-            &:dir(rtl) {
-                margin: 0 0 0 -8px;
-                padding: 0 0 0 8px;
-                background-position: right;
-            }
+            padding: 0 2px;
+            margin: 0 -2px;
 
             &.wide {
                 margin: 0;
@@ -208,10 +199,9 @@
         }
 
         &.vertical > separator {
-            margin: 0 0 -8px 0;
-            padding: 0 0 8px 0;
             background-repeat: repeat-x;
-            background-position: top;
+            padding: 2px 0;
+            margin: -2px 0;
 
             &.wide {
                 margin: 0;
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_toolbar.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_toolbar.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_toolbar.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_toolbar.scss	2016-04-23 04:16:50.000000000 +0000
@@ -67,6 +67,18 @@
 
         border-width: 0 0 1px;
         border-style: solid;
+
+        window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case
+        window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: $roundness; } }
+
+        window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: $roundness; } }
+    }
+
+    .background:not(.tiled):not(.maximized) .titlebar {
+        &:backdrop, & {
+            border-top-left-radius: $roundness;
+            border-top-right-radius: $roundness;
+        }
     }
 
     .titlebar {
diff -Nru numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_view.scss numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_view.scss
--- numix-gtk-theme-2.4ubuntu1+422~201604182216~ubuntu15.04.1/gtk-3.20/scss/widgets/_view.scss	2016-04-18 22:16:54.000000000 +0000
+++ numix-gtk-theme-2.4ubuntu1+432~201604230416~ubuntu15.04.1/gtk-3.20/scss/widgets/_view.scss	2016-04-23 04:16:50.000000000 +0000
@@ -182,7 +182,7 @@
                         box-shadow: inset 0 1px transparentize(white, .95);
                     }
 
-                    background-color: linear-gradient(to bottom, $base_color, darken($base_color, .1));
+                    @include linear-gradient($selected_bg_color);
 
                     &:backdrop {
                         @if $variant == 'light' {
@@ -197,17 +197,9 @@
                 }
             }
 
-            /* transmission fix. */
-            &:insensitive {
-                &:insensitive {
-                    @include linear-gradient($bg_color);
-                    border-color: border_insensitive($bg_color);
-                }
-            }
-
             &:disabled {
                 @include linear-gradient($bg_color);
-                border-color: border_disabled($bg_color);
+                border-color: border_insensitive($bg_color);
             }
 
             &:backdrop {