diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 3c852ba..59f0d26 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -28,52 +28,3 @@ stage {
   @include fontsize($base_font_size);
   color: $fg_color;
 }
-
-// Common Stylings
-%osd_panel {
-  color: $fg_color;
-  background-color: $base_color;
-  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
-  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
-  border-radius: $bt_radius;
-  padding: 12px;
-}
-
-%overview_panel {
-  color: $light_alt_fg_color;
-  background-color: $light_divider_color;
-  border: none;
-}
-
-%status_text {
-  @include font(display-2);
-  color: $light_hint_fg_color;
-}
-
-%bubble_button {
-  @include button(normal);
-  padding: $container_padding * 2;
-  border-style: solid;
-  border-width: 0;
-  border-left-width: 0;
-  border-bottom-width: 0;
-
-  &:insensitive { @include button(insensitive); }
-  &:hover { @include button(hover); }
-  &:focus { @include button(focus); }
-  &:active { @include button(active); }
-
-  // radius is 2 pixel less to fit in bubble
-  &:first-child {
-    border-radius: 0 0 0 $bt_radius;
-  }
-
-  &:last-child {
-    border-right-width: 0;
-    border-radius: 0 0 $bt_radius 0;
-  }
-
-  &:first-child:last-child {
-    border-radius: 0 0 $bt_radius $bt_radius;
-  }
-}
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index 63a5600..fbbea1c 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -3,20 +3,15 @@
 
 $app_grid_fg_color: #fff;
 
-%icon_tile {
-  color: $light_alt_fg_color;
-  border-radius: $bd_radius * 1.5;
-  padding: 8px;
-  border: none;
-  transition-duration: $longer_duration;
-  text-align: center;
-}
-
-%app-well-app,
 .show-apps,
