diff --git a/shell/lib-install.sh b/shell/lib-install.sh
index e471e95a..dd404f87 100755
--- a/shell/lib-install.sh
+++ b/shell/lib-install.sh
@@ -780,14 +780,13 @@ remove_firefox_theme() {
 #                               DASH TO DOCK                                  #
 ###############################################################################
 
-install_dash_to_dock() {
+fix_dash_to_dock() {
   if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then
-    backup_file "${DASH_TO_DOCK_DIR_HOME}" "udo"
-    rm -rf "${DASH_TO_DOCK_DIR_HOME}"
+    backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
+  elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then
+    backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo"
   fi
 
-  udo cp -rf "${DASH_TO_DOCK_SRC_DIR}/dash-to-dock@micxgx.gmail.com"   "${GNOME_SHELL_EXTENSION_DIR}"
-
   if has_command dbus-launch; then
     udo dbus-launch dconf write /org/gnome/shell/extensions/dash-to-dock/apply-custom-theme true
   fi
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index a72dbdff..8e3582cd 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -158,6 +158,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     &:active { background-color: $track_color; }
   }
 
+  .calendar-day,
   .calendar-day-base {
     @include font(caption);
     text-align: center;
@@ -184,6 +185,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
       color: $fg_color;
       background-color: $track_color;
       border-color: transparent; //avoid jumparound due to today
+      box-shadow: none !important;
     }
 
     &.calendar-day-heading {  //day of week heading
@@ -260,9 +262,10 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     }
   }
 
+  .calendar-other-month,
   .calendar-other-month-day {
-    color: $disabled_fg_color;
-    opacity: 0.5;
+    color: $disabled_fg_color !important;
+    opacity: 1;
   }
 
   .calendar-week-number {
@@ -290,10 +293,12 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 // Events
 .events-button {
   .events-box {
+    color: $hint_fg_color;
     spacing: $base_spacing;
   }
 
   .events-list {
+    color: $hint_fg_color;
     spacing: 2 * $base_spacing;
     text-shadow: none;
   }
diff --git a/src/sass/gnome-shell/common/_looking-glass.scss b/src/sass/gnome-shell/common/_looking-glass.scss
index 0fa0d9af..44160760 100644
--- a/src/sass/gnome-shell/common/_looking-glass.scss
+++ b/src/sass/gnome-shell/common/_looking-glass.scss
@@ -43,12 +43,15 @@
     min-height: $medium_size;
     border-radius: 0;
     transition-duration: 100ms;
+    border:L none;
+    box-shadow: none;
     border-bottom: 2px solid transparent;
+    background-color: transparent;
 
     &:hover {
       color: $light_fg_color;
       text-shadow: none;
-      border-color: $light_track_color
+      border-color: $light_track_color;
     }
 
     &:selected {
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index e2361296..a0fa04a2 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -197,6 +197,7 @@ $panel_height: $menuitem_size;
     }
 
     &#panelActivities { // Activities button
+      -natural-hpadding: $base_padding * 2;
       background-image: url("assets/activities.svg");
       background-position: center center;
       background-size: 24px 24px;
@@ -209,6 +210,14 @@ $panel_height: $menuitem_size;
 
       > * { width: $medium_size; }
 
+      StBoxLayout {
+        spacing: 0;
+      }
+
+      .workspace-dot {
+        background-color: transparent;
+      }
+
       &:active, &:overview, &:focus, &:checked {
         border: none;
         color: transparent;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 0522e3af..088abb88 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -28,8 +28,17 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
   -gtk-secondary-caret-color: $selected_bg_color;
 }
 
+$side_style_shadow: linear-gradient(to left, rgba(black, if($variant == 'light', 0.04, 0.12)), transparent 6px);
+
+%side_style_left {
+  background-image: $side_style_shadow;
+  background-color: rgba($dark_sidebar_bg, 1);
+  box-shadow: none;
+  border: none;
+}
+
 %side_headerbar_left {
-  background-image: none;
+  background-image: $side_style_shadow;
   background-color: rgba($dark_sidebar_bg, 1);
   box-shadow: inset 0 1px $highlight_color;
   border: none;
@@ -44,7 +53,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 %side_searchbar {
   > revealer > box {
     background-color: rgba($dark_sidebar_bg, 1);
-    border-color: $dark_sidebar_border;
+    background-image: $side_style_shadow;
   }
 }
 
@@ -61,7 +70,7 @@ $list_shadow: if($variant == 'light',
                 (inset 0 0 8px rgba(white, 0.03), inset 0 0 3px rgba(white, 0.02), inset 0 0 0 1px rgba(white, 0.04), inset 0 1px rgba(white, 0.06)));
 
 %circular_list {
-  border-radius: $wm_radius;
+  border-radius: $bd_radius;
   box-shadow: $list_shadow;
   background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05));
   border: none;
@@ -77,24 +86,35 @@ $list_shadow: if($variant == 'light',
 
 %circular_row {
   &:first-child {
-    border-top-left-radius: $wm_radius;
-    border-top-right-radius: $wm_radius;
+    border-top-left-radius: $bd_radius;
+    border-top-right-radius: $bd_radius;
   }
 
   &:last-child { // Not use ?
-    border-bottom-left-radius: $wm_radius;
-    border-bottom-right-radius: $wm_radius;
+    border-bottom-left-radius: $bd_radius;
+    border-bottom-right-radius: $bd_radius;
   }
 
   &:only-child {
-    border-radius: $wm_radius;
+    border-radius: $bd_radius;
+  }
+
+  + row {
+    border-top: 1px solid transparent;
+    border-image: linear-gradient(to right,
+                                  transparent 0%,
+                                  transparent 2%,
+                                  $menu_bd 2%,
+                                  $menu_bd 98%,
+                                  transparent 98%,
+                                  transparent 100%) 1 0 0 0 / 1px 0 0 0 stretch;
   }
 }
 
 %sidebar_row {
   margin: 2px 4px;
-  border-radius: $wm_radius - 4px;
-  -gtk-outline-radius : $wm_radius - 6px;
+  border-radius: $bd_radius;
+  -gtk-outline-radius : $bd_radius - 2px;
 }
 
 // catch all extend
@@ -2674,9 +2694,9 @@ scrollbar {
 
   // slider
   slider {
-    min-width: $container_padding - 2px;
-    min-height: $container_padding - 2px;
-    margin: -1px;
+    min-width: $container_padding + 2px;
+    min-height: $container_padding + 2px;
+    margin: 0;
     border: 4px solid transparent;
     border-radius: $container_padding * 2;
     background-clip: padding-box;
@@ -2704,26 +2724,24 @@ scrollbar {
       background-color: transparent;
 
       slider {
-        margin: 0;
+        margin: $container_padding / 2;
         min-width: $container_padding - 2px;
         min-height: $container_padding - 2px;
         background-color: mix($fg_color, $bg_color, 70%);
-        border: 1px solid $borders_color;
+        border: none;
       }
 
       &.horizontal slider {
-        margin: 0 $container_padding / 2;
         min-width: $_slider_min_length;
       }
 
       &.vertical slider {
-        margin: $container_padding / 2 0;
         min-height: $_slider_min_length;
       }
     }
 
     &.dragging,
-    &.hovering { opacity: 0.99; }
+    &.hovering { opacity: 1; }
   }
 
   &.horizontal slider { min-width: $_slider_min_length; }
@@ -2761,8 +2779,8 @@ switch {
   background-color: transparent;
   background-clip: padding-box;
   color: transparent;
-  min-width: 40px;
-  min-height: 24px;
+  min-width: 32px;
+  min-height: 20px;
   font-size: 0;
   box-shadow: inset 0 1px 2px rgba(black, 0.1);
   background-image: $switch_image, radial-gradient(circle farthest-corner at center, transparent 0%, transparent 0%);
@@ -2796,8 +2814,8 @@ switch {
 
   slider {
     transition: $longer_transition, $shadow_transition, margin 0;
-    min-width: 22px;
-    min-height: 22px;
+    min-width: 18px;
+    min-height: 18px;
     margin: 1px 0 1px 1px;
     border-radius: $circular_radius;
     -gtk-outline-radius: $circular_radius;
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 1f00082a..ce39f26c 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -39,37 +39,52 @@ $list_shadow: if($variant == 'light',
                 (inset 0 0 8px rgba(white, 0.03), inset 0 0 3px rgba(white, 0.02), inset 0 0 0 1px rgba(white, 0.04), inset 0 1px rgba(white, 0.06)));
 
 %circular_list {
-  border-radius: $wm_radius;
+  border-radius: $bd_radius;
   box-shadow: $list_shadow;
   background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05));
   border: none;
   color: $text_color;
 
-  > separator { background: none; min-height: 0; }
+  > separator {
+    min-height: 1px;
+    background-color: $borders_color;
+    margin: $container_padding / 2 $container_padding * 2;
+  }
 }
 
 %circular_row {
   border: none;
 
   &:first-child {
-    border-top-left-radius: $wm_radius;
-    border-top-right-radius: $wm_radius;
+    border-top-left-radius: $bd_radius;
+    border-top-right-radius: $bd_radius;
   }
 
   &:last-child { // Not use ?
-    border-bottom-left-radius: $wm_radius;
-    border-bottom-right-radius: $wm_radius;
+    border-bottom-left-radius: $bd_radius;
+    border-bottom-right-radius: $bd_radius;
   }
 
   &:only-child {
-    border-radius: $wm_radius;
+    border-radius: $bd_radius;
+  }
+
+  + row {
+    border-top: 1px solid transparent;
+    border-image: linear-gradient(to right,
+                                  transparent 0%,
+                                  transparent 2%,
+                                  $menu_bd 2%,
+                                  $menu_bd 98%,
+                                  transparent 98%,
+                                  transparent 100%) 1 0 0 0 / 1px 0 0 0 stretch;
   }
 }
 
 %sidebar_row {
   margin: 2px 4px;
-  border-radius: $wm_radius - 4px;
-  -gtk-outline-radius : $wm_radius - 6px;
+  border-radius: $bd_radius;
+  -gtk-outline-radius : $bd_radius - 2px;
 }
 
 // catch all extend
@@ -335,9 +350,6 @@ label {
     color: $fg_color;
   }
 
-  row:selected &,
-  &:selected { @extend %nobg_selected_items; }
-
   > selection {
     color: $selected_fg_color;
     background-color: $selected_bg_color;
@@ -346,6 +358,7 @@ label {
   &:disabled {
     opacity: 1;
     color: $disabled_fg_color;
+
     selection { color: mix($selected_fg_color, $selected_bg_color, 50%); }
   }
 }
@@ -950,9 +963,9 @@ button {
 
   // big standalone buttons like in Documents pager
   &.osd {
-    color: $osd_fg_color;
-    background-color: $osd_bg_color;
-    border-color: darken($osd_bg_color, 8%);
+    color: white;
+    background-color: rgba(black, 0.65);
+    border: none;
     box-shadow: none;
 
     &.image-button {
@@ -961,14 +974,26 @@ button {
       min-width: 42px;
     }
 
-    &:hover {
-      color: $selected_bg_color;
-      box-shadow: none;
-      background-color: $osd_button_bg;
+    &.image-button {
+      padding: 0;
+      min-height: 28px;
+      min-width: 28px;
     }
 
-    &.keyboard-activating, &:active, &:checked {@include button(osd-active); }
-    &:disabled { @include button(osd-insensitive); }
+    &:hover {
+      color: white;
+      background-color: rgba(black, 0.75);
+      box-shadow: none;
+    }
+
+    &.keyboard-activating, &:active, &:checked {
+      color: white;
+      background-color: rgba(black, 0.85);
+    }
+
+    &:disabled {
+      opacity: 0.35;
+    }
   }
 
   //overlay / OSD style
@@ -1794,20 +1819,6 @@ combobox {
 }
 
 searchbar {
-  &:not(.inline) > revealer > box {
-    border-style: solid;
-    border-color: $solid_borders_color;
-    background-color: $header_bg;
-    border-width: 0 0 1px;
-    box-shadow: none;
-    color: $header_fg;
-  }
-
-  // Close button on searchbar
-  button.flat {
-    @extend %circular_button;
-  }
-
   > revealer > box {
     padding: $container_padding;
     border-spacing: $container_padding;
@@ -1822,6 +1833,20 @@ searchbar {
       border-radius: 50%;
     }
   }
+
+  &:not(.inline) > revealer > box {
+    border-style: solid;
+    border-color: $solid_borders_color;
+    background-color: $header_bg;
+    border-width: 0 0 1px;
+    box-shadow: none;
+    color: $header_fg;
+  }
+
+  // Close button on searchbar
+  button.flat {
+    @extend %circular_button;
+  }
 }
 
 actionbar > revealer > box {
@@ -1951,6 +1976,7 @@ headerbar {
   margin: 0;
 
   &:backdrop {
+    opacity: 1;
     transition: $backdrop_transition;
     color: transparentize($header_fg, 0.3);
     background-color: $header_bg_backdrop;
@@ -2006,6 +2032,12 @@ headerbar {
 
   button {
     @extend %headerbar_buttons;
+
+    &.star {
+      min-width: 24px;
+      padding: 2px;
+      border-radius: $circular_radius;
+    }
   }
 
   entry,
@@ -2185,6 +2217,8 @@ headerbar {
     min-height: $medium_size;
     padding: 0;
     background-color: $header_bg;
+    border: none;
+    box-shadow: none;
 
     > windowhandle > box {
       padding: 0 $container_padding / 2;
@@ -2488,7 +2522,7 @@ popover {
   > arrow,
   > contents {
     color: $fg_color;
-    background-clip: border-box;
+    background-clip: padding-box;
     background-color: $menu_bg;
     box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85)),
                 0 0 0 1px if($variant=='light', rgba($borders_color, 0.03), rgba($dark_borders_color, 0.55));
@@ -2670,6 +2704,8 @@ popover.menu {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
       transition: background-color $shorter_duration $deceleration_curve;
+
+      arrow { color: $selected_fg_color; }
     }
 
     &:hover:focus {
@@ -2978,9 +3014,9 @@ scrollbar {
     transition: none;
 
     > slider {
-      min-width: $container_padding - 2px;
-      min-height: $container_padding - 2px;
-      margin: -1px;
+      min-width: $container_padding + 2px;
+      min-height: $container_padding + 2px;
+      margin: 0;
       border: 4px solid transparent;
       border-radius: $container_padding * 2;
       background-clip: padding-box;
@@ -3027,7 +3063,7 @@ scrollbar {
       box-shadow: none;
 
       > range > trough > slider {
-        margin: 0;
+        margin: $container_padding / 2;
         min-width: $container_padding - 2px;
         min-height: $container_padding - 2px;
         background-color: mix($fg_color, $bg_color, 70%);
@@ -3035,18 +3071,16 @@ scrollbar {
       }
 
       &.horizontal > range > trough > slider {
-        margin: 0 $container_padding / 2;
         min-width: $_slider_min_length;
       }
 
       &.vertical > range > trough > slider {
-        margin: $container_padding / 2 0;
         min-height: $_slider_min_length;
       }
     }
 
     &.dragging,
-    &.hovering { opacity: 0.99; }
+    &.hovering { opacity: 1; }
   }
 
   &.horizontal > range > trough > slider { min-width: $_slider_min_length; }
@@ -3089,8 +3123,8 @@ switch {
   background-color: transparent;
   background-clip: padding-box;
   color: transparent;
-  min-width: 40px;
-  min-height: 24px;
+  min-width: 32px;
+  min-height: 20px;
   font-size: 0;
   padding: 0;
   box-shadow: inset 0 1px 2px rgba(black, 0.1);
@@ -3125,8 +3159,8 @@ switch {
 
   > slider {
     transition: $longer_transition, $shadow_transition, margin 0;
-    min-width: 22px;
-    min-height: 22px;
+    min-width: 18px;
+    min-height: 18px;
     margin: 1px 0 1px 1px;
     padding: 0;
     border-radius: $circular_radius;
@@ -3806,6 +3840,24 @@ scrolledwindow {
     padding: 0;
   }
 
+  &.undershoot-top {
+    @include undershoot(top);
+  }
+
+  &.undershoot-bottom {
+    @include undershoot(bottom);
+  }
+
+  &.undershoot-start {
+    &:dir(ltr) { @include undershoot(left); }
+    &:dir(rtl) { @include undershoot(right); }
+  }
+
+  &.undershoot-end {
+    &:dir(ltr) { @include undershoot(right); }
+    &:dir(rtl) { @include undershoot(left); }
+  }
+
   > junction { // the small square between two scrollbars
     border: none;
     background-color: $_scrollbar_bg_color;
@@ -3908,8 +3960,6 @@ listview.view {
     &, &:active {
       color: $fg_color;
       background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
-
-      label { color: $fg_color; }
     }
 
     &.has-open-popup,
@@ -3953,8 +4003,6 @@ row {
     color: $fg_color;
     background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
 
-    label { color: $fg_color; }
-
     // button { @extend %selected-button; }
   }
 
@@ -4368,7 +4416,7 @@ stacksidebar {
 // Navigation Sidebar
 .navigation-sidebar {
   background-color: $dark_sidebar_bg;
-  padding: $container_padding 0; //only vertical padding. horizontal row size would clip
+  padding: $container_padding; //only vertical padding. horizontal row size would clip
 
   > separator {
     margin: $container_padding 0;
@@ -4379,7 +4427,10 @@ stacksidebar {
     min-height: 36px;
     padding: 0 $container_padding + 2px;
     border-radius: $bt_radius;
-    margin: 0 $container_padding 2px;
+    margin: 0;
+    outline: none;
+
+    + row { margin-top: $container_padding / 2; }
 
     &:hover,
     &:focus-visible:focus-within {
@@ -4395,17 +4446,16 @@ stacksidebar {
       color: $fg_color;
       background-color: rgba($fg_color, 0.15);
 
-      label { color: $fg_color; }
-
       &:hover {
         background-color: rgba($fg_color, 0.2);
       }
 
       &:focus-visible:focus-within {
-        outline-width: 0;
-        color: $selected_fg_color;
-        background-color: $selected_bg_color;
-        &:hover { background-color: darken($selected_bg_color,10%); }
+        outline: none;
+        color: $fg_color;
+        background-color: rgba($fg_color, 0.15);
+
+        &:hover { background-color: rgba($fg_color, 0.2); }
       }
     }
 
@@ -4473,13 +4523,12 @@ placessidebar {
     &.sidebar-new-bookmark-row { color: $selected_bg_color; }
 
     &:drop(active):not(:disabled) {
-      &, label, image { color: $drop_target_color; }
-
+      color: $drop_target_color;
       box-shadow: inset 0 1px $drop_target_color,
                   inset 0 -1px $drop_target_color;
 
       &:selected {
-        &, label, image { color: $dark_sidebar_fg; }
+        color: $dark_sidebar_fg;
         background-color: $drop_target_color;
       }
     }
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index 0434a7de..9ef821ac 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -494,41 +494,73 @@
   box-shadow: none;              //
 }
 
+@mixin undershoot($p, $c: $wm_shadow, $neighbor: false) {
 //
-// Undershoot
+// undershoot
 //
-@mixin undershoot($p) {
 // $p: position
+// $c: shade color
+// $neighbor: use ~ instead of >
 //
 // possible $p values:
 // top, bottom, right, left
 //
 
-  $_undershoot_color_dark: transparentize(black, 0.8);
-  $_undershoot_color_light: transparentize(white, 0.8);
+  $_border_pos: '';
+  $_direction: '';
+  $_selector: if($neighbor, '~', '>');
 
-  $_gradient_dir: left;
-  $_dash_bg_size: 10px 1px;
-  $_gradient_repeat: repeat-x;
-  $_bg_pos: center $p;
-
-  background-color: transparent; // shouldn't be needed, but better to be sure;
-
-  @if ($p == left) or ($p == right) {
-    $_gradient_dir: top;
-    $_dash_bg_size: 1px 10px;
-    $_gradient_repeat: repeat-y;
-    $_bg_pos: $p center;
+  @if $p==top {
+    $_direction: bottom;
+    $_border_pos: 0 1px;
+  } @else if $p==bottom {
+    $_direction: top;
+    $_border_pos: 0 -1px;
+  } @else if $p==left {
+    $_direction: right;
+    $_border_pos: 1px 0;
+  } @else if $p==right {
+    $_direction: left;
+    $_border_pos: -1px 0;
+  } @else {
+    @error "Unknown position #{$p}"
+  }
+  
+  #{$_selector} undershoot.#{$p} {
+    box-shadow: inset $_border_pos $borders_color;
+    background: linear-gradient(to $_direction, gtkalpha($c, .25), transparent 6px);
   }
-
-  background-image: linear-gradient(to $_gradient_dir, // this is the dashed line
-                                    $_undershoot_color_light 50%,
-                                    $_undershoot_color_dark 50%);
-
-  padding-#{$p}: 1px;
-  background-size: $_dash_bg_size;
-  background-repeat: $_gradient_repeat;
-  background-origin: content-box;
-  background-position: $_bg_pos;
-  border: none;
 }
+
+@mixin background-shadow($direction, $color) {
+  background-image:
+  linear-gradient($direction,
+                  gtkalpha($color, 0.7),
+                  gtkalpha($color, 0.14) 40px,
+                  gtkalpha($color, 0) 56px),
+  linear-gradient($direction,
+                  gtkalpha($color, 0.4),
+                  gtkalpha($color, 0.14) 7px,
+                  gtkalpha($color, 0) 24px);
+}
+
+@mixin transition-shadows($color) {
+  > dimming {
+    background: $color;
+  }
+  
+  > border {
+    background: none;
+  }
+  
+  > shadow {
+    min-width: 56px;
+    min-height: 56px;
+  
+    &.left  { @include background-shadow(to right,  $color); }
+    &.right { @include background-shadow(to left,   $color); }
+    &.up    { @include background-shadow(to bottom, $color); }
+    &.down  { @include background-shadow(to top,    $color); }
+  }
+}
+
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 6cd6d754..83bd5576 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -1431,9 +1431,9 @@ row#AutostartTitle.tweak {
 // separator of sidebar on Gnome control center and Gnome tweaks
 window.background.csd {
   > hdyleaflet,
-  > leaflet, > leaflet.unfolded,
+  > leaflet,
   > box.horizontal {
-    > separator.vertical {
+    > separator {
       @extend %side_separator;
     }
 
@@ -1445,19 +1445,20 @@ window.background.csd {
   }
 
   > hdyleaflet > box.vertical > stack.main-container,
-  > leaflet > box.vertical > stack.main-container { // Right side
+  > leaflet > box.vertical > stack.main-container,
+  > leaflet > box.vertical:last-child > scrolledwindow { // Right side
     background-color: $base_color;
     border-bottom-right-radius: $wm_radius;
   }
 
   // sidebar on gnome tweak
-  list.tweak-categories {
-    background-image: none;
-    background-color: rgba($dark_sidebar_bg, 1);
+  list.tweak-categories,
+  > leaflet > box > scrolledwindow > viewport > list.navigation-sidebar {
+    @extend %side_style_left;
     border-radius: 0 0 0 $wm_radius;
 
     // Themed left sidebar
-    .tweak-category:not(:selected):not(:hover) {
+    > row:not(:selected):not(:hover) {
       background: none;
     }
 
@@ -1469,12 +1470,15 @@ window.background.csd {
   }
 
   &.maximized, &.tiled, &.fullscreen {
-    > hdyleaflet > box.vertical > stack.main-container {
+    > hdyleaflet > box.vertical > stack.main-container,
+    > leaflet > box.vertical > stack.main-container,
+    > leaflet > box.vertical:last-child > scrolledwindow {
       border-bottom-right-radius: $maximized_radius;
     }
 
     // sidebar on gnome tweak
-    .tweak-categories {
+    list.tweak-categories,
+    leaflet > box > scrolledwindow > viewport > list.navigation-sidebar {
       border-radius: 0 0 0 $maximized_radius;
     }
   }
@@ -1585,7 +1589,7 @@ window.background.csd {
   > leaflet > box.vertical > scrolledwindow.view, // > 3.38.0
   > hdyleaflet > box.vertical > scrolledwindow.view, // > 3.34.0
   > box.horizontal > box.vertical > scrolledwindow.view { // > 3.25.90
-    background-color: rgba($dark_sidebar_bg, 1);
+    @extend %side_style_left;
     border-bottom-left-radius: $wm_radius + 1px;
 
     > viewport.frame > stack {
@@ -1762,7 +1766,7 @@ window.background.csd {
   > overlay > leaflet,
   > deck > box > overlay > leaflet { // >= 40.0
     > stack {
-      background-color: rgba($dark_sidebar_bg, 1);
+      @extend %side_style_left;
       border-bottom-left-radius: $wm_radius;
     }
 
@@ -2725,7 +2729,7 @@ window#GearyMainWindow.background.csd { // <= 3.32
   }
 
   .geary-main-layout { // >= 40.0
-    background-color: $dark_sidebar_bg;
+    @extend %side_style_left;
 
     > leaflet > leaflet > headerbar { // left and center headerbar
       &:first-child { @extend %side_headerbar_left; background-color: transparent; }
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index f7e33c6d..9f2855c2 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -9,7 +9,7 @@ $nautilus_borders_color: if($variant=='light', darken(rgba($dark_sidebar_bg, 1),
 $flap_sidebar_size: 240px;
 
 @if $nautilus_style == 'stable' {
-  $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $flap_sidebar_size,
+  $nautilus_header_image: linear-gradient(90deg, transparent $flap_sidebar_size,
                                                  $nautilus_borders_color $flap_sidebar_size,
                                                  $nautilus_borders_color ($flap_sidebar_size + 1px),
                                                  $base_color ($flap_sidebar_size + 1px));
@@ -19,7 +19,7 @@ $flap_sidebar_size: 240px;
 }
 
 @if $nautilus_style == 'glassy' {
-  $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg ($flap_sidebar_size / 2),
+  $nautilus_header_image: linear-gradient(90deg, transparent ($flap_sidebar_size / 2),
                                                  $dark_header_bg 40%);
 
   $nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) (($flap_sidebar_size / 2) - 40px),
@@ -29,19 +29,23 @@ $flap_sidebar_size: 240px;
 .nautilus-window {
   @if $nautilus_style == 'stable' or $nautilus_style == 'glassy' {
     &.background.csd {
-      background-color: transparent;
+      &, &:backdrop {
+        background-color: $dark_sidebar_bg;
+      }
 
-      headerbar {
-        background-color: transparent;
-        border: none;
-        background-image: $nautilus_header_image;
-        border-image: $nautilus_header_borders_image 0 0 1 / 0px 0px 1px stretch;
+      &:not(.view) headerbar {
+        &, &:backdrop {
+          background-color: transparent;
+          border: none;
+          background-image: $nautilus_header_image;
+          border-image: $nautilus_header_borders_image 0 0 1 / 0px 0px 1px stretch;
+        }
       }
     }
   }
 
   @if $nautilus_style == 'stable' {
-    headerbar {
+    &:not(.view) headerbar {
       box.start > box {
         margin-left: 144px;
       }
@@ -54,19 +58,27 @@ $flap_sidebar_size: 240px;
 
   headerbar > windowhandle > box { padding: 0 10px; }
 
-  placessidebar.background {
-    row.sidebar-row {
-      .sidebar-icon { color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, 20%)); }
+  placessidebar {
+    .navigation-sidebar > row {
+      &:selected {
+        background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
+        color: $fg_color;
+      }
+
+      &.sidebar-row {
+        .sidebar-icon { color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, 20%)); }
+      }
     }
   }
 
-  flap.unfolded {
-    > placessidebar.background {
-      background: none;
+  flap.unfolded,
+  .sidebar-pane {
+    &, &:backdrop {
+      background-color: transparent;
+    }
 
-      list.navigation-sidebar {
-        background-color: $dark_sidebar_bg;
-      }
+    placessidebar {
+      background: none;
     }
 
     > separator.horizontal {
@@ -74,8 +86,14 @@ $flap_sidebar_size: 240px;
     }
   }
 
+  flap.unfolded {
+    list.navigation-sidebar {
+      background-color: transparent;
+    }
+  }
+
   flap.folded {
-    > placessidebar {
+    placessidebar {
       border-right: 1px solid $header_border;
     }
   }
@@ -84,23 +102,29 @@ $flap_sidebar_size: 240px;
     .box {
       @if $monterey == 'false' {
         background-color: mix(black, $base_color, 6%);
+        border-top: 1px solid $borders_color;
       } @else {
         background-color: $base_color;
       }
+
+      tabbox { margin: 0 -3px; }
     }
   }
 
-  .nautilus-grid-view.view {
+  .nautilus-grid-view {
+    background-color: $base_color;
+
     child.activatable {
       border-radius: $bt_radius;
       @extend %row_activatable;
     }
   }
 
-  .nautilus-list-view.view {
+  .nautilus-list-view {
     padding: 0;
     margin: 0;
     border-spacing: 0;
+    background-color: $base_color;
 
     listview.view {
       padding: 0;
@@ -610,14 +634,14 @@ screenshot-carousel button,
   padding: $container_padding / 2 $container_padding * 1.5;
 }
 
-flowboxchild.card {
+.card flowboxchild.card {
   padding: 0;
   border: none;
   box-shadow: none;
   background: none;
 }
 
-button.card.category-tile {
+.category-tile.card {
   padding: $container_padding * 3.5;
   border: none;
   border-radius: $bt_radius;
@@ -630,6 +654,7 @@ button.card.category-tile {
     min-width: 130px;
     font-size: 105%;
     font-weight: normal;
+    box-shadow: none;
   }
 
   // Styling for specific category buttons.
@@ -740,10 +765,8 @@ clamp.large .category-tile:not(.category-tile-iconless) {
 
 // The rest of the featured-tile CSS is loaded at runtime in gs-feature-tile.c
 .featured-tile {
-  all: unset;
   padding: 0;
   box-shadow: none;
-  color: $fg_color;
 
   label.title-1 {
     margin-top: $container_padding;
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index d6afd192..74b58ed3 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -228,14 +228,42 @@ viewswitcherbar actionbar > revealer > box {
 }
 
 // AdwViewSwitcherTitle
+viewswitchertitle {
+  margin-top: 0;
+  margin-bottom: 0;
 
-viewswitchertitle viewswitcher {
-  margin-left: $container_padding * 2;
-  margin-right: $container_padding * 2;
+  viewswitcher {
+    margin-left: $container_padding * 2;
+    margin-right: $container_padding * 2;
+
+    &.narrow {
+      margin-top: 0;
+      margin-bottom: 0;
+
+      button.toggle {
+        > stack > box {
+          &.narrow {
+            padding-top: 0;
+            padding-bottom: 0;
+            border-spacing: 0;
+          }
+        }
+      }
+    }
+
+    &.wide {
+      margin-top: 0;
+      margin-bottom: 0;
+    }
+  }
+
+  windowtitle {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
 }
 
 // AdwIndicatorBin
-
 indicatorbin {
   > indicator, > mask {
     min-width: $container_padding * 2;
@@ -326,6 +354,9 @@ tabbar {
     background-color: transparent;
 
     > separator {
+      margin: 0;
+      background-color: $borders_color;
+
       &.hidden {
         opacity: 0;
       }
@@ -442,8 +473,221 @@ tabbox:drop(active) {
   box-shadow: none;
 }
 
-// Sidebar
-
-.unfolded stacksidebar.sidebar {
-  border: none;
+// Transition shadows
+flap,
+leaflet,
+navigation-view,
+overlay-split-view {
+  @include transition-shadows($wm_shadow);
+}
+
+toolbarview.undershoot-top scrolledwindow {
+  @include undershoot(top);
+}
+
+toolbarview.undershoot-bottom scrolledwindow {
+  @include undershoot(bottom);
+}
+
+// Sidebar
+.unfolded stacksidebar.sidebar { border: none; }
+
+.sidebar-pane {
+  background-color: $dark_sidebar_bg;
+  color: $dark_sidebar_fg;
+
+  &:backdrop {
+    background-color: $dark_sidebar_bg;
+    // transition: background-color $longer_duration $deceleration_curve;
+  }
+
+  .sidebar,
+  .toolbar,
+  headerbar,
+  .navigation-sidebar,
+  searchbar > revealer > box {
+    background-color: transparent;
+    box-shadow: none;
+    border: none;
+  }
+
+  .toolbar {
+    padding: $container_padding $container_padding * 2;
+  }
+
+  .navigation-sidebar {
+    padding: $container_padding * 2;
+
+    > row {
+      &:selected {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
+    }
+  }
+
+  toolbarview.undershoot-top scrolledwindow {
+    @include undershoot(top);
+  }
+
+  toolbarview.undershoot-bottom scrolledwindow {
+    @include undershoot(bottom);
+  }
+
+  scrolledwindow {
+    &.undershoot-top {
+      @include undershoot(top);
+    }
+
+    &.undershoot-bottom {
+      @include undershoot(bottom)
+    }
+
+    &.undershoot-start {
+      &:dir(ltr) { @include undershoot(left); }
+      &:dir(rtl) { @include undershoot(right); }
+    }
+
+    &.undershoot-end {
+      &:dir(ltr) { @include undershoot(right); }
+      &:dir(rtl) { @include undershoot(left); }
+    }
+  }
+
+  flap,
+  leaflet,
+  navigation-view,
+  overlay-split-view {
+    @include transition-shadows($wm_shadow);
+  }
+
+  banner > revealer > widget {
+    background-color: gtkmix($selected_bg_color, $dark_sidebar_bg, 30%);
+    color: $text_color;
+
+    &:backdrop {
+      background-color: gtkmix($selected_bg_color, $dark_sidebar_bg, 30%);
+    }
+  }
+
+  &:dir(ltr), &.end:dir(rtl) {
+    &, banner > revealer > widget {
+      box-shadow: inset -1px 0 6px rgba(black, if($variant == 'light', 0.04, 0.08));
+      border-right: 1px solid $dark_sidebar_border;
+    }
+  }
+
+  &:dir(rtl), &.end:dir(ltr) {
+    &, banner > revealer > widget {
+      box-shadow: inset 1px 0 6px rgba(black, if($variant == 'light', 0.04, 0.08));
+      border-left: 1px solid $dark_sidebar_border;
+    }
+  }
+}
+
+/* Middle pane in three-pane setups */
+.content-pane .sidebar-pane,
+.sidebar-pane .content-pane {
+  background-color: $base_color;
+  color: $text_color;
+
+  &:backdrop {
+    background-color: $base_color;
+    // transition: background-color $longer_duration $deceleration_curve;
+  }
+
+  toolbarview.undershoot-top scrolledwindow {
+    @include undershoot(top);
+  }
+
+  toolbarview.undershoot-bottom scrolledwindow {
+    @include undershoot(bottom);
+  }
+
+  scrolledwindow {
+    &.undershoot-top {
+      @include undershoot(top);
+    }
+
+    &.undershoot-bottom {
+      @include undershoot(bottom)
+    }
+
+    &.undershoot-start {
+      &:dir(ltr) { @include undershoot(left); }
+      &:dir(rtl) { @include undershoot(right); }
+    }
+
+    &.undershoot-end {
+      &:dir(ltr) { @include undershoot(right); }
+      &:dir(rtl) { @include undershoot(left); }
+    }
+  }
+
+  flap,
+  leaflet,
+  navigation-view,
+  overlay-split-view {
+    @include transition-shadows($wm_shadow);
+  }
+
+  banner > revealer > widget {
+    background-color: gtkmix($selected_bg_color, $base_color, 30%);
+    color: $text_color;
+
+    &:backdrop {
+      background-color: gtkmix($selected_bg_color, $base_color, 30%);
+    }
+  }
+
+  &:dir(ltr), &.end:dir(rtl) {
+    &, banner > revealer > widget {
+      box-shadow: inset -1px 0 6px rgba(black, if($variant == 'light', 0.04, 0.08));
+      border-right: 1px solid $dark_sidebar_border;
+    }
+  }
+
+  &:dir(rtl), &.end:dir(ltr) {
+    &, banner > revealer > widget {
+      box-shadow: inset 1px 0 6px rgba(black, if($variant == 'light', 0.04, 0.08));
+      border-left: 1px solid $dark_sidebar_border;
+    }
+  }
+}
+
+.sidebar-pane .sidebar-pane {
+  background-color: transparent;
+  color: inherit;
+}
+
+.content-pane {
+  background-color: $base_color;
+
+  toolbarview {
+    &, &.view {
+      background-color: transparent;
+    }
+
+    > stack, > box > stack.view {
+      background-color: transparent;
+    }
+  }
+}
+
+// Gnome >= 45.0
+.sidebar-pane,
+.content-pane {
+  headerbar {
+    &, &:backdrop {
+      background-color: transparent;
+      box-shadow: none;
+      border: none;
+    }
+  }
+}
+
+.top-bar {
+  .collapse-spacing {
+    padding: 0;
+  }
 }
diff --git a/tweaks.sh b/tweaks.sh
index 0e52938f..b7d41711 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -214,9 +214,9 @@ if [[ "${uninstall}" == 'true' ]]; then
   fi
 
   if [[ "${dash_to_dock}" == 'true' && "${gdm}" != 'true' ]]; then
-    prompt -i "Removing '${name}' Dash to Dock theme... \n"
+    prompt -i "Revert Dash to Dock theme... \n"
     revert_dash_to_dock_theme
-    prompt -s "Done! '${name}' Dash to Dock theme has been removed. \n"
+    prompt -s "Done! Dash to Dock theme has reverted to default. \n"
   fi
 
   if [[ "${firefox}" == 'true' && "${gdm}" != 'true' ]]; then
@@ -250,9 +250,9 @@ else
   fi
 
   if [[ "${dash_to_dock}" == 'true' && "${gdm}" != 'true' ]]; then
-    prompt -i "Installing '${name}' ${colors[0]} Dash to Dock theme... \n"
-    install_dash_to_dock_theme
-    prompt -s "Done! '${name}' Dash to Dock theme has been installed. \n"
+    prompt -i "Fix Dash to Dock theme issue... \n"
+    fix_dash_to_dock
+    prompt -s "Done! '${name}' Dash to Dock theme has been fixed. \n"
     prompt -w "DASH TO DOCK: You may need to logout to take effect. \n"
   fi