diff --git a/src/other/dash-to-dock/_dash-to-dock.scss b/src/other/dash-to-dock/_dash-to-dock.scss
index e5cae5c..3f3e936 100644
--- a/src/other/dash-to-dock/_dash-to-dock.scss
+++ b/src/other/dash-to-dock/_dash-to-dock.scss
@@ -89,14 +89,14 @@
     }
   }
 
-  &.dashtodock #dash { background: $dash_panel_bg; }
+  &.dashtodock #dash { background: $dash_bg; }
 
   &.opaque #dash { // solid-mode
-    background: $dash_panel_bg;
+    background: $dash_bg;
   }
 
   &.transparent #dash { // translucent-mode
-    background: $dash_panel_bg; // does not work
+    background: $dash_bg; // does not work
   }
 
   &:overview #dash { // overview-mode #1
@@ -115,7 +115,7 @@
   &.opaque.extended:overview,
   &.transparent.extended:overview {
     #dash {
-      background-color: $dash_panel_bg;
+      background-color: $dash_bg;
     }
   }
 
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 9bb2669..cf234c7 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -160,13 +160,11 @@ $submenu_bg_color:                  if($variant == 'light', rgba(white, 1), rgba
 $panel_bg:                          if($variant == 'light', #f1f1f1, #2a2a2a);
 $panel_fg:                          if($trans == 'true', white, $text_color);
 
+@if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity/2 + 0.08), rgba(black, $panel_opacity)); }
 @if $black == 'true' { $panel_fg:   $text_color; }
 
-$shell_panel:    if($variant == 'light', rgba(white, $panel_opacity/2 + 0.08), rgba(black, $panel_opacity));
-$shell_panel_bg: if($trans == 'true', $shell_panel, $panel_bg);
-
-$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, $panel_opacity + 0.2), rgba(#222222, $panel_opacity/2 + 0.6));
-$dash_panel_fg: if($variant == 'light', black, white);
+$dash_bg: if($variant == 'light', rgba(#f1f1f1, $panel_opacity + 0.2), rgba(#222222, $panel_opacity/2 + 0.6));
+$dash_fg: if($variant == 'light', black, white);
 
 // Entry colors
 $entry_bg:                          if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss
index 215e8dc..d149817 100644
--- a/src/sass/cinnamon/_common.scss
+++ b/src/sass/cinnamon/_common.scss
@@ -9,8 +9,6 @@ $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
 
-@if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); }
-
 stage {
   font-family: $font-family;
   @include fontsize($font-size);
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 28330b4..6b48ec5 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -28,3 +28,104 @@ stage {
   @include font(body-1);
   color: $fg_color;
 }
+
+$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
+
+%popover_bubble {
+  color: $alt_fg_color;
+  background-color: $popover_bubble_bg;
+  border-radius: $mn_radius;
+  border: none;
+  box-shadow: none;
+  text-shadow: none;
+
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
+    box-shadow: 0 3px 5px rgba(black, 0.1);
+  }
+
+  &:active {
+    color: $fg_color;
+    background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
+    box-shadow: none;
+  }
+}
+
+%show_apps_bigsur {
+  .show-apps-icon {
+    color: transparent;
+    background-image: url("assets/view-app-grid.svg");
+    background-size: contain;
+  }
+
+  .overview-icon { color: transparent; }
+
+  &:hover,
+  &:active,
+  &:checked,
+  &:focus {
+    .show-apps-icon { color: transparent; }
+  }
+}
+
+%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;
+}
+
+%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;
+  }
+}
+
+@import 'common/a11y';
+@import 'common/app-grid';
+@import 'common/base';
+@import 'common/buttons';
+@import 'common/calendar';
+@import 'common/check-box';
+@import 'common/corner-ripple';
+@import 'common/dash';
+@import 'common/dialogs';
+@import 'common/entries';
+@import 'common/hotplug';
+@import 'common/ibus-popup';
+@import 'common/keyboard';
+@import 'common/login-dialog';
+@import 'common/looking-glass';
+@import 'common/message-list';
+@import 'common/misc';
+@import 'common/network-dialog';
+@import 'common/notifications';
+@import 'common/osd';
+@import 'common/overview';
+@import 'common/panel';
+@import 'common/popovers';
+@import 'common/screen-shield';
+@import 'common/scrollbars';
+@import 'common/search-entry';
+@import 'common/search-results';
+@import 'common/slider';
+@import 'common/switcher-popup';
+@import 'common/switches';
+@import 'common/tiled-previews';
+@import 'common/workspace-switcher';
diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss
index 98e290d..6b36187 100644
--- a/src/sass/gnome-shell/_widgets-3-28.scss
+++ b/src/sass/gnome-shell/_widgets-3-28.scss
@@ -1,35 +1,3 @@
-@import 'common/a11y';
-@import 'common/app-grid';
-@import 'common/base';
-@import 'common/buttons';
-@import 'common/calendar';
-@import 'common/check-box';
-@import 'common/corner-ripple';
-@import 'common/dash';
-@import 'common/dialogs';
-@import 'common/entries';
-@import 'common/hotplug';
-@import 'common/ibus-popup';
-@import 'common/keyboard';
-@import 'common/login-dialog';
-@import 'common/looking-glass';
-@import 'common/message-list';
-@import 'common/misc';
-@import 'common/network-dialog';
-@import 'common/notifications';
-@import 'common/osd';
-@import 'common/overview';
-@import 'common/panel';
-@import 'common/popovers';
-@import 'common/screen-shield';
-@import 'common/scrollbars';
-@import 'common/search-entry';
-@import 'common/search-results';
-@import 'common/slider';
-@import 'common/switcher-popup';
-@import 'common/switches';
-@import 'common/tiled-previews';
-@import 'common/workspace-switcher';
 @import 'widgets-3-28/app-grid';
 @import 'widgets-3-28/dash';
 @import 'widgets-3-28/login-dialog';
diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss
index c3741b4..b123cf4 100644
--- a/src/sass/gnome-shell/_widgets-40-0.scss
+++ b/src/sass/gnome-shell/_widgets-40-0.scss
@@ -1,35 +1,3 @@
-@import 'common/a11y';
-@import 'common/app-grid';
-@import 'common/base';
-@import 'common/buttons';
-@import 'common/calendar';
-@import 'common/check-box';
-@import 'common/corner-ripple';
-@import 'common/dash';
-@import 'common/dialogs';
-@import 'common/entries';
-@import 'common/hotplug';
-@import 'common/ibus-popup';
-@import 'common/keyboard';
-@import 'common/login-dialog';
-@import 'common/looking-glass';
-@import 'common/message-list';
-@import 'common/misc';
-@import 'common/network-dialog';
-@import 'common/notifications';
-@import 'common/osd';
-@import 'common/overview';
-@import 'common/panel';
-@import 'common/popovers';
-@import 'common/screen-shield';
-@import 'common/scrollbars';
-@import 'common/search-entry';
-@import 'common/search-results';
-@import 'common/slider';
-@import 'common/switcher-popup';
-@import 'common/switches';
-@import 'common/tiled-previews';
-@import 'common/workspace-switcher';
 @import 'widgets-40-0/app-grid';
 @import 'widgets-40-0/dash';
 @import 'widgets-40-0/misc';
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 84f3d7c..4885e19 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -1,28 +1,5 @@
 /* Date/Time Menu */
 
-$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
-
-%popover_bubble {
-  color: $alt_fg_color;
-  background-color: $popover_bubble_bg;
-  border-radius: $mn_radius;
-  border: none;
-  box-shadow: none;
-  text-shadow: none;
-
-  &:hover, &:focus {
-    color: $fg_color;
-    background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
-    box-shadow: 0 3px 5px rgba(black, 0.1);
-  }
-
-  &:active {
-    color: $fg_color;
-    background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
-    box-shadow: none;
-  }
-}
-
 .clock-display-box {
   spacing: 2px;
 
diff --git a/src/sass/gnome-shell/common/_dash.scss b/src/sass/gnome-shell/common/_dash.scss
index b534fb0..fe89457 100644
--- a/src/sass/gnome-shell/common/_dash.scss
+++ b/src/sass/gnome-shell/common/_dash.scss
@@ -25,23 +25,6 @@ $dash_placeholder_size: 32px;
   @include font(body-1);
 }
 
