diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 7983738..0ddd379 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -103,18 +103,19 @@
 
   @if $t == normal {
     background-color: $bc;
-    border-radius: 100px;
+    border-radius: $circular_radius;
     border: 2px solid transparent;
-    box-shadow: none;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0);
   }
 
   @if $t == hover {
-    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05);
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0.1);
+    border: 2px solid transparent;
   }
 
   @if $t == focus {
     border: 2px solid lighten($fc, 15%);
-    box-shadow: none;
+    box-shadow: inset 0 0 0 1px rgba($borders_color, 0);
   }
 
   @if $t == insensitive {
@@ -124,7 +125,7 @@
 
   @if $t == flat-normal {
     background-color: $bc;
-    border-radius: 100px;
+    border-radius: $circular_radius;
     border: none;
     box-shadow: none;
     color: $tc;
@@ -161,22 +162,25 @@
     background-color: rgba(white, 0.12);
     border-radius: $bd_radius;
     border-color: transparent;
-    // box-shadow: inset 0 0 0 1px rgba(white, 0.05);
+    box-shadow: 1px 2px 3px rgba(black, 0);
   }
 
   @if $t == focus {
     border-color: transparent;
     background-color: rgba(white, 0.18);
+    box-shadow: 1px 2px 3px rgba(black, 0);
   }
 
   @if $t == hover {
     background-color: rgba(white, 0.2);
+    border-color: transparent;
     box-shadow: 1px 2px 3px rgba(black, 0.35);
   }
 
   @if $t == insensitive {
     color: $disabled_fg_color;
-    box-shadow: none;
+    border-color: transparent;
+    box-shadow: 1px 2px 3px rgba(black, 0);
   }
 }
 
diff --git a/src/sass/gnome-shell/_extensions-40-0.scss b/src/sass/gnome-shell/_extensions-40-0.scss
index 0fca3bb..79765ac 100644
--- a/src/sass/gnome-shell/_extensions-40-0.scss
+++ b/src/sass/gnome-shell/_extensions-40-0.scss
@@ -1 +1,2 @@
 @import 'extensions-40-0/dash-to-dock';
