From 9ab4930e19f7cb5e1a7424f30ab1812f8e7d7a69 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 29 May 2022 23:33:00 +0800
Subject: [PATCH] Fixed #209

---
 src/_sass/gtk/_common-3.20.scss   | 56 ++++++++++++++++++++-----
 src/_sass/gtk/apps/_misc.scss     | 27 ++++++++++++
 src/gtk/3.0/gtk-Compact.css       | 68 +++++++++++++++++++++++++------
 src/gtk/3.0/gtk-Dark-Compact.css  | 68 +++++++++++++++++++++++++------
 src/gtk/3.0/gtk-Dark.css          | 68 +++++++++++++++++++++++++------
 src/gtk/3.0/gtk-Light-Compact.css | 68 +++++++++++++++++++++++++------
 src/gtk/3.0/gtk-Light.css         | 68 +++++++++++++++++++++++++------
 src/gtk/3.0/gtk.css               | 68 +++++++++++++++++++++++++------
 8 files changed, 402 insertions(+), 89 deletions(-)

diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
index 8866b68..f8ff386 100644
--- a/src/_sass/gtk/_common-3.20.scss
+++ b/src/_sass/gtk/_common-3.20.scss
@@ -90,7 +90,7 @@
  * Base States *
  ***************/
 .background {
-  background-color: rgba($background, 0.999);
+  background-color: $background;
   color: $text;
 
   &.csd { // Set csd windows botttom border radius
@@ -140,7 +140,7 @@
   // &:hover, &:selected { border-radius: $corner-radius; }
 
   &:selected {
-    @extend %selected_items;
+    @extend %selected_items_primary;
 
     &:hover { box-shadow: none; }
   }
@@ -1798,7 +1798,7 @@ notebook {
   frame > paned > & > header,
   &.frame > header { background-color: $base-alt; }
 
-  .background.csd &, &.frame {
+  .background.csd &, .background.csd &.frame {
     background-color: $base;
     border-radius: $corner-radius;
   }
@@ -1818,6 +1818,48 @@ notebook {
 
   &:focus tab:checked { box-shadow: none; }
 
+  .background.csd & > header {
+    &.top {
+      border-radius: $corner-radius $corner-radius 0 0;
+
+      > tabs {
+        > tab {
+          border-radius: $corner-radius $corner-radius 0 0;
+        }
+      }
+    }
+
+    &.bottom {
+      border-radius: 0 0 $corner-radius $corner-radius;
+
+      > tabs {
+        > tab {
+          border-radius: 0 0 $corner-radius $corner-radius;
+        }
+      }
+    }
+
+    &.left {
+      border-radius: $corner-radius 0 0 $corner-radius;
+
+      > tabs {
+        > tab {
+          border-radius: $corner-radius 0 0 $corner-radius;
+        }
+      }
+    }
+
+    &.right {
+      border-radius: 0 $corner-radius $corner-radius 0;
+
+      > tabs {
+        > tab {
+          border-radius: 0 $corner-radius $corner-radius 0;
+        }
+      }
+    }
+  }
+
   > header {
     border-width: 1px;
     border-color: $solid-border;
@@ -1826,14 +1868,12 @@ notebook {
 
     &.top {
       border-bottom-style: solid;
-      border-radius: $corner-radius $corner-radius 0 0;
 
       > tabs {
         margin-bottom: -1px;
         margin-top: 4px;
 
         > tab {
-          border-radius: $corner-radius $corner-radius 0 0;
           border-bottom: none;
         }
       }
@@ -1841,14 +1881,12 @@ notebook {
 
     &.bottom {
       border-top-style: solid;
-      border-radius: 0 0 $corner-radius $corner-radius;
 
       > tabs {
         margin-top: -1px;
         margin-bottom: 4px;
 
         > tab {
-          border-radius: 0 0 $corner-radius $corner-radius;
           border-top: none;
         }
       }
@@ -1856,14 +1894,12 @@ notebook {
 
     &.left {
       border-right-style: solid;
-      border-radius: $corner-radius 0 0 $corner-radius;
 
       > tabs {
         margin-left: 4px;
         margin-right: -1px;
 
         > tab {
-          border-radius: $corner-radius 0 0 $corner-radius;
           border-right: none;
         }
       }
@@ -1871,14 +1907,12 @@ notebook {
 
     &.right {
       border-left-style: solid;
-      border-radius: 0 $corner-radius $corner-radius 0;
 
       > tabs {
         margin-left: -1px;
         margin-right: 4px;
 
         > tab {
-          border-radius: 0 $corner-radius $corner-radius 0;
           border-left: none;
         }
       }
diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss
index a8806e4..15307e0 100644
--- a/src/_sass/gtk/apps/_misc.scss
+++ b/src/_sass/gtk/apps/_misc.scss
@@ -344,8 +344,35 @@ window.background.csd {
 // LibreOffice
 //
 
+window.background:not(.solid-csd) {
+  // reserved area at the most-right side of GtkMenuBar
+  > grid.horizontal > grid.horizontal {
+    background-color: $titlebar;
+    box-shadow: inset 0 -1px $divider;
+
+    // > button.flat.small-button { // 'close' button
+    // }
+  }
+}
+
+window.background:not(.solid-csd) {
+  // for 'Notebookbar' toolbar
+  > notebook {
+    border: none; // unset borders
+    background-color: $base;
+    box-shadow: none;
+
+    > stack {
+      border: none;
+      box-shadow: none;
+      background-color: $base;
+    }
+  }
+}
+
 #combobox {
   background-color: $base;
+  border-radius: $corner-radius;
 }
 
 #gtk-combobox-popup-menu {
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index 5cc9c2e..b9b52ef 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(26, 115, 232, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #1A73E8;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(242, 242, 242, 0.999);
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #FAFAFA;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #FFFFFF;
   border-radius: 10px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 10px 10px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 10px 10px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #dedede;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 10px 10px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 10px 10px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 10px 10px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 10px 10px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 10px 0 0 10px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 10px 0 0 10px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 10px 10px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 10px 10px 0;
   border-left: none;
 }
 
@@ -7398,8 +7422,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #2C2C2C;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #FFFFFF;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #FFFFFF;
+}
+
 #combobox {
   background-color: #FFFFFF;
+  border-radius: 10px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index 5148ab3..c9cfe81 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: white;
   background-color: #414141;
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(50, 129, 234, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #3281ea;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(33, 33, 33, 0.999);
+  background-color: #212121;
   color: white;
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #242424;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #2C2C2C;
   border-radius: 10px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 10px 10px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 10px 10px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #404040;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 10px 10px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 10px 10px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 10px 10px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 10px 10px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 10px 0 0 10px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 10px 0 0 10px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 10px 10px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 10px 10px 0;
   border-left: none;
 }
 
@@ -7394,8 +7418,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #2C2C2C;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #2C2C2C;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #2C2C2C;
+}
+
 #combobox {
   background-color: #2C2C2C;
+  border-radius: 10px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index b30dd3f..10a7997 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: white;
   background-color: #414141;
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(50, 129, 234, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #3281ea;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(33, 33, 33, 0.999);
+  background-color: #212121;
   color: white;
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #242424;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #2C2C2C;
   border-radius: 12px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 12px 12px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 12px 12px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #404040;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 12px 12px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 12px 12px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 12px 12px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 12px 12px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 12px 0 0 12px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 12px 0 0 12px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 12px 12px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 12px 12px 0;
   border-left: none;
 }
 
@@ -7394,8 +7418,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #2C2C2C;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #2C2C2C;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #2C2C2C;
+}
+
 #combobox {
   background-color: #2C2C2C;
+  border-radius: 12px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 98930cb..1c3a1db 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(26, 115, 232, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #1A73E8;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(242, 242, 242, 0.999);
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #FAFAFA;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #FFFFFF;
   border-radius: 10px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 10px 10px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 10px 10px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 10px 0 0 10px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 10px 10px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 10px 10px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #dedede;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 10px 10px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 10px 10px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 10px 10px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 10px 10px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 10px 0 0 10px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 10px 0 0 10px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 10px 10px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 10px 10px 0;
   border-left: none;
 }
 
@@ -7397,8 +7421,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #FFFFFF;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #FFFFFF;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #FFFFFF;
+}
+
 #combobox {
   background-color: #FFFFFF;
+  border-radius: 10px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 1ff9581..20ad783 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(26, 115, 232, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #1A73E8;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(242, 242, 242, 0.999);
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #FAFAFA;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #FFFFFF;
   border-radius: 12px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 12px 12px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 12px 12px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #dedede;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 12px 12px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 12px 12px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 12px 12px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 12px 12px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 12px 0 0 12px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 12px 0 0 12px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 12px 12px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 12px 12px 0;
   border-left: none;
 }
 
@@ -7397,8 +7421,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #FFFFFF;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #FFFFFF;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #FFFFFF;
+}
+
 #combobox {
   background-color: #FFFFFF;
+  border-radius: 12px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 48cdaa5..d966e2c 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -42,7 +42,7 @@
 }
 
 XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected,
-.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected {
+.menuitem.button.flat:selected {
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(235, 235, 235, 0.987);
 }
@@ -52,8 +52,8 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover
   background-color: rgba(26, 115, 232, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected:not(.progressbar):not(.trough), spinbutton.vertical selection, spinbutton:not(.vertical) selection,
-entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected {
+.nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, statuspage.search-view entry.search > window.background treeview.view:selected, statuspage.search-view entry.search > window.background filechooser stack.view scrolledwindow treeview.view:selected, filechooser stack.view scrolledwindow statuspage.search-view entry.search > window.background treeview.view:selected, spinbutton.vertical selection, spinbutton:not(.vertical) selection,
+entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
   color: white;
   background-color: #1A73E8;
 }
@@ -98,7 +98,7 @@ entry selection, label selection, textview text selection:focus, textview text s
  * Base States *
  ***************/
 .background {
-  background-color: rgba(242, 242, 242, 0.999);
+  background-color: #F2F2F2;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -3244,7 +3244,7 @@ frame > paned > notebook > header, notebook.frame > header {
   background-color: #FAFAFA;
 }
 
-.background.csd notebook, notebook.frame {
+.background.csd notebook, .background.csd notebook.frame {
   background-color: #FFFFFF;
   border-radius: 12px;
 }
@@ -3262,6 +3262,38 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+.background.csd notebook > header.top {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.top > tabs > tab {
+  border-radius: 12px 12px 0 0;
+}
+
+.background.csd notebook > header.bottom {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 12px 12px;
+}
+
+.background.csd notebook > header.left {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.left > tabs > tab {
+  border-radius: 12px 0 0 12px;
+}
+
+.background.csd notebook > header.right {
+  border-radius: 0 12px 12px 0;
+}
+
+.background.csd notebook > header.right > tabs > tab {
+  border-radius: 0 12px 12px 0;
+}
+
 notebook > header {
   border-width: 1px;
   border-color: #dedede;
@@ -3271,7 +3303,6 @@ notebook > header {
 
 notebook > header.top {
   border-bottom-style: solid;
-  border-radius: 12px 12px 0 0;
 }
 
 notebook > header.top > tabs {
@@ -3280,13 +3311,11 @@ notebook > header.top > tabs {
 }
 
 notebook > header.top > tabs > tab {
-  border-radius: 12px 12px 0 0;
   border-bottom: none;
 }
 
 notebook > header.bottom {
   border-top-style: solid;
-  border-radius: 0 0 12px 12px;
 }
 
 notebook > header.bottom > tabs {
@@ -3295,13 +3324,11 @@ notebook > header.bottom > tabs {
 }
 
 notebook > header.bottom > tabs > tab {
-  border-radius: 0 0 12px 12px;
   border-top: none;
 }
 
 notebook > header.left {
   border-right-style: solid;
-  border-radius: 12px 0 0 12px;
 }
 
 notebook > header.left > tabs {
@@ -3310,13 +3337,11 @@ notebook > header.left > tabs {
 }
 
 notebook > header.left > tabs > tab {
-  border-radius: 12px 0 0 12px;
   border-right: none;
 }
 
 notebook > header.right {
   border-left-style: solid;
-  border-radius: 0 12px 12px 0;
 }
 
 notebook > header.right > tabs {
@@ -3325,7 +3350,6 @@ notebook > header.right > tabs {
 }
 
 notebook > header.right > tabs > tab {
-  border-radius: 0 12px 12px 0;
   border-left: none;
 }
 
@@ -7398,8 +7422,26 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame >
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
 
+window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+  background-color: #2C2C2C;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+window.background:not(.solid-csd) > notebook {
+  border: none;
+  background-color: #FFFFFF;
+  box-shadow: none;
+}
+
+window.background:not(.solid-csd) > notebook > stack {
+  border: none;
+  box-shadow: none;
+  background-color: #FFFFFF;
+}
+
 #combobox {
   background-color: #FFFFFF;
+  border-radius: 12px;
 }
 
 #gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) {