diff --git a/gtk-3.20/scss/_global.scss b/gtk-3.20/scss/_global.scss
index 43e4796..9f940d5 100755
--- a/gtk-3.20/scss/_global.scss
+++ b/gtk-3.20/scss/_global.scss
@@ -31,9 +31,6 @@ $white: #fff;
 $button_border: shade($base_color, .9);
 $entry_border: alpha($dark_shadow, .06);
 
-$top_hilight: $borders_edge;
-$headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
-
 $scrollbar_bg_color: if($variant == 'light', darken($bg_color, 5%), mix($base_color, $bg_color, .4));
 $scrollbar_slider_color: shade($bg_color, .5);
 $scrollbar_slider_hover_color: shade($bg_color, .3);
@@ -84,8 +81,8 @@ $lightdm_bg_color: $dark_bg_color;
 $lightdm_fg_color: $dark_fg_color;
 
 $wm_bg: $titlebar_bg_color;
-$wm_border_focused: if($variant == 'light', transparentize($black, .5), transparentize($borders_color, .1));
-$wm_border_unfocused: if($variant == 'light', transparentize($black, .55), transparentize($borders_color, .1));
+$wm_border_focused: transparent;
+$wm_border_unfocused: transparent;
 $wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1);
 $wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4);
 $wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1);
diff --git a/gtk-3.20/scss/widgets/_window.scss b/gtk-3.20/scss/widgets/_window.scss
index 5cabeea..da2eed2 100755
--- a/gtk-3.20/scss/widgets/_window.scss
+++ b/gtk-3.20/scss/widgets/_window.scss
@@ -1,7 +1,9 @@
+/**************
+ ! Window frame
+***************/
+
 @include exports("window") {
     decoration {
-        $_wm_border: if($variant == 'light', transparentize($black, .77), transparentize($borders_color, .1));
-
         border-radius: $roundness $roundness 0 0;
         // lamefun trick to get rounded borders regardless of CSD use
         border-width: 0;
@@ -32,14 +34,11 @@
             background-color: $bg_color;
             // Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206
             box-shadow: none;
-            //box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
-
-            //&:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
         }
 
         .csd.popup & {
             border-radius: 0;
-            box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1);
+            box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($wm_border_focused, .1);
         }
 
         tooltip.csd & {
@@ -49,7 +48,7 @@
 
         messagedialog.csd & {
             border-radius: $roundness;
-            box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1);
+            box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($wm_border_focused, .1);
         }
     }
 }