+@import 'extensions-40-0/misc';
diff --git a/src/sass/gnome-shell/common/_entries.scss b/src/sass/gnome-shell/common/_entries.scss
index 9cdfb1a..5c53221 100644
--- a/src/sass/gnome-shell/common/_entries.scss
+++ b/src/sass/gnome-shell/common/_entries.scss
@@ -2,17 +2,16 @@
 
 StEntry, %entry {
   min-height: $menuitem_size;
-  padding: 2px 10px;
-  margin: 2px;
-  border-width: 0;
+  padding: 2px 10px !important;
+  // margin: 2px;
   color: $fg_color;
   caret-color: $fg_color;
   selection-background-color: $primary_color;
   selected-color: $light_alt_fg_color;
   // @include font(subheading);
   @include entry(normal);
-  &:hover { @include entry(hover);}
-  &:focus { @include entry(focus);}
+  &:hover { @include entry(hover); }
+  &:focus { @include entry(focus); }
   &:insensitive { @include entry(insensitive);}
   StIcon.capslock-warning {
     icon-size: 16px;
diff --git a/src/sass/gnome-shell/common/_search-entry.scss b/src/sass/gnome-shell/common/_search-entry.scss
index 3e7a84e..c79d137 100644
--- a/src/sass/gnome-shell/common/_search-entry.scss
+++ b/src/sass/gnome-shell/common/_search-entry.scss
@@ -2,17 +2,21 @@
 %search-entry, .search-entry {
   width: 320px;
   min-height: $menuitem_size;
-  padding: 2px 10px;
-  border: none;
+  padding: 0 10px !important;
+  background-clip: padding-box;
   color: $light_hint_fg_color;
   caret-color: $light_alt_fg_color;
   selection-background-color: $light_track_color;
   selected-color: $light_alt_fg_color;
   @include search_entry(normal, $fc:$light_track_color);
 
+  &:hover {
+    @include search_entry(hover, $fc:$light_alt_fg_color);
+    color: $light_alt_fg_color;
+  }
+
   &:focus {
     @include search_entry(focus, $fc:$light_alt_fg_color);
-    border: none;
     color: $light_alt_fg_color;
   }
 
@@ -27,7 +31,6 @@
   }
 
   &:insensitive {
-    border: none;
     color: $light_disabled_fg_color;
   }
 
diff --git a/src/sass/gnome-shell/extensions-40-0/_misc.scss b/src/sass/gnome-shell/extensions-40-0/_misc.scss
new file mode 100644
index 0000000..0099d21
--- /dev/null
+++ b/src/sass/gnome-shell/extensions-40-0/_misc.scss
@@ -0,0 +1,59 @@
+
+//  OpenWeather Extension
+.openweather {
+  &-button,
+  &-button-action,
+  &-menu-button-container,
+  &-button-box {
+    border: 1px solid transparent !important;
+  }
+
+  &-provider {
+    // generic text buttons are allocated with y-expand-ed
+    padding: 0 16px;
+    font-weight: 500;
+    @include button(flat-normal);
+    &:hover { @include button(flat-hover); }
+    &:focus { @include button(flat-focus); }
+    &:active { @include button(flat-active); }
+    &:insensitive { @include button(flat-disabled); }
+    border: 1px solid transparent !important;
+  }
+
+  &-current {
+    &-icon,
+    &-summary,
+    &-summarybox {
+      background: none;
+      color: $fg_color;
+    }
+
+    &-databox-values {
+      background: none;
+      color: $hint_fg_color;
+    }
+
+    &-databox-captions {
+      background: none;
+      color: $hint_fg_color;
+    }
+  }
+
+  &-forecast {
+    &-icon,
+    &-summary {
+      background: none;
+      color: $alt_fg_color;
+    }
+
+    &-day,
+    &-temperature {
+      background: none;
+      color: $hint_fg_color;
+    }
+  }
+
+  &-sunrise-icon,
+  &-sunset-icon,
+  &-build-icon { color: $alt_fg_color; }
+}
diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 64e3f4a..4b435b0 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -769,6 +769,16 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
+menu#background,
+menu#selection,
+.nemo-window menu {
+  padding: 6px;
+
+  menuitem {
+    margin: 0;
+  }
+}
+
 // Cinnamon setting
 .view.cs-category-view { border-bottom-right-radius: $wm_radius; }
 
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 39f10b3..4d6f3db 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1503,6 +1503,8 @@ headerbar {
       min-height: 0;
     }
 
+    > box > separator.titlebutton { @extend %header_separator; }
+
     > button.popup {
       &:hover {
         @include button(header-hover);
@@ -1694,10 +1696,17 @@ headerbar {
   }
 }
 
-window.background.csd.maximized {
-  > deck > box > headerbar.windowhandle {
-    border-top-left-radius: $maximized_radius;
-    border-top-right-radius: $maximized_radius;
+window.background.csd.unified {
+  > deck > box.vertical > stack > headerbar.titlebar.windowhandle {
+    > box > separator { background: none; }
+    > button:disabled { @include button(header-insensitive); }
+  }
+
+  &.maximized {
+    > deck > box > headerbar.windowhandle {
+      border-top-left-radius: $maximized_radius;
+      border-top-right-radius: $maximized_radius;
+    }
   }
 }
 
@@ -2171,8 +2180,8 @@ menu,
       check, radio {
         min-height: 16px;
         min-width: 16px;
-        &:dir(ltr) { margin-right: 6px; margin-left: 2px; }
-        &:dir(rtl) { margin-left: 6px; margin-right: 2px; }
+        &:dir(ltr) { margin-right: 6px; margin-left: 0; }
+        &:dir(rtl) { margin-left: 6px; margin-right: 0; }
       }
     }
   }
@@ -3240,7 +3249,7 @@ scrolledwindow {
 }
 
 //vbox and hbox separators
-separator {
+separator:not(.titlebutton) {
   background-color: $borders_color;
   min-width: 1px;
   min-height: 1px;