diff --git a/src/main/cinnamon/cinnamon-dark-solid.css b/src/main/cinnamon/cinnamon-dark-solid.css
index ac34dd1..cff6361 100644
--- a/src/main/cinnamon/cinnamon-dark-solid.css
+++ b/src/main/cinnamon/cinnamon-dark-solid.css
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .panel-top, .panel-bottom, .panel-left, .panel-right {
-  color: white;
+  color: #dadada;
   font-size: 1em;
   padding: 0px;
   background-color: #2a2a2a;
@@ -541,19 +541,19 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .panel-top {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.72);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-bottom {
-  border-top: 1px solid rgba(0, 0, 0, 0.72);
+  border-top: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-left {
-  border-right: 1px solid rgba(0, 0, 0, 0.72);
+  border-right: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-right {
-  border-left: 1px solid rgba(0, 0, 0, 0.72);
+  border-left: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-dummy {
@@ -570,7 +570,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px;
   font-weight: bold;
   height: 22px;
-  color: white;
+  color: #dadada;
 }
 
 .panel-button {
@@ -578,7 +578,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px;
   font-weight: bold;
   transition-duration: 100ms;
-  color: white;
+  color: #dadada;
 }
 
 .system-status-icon {
@@ -1003,7 +1003,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .switcher-arrow:highlighted {
   border-color: rgba(0, 0, 0, 0);
-  color: white;
+  color: #dadada;
 }
 
 .thumbnail-scroll-gradient-left {
@@ -1457,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: white;
+  color: #dadada;
   background-color: #2a2a2a;
 }
 
@@ -1468,7 +1468,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 20px;
   min-width: 64px;
   min-height: 64px;
-  color: white;
+  color: #dadada;
   border-radius: 0;
   background-color: #2a2a2a;
   border: none;
@@ -1526,7 +1526,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: normal;
   background-image: none;
   transition-duration: 100;
-  color: rgba(255, 255, 255, 0.9);
+  color: rgba(218, 218, 218, 0.9);
   border: 0 solid transparent;
 }
 
@@ -1583,8 +1583,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:hover {
-  color: white;
-  border: 0 solid rgba(255, 255, 255, 0.5);
+  color: #dadada;
+  border: 0 solid rgba(218, 218, 218, 0.5);
   background-gradient-direction: none;
 }
 
@@ -1605,7 +1605,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:running {
-  color: white;
+  color: #dadada;
   border: 0 solid rgba(8, 96, 242, 0.35);
   background-gradient-direction: none;
 }
@@ -1631,7 +1631,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:focus {
-  color: white;
+  color: #dadada;
   border: 0 solid #0860f2;
   background-gradient-direction: none;
 }
@@ -1709,7 +1709,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .grouped-window-list-thumbnail-menu .separator {
   width: 1px;
-  background-color: rgba(255, 255, 255, 0.33);
+  background-color: rgba(218, 218, 218, 0.33);
 }
 
 .grouped-window-list-number-label {
@@ -1733,7 +1733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: normal;
   background-image: none;
   transition-duration: 100;
-  color: rgba(255, 255, 255, 0.6);
+  color: rgba(218, 218, 218, 0.6);
   border: 0 solid transparent;
 }
 
@@ -1774,8 +1774,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:hover {
-  color: white;
-  border: 0 solid rgba(255, 255, 255, 0.5);
+  color: #dadada;
+  border: 0 solid rgba(218, 218, 218, 0.5);
   background-gradient-direction: none;
 }
 
@@ -1796,7 +1796,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:active, .grouped-window-list-item-box:checked, .grouped-window-list-item-box:running {
-  color: white;
+  color: #dadada;
   border: 0 solid rgba(8, 96, 242, 0.35);
   background-gradient-direction: none;
 }
@@ -1822,7 +1822,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:focus {
-  color: white;
+  color: #dadada;
   border: 0 solid #0860f2;
   background-gradient-direction: none;
 }
@@ -2029,7 +2029,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .workspace-button {
   width: 20px;
   height: 10px;
-  color: white;
+  color: #dadada;
   padding: 3px;
   padding-top: 4px;
   transition-duration: 300;
@@ -2163,7 +2163,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .applet-box {
   padding-left: 3px;
   padding-right: 3px;
-  color: white;
+  color: #dadada;
   text-shadow: none;
   transition-duration: 100;
 }
@@ -2173,8 +2173,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .applet-box:hover {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  color: #dadada;
+  background-color: rgba(218, 218, 218, 0.15);
 }
 
 .applet-box:checked, .applet-box:checked:hover {
@@ -2190,7 +2190,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .applet-label {
   font-weight: bold;
-  color: white;
+  color: #dadada;
 }
 
 .applet-box:checked .applet-label {
@@ -2199,7 +2199,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .applet-icon {
-  color: white;
+  color: #dadada;
   icon-size: 22px;
 }
 
diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css
index 5e3f250..3b86a13 100644
--- a/src/main/cinnamon/cinnamon-dark.css
+++ b/src/main/cinnamon/cinnamon-dark.css
@@ -518,7 +518,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: white;
   font-size: 1em;
   padding: 0px;
-  background-color: rgba(42, 42, 42, 0.95);
+  background-color: rgba(0, 0, 0, 0.95);
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.5), 0 0 16px rgba(0, 0, 0, 0.24);
 }
 
@@ -541,19 +541,19 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .panel-top {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.72);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-bottom {
-  border-top: 1px solid rgba(0, 0, 0, 0.72);
+  border-top: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-left {
-  border-right: 1px solid rgba(0, 0, 0, 0.72);
+  border-right: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-right {
-  border-left: 1px solid rgba(0, 0, 0, 0.72);
+  border-left: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .panel-dummy {
@@ -1458,7 +1458,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 1em;
   padding: 16px;
   color: white;
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
 }
 
 .osd-window {
@@ -1470,7 +1470,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   min-height: 64px;
   color: white;
   border-radius: 0;
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   border: none;
   border-image: url("assets/menu.svg") 15 15 15 15;
 }
@@ -2061,16 +2061,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .workspace-graph .workspace .windows {
-  -active-window-background: rgba(80, 80, 80, 0.25);
+  -active-window-background: rgba(38, 38, 38, 0.15);
   -active-window-border: rgba(0, 0, 0, 0.8);
-  -inactive-window-background: rgba(80, 80, 80, 0.25);
+  -inactive-window-background: rgba(38, 38, 38, 0.15);
   -inactive-window-border: rgba(0, 0, 0, 0.8);
 }
 
 .workspace-graph .workspace:active .windows {
-  -active-window-background: rgba(93, 93, 93, 0.25);
+  -active-window-background: rgba(51, 51, 51, 0.15);
   -active-window-border: rgba(0, 0, 0, 0.8);
-  -inactive-window-background: rgba(55, 55, 55, 0.25);
+  -inactive-window-background: rgba(13, 13, 13, 0.15);
   -inactive-window-border: rgba(0, 0, 0, 0.8);
 }
 
diff --git a/src/main/cinnamon/cinnamon-light-solid.css b/src/main/cinnamon/cinnamon-light-solid.css
index 50ae7c5..4e3de53 100644
--- a/src/main/cinnamon/cinnamon-light-solid.css
+++ b/src/main/cinnamon/cinnamon-light-solid.css
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .panel-top, .panel-bottom, .panel-left, .panel-right {
-  color: white;
+  color: #363636;
   font-size: 1em;
   padding: 0px;
   background-color: #f1f1f1;
@@ -554,7 +554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px;
   font-weight: bold;
   height: 22px;
-  color: white;
+  color: #363636;
 }
 
 .panel-button {
@@ -562,7 +562,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px;
   font-weight: bold;
   transition-duration: 100ms;
-  color: white;
+  color: #363636;
 }
 
 .system-status-icon {
@@ -987,7 +987,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .switcher-arrow:highlighted {
   border-color: rgba(0, 0, 0, 0);
-  color: white;
+  color: #363636;
 }
 
 .thumbnail-scroll-gradient-left {
@@ -1441,7 +1441,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: white;
+  color: #363636;
   background-color: #f1f1f1;
 }
 
@@ -1452,7 +1452,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 20px;
   min-width: 64px;
   min-height: 64px;
-  color: white;
+  color: #363636;
   border-radius: 0;
   background-color: #f1f1f1;
   border: none;
@@ -1510,7 +1510,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: normal;
   background-image: none;
   transition-duration: 100;
-  color: rgba(255, 255, 255, 0.9);
+  color: rgba(54, 54, 54, 0.9);
   border: 0 solid transparent;
 }
 
@@ -1567,8 +1567,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:hover {
-  color: white;
-  border: 0 solid rgba(255, 255, 255, 0.5);
+  color: #363636;
+  border: 0 solid rgba(54, 54, 54, 0.5);
   background-gradient-direction: none;
 }
 
@@ -1589,7 +1589,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:running {
-  color: white;
+  color: #363636;
   border: 0 solid rgba(8, 96, 242, 0.35);
   background-gradient-direction: none;
 }
@@ -1615,7 +1615,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-list-item-box:focus {
-  color: white;
+  color: #363636;
   border: 0 solid #0860f2;
   background-gradient-direction: none;
 }
@@ -1693,7 +1693,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .grouped-window-list-thumbnail-menu .separator {
   width: 1px;
-  background-color: rgba(255, 255, 255, 0.33);
+  background-color: rgba(54, 54, 54, 0.33);
 }
 
 .grouped-window-list-number-label {
@@ -1717,7 +1717,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: normal;
   background-image: none;
   transition-duration: 100;
-  color: rgba(255, 255, 255, 0.6);
+  color: rgba(54, 54, 54, 0.6);
   border: 0 solid transparent;
 }
 
@@ -1758,8 +1758,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:hover {
-  color: white;
-  border: 0 solid rgba(255, 255, 255, 0.5);
+  color: #363636;
+  border: 0 solid rgba(54, 54, 54, 0.5);
   background-gradient-direction: none;
 }
 
@@ -1780,7 +1780,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:active, .grouped-window-list-item-box:checked, .grouped-window-list-item-box:running {
-  color: white;
+  color: #363636;
   border: 0 solid rgba(8, 96, 242, 0.35);
   background-gradient-direction: none;
 }
@@ -1806,7 +1806,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .grouped-window-list-item-box:focus {
-  color: white;
+  color: #363636;
   border: 0 solid #0860f2;
   background-gradient-direction: none;
 }
@@ -2013,7 +2013,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .workspace-button {
   width: 20px;
   height: 10px;
-  color: white;
+  color: #363636;
   padding: 3px;
   padding-top: 4px;
   transition-duration: 300;
@@ -2147,7 +2147,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .applet-box {
   padding-left: 3px;
   padding-right: 3px;
-  color: white;
+  color: #363636;
   text-shadow: none;
   transition-duration: 100;
 }
@@ -2157,8 +2157,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .applet-box:hover {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.15);
+  color: #363636;
+  background-color: rgba(54, 54, 54, 0.15);
 }
 
 .applet-box:checked, .applet-box:checked:hover {
@@ -2174,7 +2174,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .applet-label {
   font-weight: bold;
-  color: white;
+  color: #363636;
 }
 
 .applet-box:checked .applet-label {
@@ -2183,7 +2183,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .applet-icon {
-  color: white;
+  color: #363636;
   icon-size: 22px;
 }
 
diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css
index b5de964..27556ae 100644
--- a/src/main/cinnamon/cinnamon-light.css
+++ b/src/main/cinnamon/cinnamon-light.css
@@ -518,7 +518,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: white;
   font-size: 1em;
   padding: 0px;
-  background-color: rgba(241, 241, 241, 0.95);
+  background-color: rgba(255, 255, 255, 0.95);
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.5), 0 0 16px rgba(0, 0, 0, 0.24);
 }
 
@@ -1442,7 +1442,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 1em;
   padding: 16px;
   color: white;
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
 }
 
 .osd-window {
@@ -1454,7 +1454,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   min-height: 64px;
   color: white;
   border-radius: 0;
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   border: none;
   border-image: url("assets/menu.svg") 15 15 15 15;
 }
@@ -2045,16 +2045,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .workspace-graph .workspace .windows {
-  -active-window-background: rgba(255, 255, 255, 0.25);
+  -active-window-background: rgba(255, 255, 255, 0.15);
   -active-window-border: rgba(0, 0, 0, 0.8);
-  -inactive-window-background: rgba(255, 255, 255, 0.25);
+  -inactive-window-background: rgba(255, 255, 255, 0.15);
   -inactive-window-border: rgba(0, 0, 0, 0.8);
 }
 
 .workspace-graph .workspace:active .windows {
-  -active-window-background: rgba(255, 255, 255, 0.25);
+  -active-window-background: rgba(255, 255, 255, 0.15);
   -active-window-border: rgba(0, 0, 0, 0.8);
-  -inactive-window-background: rgba(254, 254, 254, 0.25);
+  -inactive-window-background: rgba(255, 255, 255, 0.15);
   -inactive-window-border: rgba(0, 0, 0, 0.8);
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 4900c10..a15f9ec 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -1398,7 +1398,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid .panel-button {
-  color: white;
+  color: #dadada;
   text-shadow: none;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 25be3fe..d1ee1f8 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -1382,7 +1382,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid {
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   /* transition from transparent to solid */
   transition-duration: 250ms;
   background-gradient-direction: none;
@@ -1394,7 +1394,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid .panel-corner {
-  -panel-corner-background-color: rgba(42, 42, 42, 0.25);
+  -panel-corner-background-color: rgba(0, 0, 0, 0.15);
 }
 
 #panel.solid .panel-button {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 983f1a2..846fc80 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -1398,7 +1398,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid .panel-button {
-  color: white;
+  color: #363636;
   text-shadow: none;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 69d915a..3a9828d 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -1382,7 +1382,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid {
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   /* transition from transparent to solid */
   transition-duration: 250ms;
   background-gradient-direction: none;
@@ -1394,7 +1394,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel.solid .panel-corner {
-  -panel-corner-background-color: rgba(241, 241, 241, 0.25);
+  -panel-corner-background-color: rgba(255, 255, 255, 0.15);
 }
 
 #panel.solid .panel-button {
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 18f3c0e..fd88143 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -1634,6 +1634,11 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
   box-shadow: none;
 }
 
+.titlebar > box.left.horizontal,
+.titlebar > box.right.horizontal {
+  padding: 0 6px;
+}
+
 window.background > box.vertical > headerbar:not(.titlebar) {
   border-radius: 0 0 0 0;
   box-shadow: none;
@@ -4775,187 +4780,21 @@ filechooser paned > separator:dir(rtl),
   margin-right: -1px;
 }
 
-.nautilus-window paned > separator {
-  background-image: none;
-  background-size: 0 0;
-  min-width: 0;
-  min-height: 0;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #0e0e0e;
-}
-
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar list {
+.nautilus-window.background.csd {
+  border-radius: 0 0 16px 16px;
   background-color: transparent;
+  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
 }
 
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar {
-  background-color: transparent;
-}
-
-
-.nautilus-window placessidebar.sidebar {
+.nautilus-window.background.csd > headerbar.titlebar {
   border: none;
-  background-color: transparent;
-  min-width: 200px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+  background: none;
+  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
 }
 
-
-.nautilus-window placessidebar.sidebar row.sidebar-row {
-  color: #dadada;
-  background-color: transparent;
-  transition: background-image 0;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled label,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled image,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
-  color: rgba(218, 218, 218, 0.4);
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
-  opacity: 0.85;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
-  transition: background-image 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px-dark.png"), url("assets/sidebar-view-hover-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:active,
-.nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px-dark.png"), url("assets/sidebar-view-active-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
-  color: #dedede;
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px-dark.png"), url("assets/sidebar-view-checked-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
-  color: #dedede;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
-  color: inherit;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled),
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
-  color: #dadada;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
-  background-color: #F08437;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
-  color: #dadada;
-}
-
-
-.nautilus-window placessidebar.sidebar separator {
-  background-color: transparent;
-}
-
-
-.nautilus-window.maximized headerbar,
-.nautilus-window.maximized placessidebar {
-  border-radius: 0;
-}
-
-
-.nautilus-window placesview actionbar.background {
-  border-radius: 0 0 14px 0;
-}
-
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser actionbar {
-  color: #dadada;
-  background-color: #333333;
-  border-color: rgba(255, 255, 255, 0.12);
-}
-
-filechooser actionbar label, filechooser actionbar combobox {
-  color: #dadada;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#242424);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+  margin-left: 120px;
 }
 
 .nautilus-window headerbar .path-bar-box {
@@ -4976,56 +4815,91 @@ filechooser box.vertical > paned > separator:dir(rtl) {
   background-color: transparent;
 }
 
-.nautilus-canvas-item {
-  border-radius: 5px;
+.nautilus-window paned > separator {
+  background-image: none;
+  background-size: 0 0;
+  min-width: 0;
+  min-height: 0;
 }
 
-.caja-desktop, .nemo-desktop.nemo-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-  color: white;
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
-}
-
-.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:active {
-  color: white;
-}
-
-.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
-.nautilus-desktop.nautilus-canvas-item:selected {
-  color: white;
-  text-shadow: none;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-  color: #898989;
-}
-
-.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
-.nautilus-list-dim-label:selected,
-.nautilus-list-dim-label:selected:focus {
-  color: #cedffc;
-}
-
-.nautilus-window {
-  border-radius: 14px 14px 16px 16px;
-}
-
-.nautilus-window.background.csd {
-  background-color: transparent;
-  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
-}
-
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window placessidebar.sidebar {
   border: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-  background: none;
-  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
+  background-color: transparent;
+  min-width: 200px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
-  margin-left: 128px;
+.nautilus-window placessidebar.sidebar row.sidebar-row {
+  color: #dadada;
+  background-color: transparent;
+  transition: background-image 0;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled label, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled image, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
+  color: rgba(218, 218, 218, 0.4);
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
+  opacity: 0.85;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
+  transition: background-image 0;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px-dark.png"), url("assets/sidebar-view-hover-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:active, .nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px-dark.png"), url("assets/sidebar-view-active-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
+  color: #dedede;
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px-dark.png"), url("assets/sidebar-view-checked-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
+  color: #dedede;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
+  color: inherit;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
+  color: #dadada;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
+  background-color: #F08437;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
+  color: #dadada;
+}
+
+.nautilus-window placessidebar.sidebar separator {
+  background-color: transparent;
 }
 
 .nautilus-window notebook {
@@ -5077,7 +4951,82 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 }
 
 .nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
-  border-radius: 0 0 0 0;
+  border-radius: 0;
+}
+
+.nautilus-window.maximized headerbar, .nautilus-window.maximized placessidebar {
+  border-radius: 0;
+}
+
+.nautilus-window placesview actionbar.background {
+  border-radius: 0 0 14px 0;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+  background-color: transparent;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #0e0e0e;
+}
+
+filechooser actionbar {
+  color: #dadada;
+  background-color: #333333;
+  border-color: rgba(255, 255, 255, 0.12);
+}
+
+filechooser actionbar label, filechooser actionbar combobox {
+  color: #dadada;
+}
+
+filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#242424);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+.nautilus-canvas-item {
+  border-radius: 5px;
+}
+
+.caja-desktop, .nemo-desktop.nemo-canvas-item,
+.nautilus-desktop.nautilus-canvas-item {
+  color: white;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
+}
+
+.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:active {
+  color: white;
+}
+
+.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected {
+  color: white;
+  text-shadow: none;
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: #898989;
+}
+
+.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
+.nautilus-list-dim-label:selected,
+.nautilus-list-dim-label:selected:focus {
+  color: #cedffc;
 }
 
 .nautilus-list-view {
@@ -6665,7 +6614,7 @@ panel-toplevel.background menubar {
 panel-toplevel.background menubar,
 panel-toplevel.background #PanelApplet label,
 panel-toplevel.background #PanelApplet image {
-  color: white;
+  color: #dadada;
 }
 
 .mate-panel-menu-bar button label, .mate-panel-menu-bar button image,
@@ -6680,7 +6629,7 @@ panel-toplevel.background #tasklist-button image {
 
 .mate-panel-menu-bar .wnck-pager,
 panel-toplevel.background .wnck-pager {
-  color: gray;
+  color: #6d6d6d;
   background-color: #111111;
 }
 
@@ -6770,21 +6719,21 @@ panel-toplevel.background na-tray-applet {
 
 .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button),
 panel-toplevel.background button:not(#tasklist-button) {
-  color: white;
+  color: #dadada;
   border-radius: 6px;
   border: none;
 }
 
 .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
 panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.2);
+  color: #dadada;
+  background-color: rgba(218, 218, 218, 0.2);
 }
 
 .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button),
 panel-toplevel.background button:checked:not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
+  color: #dadada;
+  background-color: rgba(218, 218, 218, 0.25);
 }
 
 .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label,
@@ -6795,8 +6744,8 @@ panel-toplevel.background button:checked:not(#tasklist-button) image {
 
 .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button),
 panel-toplevel.background button:active:not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  color: #dadada;
+  background-color: rgba(218, 218, 218, 0.3);
 }
 
 .xfce4-panel.panel {
@@ -6814,7 +6763,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 
 .xfce4-panel {
   background-color: #2a2a2a;
-  color: white;
+  color: #dadada;
   font-weight: 700;
   text-shadow: none;
   -gtk-icon-shadow: none;
@@ -7579,19 +7528,19 @@ menubar.-vala-panel-background {
 
 menubar.-vala-panel-appmenu-private > menuitem,
 menubar.-vala-panel-background > menuitem {
-  color: white;
+  color: #dadada;
   font-weight: normal;
 }
 
 menubar.-vala-panel-appmenu-private > menuitem:hover,
 menubar.-vala-panel-background > menuitem:hover {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.2);
+  color: #dadada;
+  background-color: rgba(218, 218, 218, 0.2);
 }
 
 menubar.-vala-panel-appmenu-private > menuitem:disabled,
 menubar.-vala-panel-background > menuitem:disabled {
-  color: rgba(255, 255, 255, 0.4);
+  color: rgba(218, 218, 218, 0.4);
 }
 
 .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark {
@@ -7599,7 +7548,7 @@ menubar.-vala-panel-background > menuitem:disabled {
   background-image: linear-gradient(0deg, rgba(42, 42, 42, 0.95) 0%, rgba(51, 51, 51, 0.95) 100%);
   border-bottom: 1px solid #0e0e0e;
   transition: all 100ms ease-in-out;
-  color: white;
+  color: #dadada;
 }
 
 .menubar.panel .panel.maximized {
@@ -7743,7 +7692,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 .composited-indicator > revealer label,
 .composited-indicator > revealer image,
 .composited-indicator > revealer spinner {
-  color: white;
+  color: #dadada;
   font-weight: normal;
   transition: all 200ms ease-in-out;
   text-shadow: none;
@@ -7760,7 +7709,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 }
 
 .composited-indicator .keyboard {
-  background-color: white;
+  background-color: #dadada;
   border-radius: 2px;
   color: #2a2a2a;
   padding: 0 3px;
@@ -8089,7 +8038,7 @@ UnityPanelWidget,
 
 UnityPanelWidget:backdrop,
 .unity-panel:backdrop {
-  color: white;
+  color: #dddddd;
 }
 
 .unity-panel.menubar.menuitem:hover,
@@ -8394,7 +8343,7 @@ GtkListBox .h4 {
 
 #panel_window {
   background-color: #2a2a2a;
-  color: white;
+  color: #dadada;
   font-weight: bold;
   box-shadow: inset 0 -1px #181818;
 }
@@ -8405,12 +8354,12 @@ GtkListBox .h4 {
 
 #panel_window menubar, #panel_window menubar > menuitem {
   background-color: transparent;
-  color: white;
+  color: #dadada;
   font-weight: bold;
 }
 
 #panel_window menubar menuitem:disabled {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(218, 218, 218, 0.5);
 }
 
 #panel_window menubar menuitem:disabled label {
@@ -9049,29 +8998,20 @@ popover.background.places-menu row {
 .budgie-panel {
   transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1);
   background-color: #2a2a2a;
-  color: white;
+  color: #dadada;
   font-weight: 500;
   box-shadow: none;
+  border: none;
   background-clip: padding-box;
 }
 
 .budgie-panel.transparent {
-  background-color: rgba(42, 42, 42, 0.65);
+  background-color: rgba(42, 42, 42, 0.1);
   box-shadow: none;
 }
 
-.top .budgie-panel {
-  border-bottom: 1px solid #0e0e0e;
-  background-image: linear-gradient(0deg, #2a2a2a 0%, #333333 100%);
-}
-
-.top .budgie-panel.transparent {
-  background-color: transparent;
-  background-image: linear-gradient(0deg, rgba(42, 42, 42, 0.85) 0%, rgba(51, 51, 51, 0.85) 100%);
-}
-
 .bottom .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
+  border: solid rgba(0, 0, 0, 0.22);
   border-width: 1px 1px 0 1px;
   border-radius: 14px 14px 0 0;
 }
@@ -9082,8 +9022,6 @@ popover.background.places-menu row {
 }
 
 .left .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
-  border-width: 1px 1px 1px 0;
   border-radius: 0 14px 14px 0;
 }
 
@@ -9093,8 +9031,6 @@ popover.background.places-menu row {
 }
 
 .right .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
-  border-width: 1px 0 1px 1px;
   border-radius: 14px 0 0 14px;
 }
 
@@ -9112,25 +9048,25 @@ popover.background.places-menu row {
   border-bottom-width: 0;
   border: none;
   box-shadow: none;
-  color: rgba(255, 255, 255, 0.85);
+  color: rgba(218, 218, 218, 0.85);
   background: none;
 }
 
 .budgie-panel button:hover {
-  background-color: rgba(255, 255, 255, 0.1);
-  color: rgba(255, 255, 255, 0.95);
+  background-color: rgba(218, 218, 218, 0.1);
+  color: rgba(218, 218, 218, 0.95);
   background-image: none;
 }
 
 .budgie-panel button:active {
-  background-color: rgba(255, 255, 255, 0.15);
-  color: white;
+  background-color: rgba(218, 218, 218, 0.15);
+  color: #dadada;
   background-image: none;
 }
 
 .budgie-panel button:checked {
-  background-color: rgba(255, 255, 255, 0.12);
-  color: white;
+  background-color: rgba(218, 218, 218, 0.12);
+  color: #dadada;
 }
 
 .budgie-panel.horizontal button {
@@ -9148,7 +9084,7 @@ popover.background.places-menu row {
 .budgie-panel menubar,
 .budgie-panel .menubar {
   box-shadow: none;
-  color: white;
+  color: #dadada;
   background-image: none;
   background-color: transparent;
 }
@@ -9174,12 +9110,12 @@ popover.background.places-menu row {
 
 .budgie-panel menubar > menuitem:disabled,
 .budgie-panel .menubar > menuitem:disabled {
-  color: rgba(255, 255, 255, 0.4);
+  color: rgba(218, 218, 218, 0.4);
 }
 
 .budgie-panel menubar > menuitem.budgie-menubar:hover,
 .budgie-panel .menubar > menuitem.budgie-menubar:hover {
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(218, 218, 218, 0.1);
 }
 
 .budgie-panel menubar.-vala-panel-appmenu-private > menuitem {
@@ -9425,24 +9361,24 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .left frame.raven-frame > border {
   border: none;
-  border-right: 1px solid rgba(0, 0, 0, 0.72);
+  border-right: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .right frame.raven-frame > border {
   border: none;
-  border-left: 1px solid rgba(0, 0, 0, 0.72);
+  border-left: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .top .shadow-block {
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .left .shadow-block {
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .right .shadow-block {
-  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .raven {
@@ -9462,6 +9398,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
+.raven stackswitcher.linked > button {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9489,15 +9429,31 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-.raven .raven-header.top stackswitcher {
-  padding: 6px 0 0 0;
-  margin: 0;
+.raven .raven-header.top > stackswitcher.linked {
+  padding: 2px;
+  margin: 6px 0 0 0;
+  background-color: rgba(222, 222, 222, 0.05);
+  border-radius: 6px;
 }
 
-.raven .raven-header.top stackswitcher button {
+.raven .raven-header.top > stackswitcher.linked > button {
+  border-radius: 6px;
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
+  border: none;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:hover {
+  background-color: rgba(101, 101, 101, 0.35);
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:active, .raven .raven-header.top > stackswitcher.linked > button:checked {
+  background-color: #656565;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:checked {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.05);
 }
 
 .raven .raven-header.top button.image-button:dir(ltr) {
@@ -10025,7 +9981,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 }
 
 .budgie-panel box.titlebar > widget > label {
-  color: rgba(255, 255, 255, 0.75);
+  color: rgba(218, 218, 218, 0.75);
 }
 
 .budgie-panel box.titlebar > button.image-button.titlebutton {
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 35632d8..507e359 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -1634,6 +1634,11 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
   box-shadow: none;
 }
 
+.titlebar > box.left.horizontal,
+.titlebar > box.right.horizontal {
+  padding: 0 6px;
+}
+
 window.background > box.vertical > headerbar:not(.titlebar) {
   border-radius: 0 0 0 0;
   box-shadow: none;
@@ -4775,187 +4780,21 @@ filechooser paned > separator:dir(rtl),
   margin-right: -1px;
 }
 
-.nautilus-window paned > separator {
-  background-image: none;
-  background-size: 0 0;
-  min-width: 0;
-  min-height: 0;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #0e0e0e;
-}
-
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar list {
+.nautilus-window.background.csd {
+  border-radius: 0 0 16px 16px;
   background-color: transparent;
+  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar {
-  background-color: transparent;
-}
-
-
-.nautilus-window placessidebar.sidebar {
+.nautilus-window.background.csd > headerbar.titlebar {
   border: none;
-  background-color: transparent;
-  min-width: 200px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+  background: none;
+  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-
-.nautilus-window placessidebar.sidebar row.sidebar-row {
-  color: #dadada;
-  background-color: transparent;
-  transition: background-image 0;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled label,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled image,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
-  color: rgba(218, 218, 218, 0.4);
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
-  opacity: 0.85;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
-  transition: background-image 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px-dark.png"), url("assets/sidebar-view-hover-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:active,
-.nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px-dark.png"), url("assets/sidebar-view-active-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
-  color: #dedede;
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px-dark.png"), url("assets/sidebar-view-checked-200px-dark@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
-  color: #dedede;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
-  color: inherit;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled),
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
-  color: #dadada;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
-  background-color: #F08437;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
-  color: #dadada;
-}
-
-
-.nautilus-window placessidebar.sidebar separator {
-  background-color: transparent;
-}
-
-
-.nautilus-window.maximized headerbar,
-.nautilus-window.maximized placessidebar {
-  border-radius: 0;
-}
-
-
-.nautilus-window placesview actionbar.background {
-  border-radius: 0 0 14px 0;
-}
-
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser actionbar {
-  color: #dadada;
-  background-color: rgba(51, 51, 51, 0.95);
-  border-color: rgba(255, 255, 255, 0.12);
-}
-
-filechooser actionbar label, filechooser actionbar combobox {
-  color: #dadada;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#242424);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+  margin-left: 120px;
 }
 
 .nautilus-window headerbar .path-bar-box {
@@ -4976,56 +4815,91 @@ filechooser box.vertical > paned > separator:dir(rtl) {
   background-color: transparent;
 }
 
-.nautilus-canvas-item {
-  border-radius: 5px;
+.nautilus-window paned > separator {
+  background-image: none;
+  background-size: 0 0;
+  min-width: 0;
+  min-height: 0;
 }
 
-.caja-desktop, .nemo-desktop.nemo-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-  color: white;
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
-}
-
-.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:active {
-  color: white;
-}
-
-.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
-.nautilus-desktop.nautilus-canvas-item:selected {
-  color: white;
-  text-shadow: none;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-  color: #898989;
-}
-
-.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
-.nautilus-list-dim-label:selected,
-.nautilus-list-dim-label:selected:focus {
-  color: #cedffc;
-}
-
-.nautilus-window {
-  border-radius: 14px 14px 16px 16px;
-}
-
-.nautilus-window.background.csd {
-  background-color: transparent;
-  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
-}
-
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window placessidebar.sidebar {
   border: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-  background: none;
-  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
+  background-color: transparent;
+  min-width: 200px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
-  margin-left: 128px;
+.nautilus-window placessidebar.sidebar row.sidebar-row {
+  color: #dadada;
+  background-color: transparent;
+  transition: background-image 0;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled label, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled image, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
+  color: rgba(218, 218, 218, 0.4);
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
+  opacity: 0.85;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
+  transition: background-image 0;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px-dark.png"), url("assets/sidebar-view-hover-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:active, .nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px-dark.png"), url("assets/sidebar-view-active-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
+  color: #dedede;
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px-dark.png"), url("assets/sidebar-view-checked-200px-dark@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
+  color: #dedede;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
+  color: inherit;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
+  color: #dadada;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
+  background-color: #F08437;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
+  color: #dadada;
+}
+
+.nautilus-window placessidebar.sidebar separator {
+  background-color: transparent;
 }
 
 .nautilus-window notebook {
@@ -5077,7 +4951,82 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 }
 
 .nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
-  border-radius: 0 0 0 0;
+  border-radius: 0;
+}
+
+.nautilus-window.maximized headerbar, .nautilus-window.maximized placessidebar {
+  border-radius: 0;
+}
+
+.nautilus-window placesview actionbar.background {
+  border-radius: 0 0 14px 0;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+  background-color: transparent;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #0e0e0e;
+}
+
+filechooser actionbar {
+  color: #dadada;
+  background-color: rgba(51, 51, 51, 0.95);
+  border-color: rgba(255, 255, 255, 0.12);
+}
+
+filechooser actionbar label, filechooser actionbar combobox {
+  color: #dadada;
+}
+
+filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#242424);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+.nautilus-canvas-item {
+  border-radius: 5px;
+}
+
+.caja-desktop, .nemo-desktop.nemo-canvas-item,
+.nautilus-desktop.nautilus-canvas-item {
+  color: white;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
+}
+
+.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:active {
+  color: white;
+}
+
+.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected {
+  color: white;
+  text-shadow: none;
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: #898989;
+}
+
+.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
+.nautilus-list-dim-label:selected,
+.nautilus-list-dim-label:selected:focus {
+  color: #cedffc;
 }
 
 .nautilus-list-view {
@@ -6656,7 +6605,7 @@ MsdOsdWindow.background.osd .trough {
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
-  background-color: #2a2a2a;
+  background-color: black;
 }
 
 .mate-panel-menu-bar menubar,
@@ -6681,12 +6630,12 @@ panel-toplevel.background #tasklist-button image {
 .mate-panel-menu-bar .wnck-pager,
 panel-toplevel.background .wnck-pager {
   color: gray;
-  background-color: rgba(17, 17, 17, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
 }
 
 .mate-panel-menu-bar .wnck-pager:hover,
 panel-toplevel.background .wnck-pager:hover {
-  background-color: rgba(55, 55, 55, 0.25);
+  background-color: rgba(13, 13, 13, 0.15);
 }
 
 .mate-panel-menu-bar .wnck-pager:selected,
@@ -6800,7 +6749,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 }
 
 .xfce4-panel.panel {
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   text-shadow: none;
   -gtk-icon-shadow: none;
   border: none;
@@ -6813,7 +6762,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 }
 
 .xfce4-panel {
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   color: white;
   font-weight: 700;
   text-shadow: none;
@@ -7603,13 +7552,13 @@ menubar.-vala-panel-background > menuitem:disabled {
 }
 
 .menubar.panel .panel.maximized {
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(42, 42, 42, 0.75);
+  background-color: rgba(0, 0, 0, 0.75);
   background-image: none;
   border: none;
 }
@@ -7762,7 +7711,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 .composited-indicator .keyboard {
   background-color: white;
   border-radius: 2px;
-  color: rgba(42, 42, 42, 0.25);
+  color: rgba(0, 0, 0, 0.15);
   padding: 0 3px;
   font-weight: normal;
   box-shadow: none;
@@ -8082,7 +8031,7 @@ UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration
 
 UnityPanelWidget,
 .unity-panel {
-  background-color: rgba(42, 42, 42, 0.95);
+  background-color: rgba(0, 0, 0, 0.95);
   color: white;
   box-shadow: none;
 }
@@ -8393,10 +8342,10 @@ GtkListBox .h4 {
 }
 
 #panel_window {
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   color: white;
   font-weight: bold;
-  box-shadow: inset 0 -1px rgba(24, 24, 24, 0.25);
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
 }
 
 #panel_window menubar {
@@ -9048,30 +8997,21 @@ popover.background.places-menu row {
 
 .budgie-panel {
   transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1);
-  background-color: rgba(42, 42, 42, 0.25);
+  background-color: rgba(0, 0, 0, 0.15);
   color: white;
   font-weight: 500;
   box-shadow: none;
+  border: none;
   background-clip: padding-box;
 }
 
 .budgie-panel.transparent {
-  background-color: rgba(42, 42, 42, 0.65);
+  background-color: rgba(0, 0, 0, 0.1);
   box-shadow: none;
 }
 
-.top .budgie-panel {
-  border-bottom: 1px solid #0e0e0e;
-  background-image: linear-gradient(0deg, #2a2a2a 0%, #333333 100%);
-}
-
-.top .budgie-panel.transparent {
-  background-color: transparent;
-  background-image: linear-gradient(0deg, rgba(42, 42, 42, 0.85) 0%, rgba(51, 51, 51, 0.85) 100%);
-}
-
 .bottom .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
+  border: solid rgba(0, 0, 0, 0.22);
   border-width: 1px 1px 0 1px;
   border-radius: 14px 14px 0 0;
 }
@@ -9082,8 +9022,6 @@ popover.background.places-menu row {
 }
 
 .left .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
-  border-width: 1px 1px 1px 0;
   border-radius: 0 14px 14px 0;
 }
 
@@ -9093,8 +9031,6 @@ popover.background.places-menu row {
 }
 
 .right .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.72);
-  border-width: 1px 0 1px 1px;
   border-radius: 14px 0 0 14px;
 }
 
@@ -9425,24 +9361,24 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .left frame.raven-frame > border {
   border: none;
-  border-right: 1px solid rgba(0, 0, 0, 0.72);
+  border-right: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .right frame.raven-frame > border {
   border: none;
-  border-left: 1px solid rgba(0, 0, 0, 0.72);
+  border-left: 1px solid rgba(0, 0, 0, 0.22);
 }
 
 .top .shadow-block {
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .left .shadow-block {
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .right .shadow-block {
-  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .raven {
@@ -9462,6 +9398,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
+.raven stackswitcher.linked > button {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9489,15 +9429,31 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
 }
 
-.raven .raven-header.top stackswitcher {
-  padding: 6px 0 0 0;
-  margin: 0;
+.raven .raven-header.top > stackswitcher.linked {
+  padding: 2px;
+  margin: 6px 0 0 0;
+  background-color: rgba(222, 222, 222, 0.05);
+  border-radius: 6px;
 }
 
-.raven .raven-header.top stackswitcher button {
+.raven .raven-header.top > stackswitcher.linked > button {
+  border-radius: 6px;
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
+  border: none;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:hover {
+  background-color: rgba(101, 101, 101, 0.35);
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:active, .raven .raven-header.top > stackswitcher.linked > button:checked {
+  background-color: #656565;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:checked {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.05);
 }
 
 .raven .raven-header.top button.image-button:dir(ltr) {
@@ -10096,7 +10052,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color titlebar_gradient_b #373737;
 @define-color budgie_tasklist_indicator_color #0860f2;
 @define-color budgie_tasklist_indicator_color_active #0860f2;
-@define-color budgie_tasklist_indicator_color_active_window rgba(12, 90, 220, 0.655);
+@define-color budgie_tasklist_indicator_color_active_window rgba(7, 90, 226, 0.609);
 @define-color budgie_tasklist_indicator_color_attention #F27835;
 @define-color STRAWBERRY_100 #FF9262;
 @define-color STRAWBERRY_300 #FF793E;
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index f7d8cde..9c68aef 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -1643,6 +1643,11 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
   box-shadow: none;
 }
 
+.titlebar > box.left.horizontal,
+.titlebar > box.right.horizontal {
+  padding: 0 6px;
+}
+
 window.background > box.vertical > headerbar:not(.titlebar) {
   border-radius: 0 0 0 0;
   box-shadow: none;
@@ -4796,187 +4801,21 @@ filechooser paned > separator:dir(rtl),
   margin-right: -1px;
 }
 
-.nautilus-window paned > separator {
-  background-image: none;
-  background-size: 0 0;
-  min-width: 0;
-  min-height: 0;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #d6d6d6;
-}
-
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar list {
+.nautilus-window.background.csd {
+  border-radius: 0 0 16px 16px;
   background-color: transparent;
+  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
 }
 
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar {
-  background-color: transparent;
-}
-
-
-.nautilus-window placessidebar.sidebar {
+.nautilus-window.background.csd > headerbar.titlebar {
   border: none;
-  background-color: transparent;
-  min-width: 200px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+  background: none;
+  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
 }
 
-
-.nautilus-window placessidebar.sidebar row.sidebar-row {
-  color: #363636;
-  background-color: transparent;
-  transition: background-image 0;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled label,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled image,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
-  color: rgba(54, 54, 54, 0.4);
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
-  opacity: 0.85;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
-  transition: background-image 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px.png"), url("assets/sidebar-view-hover-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:active,
-.nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px.png"), url("assets/sidebar-view-active-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
-  color: #242424;
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px.png"), url("assets/sidebar-view-checked-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
-  color: #242424;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
-  color: inherit;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled),
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
-  color: #363636;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
-  background-color: #F08437;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
-  color: #363636;
-}
-
-
-.nautilus-window placessidebar.sidebar separator {
-  background-color: transparent;
-}
-
-
-.nautilus-window.maximized headerbar,
-.nautilus-window.maximized placessidebar {
-  border-radius: 0;
-}
-
-
-.nautilus-window placesview actionbar.background {
-  border-radius: 0 0 14px 0;
-}
-
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser actionbar {
-  color: #363636;
-  background-color: #f0f0f0;
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
-filechooser actionbar label, filechooser actionbar combobox {
-  color: #363636;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#ffffff);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+  margin-left: 120px;
 }
 
 .nautilus-window headerbar .path-bar-box {
@@ -4997,56 +4836,91 @@ filechooser box.vertical > paned > separator:dir(rtl) {
   background-color: transparent;
 }
 
-.nautilus-canvas-item {
-  border-radius: 5px;
+.nautilus-window paned > separator {
+  background-image: none;
+  background-size: 0 0;
+  min-width: 0;
+  min-height: 0;
 }
 
-.caja-desktop, .nemo-desktop.nemo-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-  color: white;
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
-}
-
-.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:active {
-  color: white;
-}
-
-.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
-.nautilus-desktop.nautilus-canvas-item:selected {
-  color: white;
-  text-shadow: none;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-  color: #8d8d8d;
-}
-
-.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
-.nautilus-list-dim-label:selected,
-.nautilus-list-dim-label:selected:focus {
-  color: #cedffc;
-}
-
-.nautilus-window {
-  border-radius: 14px 14px 16px 16px;
-}
-
-.nautilus-window.background.csd {
-  background-color: transparent;
-  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
-}
-
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window placessidebar.sidebar {
   border: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-  background: none;
-  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
+  background-color: transparent;
+  min-width: 200px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
-  margin-left: 128px;
+.nautilus-window placessidebar.sidebar row.sidebar-row {
+  color: #363636;
+  background-color: transparent;
+  transition: background-image 0;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled label, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled image, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
+  color: rgba(54, 54, 54, 0.4);
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
+  opacity: 0.85;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
+  transition: background-image 0;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px.png"), url("assets/sidebar-view-hover-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:active, .nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px.png"), url("assets/sidebar-view-active-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
+  color: #242424;
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px.png"), url("assets/sidebar-view-checked-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
+  color: #242424;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
+  color: inherit;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
+  color: #363636;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
+  background-color: #F08437;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
+  color: #363636;
+}
+
+.nautilus-window placessidebar.sidebar separator {
+  background-color: transparent;
 }
 
 .nautilus-window notebook {
@@ -5098,7 +4972,82 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 }
 
 .nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
-  border-radius: 0 0 0 0;
+  border-radius: 0;
+}
+
+.nautilus-window.maximized headerbar, .nautilus-window.maximized placessidebar {
+  border-radius: 0;
+}
+
+.nautilus-window placesview actionbar.background {
+  border-radius: 0 0 14px 0;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+  background-color: transparent;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #d6d6d6;
+}
+
+filechooser actionbar {
+  color: #363636;
+  background-color: #f0f0f0;
+  border-color: rgba(0, 0, 0, 0.12);
+}
+
+filechooser actionbar label, filechooser actionbar combobox {
+  color: #363636;
+}
+
+filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#ffffff);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+.nautilus-canvas-item {
+  border-radius: 5px;
+}
+
+.caja-desktop, .nemo-desktop.nemo-canvas-item,
+.nautilus-desktop.nautilus-canvas-item {
+  color: white;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
+}
+
+.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:active {
+  color: white;
+}
+
+.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected {
+  color: white;
+  text-shadow: none;
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: #8d8d8d;
+}
+
+.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
+.nautilus-list-dim-label:selected,
+.nautilus-list-dim-label:selected:focus {
+  color: #cedffc;
 }
 
 .nautilus-list-view {
@@ -6681,7 +6630,7 @@ panel-toplevel.background menubar {
 panel-toplevel.background menubar,
 panel-toplevel.background #PanelApplet label,
 panel-toplevel.background #PanelApplet image {
-  color: white;
+  color: #363636;
 }
 
 .mate-panel-menu-bar button label, .mate-panel-menu-bar button image,
@@ -6696,7 +6645,7 @@ panel-toplevel.background #tasklist-button image {
 
 .mate-panel-menu-bar .wnck-pager,
 panel-toplevel.background .wnck-pager {
-  color: gray;
+  color: #1b1b1b;
   background-color: #d8d8d8;
 }
 
@@ -6786,21 +6735,21 @@ panel-toplevel.background na-tray-applet {
 
 .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button),
 panel-toplevel.background button:not(#tasklist-button) {
-  color: white;
+  color: #363636;
   border-radius: 6px;
   border: none;
 }
 
 .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button),
 panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.2);
+  color: #363636;
+  background-color: rgba(54, 54, 54, 0.2);
 }
 
 .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button),
 panel-toplevel.background button:checked:not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
+  color: #363636;
+  background-color: rgba(54, 54, 54, 0.25);
 }
 
 .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label,
@@ -6811,8 +6760,8 @@ panel-toplevel.background button:checked:not(#tasklist-button) image {
 
 .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button),
 panel-toplevel.background button:active:not(#tasklist-button) {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.3);
+  color: #363636;
+  background-color: rgba(54, 54, 54, 0.3);
 }
 
 .xfce4-panel.panel {
@@ -6830,7 +6779,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 
 .xfce4-panel {
   background-color: #f1f1f1;
-  color: white;
+  color: #363636;
   font-weight: 700;
   text-shadow: none;
   -gtk-icon-shadow: none;
@@ -7563,7 +7512,7 @@ button.flat.-panel-icon-button:active,
 button.flat.-panel-icon-button:checked,
 .raven .raven-header:not(.top) button.-panel-icon-button:checked {
   box-shadow: inset 0 -2px #0860f2;
-  color: #f2f2f2;
+  color: #292929;
   background: none;
 }
 
@@ -7577,7 +7526,7 @@ button.flat.-panel-icon-button:checked,
 
 .unpinned button.flat.-panel-icon-button:hover, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:hover, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:hover, .unpinned button.flat.-panel-icon-button:active, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:active, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:active, .unpinned button.flat.-panel-icon-button:checked, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:checked, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:checked {
   box-shadow: inset 0 -2px #0860f2;
-  color: #f2f2f2;
+  color: #292929;
 }
 
 .pinned button.flat.-panel-icon-button.running, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running {
@@ -7594,7 +7543,7 @@ button.flat.-panel-icon-button:checked,
 
 .pinned button.flat.-panel-icon-button.running:hover, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:hover, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:hover, .pinned button.flat.-panel-icon-button.running:active, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:active, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:active, .pinned button.flat.-panel-icon-button.running:checked, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:checked, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:checked {
   box-shadow: inset 0 -2px #0860f2;
-  color: #f2f2f2;
+  color: #292929;
 }
 
 menubar.-vala-panel-appmenu-private,
@@ -7606,27 +7555,27 @@ menubar.-vala-panel-background {
 
 menubar.-vala-panel-appmenu-private > menuitem,
 menubar.-vala-panel-background > menuitem {
-  color: white;
+  color: #363636;
   font-weight: normal;
 }
 
 menubar.-vala-panel-appmenu-private > menuitem:hover,
 menubar.-vala-panel-background > menuitem:hover {
-  color: white;
-  background-color: rgba(255, 255, 255, 0.2);
+  color: #363636;
+  background-color: rgba(54, 54, 54, 0.2);
 }
 
 menubar.-vala-panel-appmenu-private > menuitem:disabled,
 menubar.-vala-panel-background > menuitem:disabled {
-  color: rgba(255, 255, 255, 0.4);
+  color: rgba(54, 54, 54, 0.4);
 }
 
 .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark {
   background-color: transparent;
   background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.22);
   transition: all 100ms ease-in-out;
-  color: white;
+  color: #363636;
 }
 
 .menubar.panel .panel.maximized {
@@ -7771,7 +7720,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 .composited-indicator > revealer label,
 .composited-indicator > revealer image,
 .composited-indicator > revealer spinner {
-  color: white;
+  color: #363636;
   font-weight: normal;
   transition: all 200ms ease-in-out;
   text-shadow: none;
@@ -7788,7 +7737,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 }
 
 .composited-indicator .keyboard {
-  background-color: white;
+  background-color: #363636;
   border-radius: 2px;
   color: #f1f1f1;
   padding: 0 3px;
@@ -8114,13 +8063,13 @@ UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration
 UnityPanelWidget,
 .unity-panel {
   background-color: rgba(241, 241, 241, 0.95);
-  color: white;
+  color: dimgray;
   box-shadow: none;
 }
 
 UnityPanelWidget:backdrop,
 .unity-panel:backdrop {
-  color: white;
+  color: #393939;
 }
 
 .unity-panel.menubar.menuitem:hover,
@@ -8425,7 +8374,7 @@ GtkListBox .h4 {
 
 #panel_window {
   background-color: #f1f1f1;
-  color: white;
+  color: #363636;
   font-weight: bold;
   box-shadow: inset 0 -1px #dfdfdf;
 }
@@ -8436,12 +8385,12 @@ GtkListBox .h4 {
 
 #panel_window menubar, #panel_window menubar > menuitem {
   background-color: transparent;
-  color: white;
+  color: #363636;
   font-weight: bold;
 }
 
 #panel_window menubar menuitem:disabled {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(54, 54, 54, 0.5);
 }
 
 #panel_window menubar menuitem:disabled label {
@@ -9087,29 +9036,20 @@ popover.background.places-menu row {
 .budgie-panel {
   transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1);
   background-color: #f1f1f1;
-  color: white;
+  color: #363636;
   font-weight: 500;
   box-shadow: none;
+  border: none;
   background-clip: padding-box;
 }
 
 .budgie-panel.transparent {
-  background-color: rgba(241, 241, 241, 0.65);
+  background-color: rgba(241, 241, 241, 0.1);
   box-shadow: none;
 }
 
-.top .budgie-panel {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(0deg, #e2e2e2 0%, #f5f5f5 100%);
-}
-
-.top .budgie-panel.transparent {
-  background-color: transparent;
-  background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.85) 0%, rgba(245, 245, 245, 0.85) 100%);
-}
-
 .bottom .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
+  border: solid rgba(255, 255, 255, 0.22);
   border-width: 1px 1px 0 1px;
   border-radius: 14px 14px 0 0;
 }
@@ -9120,8 +9060,6 @@ popover.background.places-menu row {
 }
 
 .left .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
-  border-width: 1px 1px 1px 0;
   border-radius: 0 14px 14px 0;
 }
 
@@ -9131,8 +9069,6 @@ popover.background.places-menu row {
 }
 
 .right .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
-  border-width: 1px 0 1px 1px;
   border-radius: 14px 0 0 14px;
 }
 
@@ -9150,25 +9086,25 @@ popover.background.places-menu row {
   border-bottom-width: 0;
   border: none;
   box-shadow: none;
-  color: rgba(255, 255, 255, 0.85);
+  color: rgba(54, 54, 54, 0.85);
   background: none;
 }
 
 .budgie-panel button:hover {
-  background-color: rgba(255, 255, 255, 0.1);
-  color: rgba(255, 255, 255, 0.95);
+  background-color: rgba(54, 54, 54, 0.1);
+  color: rgba(54, 54, 54, 0.95);
   background-image: none;
 }
 
 .budgie-panel button:active {
-  background-color: rgba(255, 255, 255, 0.15);
-  color: white;
+  background-color: rgba(54, 54, 54, 0.15);
+  color: #363636;
   background-image: none;
 }
 
 .budgie-panel button:checked {
-  background-color: rgba(255, 255, 255, 0.12);
-  color: white;
+  background-color: rgba(54, 54, 54, 0.12);
+  color: #363636;
 }
 
 .budgie-panel.horizontal button {
@@ -9186,7 +9122,7 @@ popover.background.places-menu row {
 .budgie-panel menubar,
 .budgie-panel .menubar {
   box-shadow: none;
-  color: white;
+  color: #363636;
   background-image: none;
   background-color: transparent;
 }
@@ -9212,12 +9148,12 @@ popover.background.places-menu row {
 
 .budgie-panel menubar > menuitem:disabled,
 .budgie-panel .menubar > menuitem:disabled {
-  color: rgba(255, 255, 255, 0.4);
+  color: rgba(54, 54, 54, 0.4);
 }
 
 .budgie-panel menubar > menuitem.budgie-menubar:hover,
 .budgie-panel .menubar > menuitem.budgie-menubar:hover {
-  background-color: rgba(255, 255, 255, 0.1);
+  background-color: rgba(54, 54, 54, 0.1);
 }
 
 .budgie-panel menubar.-vala-panel-appmenu-private > menuitem {
@@ -9463,24 +9399,24 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .left frame.raven-frame > border {
   border: none;
-  border-right: 1px solid rgba(0, 0, 0, 0.2);
+  border-right: 1px solid rgba(255, 255, 255, 0.22);
 }
 
 .right frame.raven-frame > border {
   border: none;
-  border-left: 1px solid rgba(0, 0, 0, 0.2);
+  border-left: 1px solid rgba(255, 255, 255, 0.22);
 }
 
 .top .shadow-block {
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .left .shadow-block {
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .right .shadow-block {
-  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .raven {
@@ -9500,6 +9436,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
+.raven stackswitcher.linked > button {
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9527,15 +9467,31 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.raven .raven-header.top stackswitcher {
-  padding: 6px 0 0 0;
-  margin: 0;
+.raven .raven-header.top > stackswitcher.linked {
+  padding: 2px;
+  margin: 6px 0 0 0;
+  background-color: rgba(36, 36, 36, 0.05);
+  border-radius: 6px;
 }
 
-.raven .raven-header.top stackswitcher button {
+.raven .raven-header.top > stackswitcher.linked > button {
+  border-radius: 6px;
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
+  border: none;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:hover {
+  background-color: rgba(255, 255, 255, 0.35);
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:active, .raven .raven-header.top > stackswitcher.linked > button:checked {
+  background-color: white;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:checked {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.05);
 }
 
 .raven .raven-header.top button.image-button:dir(ltr) {
@@ -10062,7 +10018,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 }
 
 .budgie-panel box.titlebar > widget > label {
-  color: rgba(255, 255, 255, 0.75);
+  color: rgba(54, 54, 54, 0.75);
 }
 
 .budgie-panel box.titlebar > button.image-button.titlebutton {
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 0002490..5310507 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -1643,6 +1643,11 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
   box-shadow: none;
 }
 
+.titlebar > box.left.horizontal,
+.titlebar > box.right.horizontal {
+  padding: 0 6px;
+}
+
 window.background > box.vertical > headerbar:not(.titlebar) {
   border-radius: 0 0 0 0;
   box-shadow: none;
@@ -4796,187 +4801,21 @@ filechooser paned > separator:dir(rtl),
   margin-right: -1px;
 }
 
-.nautilus-window paned > separator {
-  background-image: none;
-  background-size: 0 0;
-  min-width: 0;
-  min-height: 0;
-}
-
-filechooser placessidebar.sidebar.frame {
-  border-right: 1px solid #d6d6d6;
-}
-
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar list {
+.nautilus-window.background.csd {
+  border-radius: 0 0 16px 16px;
   background-color: transparent;
+  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-
-.nautilus-window.csd.background,
-.nautilus-window placessidebar {
-  background-color: transparent;
-}
-
-
-.nautilus-window placessidebar.sidebar {
+.nautilus-window.background.csd > headerbar.titlebar {
   border: none;
-  background-color: transparent;
-  min-width: 200px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+  background: none;
+  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-
-.nautilus-window placessidebar.sidebar row.sidebar-row {
-  color: #363636;
-  background-color: transparent;
-  transition: background-image 0;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled label,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:disabled image,
-.nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image,
-label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
-  color: rgba(54, 54, 54, 0.4);
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
-  opacity: 0.85;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
-  transition: background-image 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px.png"), url("assets/sidebar-view-hover-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:active,
-.nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-color: transparent;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px.png"), url("assets/sidebar-view-active-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
-  color: #242424;
-  transition: background-image ease-out 200ms;
-  background-repeat: no-repeat;
-  background-position: left center;
-  background-size: 200px 28px;
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px.png"), url("assets/sidebar-view-checked-200px@2.png"));
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover,
-.nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
-  color: #242424;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
-  color: #0860f2;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
-  color: inherit;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled),
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
-  color: #363636;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
-  background-color: #F08437;
-}
-
-
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label,
-.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
-  color: #363636;
-}
-
-
-.nautilus-window placessidebar.sidebar separator {
-  background-color: transparent;
-}
-
-
-.nautilus-window.maximized headerbar,
-.nautilus-window.maximized placessidebar {
-  border-radius: 0;
-}
-
-
-.nautilus-window placesview actionbar.background {
-  border-radius: 0 0 14px 0;
-}
-
-filechooser placessidebar.sidebar {
-  border: none;
-  background-color: transparent;
-}
-
-filechooser actionbar {
-  color: #363636;
-  background-color: rgba(240, 240, 240, 0.94);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
-filechooser actionbar label, filechooser actionbar combobox {
-  color: #363636;
-}
-
-filechooser box.vertical > paned > separator {
-  border: none;
-  background-color: transparent;
-  background-image: image(#ffffff);
-  background-size: 8px 8px;
-  background-position: left bottom;
-}
-
-filechooser box.vertical > paned > separator:dir(ltr) {
-  margin-left: -1px;
-}
-
-filechooser box.vertical > paned > separator:dir(rtl) {
-  margin-right: -1px;
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+  margin-left: 120px;
 }
 
 .nautilus-window headerbar .path-bar-box {
@@ -4997,56 +4836,91 @@ filechooser box.vertical > paned > separator:dir(rtl) {
   background-color: transparent;
 }
 
-.nautilus-canvas-item {
-  border-radius: 5px;
+.nautilus-window paned > separator {
+  background-image: none;
+  background-size: 0 0;
+  min-width: 0;
+  min-height: 0;
 }
 
-.caja-desktop, .nemo-desktop.nemo-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-  color: white;
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
-}
-
-.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:active {
-  color: white;
-}
-
-.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
-.nautilus-desktop.nautilus-canvas-item:selected {
-  color: white;
-  text-shadow: none;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-  color: #8d8d8d;
-}
-
-.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
-.nautilus-list-dim-label:selected,
-.nautilus-list-dim-label:selected:focus {
-  color: #cedffc;
-}
-
-.nautilus-window {
-  border-radius: 14px 14px 16px 16px;
-}
-
-.nautilus-window.background.csd {
-  background-color: transparent;
-  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
-}
-
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window placessidebar.sidebar {
   border: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-  background: none;
-  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
+  background-color: transparent;
+  min-width: 200px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
-  margin-left: 128px;
+.nautilus-window placessidebar.sidebar row.sidebar-row {
+  color: #363636;
+  background-color: transparent;
+  transition: background-image 0;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup label, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup image, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled label, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row label, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row label, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled image, .nautilus-window placessidebar.sidebar label:disabled selection.sidebar-row image, label:disabled .nautilus-window placessidebar.sidebar selection.sidebar-row image {
+  color: rgba(54, 54, 54, 0.4);
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:backdrop {
+  opacity: 0.85;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:hover {
+  transition: background-image 0;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-hover-200px.png"), url("assets/sidebar-view-hover-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:active, .nautilus-window placessidebar.sidebar row.sidebar-row:active:hover {
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-image: -gtk-scaled(url("assets/sidebar-view-active-200px.png"), url("assets/sidebar-view-active-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover {
+  color: #242424;
+  transition: background-image ease-out 200ms;
+  background-repeat: no-repeat;
+  background-position: left center;
+  background-size: 200px 28px;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/sidebar-view-checked-200px.png"), url("assets/sidebar-view-checked-200px@2.png"));
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover label {
+  color: #242424;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row {
+  color: #0860f2;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon {
+  color: inherit;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) .sidebar-icon {
+  color: #363636;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
+  background-color: #F08437;
+}
+
+.nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon {
+  color: #363636;
+}
+
+.nautilus-window placessidebar.sidebar separator {
+  background-color: transparent;
 }
 
 .nautilus-window notebook {
@@ -5098,7 +4972,82 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 }
 
 .nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
-  border-radius: 0 0 0 0;
+  border-radius: 0;
+}
+
+.nautilus-window.maximized headerbar, .nautilus-window.maximized placessidebar {
+  border-radius: 0;
+}
+
+.nautilus-window placesview actionbar.background {
+  border-radius: 0 0 14px 0;
+}
+
+filechooser placessidebar.sidebar {
+  border: none;
+  background-color: transparent;
+}
+
+filechooser placessidebar.sidebar.frame {
+  border-right: 1px solid #d6d6d6;
+}
+
+filechooser actionbar {
+  color: #363636;
+  background-color: rgba(240, 240, 240, 0.94);
+  border-color: rgba(0, 0, 0, 0.12);
+}
+
+filechooser actionbar label, filechooser actionbar combobox {
+  color: #363636;
+}
+
+filechooser box.vertical > paned > separator {
+  border: none;
+  background-color: transparent;
+  background-image: image(#ffffff);
+  background-size: 8px 8px;
+  background-position: left bottom;
+}
+
+filechooser box.vertical > paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser box.vertical > paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
+.nautilus-canvas-item {
+  border-radius: 5px;
+}
+
+.caja-desktop, .nemo-desktop.nemo-canvas-item,
+.nautilus-desktop.nautilus-canvas-item {
+  color: white;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.6);
+}
+
+.caja-desktop:active, .nemo-desktop.nemo-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:active {
+  color: white;
+}
+
+.caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected {
+  color: white;
+  text-shadow: none;
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: #8d8d8d;
+}
+
+.nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.dim-label:selected:focus,
+.nautilus-list-dim-label:selected,
+.nautilus-list-dim-label:selected:focus {
+  color: #cedffc;
 }
 
 .nautilus-list-view {
@@ -6672,7 +6621,7 @@ MsdOsdWindow.background.osd .trough {
 .mate-panel-menu-bar, .mate-panel-menu-bar menubar,
 panel-toplevel.background,
 panel-toplevel.background menubar {
-  background-color: #f1f1f1;
+  background-color: white;
 }
 
 .mate-panel-menu-bar menubar,
@@ -6697,12 +6646,12 @@ panel-toplevel.background #tasklist-button image {
 .mate-panel-menu-bar .wnck-pager,
 panel-toplevel.background .wnck-pager {
   color: gray;
-  background-color: rgba(216, 216, 216, 0.25);
+  background-color: rgba(230, 230, 230, 0.15);
 }
 
 .mate-panel-menu-bar .wnck-pager:hover,
 panel-toplevel.background .wnck-pager:hover {
-  background-color: rgba(254, 254, 254, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
 }
 
 .mate-panel-menu-bar .wnck-pager:selected,
@@ -6816,7 +6765,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 }
 
 .xfce4-panel.panel {
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   text-shadow: none;
   -gtk-icon-shadow: none;
   border: none;
@@ -6829,7 +6778,7 @@ panel-toplevel.background button:active:not(#tasklist-button) {
 }
 
 .xfce4-panel {
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   color: white;
   font-weight: 700;
   text-shadow: none;
@@ -7624,19 +7573,19 @@ menubar.-vala-panel-background > menuitem:disabled {
 .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark {
   background-color: transparent;
   background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.22);
   transition: all 100ms ease-in-out;
   color: white;
 }
 
 .menubar.panel .panel.maximized {
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(241, 241, 241, 0.75);
+  background-color: rgba(255, 255, 255, 0.75);
   background-image: none;
   border: none;
 }
@@ -7790,7 +7739,7 @@ menubar.-vala-panel-background > menuitem:disabled {
 .composited-indicator .keyboard {
   background-color: white;
   border-radius: 2px;
-  color: rgba(241, 241, 241, 0.25);
+  color: rgba(255, 255, 255, 0.15);
   padding: 0 3px;
   font-weight: normal;
   box-shadow: none;
@@ -8113,7 +8062,7 @@ UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration
 
 UnityPanelWidget,
 .unity-panel {
-  background-color: rgba(241, 241, 241, 0.95);
+  background-color: rgba(255, 255, 255, 0.95);
   color: white;
   box-shadow: none;
 }
@@ -8424,10 +8373,10 @@ GtkListBox .h4 {
 }
 
 #panel_window {
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   color: white;
   font-weight: bold;
-  box-shadow: inset 0 -1px rgba(223, 223, 223, 0.25);
+  box-shadow: inset 0 -1px rgba(237, 237, 237, 0.15);
 }
 
 #panel_window menubar {
@@ -9086,30 +9035,21 @@ popover.background.places-menu row {
 
 .budgie-panel {
   transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1);
-  background-color: rgba(241, 241, 241, 0.25);
+  background-color: rgba(255, 255, 255, 0.15);
   color: white;
   font-weight: 500;
   box-shadow: none;
+  border: none;
   background-clip: padding-box;
 }
 
 .budgie-panel.transparent {
-  background-color: rgba(241, 241, 241, 0.65);
+  background-color: rgba(255, 255, 255, 0.1);
   box-shadow: none;
 }
 
-.top .budgie-panel {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(0deg, #e2e2e2 0%, #f5f5f5 100%);
-}
-
-.top .budgie-panel.transparent {
-  background-color: transparent;
-  background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.85) 0%, rgba(245, 245, 245, 0.85) 100%);
-}
-
 .bottom .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
+  border: solid rgba(255, 255, 255, 0.22);
   border-width: 1px 1px 0 1px;
   border-radius: 14px 14px 0 0;
 }
@@ -9120,8 +9060,6 @@ popover.background.places-menu row {
 }
 
 .left .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
-  border-width: 1px 1px 1px 0;
   border-radius: 0 14px 14px 0;
 }
 
@@ -9131,8 +9069,6 @@ popover.background.places-menu row {
 }
 
 .right .budgie-panel {
-  border: solid rgba(0, 0, 0, 0.2);
-  border-width: 1px 0 1px 1px;
   border-radius: 14px 0 0 14px;
 }
 
@@ -9463,24 +9399,24 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
 
 .left frame.raven-frame > border {
   border: none;
-  border-right: 1px solid rgba(0, 0, 0, 0.2);
+  border-right: 1px solid rgba(255, 255, 255, 0.22);
 }
 
 .right frame.raven-frame > border {
   border: none;
-  border-left: 1px solid rgba(0, 0, 0, 0.2);
+  border-left: 1px solid rgba(255, 255, 255, 0.22);
 }
 
 .top .shadow-block {
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .left .shadow-block {
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .right .shadow-block {
-  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.23) 10%, rgba(0, 0, 0, 0.08) 60%, transparent);
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent);
 }
 
 .raven {
@@ -9500,6 +9436,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
+.raven stackswitcher.linked > button {
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9527,15 +9467,31 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-.raven .raven-header.top stackswitcher {
-  padding: 6px 0 0 0;
-  margin: 0;
+.raven .raven-header.top > stackswitcher.linked {
+  padding: 2px;
+  margin: 6px 0 0 0;
+  background-color: rgba(36, 36, 36, 0.05);
+  border-radius: 6px;
 }
 
-.raven .raven-header.top stackswitcher button {
+.raven .raven-header.top > stackswitcher.linked > button {
+  border-radius: 6px;
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
+  border: none;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:hover {
+  background-color: rgba(255, 255, 255, 0.35);
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:active, .raven .raven-header.top > stackswitcher.linked > button:checked {
+  background-color: white;
+}
+
+.raven .raven-header.top > stackswitcher.linked > button:checked {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.05);
 }
 
 .raven .raven-header.top button.image-button:dir(ltr) {
@@ -10133,7 +10089,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color titlebar_gradient_b #ffffff;
 @define-color budgie_tasklist_indicator_color #0860f2;
 @define-color budgie_tasklist_indicator_color_active #0860f2;
-@define-color budgie_tasklist_indicator_color_active_window rgba(33, 112, 242, 0.655);
+@define-color budgie_tasklist_indicator_color_active_window rgba(24, 106, 243, 0.609);
 @define-color budgie_tasklist_indicator_color_attention #F27835;
 @define-color STRAWBERRY_100 #FF9262;
 @define-color STRAWBERRY_300 #FF793E;
diff --git a/src/other/firefox/chrome/WhiteSur/icons/view-fullscreen-symbolic.svg b/src/other/firefox/chrome/WhiteSur/icons/view-fullscreen-symbolic.svg
index 72cddce..5e255ec 100644
--- a/src/other/firefox/chrome/WhiteSur/icons/view-fullscreen-symbolic.svg
+++ b/src/other/firefox/chrome/WhiteSur/icons/view-fullscreen-symbolic.svg
@@ -1,4 +1,3 @@
 <svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m8 1v1h5.293l-3.293 3.293v0.70703h0.70703l3.293-3.293v5.293h1v-6-1h-0.70703-0.29297-6zm-7 7v6 1h0.70703 0.29297 6v-1h-5.293l3.293-3.293v-0.70703h-0.70703l-3.293 3.293v-5.293h-1z" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8708"/>
- <circle cx="8" cy="8" r="1" fill="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m3 1c-1.108 0-2 0.892-2 2v3h1v-3c0-0.554 0.446-1 1-1h3v-1h-3zm7 0v1h3c0.554 0 1 0.446 1 1v3h1v-3c0-1.108-0.892-2-2-2h-3zm-9 9v3c0 1.108 0.892 2 2 2h3v-1h-3c-0.554 0-1-0.446-1-1v-3h-1zm13 0v3c0 0.554-0.446 1-1 1h-3v1h3c1.108 0 2-0.892 2-2v-3h-1z" fill="#333" stroke-linecap="square" stroke-width="2"/>
 </svg>
diff --git a/src/other/firefox/chrome/WhiteSur/parts/icons.css b/src/other/firefox/chrome/WhiteSur/parts/icons.css
index 40bd1df..1ccd71d 100644
--- a/src/other/firefox/chrome/WhiteSur/parts/icons.css
+++ b/src/other/firefox/chrome/WhiteSur/parts/icons.css
@@ -408,6 +408,9 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	#tracking-protection-icon,
 	#identity-icon,
 	#pageActionButton,
+	#permissions-granted-icon,
+	#tracking-protection-icon-animatable-image,
+	#reader-mode-button,
 	#star-button:not([starred]),
 	#plugins-notification-icon:not(.plugin-blocked) > .plugin-icon,
 	.bookmark-item[container] .toolbarbutton-icon {
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 88ce0da..8ab9ab7 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -118,13 +118,18 @@ $menu_bd:                           if($variant == 'light', rgba(black, 0.05), r
 $panel_bg:                          if($variant == 'light', #f1f1f1, #2a2a2a);
 
 @if $trans == 'true' {
-  $panel_bg:                        if($variant == 'light', rgba(#f1f1f1, 0.25), rgba(#2a2a2a, 0.25));
+  $panel_bg:                        if($variant == 'light', rgba(white, 0.15), rgba(black, 0.15));
+}
+
+$panel_fg:                          $text_color;
+
+@if $trans == 'true' {
+  $panel_fg:                        white;
 }
 
-$panel_fg:                          white;
 $panel_top_color:                   if($variant == 'dark', #333333, #f5f5f5);
 $panel_bottom_color:                if($variant == 'dark', #2a2a2a, #e2e2e2);
-$panel_border_color:                if($variant =='light', rgba(black, 0.2), rgba(black, 0.72));
+$panel_border_color:                if($variant =='light', rgba(white, 0.22), rgba(black, 0.22));
 
 // Entry colors
 $entry_bg:                          if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 433099d..668cb64 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -84,22 +84,47 @@ filechooser,
 }
 
 .nautilus-window {
+  &.background.csd {
+    border-radius: 0 0 $nautilus_radius $nautilus_radius;
+    background-color: transparent;
+    background-image: $nautilus_image;
+
+    > headerbar.titlebar {
+      border: none;
+      box-shadow: inset 0 1px rgba(white, 0.1);
+      background: none;
+      background-image: $nautilus_image;
+
+      > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
+    }
+  }
+
+  headerbar {
+    .path-bar-box {
+      color: transparent;
+      background: none;
+      padding: 0 12px;
+
+      .linked.nautilus-path-bar { // for ≥ 3.31.90
+        > button:not(:only-child):last-child {
+          @include button(header-checked);
+        }
+      }
+
+      // workaround for 3.30.1
+      &.background.frame {
+        border: none;
+        background-color: transparent;
+      }
+    }
+  }
+
   paned > separator {
     background-image: none;
     background-size: 0 0;
-      min-width: 0;
-      min-height: 0;
+    min-width: 0;
+    min-height: 0;
   }
-}
-
-
-filechooser placessidebar.sidebar.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
-
-// transparent sidebars
-%placessidebar,
-.nautilus-window {
-  &.csd.background, placessidebar list { background-color: transparent; }
-  &.csd.background, placessidebar { background-color: transparent; }
 
   placessidebar.sidebar {
     border: none;
@@ -173,105 +198,6 @@ filechooser placessidebar.sidebar.frame { border-right: 1px solid if($variant=='
     separator { background-color: transparent; }
   }
 
-  &.maximized headerbar,
-  &.maximized placessidebar { border-radius: 0; }
-
-  placesview {
-    actionbar.background { border-radius: 0 0 $wm_radius 0; }
-  }
-}
-
-filechooser {
-  placessidebar.sidebar {
-    border: none;
-    background-color: transparent;
-  }
-
-  actionbar {
-    color: $dark_sidebar_fg;
-    background-color: $dark_sidebar_bg;
-    border-color: $borders_color;
-
-    label, combobox { color: $dark_sidebar_fg; }
-  }
-
-  box.vertical > paned > separator { // Use paned separator to hide stack border-bottom-left-radius
-    border: none;
-    background-color: transparent;
-    background-image: image($base_color);
-    background-size: 8px 8px;
-    background-position: left bottom;
-
-    &:dir(ltr) { margin-left: -1px; }
-    &:dir(rtl) { margin-right: -1px; }
-  }
-}
-
-.nautilus-window headerbar {
-  .path-bar-box {
-    color: transparent;
-    background: none;
-    padding: 0 12px;
-
-    .linked.nautilus-path-bar { // for ≥ 3.31.90
-      > button:not(:only-child):last-child {
-        @include button(header-checked);
-      }
-    }
-
-    // workaround for 3.30.1
-    &.background.frame {
-      border: none;
-      background-color: transparent;
-    }
-  }
-}
-
-.nautilus-canvas-item { border-radius: 5px; }
-
-// .view.nautilus-desktop,
-%nautilus-desktop-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-  color: white;
-  text-shadow: 1px 1px transparentize(black, 0.4);
-
-  &:active {
-    color: white;
-  }
-
-  &:selected {
-    color: $selected_fg_color;
-    text-shadow: none;
-  }
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-  color: mix($fg_color, $bg_color, 50%);
-
-  &:selected,
-  &:selected:focus {
-    color: mix($selected_fg_color, $selected_bg_color, 80%);
-  }
-}
-
-.nautilus-window {
-  border-radius: $wm_radius $wm_radius $nautilus_radius $nautilus_radius;
-
-  &.background.csd {
-    background-color: transparent;
-    background-image: $nautilus_image;
-
-    > headerbar.titlebar {
-      border: none;
-      box-shadow: inset 0 1px rgba(white, 0.1);
-      background: none;
-      background-image: $nautilus_image;
-
-      > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 72px; }
-    }
-  }
-
   notebook {
     margin-left: -1px;
     margin-right: -1px;
@@ -323,11 +249,68 @@ filechooser {
 
   // Reset maximized nautilus-window border-radius
   &.maximized {
-    notebook {
-      &, > stack {
-        border-radius: 0 0 0 0;
-      }
-    }
+    notebook { &, > stack { border-radius: 0; } }
+    headerbar, placessidebar { border-radius: 0; }
+  }
+
+  placesview {
+    actionbar.background { border-radius: 0 0 $wm_radius 0; }
+  }
+}
+
+filechooser {
+  placessidebar.sidebar {
+    border: none;
+    background-color: transparent;
+
+    &.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
+  }
+
+  actionbar {
+    color: $dark_sidebar_fg;
+    background-color: $dark_sidebar_bg;
+    border-color: $borders_color;
+
+    label, combobox { color: $dark_sidebar_fg; }
+  }
+
+  box.vertical > paned > separator { // Use paned separator to hide stack border-bottom-left-radius
+    border: none;
+    background-color: transparent;
+    background-image: image($base_color);
+    background-size: 8px 8px;
+    background-position: left bottom;
+
+    &:dir(ltr) { margin-left: -1px; }
+    &:dir(rtl) { margin-right: -1px; }
+  }
+}
+
+.nautilus-canvas-item { border-radius: 5px; }
+
+// .view.nautilus-desktop,
+%nautilus-desktop-canvas-item,
+.nautilus-desktop.nautilus-canvas-item {
+  color: white;
+  text-shadow: 1px 1px transparentize(black, 0.4);
+
+  &:active {
+    color: white;
+  }
+
+  &:selected {
+    color: $selected_fg_color;
+    text-shadow: none;
+  }
+}
+
+.nautilus-canvas-item.dim-label,
+.nautilus-list-dim-label {
+  color: mix($fg_color, $bg_color, 50%);
+
+  &:selected,
+  &:selected:focus {
+    color: mix($selected_fg_color, $selected_bg_color, 80%);
   }
 }
 
diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss
index 7737227..26b6c3d 100644
--- a/src/sass/gtk/_budgie.scss
+++ b/src/sass/gtk/_budgie.scss
@@ -379,23 +379,14 @@ popover.background.places-menu {
   color: $panel_fg;
   font-weight: 500;
   box-shadow: none;
+  border: none;
   background-clip: padding-box;
 
   &.transparent {
-    background-color: rgba($panel_bg, 0.65);
+    background-color: rgba($panel_bg, 0.1);
     box-shadow: none;
   }
 
-  .top & {
-    border-bottom: 1px solid if($variant == 'light', $panel_border_color, $header_border);
-    background-image: linear-gradient(0deg, $panel_bottom_color 0%, $panel_top_color 100%);
-  }
-
-  .top &.transparent {
-    background-color: transparent;
-    background-image: linear-gradient(0deg, rgba($panel_bottom_color, 0.85) 0%, rgba($panel_top_color, 0.85) 100%);
-  }
-
   .bottom & {
     border: solid $panel_border_color;
     border-width: 1px 1px 0 1px;
@@ -408,8 +399,6 @@ popover.background.places-menu {
   }
 
   .left & {
-    border: solid $panel_border_color;
-    border-width: 1px 1px 1px 0;
     border-radius: 0 $wm_radius $wm_radius 0;
 
     &.dock-mode {
@@ -419,8 +408,6 @@ popover.background.places-menu {
   }
 
   .right & {
-    border: solid $panel_border_color;
-    border-width: 1px 0 1px 1px;
     border-radius: $wm_radius 0 0 $wm_radius;
 
     &.dock-mode {
@@ -616,7 +603,6 @@ popover.background.places-menu {
                           (left, 3px 6px),
                           (right, 3px 6px) {
   .#{$position} .budgie-panel {
-
     .unpinned button.flat.launcher,
     .pinned button.flat.launcher.running,
     .pinned button.launcher.running.sidebar-button {
@@ -660,7 +646,7 @@ $pos_list: ((top, bottom), (left, right), (right, left));
 
   // Shadows
    .#{$pos} .shadow-block {
-     background-image: linear-gradient(to $b_pos, rgba(black, 0.35) 0%, rgba(black, 0.23) 10%, rgba(black, 0.08) 60%, transparent);
+     background-image: linear-gradient(to $b_pos, rgba(black, 0.35) 0%, rgba(black, 0.15) 15%, rgba(black, 0.03) 60%, transparent);
    }
 }
 
@@ -716,14 +702,29 @@ $raven_opacity: if($variant =='light', 0.85, 0.95);
       color: $raven_fg_color;
       border-bottom: 1px solid $borders_color;
 
-      stackswitcher {
-        padding: 6px 0 0 0;
-        margin: 0;
+      > stackswitcher.linked {
+        padding: 2px;
+        margin: 6px 0 0 0;
+        background-color: rgba($fg_color, 0.05);
+        border-radius: $bt_radius;
 
-        button {
+        > button {
+          border-radius: $bt_radius;
           margin: 0;
           padding: 0 20px;
           min-height: 20px;
+
+          &:hover {
+            background-color: rgba($button_bg, 0.35);
+          }
+
+          &:active, &:checked {
+            background-color: $button_bg;
+          }
+
+          &:checked {
+            box-shadow: 0 1px 2px rgba(black, 0.08), 0 2px 3px rgba(black, 0.05);
+          }
         }
       }
 
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index 6df5f0c..fe0ef06 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -1195,8 +1195,7 @@ actionbar {
 // Headerbars
 //
 
-headerbar,
-%titlebar {
+headerbar {
   min-height: 40px;
   padding: 0 16px;
   color: $header_fg;
@@ -1477,6 +1476,11 @@ headerbar,
     .maximized &,
     .fullscreen & { box-shadow: none; }
   }
+
+  > box.left.horizontal,
+  > box.right.horizontal {
+    padding: 0 6px;
+  }
 }
 
 window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar style for not CSD window
@@ -1514,8 +1518,6 @@ window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar
     min-width: 1px;
     @extend %side_separator;
   }
-
-  // @extend %titlebar;
 }
 
 headerbar, .titlebar {