diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index 19325def..b0d0d9a8 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -1,8 +1,6 @@
 
 /* App Icons */
 
-$app_grid_fg_color: #fff;
-
 .show-apps,
 .app-well-app,
 %app-well-app {
@@ -62,7 +60,7 @@ $app_grid_fg_color: #fff;
     }
 
     & .folder-name-entry {
-      @extend %search-entry !optional;
+      @extend %search-entry;
       width: 300px;
     }
 
@@ -78,7 +76,7 @@ $app_grid_fg_color: #fff;
       height: 36px;
       border-radius: 18px;
 
-      & > StIcon { icon-size: 16px }
+      & > StIcon { icon-size: 16px; }
 
       &:hover { background-color: $light_divider_color; }
       &:checked, &:active { background-color: $light_track_color; }
diff --git a/src/sass/gnome-shell/widgets-3-28/_other.scss b/src/sass/gnome-shell/widgets-3-28/_other.scss
index 90ef14a7..dcc91695 100644
--- a/src/sass/gnome-shell/widgets-3-28/_other.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_other.scss
@@ -221,15 +221,5 @@
 #panel.lock-screen { background-color: $alt_dark_bg_color; }
 
 #screenShieldNotifications {
-  StScrollBar {
-    StBin#trough {
-      background-color: $light_divider_color;
-    }
-
-    StButton#vhandle, StButton#hhandle {
-      background-color: $light_hint_fg_color;
-      &:hover { background-color: $light_alt_fg_color; }
-      &:active { background-color: $light_alt_fg_color; }
-    }
-  }
+  StScrollBar { @extend %overview_scrollbar; }
 }
diff --git a/src/sass/gnome-shell/widgets-3-28/_overview.scss b/src/sass/gnome-shell/widgets-3-28/_overview.scss
index 02ee2e17..ad34beb0 100644
--- a/src/sass/gnome-shell/widgets-3-28/_overview.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_overview.scss
@@ -1,4 +1,16 @@
+%overview_scrollbar {
+  StBin#trough {
+    background-color: $inverse_divider_color;
+  }
+
+  StButton#vhandle, StButton#hhandle {
+    background-color: $inverse_hint_fg_color;
+    &:hover { background-color: $inverse_secondary_fg_color; }
+    &:active { background-color: $inverse_fg_color; }
+  }
+}
+
 #overview {
   spacing: 24px;
-  StScrollBar { @extend %overview_scrollbar !optional; }
+  StScrollBar { @extend %overview_scrollbar; }
 }
diff --git a/src/sass/gnome-shell/widgets-40-0/_search-results.scss b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index a98cb0d9..17c1cb22 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1084,11 +1084,11 @@ spinbutton {
     > button.up:dir(rtl):hover:not(:active),
     > text + button:not(:active):hover { box-shadow: none; }
 
-    > text:focus + button { border-left-color: $entry_highlight; }
+    > text:focus-within + button { border-left-color: $entry_highlight; }
     > text:drop(active) + button { border-left-color: $drop_target_color; }
 
     .osd & {
-      &, &:focus, &:drop(active) { border-image: none; }
+      &, &:focus-within, &:drop(active) { border-image: none; }
       > button:hover:not(:active),
       > button:hover + button { box-shadow: inset 1px 0 $osd_button_border; }
 
@@ -1096,7 +1096,7 @@ spinbutton {
       > button.up:dir(rtl):hover:not(:active),
       > text + button:not(:active):hover { box-shadow: none; }
 
-      > text:focus + button { border-left-color: $entry_highlight; }
+      > text:focus-within + button { border-left-color: $entry_highlight; }
     }
   }
 
@@ -1111,7 +1111,7 @@ spinbutton {
 
     > button.up { border-radius: $bt_radius $bt_radius 0 0; }
 
-    > text:focus + button { border-top-color: $entry_highlight; }
+    > text:focus-within + button { border-top-color: $entry_highlight; }
     > text:drop(active) + button { border-top-color: $drop_target_color; }
   }
 
@@ -1966,19 +1966,10 @@ treeview.view {
     color: $borders_color;
   }
 
-  &:drop(active) {
-    border-style: solid none;
-    border-width: 1px;
-    border-color: mix($fg_color, $selected_bg_color, 50%);
-
-    &.after { border-top-style: none; }
-    &.before { border-bottom-style: none; }
-  }
-
   > dndtarget:drop(active) {
     border-style: solid none;
     border-width: 1px;
-    border-color: $selected_borders_color;
+    border-color: mix($fg_color, $selected_bg_color, 50%);
 
     &.after { border-top-style: none; }
 
@@ -2778,7 +2769,7 @@ radio {
   margin: 0 2px;
 
   &:only-child,
-  menu menuitem & { margin: 0; }
+  popover.menu > contents & { margin: 0; }
 }
 
 //
@@ -2816,7 +2807,6 @@ scale {
     $_scale_trough_bg: rgba(black, 0.2);
 
     outline-offset: 2px;
-
     border-radius: $bt_radius;
     background-color: $_scale_trough_bg;
 
@@ -2836,7 +2826,7 @@ scale {
     }
 
     // Troughs in selected list-rows and infobars
-    menuitem:hover &,
+    modelbutton:hover &,
     row:selected &,
     infobar & {
       background-color: transparentize(black, 0.8);
@@ -2898,7 +2888,7 @@ scale {
     }
 
     // Selected list-row and infobar sliders
-    menuitem:hover &,
+    modelbutton:hover &,
     row:selected &,
     infobar & {
       background-clip: border-box;
@@ -3103,8 +3093,8 @@ progressbar {
     }
   }
 
-  &.horizontal > trough > progress { margin: 0 -1px; } // the progress node is positioned after the trough border
-  &.vertical > trough > progress { margin: -1px 0; }   // this moves it over it.
+//  &.horizontal > trough > progress { margin: 0 -1px; } // the progress node is positioned after the trough border
+//  &.vertical > trough > progress { margin: -1px 0; }   // this moves it over it.
 
   &.osd {
     min-width: 3px;
@@ -3514,10 +3504,7 @@ calendar {
     }
 
     > label:focus {
-      outline-color: $borders_color;
-      outline-offset: -2px;
-      outline-width: 2px;
-      outline-style: solid;
+      outline-style: none;
     }
 
     > label.day-number {
@@ -4003,7 +3990,7 @@ infobar {
         background-color: $selected_fg_color;
       }
 
-      *:link { @extend %link_selected; }
+      link { @extend %link_selected; }
     }
   }
 }