diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 03bc333..9bcaade 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2737,6 +2737,7 @@ scrollbar {
 $switch_image: linear-gradient(0deg, rgba($fg_color, 0.25) 0%, rgba($fg_color, 0.35) 100%);
 $switch_disabled_image: linear-gradient(0deg, rgba($fg_color, 0.1) 0%, rgba($fg_color, 0.15) 100%);
 $switch_checked_image: linear-gradient(0deg, lighten($selected_bg_color, 10%) 0%, $selected_bg_color 100%);
+$switch_checked_backdrop_image: linear-gradient(0deg, lighten($bg_color, 15%) 0%, lighten($bg_color, 5%)  100%);
 $switch_checked_disabled_image: linear-gradient(0deg, lighten($selected_bg_color, 35%) 0%, lighten($selected_bg_color, 25%) 100%);
 $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
 
@@ -2787,6 +2788,12 @@ switch {
     }
   }
 
+  &:backdrop {
+    background-color: transparent;
+    background-image: $switch_checked_backdrop_image;
+    color: transparent;
+  }
+
   slider {
     transition: $longer_transition, $shadow_transition, margin 0;
     min-width: 22px;
@@ -3021,11 +3028,7 @@ scale {
 
       highlight {
         background-color: $selected_bg_color;
-
-        &:disabled {  }
       }
-
-      &:disabled {  }
     }
 
     // Troughs in selected list-rows and infobars
@@ -3128,8 +3131,6 @@ scale {
         border-color: $_slider_border;
         box-shadow: $shadow_3;
       }
-
-      &:disabled {  }
     }
   }
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 2ee72a9..d5ae341 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1970,16 +1970,30 @@ headerbar {
     }
   }
 
-  entry { @extend %headerbar_entrys; }
+  entry {
+    @extend %headerbar_entrys;
+  }
 
-  button { @extend %headerbar_buttons; }
+  button {
+    @extend %headerbar_buttons;
+  }
 
-  button, spinbutton, entry, stackswitcher {
+  entry,
+  spinbutton,
+  button,
+  menubutton,
+  splitbutton,
+  stackswitcher,
+  separator:not(.sidebar) {
     margin-top: 8px;
     margin-bottom: 8px;
   }
 
-  menubutton.popup {
+  menubutton > button,
+  spinbutton > button,
+  splitbutton > button,
+  splitbutton > menubutton,
+  entry > menubutton {
     margin-top: 0;
     margin-bottom: 0;
   }
@@ -3059,6 +3073,7 @@ scrollbar {
 $switch_image: linear-gradient(0deg, rgba($fg_color, 0.25) 0%, rgba($fg_color, 0.35) 100%);
 $switch_disabled_image: linear-gradient(0deg, rgba($fg_color, 0.1) 0%, rgba($fg_color, 0.15) 100%);
 $switch_checked_image: linear-gradient(0deg, lighten($selected_bg_color, 10%) 0%, $selected_bg_color 100%);
+$switch_checked_backdrop_image: linear-gradient(0deg, lighten($bg_color, 15%) 0%, lighten($bg_color, 5%)  100%);
 $switch_checked_disabled_image: linear-gradient(0deg, lighten($selected_bg_color, 35%) 0%, lighten($selected_bg_color, 25%) 100%);
 $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
 
@@ -3110,6 +3125,12 @@ switch {
     }
   }
 
+  &:backdrop {
+    background-color: transparent;
+    background-image: $switch_checked_backdrop_image;
+    color: transparent;
+  }
+
   > slider {
     transition: $longer_transition, $shadow_transition, margin 0;
     min-width: 22px;
@@ -3321,11 +3342,7 @@ scale {
 
       highlight {
         background-color: $selected_bg_color;
-
-        &:disabled {  }
       }
-
-      &:disabled {  }
     }
 
     // Troughs in selected list-rows and infobars
@@ -3428,8 +3445,6 @@ scale {
         border-color: $_slider_border;
         box-shadow: $shadow_3;
       }
-
-      &:disabled {  }
     }
   }
 
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index dd09f8e..0434a7d 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -233,16 +233,15 @@
     label, & { color: $disabled_fg_color; }
 
     background-color: transparent;
-//    border: none;
   }
 
   @else if $t==flat-insensitive-active {
   //
   // insensitive pushed button
   //
-    label, & { color: transparentize($selected_fg_color, 0.2); }
+    label, & { color: transparentize($selected_fg_color, 0.35); }
 
-    background-color: lighten($fg_color, 20%);
+    background-color: if($variant=='light', rgba(black, 0.3), rgba(white, 0.15));
     opacity: 0.6;
   }
 
diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index 05f25b9..70f8c08 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -75,7 +75,7 @@ $raven_padding: 8px;
 
 .budgie-settings-window {
   &.background {
-    background-color: rgba($base_color, if($trans == 'true', 0.95, 1));
+    background-color: rgba($base_color, if($trans == 'true', 0.97, 1));
 
     buttonbox.inline-toolbar {
       border-style: none none solid;
@@ -197,7 +197,7 @@ $raven_padding: 8px;
     entry.search {
       padding: 5px 10px;
       border: none;
-      border-bottom: 1px solid $borders_color;
+      border-bottom: 1px solid $header_border;
       border-radius: 0;
       box-shadow: none;
       font-size: 110%;
@@ -215,6 +215,16 @@ $raven_padding: 8px;
       button.flat.category-button {
         min-height: 28px;
         border-radius: 0;
+
+        &:disabled {
+          color: $alt_disabled_fg_color;
+          background-color: transparent;
+        }
+
+        &:checked:disabled {
+          color: $disabled_fg_color;
+          background-color: $fill_color;
+        }
       }
     }
 
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 7f911c3..961936c 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -412,17 +412,17 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
     padding: 2px;
     background-color: $selected_bg_color;
     color: $selected_fg_color;
-    border-radius: $wm_radius - 6px;
-    margin: 6px;
+    border-radius: $wm_radius - $container_padding;
+    margin: $container_padding;
     box-shadow: $shadow_5;
 
     button {
       border: none;
-      border-radius: 100px;
+      border-radius: $circular_radius;
       min-height: 0;
       min-width: 0;
       padding: 0;
-      margin-right: 6px;
+      margin-right: container_padding;
       -gtk-icon-shadow: none;
       @extend %selected-button;
     }
@@ -608,11 +608,6 @@ terminal-window {
     border-radius: $wm_radius $wm_radius 0 0;
   }
 
-  notebook {
-    // button.flat.toggle.popup {
-    // }
-  }
-
   &.background.csd.maximized { border-radius: 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization
 }
 
@@ -1840,13 +1835,6 @@ notebook > box > stack > box.vertical > paned.vertical > overlay {
   > .floating-bar { color: rgba($fg_color, 0.75); }
 }
 
-.background:not(.csd) > box.vertical > headerbar {
-  // conflicts with .primary-toolbar styling?
-  .linked > button.image-button { // = 'back/forward' button
-
-  }
-}
-
 // overrides foregrounds for 3.24's ssd-mode
 .background headerbar entry {
   &.starred,
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index eeb6ef3..a961fde 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -1,53 +1,85 @@
-//
-// Extensions
-//
-window.background.csd {
-  > stack, // GameMode setting
-  > stack > scrolledwindow > viewport > box, // User Themes (Workspace) setting
-  > box > stack > scrolledwindow > viewport > box {
-    > list {
-      @extend %circular_list;
 
-      row.activatable { @extend %circular_row; }
-    }
-  }
+/************
+ * Nautilus *
+ ************/
 
-  stack stack stack frame, // ArcMenu setting
-  > stack > stack > box > frame, // Night Theme Switcher setting
-  > stack > stack > box > box > frame, // Night Theme Switcher setting bottom lists
-  > stack > box > stack > box > frame, // ArcMenu setting
-  > stack > box > stack > scrolledwindow > viewport frame, // ArcMenu setting
-  > stack > box > stack > box > scrolledwindow > viewport > frame, // ArcMenu setting
-  > stack > grid > scrolledwindow > viewport > box > frame { // GSConnect setting
-    > border { border: none; }
-    border: none;
+ .nautilus-window {
+  // Floating Bar
+  .floating-bar {
+    padding: 2px;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+    border-radius: $wm_radius - $container_padding;
+    margin: $container_padding;
+    box-shadow: $shadow_5;
 
-    > list {
-      @extend %circular_list;
-
-      row.activatable { @extend %circular_row; }
-    }
-  }
-
-  > stack > box > box > list,
-  > stack > box > stack > scrolledwindow > viewport > list { // ArcMenu setting sidebar
-    border-bottom-left-radius: $wm_radius;
-  }
-
-  &.maximized, &.tiled, &.fullscreen {
-    > stack > box > box > list,
-    > stack > box > stack > scrolledwindow > viewport > list { // ArcMenu setting sidebar
-      border-bottom-left-radius: $maximized_radius;
+    button {
+      border: none;
+      border-radius: $circular_radius;
+      min-height: 0;
+      min-width: 0;
+      padding: 0;
+      margin-right: container_padding;
+      -gtk-icon-shadow: none;
+      @extend %selected-button;
     }
   }
 }
 
+#NautilusViewCell {
+  clamp box {
+    margin: 0;
+    border-spacing: 0;
+  }
+}
+
+#NautilusQueryEditor { // search entry
+  padding: 1px $container_padding;
+
+  > menubutton > button {
+    min-width: 16px;
+    min-height: 16px;
+    margin: 0;
+    -gtk-icon-size: 12px;
+    padding: 0 4px;
+  }
+
+  > text, > image { margin: 0; }
+}
+
+#NautilusPathBar {
+  background-color: $fill_color;
+  border-radius: $bt_radius;
+  margin: $container_padding 0 $container_padding $container_padding;
+
+  #NautilusPathButton {
+    margin: 0 $container_padding / 2;
+    border-radius: $bt_radius;
+
+    &.current-dir {
+      color: $header_fg;
+  
+      &:hover, &:active {
+        background: none;
+        box-shadow: none;
+      }
+    }
+
+    &:first-child { margin-left: 0; }
+  }
+
+  > menubutton {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+}
+
+// Extensions
 window.nightthemeswitcher headerbar {
   background: $header_bg;
   color: $header_fg;
 }
 
-
 //
 // Gnome Control Center
 //