-%show_apps_bigsur {
-  .show-apps-icon {
-    color: transparent;
-    background-image: url("assets/view-app-grid.svg");
-    background-size: contain;
-  }
-
-  .overview-icon { color: transparent; }
-
-  &:hover,
-  &:active,
-  &:checked,
-  &:focus {
-    .show-apps-icon { color: transparent; }
-  }
-}
-
 // Show apps button
 .show-apps {
   @if $showapps_button == "bigsur" {
diff --git a/src/sass/gnome-shell/common/_osd.scss b/src/sass/gnome-shell/common/_osd.scss
index 5103579..e5f0f3f 100644
--- a/src/sass/gnome-shell/common/_osd.scss
+++ b/src/sass/gnome-shell/common/_osd.scss
@@ -1,18 +1,7 @@
 /* OSD */
 
-$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;
+  @extend %osd_panel;
   text-align: center;
   font-weight: bold;
   spacing: 1em;
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 37e93b2..2bbca17 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -2,7 +2,7 @@
 // a.k.a. the panel
 
 #panel {
-  background-color: $shell_panel_bg;
+  background-color: $panel_bg;
   font-weight: normal;
   height: $menuitem_size;
   box-shadow: 0 5px 16px rgba(black, 0.35);
@@ -44,7 +44,7 @@
   // the rounded outset corners
   .panel-corner {
     -panel-corner-radius: 0;
-    -panel-corner-background-color: $shell_panel_bg;
+    -panel-corner-background-color: $panel_bg;
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent;
     -panel-corner-opacity: 1;
diff --git a/src/sass/gnome-shell/common/_search-results.scss b/src/sass/gnome-shell/common/_search-results.scss
index 81ad5bc..3ce9687 100644
--- a/src/sass/gnome-shell/common/_search-results.scss
+++ b/src/sass/gnome-shell/common/_search-results.scss
@@ -1,24 +1,5 @@
 /* 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 overview container
 #searchResultsContent {
   max-width: 1024px;
diff --git a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss
index e5ea440..65d86d4 100644
--- a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss
@@ -15,7 +15,7 @@
   background-color: transparent;
 
   .app-well-app-running-dot {
-    background-color: $dash_panel_fg;
+    background-color: $dash_fg;
   }
 
   .number-overlay {
@@ -93,13 +93,13 @@
     }
   }
 
-  &.dashtodock #dash { background-color: $dash_panel_bg; }
+  &.dashtodock #dash { background-color: $dash_bg; }
 
   #dash { // default-mode
-    background-color: $dash_panel_bg;
+    background-color: $dash_bg;
 
     .app-well-app-running-dot {
-      background-color: rgba($dash_panel_fg, 0.85);
+      background-color: rgba($dash_fg, 0.85);
     }
 
     StWidget.focused .app-well-app-running-dot {
@@ -108,11 +108,11 @@
   }
 
   &.opaque #dash { // solid-mode
-    background-color: $dash_panel_bg;
+    background-color: $dash_bg;
   }
 
   &.transparent #dash { // translucent-mode
-    background-color: $dash_panel_bg; // does not work
+    background-color: $dash_bg; // does not work
   }
 
   &:overview #dash { // overview-mode #1
@@ -139,7 +139,7 @@
   &.opaque.extended:overview,
   &.transparent.extended:overview {
     #dash {
-      background-color: $dash_panel_bg;
+      background-color: $dash_bg;
     }
   }
 
diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
index 7dca78c..cecd690 100644
--- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
@@ -114,7 +114,7 @@
   }
 
   .dash-background {
-    background-color: $dash_panel_bg;
+    background-color: $dash_bg;
     border: 1px solid if($variant == 'light', rgba(black, 0.08), rgba(black, 0.75));
     box-shadow: inset 0 0 0 1px rgba(white, 0.05);
   }
diff --git a/src/sass/gnome-shell/widgets-3-28/_search-results.scss b/src/sass/gnome-shell/widgets-3-28/_search-results.scss
deleted file mode 100644
index 8b13789..0000000
--- a/src/sass/gnome-shell/widgets-3-28/_search-results.scss
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 193dd08..552391b 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -1,6 +1,4 @@
 
-@if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); }
-
 //
 // GNOME Terminal, MATE Terminal
 //