diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 23b7589..1bc2f46 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2307,11 +2307,13 @@ menu,
 //
 popover,
 popover.background {
-  padding: 0;
+  padding: $container_padding;
   border-radius: $wm_radius;
   background-clip: border-box;
   background-color: $menu_bg;
 
+  &.menu { padding: 0; }
+
   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));
 
@@ -2437,43 +2439,43 @@ notebook {
       // Set box-shadow to make the header frame color more easy to see
       // Set margin to hide the ugly borders around the header
       &.top {
-        box-shadow: inset 0 1px $solid_borders_color, inset 0 -1px $solid_borders_color;
-        @if $variant=='light' {
-            box-shadow: inset 0 1px $solid_borders_color,
-                        inset 0 -1px $solid_borders_color,
-                              1px 0 $solid_borders_color,
-                              -1px 0 $solid_borders_color;
-        }
+        box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
+        // @if $variant=='light' {
+        //     box-shadow: inset 0 1px $borders_color,
+        //                 inset 0 -1px $borders_color,
+        //                       1px 0 $borders_color,
+        //                       -1px 0 $borders_color;
+        // }
       }
 
       &.bottom {
-        box-shadow: inset 0 1px $solid_borders_color, inset 0 -1px $solid_borders_color;
-        @if $variant=='light' {
-            box-shadow: inset 0 1px $solid_borders_color,
-                        inset 0 -1px $solid_borders_color,
-                        1px 0 $solid_borders_color,
-                        -1px 0 $solid_borders_color;
-        }
+        box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color;
+        // @if $variant=='light' {
+        //     box-shadow: inset 0 1px $borders_color,
+        //                 inset 0 -1px $borders_color,
+        //                 1px 0 $borders_color,
+        //                 -1px 0 $borders_color;
+        // }
       }
 
       &.right {
-        box-shadow: inset 1px 0 $solid_borders_color, inset -1px 0 $solid_borders_color;
-        @if $variant=='light' {
-            box-shadow: inset 1px 0 $solid_borders_color,
-                        inset -1px 0 $solid_borders_color,
-                        0 1px $solid_borders_color,
-                        0 -1px $solid_borders_color;
-        }
+        box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
+        // @if $variant=='light' {
+        //     box-shadow: inset 1px 0 $borders_color,
+        //                 inset -1px 0 $borders_color,
+        //                 0 1px $borders_color,
+        //                 0 -1px $borders_color;
+        // }
       }
 
       &.left {
-        box-shadow: inset 1px 0 $solid_borders_color, inset -1px 0 $solid_borders_color;
-        @if $variant=='light' {
-            box-shadow: inset 1px 0 $solid_borders_color,
-                        inset -1px 0 $solid_borders_color,
-                        0 1px $solid_borders_color,
-                        0 -1px $solid_borders_color;
-        }
+        box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color;
+        // @if $variant=='light' {
+        //     box-shadow: inset 1px 0 $borders_color,
+        //                 inset -1px 0 $borders_color,
+        //                 0 1px $borders_color,
+        //                 0 -1px $borders_color;
+        // }
       }
     } @else {
       &.top {
@@ -2498,14 +2500,8 @@ notebook {
       border: none;
       box-shadow: none;
       padding: 0;
-
-      @if $monterey == 'false' {
-        border-radius: 0;
-        margin: 0;
-      } @else {
-        margin-left: $container_padding / 2;
-        border-radius: $bt_radius;
-      }
+      margin-left: $container_padding / 2;
+      border-radius: $bt_radius;
 
       &:active, &:checked {
         color: $fg_color;
@@ -2843,14 +2839,6 @@ switch {
       }
     }
 
-    // the borders of checks and radios are
-    // too similar in luminosity to the selected background color, hence
-    // we need special casing.
-
-    // menuitem #{$w}#{$s}:hover,
-    // .view #{$w}#{$s}:selected,
-    // treeview.#{$w}#{$s}:selected,
-    // row:selected #{$w}#{$s},
     infobar #{$w}#{$s} {
       -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-selected.png"),
                                     url("assets/#{$a}#{$as}-selected@2.png"));
@@ -3249,6 +3237,7 @@ levelbar {
     min-width: 32px;
     min-height: 1px;
   }
+
   &.vertical block {
     min-width: 1px;
     min-height: 32px;
@@ -3269,18 +3258,22 @@ levelbar {
     background-color: $selected_bg_color;
     border-radius: $bt_radius;
   }
+
   block.low {
-    border-color: $warning_color;
-    background-color: $warning_color;
-  }
-  block.high {
     border-color: $selected_bg_color;
     background-color: $selected_bg_color;
   }
-  block.full {
-    border-color: $success_color;
-    background-color: $success_color;
+
+  block.high {
+    border-color: $warning_color;
+    background-color: $warning_color;
   }
+
+  block.full {
+    border-color: $error_color;
+    background-color: $error_color;
+  }
+
   block.empty {
     background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color);
     border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color);
diff --git a/src/sass/gtk/apps/_elementary.scss b/src/sass/gtk/apps/_elementary.scss
index 0d63582..151f8f8 100644
--- a/src/sass/gtk/apps/_elementary.scss
+++ b/src/sass/gtk/apps/_elementary.scss
@@ -165,6 +165,86 @@ MarlinViewWindow {
   &:disabled { @include entry(header-insensitive) }
 }
 
+// Checkbutton
+checkbutton.color-button {
+  border: 1px solid $borders_color;
+  border-radius: $circular_radius;
+  background-clip: border-box;
+  padding: 0;
+
+  > check {
+    -gtk-icon-source: none;
+    background: none;
+    margin-right: 0;
+  }
+
+  &.none {
+    > check {
+      background-color: transparent;
+      border-radius: $circular_radius;
+      -gtk-icon-source: -gtk-icontheme("close-symbolic");
+    }
+  }
+
+  &.blue {
+    background-color: blue;
+  }
+
+  &.mint {
+    background-color: mix(blue, green, 35%);
+  }
+
+  &.green {
+    background-color: green;
+  }
+
+  &.yellow {
+    background-color: yellow;
+  }
+
+  &.blue {
+    background-color: blue;
+  }
+
+  &.orange {
+    background-color: orange;
+  }
+
+  &.red {
+    background-color: red;
+  }
+
+  &.pink {
+    background-color: pink;
+  }
+
+  &.purple {
+    background-color: purple;
+  }
+
+  &.brown {
+    background-color: brown;
+  }
+
+  &.slate {
+    background-color: grey;
+  }
+}
+
+radiobutton.color-button {
+  > radio {
+    -gtk-icon-source: none;
+    margin-right: 0;
+    border: 1px solid rgba(black, 0.15);
+    border-radius: $circular_radius;
+    background-clip: border-box;
+  }
+
+  &:active > radio {
+    border: 1px solid rgba(black, 0.35);
+  }
+}
+
 window.background.csd {
   > paned.horizontal {
     > separator {
@@ -175,8 +255,7 @@ window.background.csd {
     > scrolledwindow {
       > viewport.frame {
         > box.vertical treeview.view {
-
-          border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border);
+          border-right: 1px solid $header_border;
 
           &:not(:hover):not(:selected) {
             border-bottom-left-radius: $wm_radius;
@@ -187,7 +266,6 @@ window.background.csd {
           padding-top: 3px;
           padding-bottom: 3px;
           border-right: 1px solid $header_border;
-          // @extend %view;
 
           &:not(:selected):hover { background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); }
 
@@ -231,6 +309,57 @@ window.background.csd {
     }
   }
 
+  &.unified > deck > grid > paned {
+    > separator { background-image: image($header_border); }
+
+    > .sidebar {
+      button.expander { color: $disabled_fg_color; }
+
+      actionbar button { @extend %flat_button; }
+
+      list {
+        padding: $container_padding;
+
+        > row.activatable {
+          border-radius: $bt_radius;
+          padding: ($container_padding - 2px) $container_padding * 1.5;
+          margin: 1px 0;
+          -gtk-icon-style: symbolic;
+
+          button {
+            @extend %sidebar_button;
+          }
+
+          levelbar {
+            block {
+              border: none;
+
+              &.low {
+                background-color: $warning_color;
+              }
+
+              &.high {
+                background-color: $selected_bg_color;
+              }
+
+              &.full {
+                background-color: $error_color;
+              }
+
+              &.empty {
+                background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color);
+              }
+            }
+
+            trough {
+              padding: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
   &.maximized, &.tiled, &.fullscreen {
     > stack > stack {
       > paned.horizontal {
@@ -244,8 +373,50 @@ window.background.csd {
   }
 }
 
+// Dynamic-notebook
 .dynamic-notebook {
   > notebook {
+    > header {
+      border-color: $solid_borders_color;
+
+      @if $monterey == 'false' {
+        background-color: darken($header_bg, 10%);
+      } @else {
+        background-color: $header_bg;
+      }
+
+      > tabs > tab {
+        padding: 0 10px;
+        min-height: 0;
+
+        label {
+          @if $monterey == 'false' {
+            margin-bottom: -$container_padding / 2;
+          } @else {
+            margin-bottom: -$container_padding * 1.5;
+          }
+        }
+
+        > widget > grid > revealer > button.image-button.flat {
+          @if $monterey == 'false' {
+            margin-top: $container_padding;
+            margin-right: $container_padding;
+            margin-bottom: 0;
+            margin-left: 0;
+          } @else {
+            margin-top: $container_padding * 1.5;
+            margin-right: $container_padding;
+            margin-bottom: 0;
+            margin-left: 0;
+          }
+        }
+      }
+
+      > box > button.flat {
+        margin: 0 $container_padding;
+      }
+    }
+
     > stack {
       border-bottom-right-radius: $wm_radius;
       background-color: $base_color;
@@ -335,6 +506,10 @@ headerbar.titlebar {
       background-color: $header_bg_backdrop;
     }
   }
+
+  &.windowhandle > button {
+    -gtk-icon-style: symbolic;
+  }
 }
 
 // Gala
@@ -397,8 +572,29 @@ scale.warmth trough {
     background-color: $bg_color;
     border-bottom: 1px solid $solid_borders_color;
   }
+}
 
-  .dynamic-notebook {
-    notebook > header { border-color: $solid_borders_color; }
+// Popovers
+popover.background {
+  menuitem.toggle {
+    margin: $container_padding $container_padding * 2;
+  }
+}
+
+// actionbar
+.sidebar > actionbar.inline-toolbar > revealer > box {
+  border-top: none;
+}
+
+actionbar.bottom-toolbar {
+  button { -gtk-icon-style: symbolic; }
+}
+
+.sidebar > treeview.view.source-list {
+  -gtk-icon-style: symbolic;
+
+  &:selected {
+    background-color: rgba($fg_color, 0.15);
+    color: $fg_color;
   }
 }
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 37b51f4..ca0439f 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -594,13 +594,8 @@ terminal-window {
   }
 
   notebook {
-    button.flat.toggle.popup {
-      @if $monterey == 'false' {
-        margin: -2px;
-      } @else {
-        margin: -2px 0;
-      }
-    }
+    // button.flat.toggle.popup {
+    // }
   }
 
   &.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization