diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index 078b7bd..15c7286 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -3936,9 +3936,20 @@ colorchooser .popover.osd {
 window {
   outline: none;
   transition: $transition-shadow;
-  border-radius: $window-radius;
   box-shadow: $shadow-z16, 0 16px (24px * .6) 2px transparent, 0 6px (30px * .6) 5px transparent;
 
+  &.csd {
+    border-radius: $window-radius;
+
+    &.maximized,
+    &.fullscreen,
+    &.tiled,
+    &.tiled-top,
+    &.tiled-right,
+    &.tiled-bottom,
+    &.tiled-left { border-radius: 0; }
+  }
+
   @if $variant == 'light' and $topbar == 'dark' {
     &.background {
       background-color: transparent;
@@ -3958,16 +3969,11 @@ window {
     box-shadow: $shadow-z4, 0 16px (24px * .6) 2px transparent, 0 6px (30px * .6) 5px transparent;
   }
 
-  &.popup {
-    border-radius: $menu-radius;
-    box-shadow: $shadow-z4;
+  &.ssd {
+    box-shadow: none; // just doing borders, wm draws actual shadows
   }
 
-  &.dialog.message {
-    border-radius: $window-radius;
-  }
-
-  .solid-csd & {
+  &.solid-csd {
     margin: 0;
     padding: 2px;
     border-radius: 0;
@@ -3976,14 +3982,6 @@ window {
 
     &:backdrop { background-color: $titlebar-backdrop; }
   }
-
-  &.maximized,
-  &.fullscreen,
-  &.tiled,
-  &.tiled-top,
-  &.tiled-right,
-  &.tiled-bottom,
-  &.tiled-left { border-radius: 0; }
 }
 
 // Window button
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 6a2d9fb..33f4ef0 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -4364,10 +4364,17 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 16px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
+window.csd {
+  border-radius: 16px;
+}
+
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
+}
+
 window.background {
   background-color: transparent;
   background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 40px, #F2F2F2 40px, #F2F2F2);
@@ -4377,16 +4384,11 @@ window:backdrop {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window.popup {
-  border-radius: 9px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
-}
-
-window.dialog.message {
-  border-radius: 16px;
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4394,14 +4396,10 @@ window.dialog.message {
   background-color: #2C2C2C;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #2C2C2C;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 4px;
 }
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index 0c8e0ca..9fb0758 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -4364,24 +4364,26 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 16px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+window.csd {
+  border-radius: 16px;
 }
 
-window.popup {
-  border-radius: 9px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 16px;
+window:backdrop {
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+}
+
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4389,14 +4391,10 @@ window.dialog.message {
   background-color: #2C2C2C;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #2C2C2C;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 4px;
 }
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index 746a57d..b2ea00e 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -4364,24 +4364,26 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 18px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+window.csd {
+  border-radius: 18px;
 }
 
-window.popup {
-  border-radius: 11px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 18px;
+window:backdrop {
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+}
+
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4389,14 +4391,10 @@ window.dialog.message {
   background-color: #2C2C2C;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #2C2C2C;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 6px;
 }
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 4d00968..f5193a0 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -4364,24 +4364,26 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 16px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+window.csd {
+  border-radius: 16px;
 }
 
-window.popup {
-  border-radius: 9px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 16px;
+window:backdrop {
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+}
+
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4389,14 +4391,10 @@ window.dialog.message {
   background-color: #FFFFFF;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #FFFFFF;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 4px;
 }
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 937262c..eff2f61 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -4364,24 +4364,26 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 18px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+window.csd {
+  border-radius: 18px;
 }
 
-window.popup {
-  border-radius: 11px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 18px;
+window:backdrop {
+  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
+}
+
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4389,14 +4391,10 @@ window.dialog.message {
   background-color: #FFFFFF;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #FFFFFF;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 6px;
 }
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index d36eee9..2d36e00 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -4364,10 +4364,17 @@ colorchooser .popover.osd:backdrop {
 window {
   outline: none;
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
-  border-radius: 18px;
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
+window.csd {
+  border-radius: 18px;
+}
+
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
+}
+
 window.background {
   background-color: transparent;
   background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 48px, #F2F2F2 48px, #F2F2F2);
@@ -4377,16 +4384,11 @@ window:backdrop {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
-window.popup {
-  border-radius: 11px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
-}
-
-window.dialog.message {
-  border-radius: 18px;
+window.ssd {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
@@ -4394,14 +4396,10 @@ window.dialog.message {
   background-color: #2C2C2C;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #2C2C2C;
 }
 
-window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
-  border-radius: 0;
-}
-
 windowcontrols {
   border-spacing: 6px;
 }