From a8bc0d4d71a325330f509a4943e4f224f0715370 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Tue, 28 May 2019 14:22:59 +0800
Subject: [PATCH] Fixed gnome app border-radius issues

---
 src/gtk-3.0/gtk-compact-dark-alt.css        | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-dark-solid-alt.css  | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-dark-solid.css      | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-dark.css            | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-light-alt.css       | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-light-solid-alt.css | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-light-solid.css     | 45 ++++++++++-------
 src/gtk-3.0/gtk-compact-light.css           | 45 ++++++++++-------
 src/gtk-3.0/gtk-dark-alt.css                | 45 ++++++++++-------
 src/gtk-3.0/gtk-dark-solid-alt.css          | 45 ++++++++++-------
 src/gtk-3.0/gtk-dark-solid.css              | 45 ++++++++++-------
 src/gtk-3.0/gtk-dark.css                    | 45 ++++++++++-------
 src/gtk-3.0/gtk-light-alt.css               | 45 ++++++++++-------
 src/gtk-3.0/gtk-light-solid-alt.css         | 45 ++++++++++-------
 src/gtk-3.0/gtk-light-solid.css             | 45 ++++++++++-------
 src/gtk-3.0/gtk-light.css                   | 45 ++++++++++-------
 src/gtk-3.0/sass/_applications.scss         | 55 ++++++++++++++-------
 17 files changed, 485 insertions(+), 290 deletions(-)

diff --git a/src/gtk-3.0/gtk-compact-dark-alt.css b/src/gtk-3.0/gtk-compact-dark-alt.css
index 86a2911..f144274 100644
--- a/src/gtk-3.0/gtk-compact-dark-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-alt.css
@@ -6235,11 +6235,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6650,50 +6651,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-dark-solid-alt.css b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
index e2f8826..384908a 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
@@ -6235,11 +6235,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6650,50 +6651,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index 35c61e8..3a62ad1 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -6235,11 +6235,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6650,50 +6651,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index 24eec33..6510bd1 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -6235,11 +6235,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6650,50 +6651,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-light-alt.css b/src/gtk-3.0/gtk-compact-light-alt.css
index 44c56ea..0a513dd 100644
--- a/src/gtk-3.0/gtk-compact-light-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-alt.css
@@ -6247,11 +6247,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6656,50 +6657,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-light-solid-alt.css b/src/gtk-3.0/gtk-compact-light-solid-alt.css
index 3c2068e..ed873f9 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-alt.css
@@ -6247,11 +6247,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6656,50 +6657,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 4539183..bc866b7 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -6247,11 +6247,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6656,50 +6657,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 517c7f6..9d7793e 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -6247,11 +6247,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6656,50 +6657,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-dark-alt.css b/src/gtk-3.0/gtk-dark-alt.css
index 8da85bb..d904d62 100644
--- a/src/gtk-3.0/gtk-dark-alt.css
+++ b/src/gtk-3.0/gtk-dark-alt.css
@@ -6245,11 +6245,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6658,50 +6659,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-dark-solid-alt.css b/src/gtk-3.0/gtk-dark-solid-alt.css
index 0af28a9..d96eb34 100644
--- a/src/gtk-3.0/gtk-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-dark-solid-alt.css
@@ -6233,11 +6233,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6646,50 +6647,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index fe1fb5c..8cde1fd 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -6245,11 +6245,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6658,50 +6659,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 747b63d..ce4350b 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -6245,11 +6245,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6658,50 +6659,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #242424;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(255, 255, 255, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-light-alt.css b/src/gtk-3.0/gtk-light-alt.css
index 11a6c37..98fd36a 100644
--- a/src/gtk-3.0/gtk-light-alt.css
+++ b/src/gtk-3.0/gtk-light-alt.css
@@ -6290,11 +6290,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6695,50 +6696,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-light-solid-alt.css b/src/gtk-3.0/gtk-light-solid-alt.css
index 0887799..58d31d2 100644
--- a/src/gtk-3.0/gtk-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-light-solid-alt.css
@@ -6290,11 +6290,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6695,50 +6696,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index f7a8404..e5e6d03 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -6290,11 +6290,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6695,50 +6696,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index fe0feee..0ed0ab2 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -6290,11 +6290,12 @@ window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical
   background: none;
 }
 
-stack > grid.vertical > scrolledwindow.frame {
+stack > grid.vertical > scrolledwindow {
   border: none;
+  border-radius: 0 0 6px 6px;
 }
 
-stack > grid.vertical > scrolledwindow.frame > viewport.frame list {
+stack > grid.vertical > scrolledwindow > viewport.frame list {
   border-radius: 0 0 6px 6px;
 }
 
@@ -6695,50 +6696,60 @@ window.background.csd evview.view.content-view {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame {
   border: none;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:first-child {
   border-radius: 0 0 0 6px;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame > viewport.frame list:last-child {
   border-radius: 0 0 6px 0;
 }
 
-dialog.background.csd box.dialog-vbox grid.horizontal stack scrolledwindow.frame {
+dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > stack > scrolledwindow.frame {
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow,
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow {
   border-radius: 0 0 6px 6px;
   background-color: #ffffff;
 }
 
-dialog.background.csd box.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active),
+dialog.background.csd > box.vertical.dialog-vbox > stack > stack > scrolledwindow iconview.view:not(:hover):not(:selected):not(:active) {
   background-color: transparent;
 }
 
-dialog.background.csd box.dialog-vbox notebook > stack {
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list {
   border-radius: 0 0 6px 6px;
 }
 
-dialog.background.csd stack entry {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list row.activatable:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .nemo-window .nemo-places-sidebar .places-treeview:not(:hover):not(:selected):not(:active), .nemo-window .nemo-places-sidebar dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .places-treeview:not(:hover):not(:selected):not(:active), dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list .budgie-menu button:not(:hover):not(:selected):not(:active), .budgie-menu dialog.background.csd > box.vertical.dialog-vbox > stack > scrolledwindow > viewport.frame > list button:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd stack spinbutton entry,
-dialog.background.csd stack .linked entry {
-  margin: 0;
+dialog.background.csd > box.vertical.dialog-vbox > stack > box.vertical > stack.view > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+  background-color: transparent;
 }
 
-dialog.background.csd entry.search {
-  margin: 2px;
+dialog.background.csd > box.vertical.dialog-vbox > stack toolbar.toolbar, dialog.background.csd > box.vertical.dialog-vbox > stack .toolbar.inline-toolbar {
+  border-radius: 0 0 6px 6px;
+  border-width: 1px 0 0 0;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox > notebook > stack {
+  border-radius: 0 0 6px 6px;
+}
+
+dialog.background.csd > box.vertical.dialog-vbox separator.vertical {
+  background-color: rgba(0, 0, 0, 0.12);
 }
 
 MsdOsdWindow.background.osd {
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index c424f66..2c5d850 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1067,8 +1067,9 @@ window#gnome-system-monitor.background.csd {
 //
 stack {
   > grid.vertical {
-    > scrolledwindow.frame {
+    > scrolledwindow {
       border: none;
+      border-radius: 0 0 $wm_radius $wm_radius;
 
       > viewport.frame {
         list {
@@ -1441,8 +1442,8 @@ window.background.csd {
 // Dialogs
 //
 dialog.background.csd {
-  box.dialog-vbox {
-    grid.horizontal {
+  > box.vertical.dialog-vbox {
+    > grid.horizontal {
       > scrolledwindow.frame { //removed ugly boders for nautilus batch renaming dialog
         border: none;
 
@@ -1454,38 +1455,56 @@ dialog.background.csd {
         }
       }
 
-      stack {
-        scrolledwindow.frame { // reset border for totem setting dialog
+      > stack {
+        > scrolledwindow.frame { // reset border for totem setting dialog
           border: 1px solid $borders_color;
         }
       }
     }
 
-    > stack {
+    > stack,
+    > stack > stack {
       > scrolledwindow {
         border-radius: 0 0 $wm_radius $wm_radius;
         background-color: $base_color;
 
         iconview.view:not(:hover):not(:selected):not(:active) { // Wallpaper setting window
-          // @extend %view;
           background-color: transparent;
         }
       }
     }
 
-    notebook > stack {
-      border-radius: 0 0 $wm_radius $wm_radius;
+    > stack {
+      > scrolledwindow > viewport.frame {
+        > list {
+          border-radius: 0 0 $wm_radius $wm_radius;
+
+          row.activatable:not(:hover):not(:selected):not(:active) {
+            background-color: transparent;
+          }
+        }
+      }
+
+      > box.vertical > stack.view {
+        > scrolledwindow > treeview.view:not(:hover):not(:selected):not(:active) {
+          background-color: transparent;
+        }
+      }
+
+      toolbar.toolbar {
+        border-radius: 0 0 $wm_radius $wm_radius;
+        border-width: 1px 0 0 0;
+      }
     }
+
+    > notebook {
+      > stack {
+        border-radius: 0 0 $wm_radius $wm_radius;
+      }
+    }
+
+    separator.vertical { background-color: $borders_color; }
   }
-
-  stack {
-    entry { margin: 2px; }
-
-    spinbutton entry,
-    .linked entry { margin: 0; }
-  }
-
-  entry.search { margin: 2px; }
 }
 
 //