diff --git a/libs/lib-core.sh b/libs/lib-core.sh
index 2249a14c..ba007230 100755
--- a/libs/lib-core.sh
+++ b/libs/lib-core.sh
@@ -259,7 +259,6 @@ if [[ -d "${WHITESUR_TMP_DIR}" ]]; then
 
   if [[ -d "${WHITESUR_TMP_DIR}" ]]; then
     prompt -e "ERROR: Whitesur installer or tweaks is already running. Probably it's run by '$(ls -ld "${WHITESUR_TMP_DIR}" | awk '{print $3}')'"
-    exit 1
   fi
 fi
 
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 23879915..26ec674e 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -40,8 +40,8 @@ $hint_fg_color:                     if($variant == 'light', #565656, #999999);
 }
 
 //insensitive state derived colors
-$disabled_fg_color:                 if($variant == 'light', transparentize($fg_color, 0.55), transparentize($fg_color, 0.65));
-$alt_disabled_fg_color:             if($variant == 'light', transparentize($alt_fg_color, 0.55), transparentize($alt_fg_color, 0.65));
+$disabled_fg_color:                 if($variant == 'light', rgba($fg_color, 0.45), rgba($fg_color, 0.35));
+$alt_disabled_fg_color:             if($variant == 'light', rgba($alt_fg_color, 0.45), rgba($alt_fg_color, 0.35));
 $disabled_bg_color:                 if($variant == 'light', gtkmix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
 $active_color:                      if($variant == 'light', gtkalpha(currentColor, 0.26), gtkalpha(currentColor, 0.2));
@@ -97,12 +97,12 @@ $selected_bg_color:                 if($scheme == 'nord', $nord_color_default, $
 $primary_color:                     $selected_bg_color;
 
 $selected_borders_color:            darken($selected_bg_color, 10%);
-$borders_color:                     if($variant == 'light', gtkalpha(currentColor, 0.12), gtkalpha(currentColor, 0.12));
-$light_borders_color:               if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.10));
-$dark_borders_color:                if($variant == 'light', gtkalpha(black, 0.08), gtkalpha(black, 0.15));
-$solid_borders_color:               if($variant == 'light', gtkmix(currentColor, $base_color, 12%), gtkmix(currentColor, $base_color, 12%));
-$dark_solid_borders_color:          if($variant == 'light', gtkmix(currentColor, $base_color, 12%), gtkmix(currentColor, $base_color, 15%));
-$highlight_color:                   if($variant == 'light', gtkalpha(white, 0.15), gtkalpha(white, 0.1));
+$borders_color:                     if($variant == 'light', rgba(black, 0.12), rgba(white, 0.12));
+$light_borders_color:               if($variant == 'light', rgba(black, 0.08), rgba(white, 0.10));
+$dark_borders_color:                if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15));
+$solid_borders_color:               if($variant == 'light', gtkmix(black, $base_color, 12%), gtkmix(white, $base_color, 12%));
+$dark_solid_borders_color:          if($variant == 'light', gtkmix(black, $base_color, 12%), gtkmix(white, $base_color, 15%));
+$highlight_color:                   if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1));
 
 // Gnome-shell background colors
 $dark_bg_color:                     rgba(black, 0.6);
@@ -205,10 +205,10 @@ $osd_borders_color:                 $dark_borders_color;
 
 // Menu colors
 $menu_bg:                           if($variant == 'light', $base_color, $bg_color);
-$menu_bd:                           if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.07));
+$menu_bd:                           if($variant == 'light', rgba(black, 0.08), rgba(white, 0.07));
 
 @if $trans == 'true' {
-  $menu_bg:                         if($variant == 'light', gtkalpha($base_color, $opacity), gtkalpha($bg_color, $opacity));
+  $menu_bg:                         if($variant == 'light', rgba($base_color, $opacity), rgba($bg_color, $opacity));
 }
 
 $popover_opacity:                   if($trans == 'false', 1, if($shell_version == 'new', 0.92, 0.96));