-.app-well-app {
+.app-well-app,
+.grid-search-result {
   & .overview-icon {
-    @extend %icon_tile !optional;
+    color: $light_alt_fg_color;
+    border-radius: $bd_radius * 1.5;
+    padding: 8px;
+    border: none;
+    text-align: center;
   }
 
   &:hover .overview-icon,
diff --git a/src/sass/gnome-shell/common/_hotplug.scss b/src/sass/gnome-shell/common/_hotplug.scss
index 6531cf7..e37b4b2 100644
--- a/src/sass/gnome-shell/common/_hotplug.scss
+++ b/src/sass/gnome-shell/common/_hotplug.scss
@@ -1,7 +1,31 @@
 // hotplug
 
 .hotplug-notification-item {
-  @extend %bubble_button !optional;
+  @include button(normal);
+  padding: $container_padding * 2;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+
+  &:insensitive { @include button(insensitive); }
+  &:hover { @include button(hover); }
+  &:focus { @include button(focus); }
+  &:active { @include button(active); }
+
+  // radius is 2 pixel less to fit in bubble
+  &:first-child {
+    border-radius: 0 0 0 $bt_radius;
+  }
+
+  &:last-child {
+    border-right-width: 0;
+    border-radius: 0 0 $bt_radius 0;
+  }
+
+  &:first-child:last-child {
+    border-radius: 0 0 $bt_radius $bt_radius;
+  }
 }
 
 .hotplug-notification-item-icon {
diff --git a/src/sass/gnome-shell/common/_osd.scss b/src/sass/gnome-shell/common/_osd.scss
index cdfd36f..5103579 100644
--- a/src/sass/gnome-shell/common/_osd.scss
+++ b/src/sass/gnome-shell/common/_osd.scss
@@ -2,6 +2,15 @@
 
 $osd_levelbar_height: 8px;
 
+%osd_panel {
+  color: $fg_color;
+  background-color: $base_color;
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
+  border-radius: $bt_radius;
+  padding: 12px;
+}
+
 .osd-window {
   @extend %osd_panel !optional;
   text-align: center;
diff --git a/src/sass/gnome-shell/common/_search-results.scss b/src/sass/gnome-shell/common/_search-results.scss
index e681aa9..3cde24f 100644
--- a/src/sass/gnome-shell/common/_search-results.scss
+++ b/src/sass/gnome-shell/common/_search-results.scss
@@ -1,5 +1,24 @@
 /* Search */
 
+%search-section-content-item {
+  border-radius: $bt_radius;
+  padding: $base_padding;
+  transition-duration: 100ms;
+  text-align: center;
+
+  &:focus,
+  &:hover,
+  &:selected {
+    background-color: $light_divider_color;
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: $light_track_color;
+  }
+}
+
 // search results sections "the boxes"
 .search-section {
   // This should be equal to #searchResultsContent spacing
@@ -15,7 +34,7 @@
 // content
 .search-section-content {  // This is the space between the provider icon and the results container
   spacing: $base_margin * 2;
-  border-radius: $bt_radius;
+  border-radius: $modal_radius;
   padding: $base_padding * 3;
   border: none;
   box-shadow: none;
@@ -26,7 +45,13 @@
 
 // "no results" text
 .search-statustext {
-  @extend %status_text !optional;
+  font-size: 2em;
+  font-weight: bold;
+  color: $light_hint_fg_color;
+}
+
+.grid-search-results {
+  spacing: $base_spacing * 6;
 }
 
 //Icon tile
@@ -42,9 +67,10 @@
 
 // search result provider
 .search-provider-icon {
+  @extend %search-section-content-item;
   // content
   .list-search-provider-content {
-    spacing: 12px;
+    spacing: $base_spacing * 2;
 
     // provider labels
     .list-search-provider-details {
diff --git a/src/sass/gnome-shell/common/_workspace-thumbnails.scss b/src/sass/gnome-shell/common/_workspace-thumbnails.scss
index 99c9926..2d449a0 100644
--- a/src/sass/gnome-shell/common/_workspace-thumbnails.scss
+++ b/src/sass/gnome-shell/common/_workspace-thumbnails.scss
@@ -7,7 +7,9 @@
   padding: $base_padding;
 
   .workspace-thumbnail {
-    @extend %overview_panel !optional;
+    color: $light_alt_fg_color;
+    background-color: $light_divider_color;
+    border: none;
     border-radius: $bt_radius;
   }
 
diff --git a/src/sass/gnome-shell/widgets-40-0/_search-results.scss b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
index 5dfcc53..92f99d5 100644
--- a/src/sass/gnome-shell/widgets-40-0/_search-results.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
@@ -4,15 +4,6 @@
   spacing: $base_margin * 2;
 }
 
-.grid-search-results {
-  spacing: $base_spacing * 6;
-}
-
-// Search results with icons
-.grid-search-result {
-  @extend %app-well-app;
-}
-
 // search results list
 .list-search-results {
   spacing: $base_spacing;
@@ -20,6 +11,7 @@
 
 // search result listitem
 .list-search-result {
+  @extend %search-section-content-item;
   // content
   .list-search-result-content {
     spacing: $base_padding;
diff --git a/tweaks.sh b/tweaks.sh
index 2a7f691..54ad3da 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -95,11 +95,7 @@ while [[ $# -gt 0 ]]; do
     -g|--gdm)
       gdm="true"; full_rootify "${1}"
 
-      if [[ "${GNOME_VERSION}" == 'new' ]]; then
-        prompt -e "SORRY: WhiteSur GDM theme for GNOME 40 is in development and not yet available"
-        prompt -e "SORRY: We can't do a GDM removal here either"
-        has_any_error="true"
-      elif [[ ! "$(which gdm 2> /dev/null)" && ! "$(which gdm3 2> /dev/null)" ]]; then
+      if [[ ! "$(which gdm 2> /dev/null)" && ! "$(which gdm3 2> /dev/null)" ]]; then
         prompt -e "'${1}' ERROR: There's no GDM installed in your system"
         has_any_error="true"
       fi; shift ;;