diff --git a/gtk-3.20/scss/widgets/_window.scss b/gtk-3.20/scss/widgets/_window.scss
index e6926c3..660f0d4 100755
--- a/gtk-3.20/scss/widgets/_window.scss
+++ b/gtk-3.20/scss/widgets/_window.scss
@@ -4,52 +4,54 @@
 
 @include exports("window") {
     %window {
-        box-shadow: 0 19px 38px rgba(0, 0, 0, .3), 0 15px 12px rgba(0, 0, 0, .22), 0 0 0 1px $wm_border_focused;
+        box-shadow: 0 10px 20px rgba(0, 0, 0, .3), 0 6px 6px rgba(0, 0, 0, .22), 0 0 0 1px $wm_border_focused;
 
         &:backdrop {
             box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23), 0 0 0 1px $wm_border_unfocused;
         }
     }
 
-    .window-frame {
+    decoration {
         @extend %window;
 
-        border: 0;
         border-radius: $roundness $roundness 0 0;
+        // lamefun trick to get rounded borders regardless of CSD use
+        border-width: 0px;
 
         /* this is used for the resize cursor area */
         margin: $spacing * 3;
 
-        &.tiled { border-radius: 0; }
+        .fullscreen &, .tiled & { border-radius: 0; }
 
-        &.solid-csd {
+        .popup & { box-shadow: none; }
+
+        // this needs to be transparent
+        // see bug #722563
+        // server-side decorations as used by mutter
+        .ssd & { box-shadow: 0 0 0 1px if($variant=='light', transparentize(black, .77), transparentize($borders_color, .1)); } //just doing borders, wm draws actual shadows
+
+        .solid-csd & {
             border-radius: 0;
             margin: 1px;
             background-color: $bg_color;
             box-shadow: none;
         }
 
-        &.csd {
-            &.popup {
-                @extend %window;
+        .csd.popup & {
+            @extend %window;
 
-                border-radius: 0;
-            }
-
-            &.tooltip {
-                border-radius: $roundness;
-                box-shadow: none;
-            }
-
-            &.message-dialog {
-                @extend %window;
-
-                border-radius: $roundness;
-            }
+            border-radius: 0;
         }
 
-        &.ssd {
-            &.maximized { border-radius: 0; }
+        tooltip.csd & {
+            border-radius: $roundness;
+            box-shadow: none;
+        }
+
+        messagedialog.csd & {
+            @extend %window;
+
+            border-radius: $roundness;
         }
     }
 }