@@ -273,7 +273,7 @@ $dash_bg:                           if($variant == 'light', rgba(#d1d1d1, $panel
 }
 
 // Entry colors
-$entry_bg:                          gtkalpha(currentColor, 0.05);
+$entry_bg:                          if($variant=='light', rgba(black, 0.05), rgba(white, 0.05));
 $entry_border:                      $borders_color;
 $entry_highlight:                   gtkalpha($selection_mode_bg, 0.75);
 
diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss
index ebbd1f4c..7347cfd8 100644
--- a/src/sass/cinnamon/_common.scss
+++ b/src/sass/cinnamon/_common.scss
@@ -5,7 +5,7 @@ $asset_path: assets;
 //
 $font-size: 9;
 $font-family: Futura Bk bt, sans, Sans-Serif;
-$_bubble_bg_color: gtkalpha($solid_osd_bg_color, 0.25);
+$_bubble_bg_color: transparentize($solid_osd_bg_color, 0.75);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color, 0.8);
 
diff --git a/src/sass/cinnamon/_drawing.scss b/src/sass/cinnamon/_drawing.scss
index 722314cc..0abd9a0b 100644
--- a/src/sass/cinnamon/_drawing.scss
+++ b/src/sass/cinnamon/_drawing.scss
@@ -33,7 +33,7 @@
 
   @if $t==insensitive {
     color: $disabled_fg_color;
-    background-color: gtkalpha($entry_bg, 0.45);
+    background-color: rgba($entry_bg, 0.45);
   }
 
   @if $t==osd {
@@ -50,7 +50,7 @@
 
   @if $t==osd-insensitive {
     color: transparentize($osd_fg_color, 0.45);
-    background-color: gtkalpha($osd_entry_bg, 0.85);
+    background-color: rgba($osd_entry_bg, 0.85);
     box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 }
@@ -76,21 +76,21 @@
     color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
     border: 1px solid $button_borders;
     background-color: if($variant=='light', #ffffff, lighten($button_bg, 3%));
-    box-shadow: inset 0 1px gtkalpha($button_highlight, 0.12);
+    box-shadow: inset 0 1px rgba(white, 0.12);
   }
 
   @else if $t==focus {
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $selected_bg_color;
-    box-shadow: inset 0 1px gtkalpha($button_highlight, 0.12);
+    box-shadow: inset 0 1px rgba(white, 0.12);
   }
 
   @else if $t==focus-hover {
     color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
     background-color: if($variant=='light', #ffffff, lighten($button_bg, 3%));
     border: 1px solid $selected_bg_color;
-    box-shadow: inset 0 1px gtkalpha($button_highlight, 0.12);
+    box-shadow: inset 0 1px rgba(white, 0.12);
   }
 
   @else if $t==active {
@@ -102,7 +102,7 @@
   @else if $t==insensitive {
     color: $disabled_fg_color;
     border: 1px solid if($variant == 'light', $button_border, $dark_borders_color);
-    background-color: gtkalpha($button_bg, 0.55);
+    background-color: rgba($button_bg, 0.55);
   }
 
   @else if $t==flat {
@@ -112,12 +112,12 @@
 
   @else if $t==flat-hover {
     color: $fg_color;
-    background-color: gtkalpha($fg_color, 0.1);
+    background-color: rgba($fg_color, 0.1);
   }
 
   @else if $t==flat-active {
     color: $fg_color;
-    background-color: gtkalpha($fg_color, 0.2);
+    background-color: rgba($fg_color, 0.2);
   }
 
   @else if $t==flat-insensitive {
@@ -132,7 +132,7 @@
 
   @else if $t==osd-hover {
     color: $osd_fg_color;
-    background-color: gtkalpha(gtkmix($osd_fg_color, $osd_button_bg, 7%), 0.1);
+    background-color: rgba(mix($osd_fg_color, $osd_button_bg, 7%), 0.1);
   }
 
   @else if $t==osd-active {
@@ -142,6 +142,6 @@
 
   @else if $t==osd-insensitive {
     color: $osd_disabled_fg_color;
-    background-color: gtkalpha($osd_button_bg, 0.85);
+    background-color: rgba($osd_button_bg, 0.85);
   }
 }
diff --git a/src/sass/gtk/_colors-libadwaita.scss b/src/sass/gtk/_colors-libadwaita.scss
index e6ea7b20..cfa3cc75 100644
--- a/src/sass/gtk/_colors-libadwaita.scss
+++ b/src/sass/gtk/_colors-libadwaita.scss
@@ -258,7 +258,6 @@ $dark_5: #000000;
 
   $bg_color: gtkcolor(window_bg_color);
   $base_color: gtkcolor(view_bg_color);
-  $button_bg: gtkcolor(card_bg_color);
 
   $text_color: gtkcolor(window_fg_color);
   $fg_color: gtkcolor(window_fg_color);
@@ -267,6 +266,19 @@ $dark_5: #000000;
   $disabled_fg_color: gtkalpha($fg_color, 0.45);
   $alt_disabled_fg_color: gtkalpha($fg_color, 0.35);
 
+  $borders_color:                     gtkalpha(currentColor, 0.12);
+  $light_borders_color:               if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.10));
+  $solid_borders_color:               if($variant == 'light', gtkmix(currentColor, $base_color, 12%), gtkmix(currentColor, $base_color, 12%));
+  $dark_solid_borders_color:          if($variant == 'light', gtkmix(currentColor, $base_color, 12%), gtkmix(currentColor, $base_color, 15%));
+
+  $entry_bg:                          gtkalpha(currentColor, 0.05);
+  $entry_border:                      $borders_color;
+
+  $button_bg:                         gtkcolor(card_bg_color);
+  $button_border:                     $borders_color;
+  $button_highlight:                  if($variant == 'light', white, rgba(white, 0.1));
+  $button_borders:                    if($variant == 'light', $button_border, $dark_borders_color);
+
   $header_bg: gtkcolor(headerbar_bg_color);
   $header_fg: gtkcolor(headerbar_fg_color);
   $header_border: gtkcolor(headerbar_darker_shade_color);
@@ -282,6 +294,7 @@ $dark_5: #000000;
 
   $menu_bg: gtkcolor(popover_bg_color);
   $menu_fg: gtkcolor(popover_fg_color);
+  $menu_bd: if($variant == 'light', gtkalpha(currentColor, 0.08), gtkalpha(currentColor, 0.07));
 
   $wm_shadow: gtkcolor(headerbar_shade_color);
   $wm_shadow_backdrop: gtkcolor(sidebar_shade_color);
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index cf0113e0..ed5e7007 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -248,7 +248,7 @@ $maximized_radius_style: 0 0 $maximized_radius $maximized_radius;
 
   &.csd {
     border-radius: $background_radius_style; // Set csd windows botttom border radius
-    background-color: gtkalpha($bg_color, 0.999);
+    background-color: rgba($bg_color, 0.999);
 
     &.maximized, &.tiled, &.fullscreen {
       border-radius: $maximized_radius_style; // Set csd windows botttom border radius
@@ -1220,7 +1220,7 @@ combobox {
 
   button.combo:disabled arrow,
   button.combo:backdrop arrow {
-    background-color: if($variant == 'light', gtkalpha($text_color, 0.45), gtkmix(white, $button_bg, 25%));
+    background-color: if($variant == 'light', rgba($text_color, 0.45), gtkmix(white, $button_bg, 25%));
   }
 
   decoration,
@@ -2021,7 +2021,7 @@ treeview.view {
   &:selected {
     border-radius: 0;
     border-left-color: gtkmix($selected_fg_color, $selected_bg_color, 50%);
-    border-top-color: gtkalpha($fg_color, 0.15); // doesn't work unfortunately
+    border-top-color: rgba($fg_color, 0.15); // doesn't work unfortunately
     background-color: $selected_bg_color;
     color: $selected_fg_color;
 
@@ -2128,12 +2128,12 @@ treeview.view {
 
       &:hover {
         color: $fg_color;
-        background-color: gtkalpha($fg_color, 0.06);
+        background-color: rgba($fg_color, 0.06);
       }
 
       &:active {
         color: $fg_color;
-        background-color: gtkalpha($fg_color, 0.1);
+        background-color: rgba($fg_color, 0.1);
       }
 
       &:disabled {
@@ -2204,7 +2204,7 @@ menubar,
 menu {
   margin: 0;
   padding: $container_padding;
-  background-color: gtkalpha($menu_bg, 1);
+  background-color: rgba($menu_bg, 1);
   color: $fg_color;
   border: none; // adds borders in a non composited env
   border-radius: 0;
@@ -2321,7 +2321,7 @@ menu {
       -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
     }
 
-    &:hover { background-color: gtkalpha($fg_color, 0.08); }
+    &:hover { background-color: rgba($fg_color, 0.08); }
 
     &:disabled {
       color: transparent;
@@ -2436,12 +2436,12 @@ cursor-handle {
 
   &:hover:not(:checked) {
     color: gtkmix($fg_color, $disabled_fg_color, 50%);
-    background-color: gtkalpha($fg_color, 0.06);
+    background-color: rgba($fg_color, 0.06);
   }
 
   &:checked {
     color: $fg_color;
-    background-color: gtkalpha($fg_color, 0.12);
+    background-color: rgba($fg_color, 0.12);
   }
 }
 
@@ -2460,8 +2460,8 @@ notebook {
     background-color: $base_color;
   }
 
-  .csd &:not(.frame),
-  .csd &:not(.frame) > stack {
+  .background.csd > &:not(.frame),
+  .background.csd > &:not(.frame) > stack {
     border-radius: 0 0 $wm_radius $wm_radius;
   }
 
@@ -2645,12 +2645,12 @@ notebook {
 
         &:hover {
           color: $fg_color;
-          background-color: gtkalpha($fg_color, 0.1);
+          background-color: rgba($fg_color, 0.1);
         }
 
         &:active {
           color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
-          background-color: gtkalpha($fg_color, 0.2);
+          background-color: rgba($fg_color, 0.2);
         }
       }
     }
@@ -2754,10 +2754,10 @@ scrollbar {
 // Switches
 //
 
-$switch_image: linear-gradient(0deg, gtkalpha($fg_color, 0.25) 0%, gtkalpha($fg_color, 0.35) 100%);
-$switch_disabled_image: linear-gradient(0deg, gtkalpha($fg_color, 0.1) 0%, gtkalpha($fg_color, 0.15) 100%);
+$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, gtkalpha($fg_color, 0.45) 0%, gtkalpha($fg_color, 0.55) 100%);
+$switch_checked_backdrop_image: linear-gradient(0deg, rgba($fg_color, 0.45) 0%, rgba($fg_color, 0.55) 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);
 
@@ -2770,8 +2770,8 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
 
   to {
     background-image: $switch_checked_image, radial-gradient(circle farthest-corner at center,
-                                      gtkalpha($selected_bg_color, 0.75) 100%,
-                                      gtkalpha($selected_bg_color, 0.0) 0%);
+                                      rgba($selected_bg_color, 0.75) 100%,
+                                      rgba($selected_bg_color, 0.0) 0%);
   }
 }
 
@@ -2799,7 +2799,7 @@ switch {
     color: transparent;
     box-shadow: inset 0 1px 2px rgba(black, 0.15);
     transition: background-image 0.3s, box-shadow 0;
-    background-image: $switch_checked_image, radial-gradient(circle farthest-corner at center, gtkalpha($selected_bg_color, 0.75) 100%, transparent 0%);
+    background-image: $switch_checked_image, radial-gradient(circle farthest-corner at center, rgba($selected_bg_color, 0.75) 100%, transparent 0%);
 
     &:disabled {
       background-color: transparent;
@@ -3040,7 +3040,7 @@ scale {
     border-radius: $bt_radius;
     background-color: $_scale_trough_bg;
 
-    &:disabled { background-color: gtkalpha($_scale_trough_bg, 0.12); }
+    &:disabled { background-color: rgba($_scale_trough_bg, 0.12); }
 
     //OSD troughs
     .osd & {
@@ -3153,10 +3153,10 @@ scale {
     }
   }
 
-  value { color: gtkalpha(currentColor, 0.4); }
+  value { color: gtkalpha(currentColor, 0.45); }
 
   marks {
-    color: gtkalpha(currentColor, 0.4);
+    color: gtkalpha(currentColor, 0.45);
 
     @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
                                                      (bottom, bottom, top),
@@ -3572,7 +3572,7 @@ row {
   padding: $container_padding;
   margin: 6px 20px 24px 20px;
   color: $fg_color;
-  background-color: gtkalpha($header_bg, 0.85);
+  background-color: rgba($header_bg, 0.85);
   // background-image: linear-gradient(0deg, $bg_color 0%, $bg_color 85%, darken($bg_color, 5%) 95%, darken($bg_color, 15%) 100%);
   border-radius: $wm_radius;
   border: none;
@@ -3638,29 +3638,29 @@ calendar {
   &.button {
     @extend %undecorated_button;
 
-    color: gtkalpha($fg_color, 0.45);
+    color: rgba($fg_color, 0.45);
 
     &:hover { color: $fg_color; }
 
     &:disabled { color: $disabled_fg_color; }
   }
 
-  &:indeterminate { color: gtkalpha($fg_color, 0.55); }
-  &.highlight { color: gtkalpha($fg_color, 0.65); font-weight: 500; }
+  &:indeterminate { color: rgba($fg_color, 0.55); }
+  &.highlight { color: rgba($fg_color, 0.65); font-weight: 500; }
 }
 
 //
 // Dialogs
 //
 
-$messagedialog_bg: if($trans == 'true', gtkalpha($bg_color, 0.98), $bg_color);
+$messagedialog_bg: if($trans == 'true', rgba($bg_color, 0.98), $bg_color);
 
 messagedialog { // Message Dialog styling
-  &.background { background-color: gtkalpha($messagedialog_bg, 1); }
+  &.background { background-color: rgba($messagedialog_bg, 1); }
 
   .titlebar {
     min-height: 28px;
-    background-color: gtkalpha($messagedialog_bg, 1);
+    background-color: rgba($messagedialog_bg, 1);
     border: none;
   }
 
@@ -3757,20 +3757,18 @@ filechooser {
       label, combobox { color: $dark_sidebar_fg; }
     }
 
-    paned {
-      stack {
-        &:dir(ltr) { border-radius: 0 0 (($wm_radius/1.5) + 2) 0 }
-        &:dir(rtl) { border-radius: 0 0 0 (($wm_radius/1.5) + 2) }
+    > box:only-child > paned {
+      stack.view {
+        &:dir(ltr) { border-radius: 0 0 $wm_radius 0; }
+        &:dir(rtl) { border-radius: 0 0 0 $wm_radius; }
       }
     }
 
     stack.view {
       background-color: $base_color;
-      border-bottom-right-radius: $wm_radius;
 
       scrolledwindow {
         background-color: transparent;
-        border-radius: 0 0 $wm_radius $wm_radius;
 
         list { background-color: transparent; }
 
@@ -3923,13 +3921,13 @@ placessidebar {
 
     &:drop(active):not(:disabled) {
       box-shadow: none;
-      background-color: gtkalpha($drop_target_color, 0.15);
+      background-color: rgba($drop_target_color, 0.15);
 
       &, label, image { color: $drop_target_color; }
 
       &:selected {
         &, label, image { color: $drop_target_color; }
-        background-color: gtkalpha($drop_target_color, 0.35);
+        background-color: rgba($drop_target_color, 0.35);
       }
     }
   }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 062021fd..adf9ed4d 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2096,9 +2096,7 @@ headerbar {
   }
 
   > windowhandle > box {
-    padding: 0 8px;
-    margin-top: 8px;
-    margin-bottom: 8px;
+    padding: 8px;
 
     &,
     > box.start,
diff --git a/src/sass/gtk/_drawing-3.0.scss b/src/sass/gtk/_drawing-3.0.scss
index 9f90585f..41a312fe 100644
--- a/src/sass/gtk/_drawing-3.0.scss
+++ b/src/sass/gtk/_drawing-3.0.scss
@@ -28,7 +28,7 @@
   //
     color: $text_color;
     background-color: $entry_bg;
-    box-shadow: inset 0 0 0 1px gtkalpha($borders_color, 0.05), inset 0 0 0 2px transparent;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05), inset 0 0 0 2px transparent;
     transition-duration: $shorter_duration * 2;
   }
 
@@ -47,7 +47,7 @@
   // insensitive entry
   //
     color: $disabled_fg_color;
-    background-color: gtkalpha($entry_bg, 0.02);
+    background-color: rgba($entry_bg, 0.02);
   }
 
   @if $t==header-normal {
@@ -67,7 +67,7 @@
   //
     color: $header_fg;
     background-color: $entry_bg;
-    box-shadow: inset 0 0 0 1px gtkalpha($borders_color, 0.05), inset 0 0 0 2px transparent;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05), inset 0 0 0 2px transparent;
     transition-duration: $shorter_duration * 2;
   }
 
@@ -85,8 +85,8 @@
   //
   // insensitive header-bar entry
   //
-    color: gtkalpha($header_fg, 0.35);
-    background-color: gtkalpha($entry_bg, 0.02);
+    color: rgba($header_fg, 0.35);
+    background-color: rgba($entry_bg, 0.02);
   }
 
   @else if $t==osd {
@@ -114,7 +114,7 @@
   // insensitive osd entry
   //
     color: $osd_disabled_fg_color;
-    background-color: gtkalpha($osd_entry_bg, 0.8);
+    background-color: rgba($osd_entry_bg, 0.8);
   }
 }
 
@@ -170,7 +170,7 @@
     label, & { color: $disabled_fg_color; }
 
     border-color: if($variant == 'light', $button_border, $dark_borders_color);
-    background-color: gtkalpha($button_bg, 0.55);
+    background-color: rgba($button_bg, 0.55);
     box-shadow: none;
   }
 
@@ -181,7 +181,7 @@
     label, & { color: transparentize($selected_fg_color, 0.45); }
 
     border-color: if($variant == 'light', $selected_bg_color, $dark_borders_color);
-    background-color: gtkalpha($selected_bg_color, 0.45);
+    background-color: rgba($selected_bg_color, 0.45);
     @if $variant=='light' { box-shadow: none; }
 
     opacity: 0.6;
@@ -261,7 +261,7 @@
   // hovered header-bar button
   //
     color: darken($header_fg, 2%);
-    background-color: gtkalpha($header_fg, 0.1);
+    background-color: rgba($header_fg, 0.1);
     background-image: none;
     box-shadow: none;
   }
@@ -271,7 +271,7 @@
   // pushed header-bar button
   //
     color: $header_fg;
-    background-color: gtkalpha($header_fg, 0.25);
+    background-color: rgba($header_fg, 0.25);
     background-image: none;
     box-shadow: none;
   }
@@ -281,7 +281,7 @@
   // pushed header-bar button
   //
     color: $header_fg;
-    background-color: gtkalpha($header_fg, 0.12);
+    background-color: rgba($header_fg, 0.12);
     background-image: none;
     box-shadow: none;
   }
@@ -290,7 +290,7 @@
   //
   // insensitive header-bar button
   //
-    label, & { color: gtkalpha($header_fg, 0.35); }
+    label, & { color: rgba($header_fg, 0.35); }
     background-image: none;
     background-color: transparent;
     box-shadow: none;
@@ -300,7 +300,7 @@
   //
   // header-bar insensitive pushed button
   //
-    label, & { color: gtkalpha($header_fg, 0.35); }
+    label, & { color: rgba($header_fg, 0.35); }
     background-image: none;
     background-color: transparent;
     box-shadow: none;
@@ -428,13 +428,13 @@
                                   $_position, 0,
                                   $_position, 0.5,
                                   to($_small_gradient_color),
-                                  to(gtkalpha($_small_gradient_color, 0)));
+                                  to(rgba($_small_gradient_color, 0)));
 
   $_big_gradient: -gtk-gradient(radial,
                                 $_position, 0,
                                 $_position, 0.6,
-                                from(gtkalpha($_big_gradient_color, 0.07)),
-                                to(gtkalpha($_big_gradient_color, 0)));
+                                from(rgba($_big_gradient_color, 0.07)),
+                                to(rgba($_big_gradient_color, 0)));
 
   @if $t==normal {
     background-image: $_small_gradient, $_big_gradient;
@@ -488,7 +488,7 @@
 
   #{$_selector} undershoot.#{$p} {
     box-shadow: if($style == 'default', none, inset $_border_pos $borders_color);
-    background: linear-gradient(to $_direction, gtkalpha($c, .25), transparent 6px);
+    background: linear-gradient(to $_direction, rgba($c, .25), transparent 6px);
   }
 }
 
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index cad87531..b4991411 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -468,6 +468,7 @@ tabbar {
     padding: 0;
     box-shadow: none;
     background-color: transparent;
+    min-height: $menuitem_size;
 
     > separator {
       margin: 0;
@@ -811,67 +812,10 @@ toolbarview.undershoot-bottom scrolledwindow {
   }
 }
 
-//
-// AdwDialog
-//
-
-floating-sheet {
-  > dimming {
-    background-color: rgba(black, 0.35);
-  }
-
-  > sheet {
-    border-radius: $wm_radius;
-    outline: 1px solid $highlight_color;
-    outline-offset: -1px;
-    box-shadow: 0 3px 6px $wm_shadow,
-                0 7px 12px $wm_shadow,
-                0 12px 20px $wm_shadow,
-                $wm_outline;
-  }
-}
-
-dialog.bottom-sheet {
-  &.landscape sheet {
-    margin-left: 30px;
-    margin-right: 30px;
-
-    > outline {
-      &.flush-left, &.flush-right, &.flush-left.flush-right {
-        box-shadow: $wm_outline;
-      }
-    }
-  }
-}
-
-dialog-host > dialog.background {
-  background: none;
-
-  sheet {
-    background-color: $bg_color;
-    color: $fg_color;
-  }
-}
-
-dialog-host > dialog.view {
-  background: none;
-
-  sheet {
-    @extend %view;
-  }
-}
-
-dialog-host > dialog.osd:not(progressbar):not(button):not(menubutton):not(splitbutton) {
-  background: none;
-
-  sheet {
-    @extend %osd;
-  }
-}
-
 //
 // AdwToolbarView
 //
+
 toolbarview {
   > .top-bar,
   > .bottom-bar {
@@ -896,8 +840,13 @@ toolbarview {
         min-height: $headerbar_size;
 
         > windowhandle > box {
-          padding-top: 0;
-          padding-bottom: 0;
+          padding-top: 8px;
+          padding-bottom: 8px;
+
+          > widget > box.vertical {
+            margin-top: -8px;
+            margin-bottom: -8px;
+          }
         }
 
         &.default-decoration {
@@ -975,6 +924,64 @@ toolbarview {
   }
 }
 
+//
+// AdwDialog
+//
+
+floating-sheet {
+  > dimming {
+    background-color: rgba(black, 0.35);
+  }
+
+  > sheet {
+    border-radius: $wm_radius;
+    outline: 1px solid $highlight_color;
+    outline-offset: -1px;
+    box-shadow: 0 3px 6px $wm_shadow,
+                0 7px 12px $wm_shadow,
+                0 12px 20px $wm_shadow,
+                $wm_outline;
+  }
+}
+
+dialog.bottom-sheet {
+  &.landscape sheet {
+    margin-left: 30px;
+    margin-right: 30px;
+
+    > outline {
+      &.flush-left, &.flush-right, &.flush-left.flush-right {
+        box-shadow: $wm_outline;
+      }
+    }
+  }
+}
+
+dialog-host > dialog.background {
+  background: none;
+
+  sheet {
+    background-color: $bg_color;
+    color: $fg_color;
+  }
+}
+
+dialog-host > dialog.view {
+  background: none;
+
+  sheet {
+    @extend %view;
+  }
+}
+
+dialog-host > dialog.osd:not(progressbar):not(button):not(menubutton):not(splitbutton) {
+  background: none;
+
+  sheet {
+    @extend %osd;
+  }
+}
+
 // ThemeSelector
 themeselector, // Gnome text editor
 panelthemeselector { // Gnome builder
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 4dbdab02..5338e940 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -264,7 +264,8 @@ window.background.chromium {
 //
 // Libre-Office
 //
-window.background:not(.solid-csd) {
+
+window.background:not(.solid-csd):not(.csd) {
   // reserved area at the most-right side of GtkMenuBar
   > grid.horizontal > grid.horizontal {
     background-color: $header_bg;
@@ -294,33 +295,6 @@ window.background:not(.solid-csd) {
     }
   }
 
-  > grid.horizontal > widget > widget {
-    viewport.frame > box > box > box > grid toolbar {
-      background-color: transparent;
-      border: none;
-      padding: 3px;
-    }
-
-    > scrolledwindow > viewport.frame {
-      background-color: $base_color;
-
-      > grid > box.vertical {
-        > toolbar {
-          background: none;
-          border: none;
-          padding: 6px;
-        }
-      }
-
-      > grid > box.horizontal > #combobox.linked,
-      > grid > box.horizontal > grid.horizontal > box.horizontal { background-color: $base_color; }
-    }
-
-    toolbar.small-button {
-      border: none;
-    }
-  }
-
   // for 'Notebookbar' toolbar
   > notebook {
     border: none; // unset borders
@@ -366,6 +340,33 @@ window.background:not(.solid-csd) {
   }
 }
 
+window.background:not(.solid-csd) {
+  > grid.horizontal > widget > widget {
+    viewport.frame > box > box > box > grid toolbar {
+      background-color: transparent;
+      border: none;
+      padding: 3px;
+    }
+
+    > scrolledwindow > viewport.frame {
+      > grid > box.vertical {
+        > toolbar {
+          background-color: transparent;
+          border: none;
+          padding: 6px;
+        }
+      }
+
+      > grid > box.horizontal > #combobox.linked,
+      > grid > box.horizontal > grid.horizontal > box.horizontal { background-color: $base_color; }
+    }
+
+    toolbar.small-button {
+      border: none;
+    }
+  }
+}
+
 #combobox.linked {
   > entry.combo {
     border: 1px solid $dark_borders_color;
@@ -406,6 +407,10 @@ toolbar.toolbar {
 
     &:disabled {
       color: $disabled_fg_color;
+
+      label {
+        color: $disabled_fg_color;
+      }
     }
   }
 }