diff --git a/src/assets/gtk-3.0/common-assets/assets.svg b/src/assets/gtk-3.0/common-assets/assets.svg
index 808c1ee..c673f73 100644
--- a/src/assets/gtk-3.0/common-assets/assets.svg
+++ b/src/assets/gtk-3.0/common-assets/assets.svg
@@ -9,7 +9,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    sodipodi:docname="assets.svg"
    id="svg1220"
    version="1.1"
@@ -36,14 +36,14 @@
      showguides="true"
      inkscape:current-layer="layer2"
      inkscape:window-maximized="1"
-     inkscape:window-y="28"
+     inkscape:window-y="44"
      inkscape:window-x="0"
-     inkscape:cy="146.26942"
-     inkscape:cx="368.52077"
-     inkscape:zoom="9.7474048"
+     inkscape:cy="229.71615"
+     inkscape:cx="563.59541"
+     inkscape:zoom="0.6092128"
      showgrid="false"
      id="namedview1222"
-     inkscape:window-height="1020"
+     inkscape:window-height="1004"
      inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
@@ -3966,21 +3966,21 @@
     </g>
     <rect
        ry="0"
-       rx="1"
+       rx="2"
        y="120"
        x="345"
-       height="64"
-       width="2"
+       height="100"
+       width="4"
        id="paned-separator"
-       style="opacity:0.15;fill:#000000;stroke-width:1.07872" />
+       style="opacity:0.15;fill:#000000;stroke-width:1.90692" />
     <rect
-       style="opacity:0.15;fill:#ffffff;stroke-width:1.07872"
+       style="opacity:0.15;fill:#ffffff;stroke-width:1.90693"
        id="paned-separator-dark"
-       width="2"
-       height="64"
+       width="4"
+       height="100"
        x="400"
        y="120"
-       rx="1"
+       rx="2"
        ry="0" />
   </g>
 </svg>
diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png b/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png
index bbf3b44..5fc94f4 100644
Binary files a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png and b/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png differ
diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png
index 76f27a5..c835d3b 100644
Binary files a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png differ
diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator.png b/src/assets/gtk-3.0/common-assets/assets/paned-separator.png
index 16e3957..fccc844 100644
Binary files a/src/assets/gtk-3.0/common-assets/assets/paned-separator.png and b/src/assets/gtk-3.0/common-assets/assets/paned-separator.png differ
diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png b/src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png
index a581ce2..f1a8b8e 100644
Binary files a/src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png and b/src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png differ
diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css
index 7aea2c3..a5d4f53 100644
--- a/src/main/cinnamon/cinnamon-dark.css
+++ b/src/main/cinnamon/cinnamon-dark.css
@@ -280,7 +280,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #Tooltip {
   border-radius: 3px;
   padding: 5px 12px;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   color: #dadada;
   font-size: 1em;
   font-weight: normal;
@@ -589,8 +589,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-caption {
-  background-color: #2a2a2a;
-  border: 1px solid #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
+  border: 1px solid rgba(42, 42, 42, 0.9);
   color: #dadada;
   spacing: 25px;
   border-radius: 2px;
@@ -949,7 +949,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .switcher-list {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border: 1px solid rgba(255, 255, 255, 0.12);
   border-radius: 3px;
   padding: 20px;
@@ -1204,7 +1204,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #keyboard {
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-width: 0;
   border-top-width: 1px;
   border-color: rgba(0, 0, 0, 0.4);
@@ -1253,7 +1253,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dadada;
   padding: 5px;
   -arrow-border-radius: 2px;
-  -arrow-background-color: #2a2a2a;
+  -arrow-background-color: rgba(42, 42, 42, 0.9);
   -arrow-border-width: 1px;
   -arrow-border-color: rgba(0, 0, 0, 0.4);
   -arrow-base: 20px;
@@ -1956,8 +1956,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   height: 70px;
   padding: 15px;
   spacing: 0.5em;
-  background: rgba(29, 29, 29, 0.9);
-  border: 0px solid #161616;
+  background: rgba(29, 29, 29, 0.8);
+  border: 0px solid rgba(22, 22, 22, 0.9);
   border-bottom: 1px;
   color: #dadada;
 }
@@ -1999,7 +1999,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .sound-player .slider {
   height: 0.5em;
   padding: 0;
-  border: 0px solid #161616;
+  border: 0px solid rgba(22, 22, 22, 0.9);
   border-bottom: 1px;
   -slider-height: 0.5em;
   -slider-background-color: #262626;
@@ -2228,7 +2228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-with-borders {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   padding: 12px;
   padding-bottom: 16px;
 }
@@ -2239,7 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-with-borders-and-header {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-radius: 6px;
   border-radius-topleft: 0;
   border-radius-topright: 0;
@@ -2253,7 +2253,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-header {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-radius: 0;
   border-radius-topleft: 6px;
   border-radius-topright: 6px;
@@ -2269,7 +2269,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .photoframe-box {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   padding: 12px;
   padding-bottom: 16px;
 }
diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css
index c5211ee..6844af9 100644
--- a/src/main/cinnamon/cinnamon-light.css
+++ b/src/main/cinnamon/cinnamon-light.css
@@ -280,7 +280,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #Tooltip {
   border-radius: 3px;
   padding: 5px 12px;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   color: #dadada;
   font-size: 1em;
   font-weight: normal;
@@ -573,8 +573,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-caption {
-  background-color: #2a2a2a;
-  border: 1px solid #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
+  border: 1px solid rgba(42, 42, 42, 0.9);
   color: #dadada;
   spacing: 25px;
   border-radius: 2px;
@@ -933,7 +933,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .switcher-list {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 3px;
   padding: 20px;
@@ -1188,7 +1188,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #keyboard {
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-width: 0;
   border-top-width: 1px;
   border-color: rgba(0, 0, 0, 0.4);
@@ -1237,7 +1237,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dadada;
   padding: 5px;
   -arrow-border-radius: 2px;
-  -arrow-background-color: #2a2a2a;
+  -arrow-background-color: rgba(42, 42, 42, 0.9);
   -arrow-border-width: 1px;
   -arrow-border-color: rgba(0, 0, 0, 0.4);
   -arrow-base: 20px;
@@ -1940,8 +1940,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   height: 70px;
   padding: 15px;
   spacing: 0.5em;
-  background: rgba(29, 29, 29, 0.9);
-  border: 0px solid #161616;
+  background: rgba(29, 29, 29, 0.8);
+  border: 0px solid rgba(22, 22, 22, 0.9);
   border-bottom: 1px;
   color: #dadada;
 }
@@ -1983,7 +1983,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .sound-player .slider {
   height: 0.5em;
   padding: 0;
-  border: 0px solid #161616;
+  border: 0px solid rgba(22, 22, 22, 0.9);
   border-bottom: 1px;
   -slider-height: 0.5em;
   -slider-background-color: rgba(0, 0, 0, 0.12);
@@ -2212,7 +2212,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-with-borders {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   padding: 12px;
   padding-bottom: 16px;
 }
@@ -2223,7 +2223,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-with-borders-and-header {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-radius: 6px;
   border-radius-topleft: 0;
   border-radius-topright: 0;
@@ -2237,7 +2237,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .desklet-header {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-radius: 0;
   border-radius-topleft: 6px;
   border-radius-topright: 6px;
@@ -2253,7 +2253,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .photoframe-box {
   color: #dadada;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   padding: 12px;
   padding-bottom: 16px;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index 0315e60..d2ec37e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index f109517..a542254 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index f109517..a542254 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 0315e60..d2ec37e 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 049a23e..e404d77 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index 6ae9c59..0b73c7d 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 6ae9c59..0b73c7d 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index f9c9103..cf811ed 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -19,7 +19,6 @@
  */
 /* GLOBALS */
 stage {
-  font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index e954aac..be000b3 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -609,6 +609,8 @@ button.osd.image-button {
 
 button.osd:hover {
   color: #0860f2;
+  box-shadow: none;
+  background-color: rgba(98, 98, 98, 0.96);
 }
 
 button.osd:active, button.osd:checked {
@@ -1299,9 +1301,24 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
 
 .osd.inline-toolbar, toolbar.osd {
   padding: 8px;
-  border: 1px solid rgba(255, 255, 255, 0.12);
-  border-radius: 6px;
-  background-color: #242424;
+  border: none;
+  border-radius: 10px;
+  background-color: #2a2a2a;
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+}
+
+.osd.toolbar.inline-toolbar, toolbar.osd.toolbar {
+  padding: 0;
+  margin: 6px 8px 10px;
+  box-shadow: none;
+  background: none;
+}
+
+.osd.toolbar.inline-toolbar > box.horizontal, toolbar.osd.toolbar > box.horizontal {
+  padding: 8px;
+  border-radius: 10px;
+  background-color: #2a2a2a;
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
 }
 
 .osd.left.inline-toolbar, .osd.right.inline-toolbar, .osd.top.inline-toolbar, .osd.bottom.inline-toolbar, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1371,7 +1388,7 @@ actionbar {
   background-color: #2b2b2b;
 }
 
-.background.csd actionbar {
+.background.csd revealer > actionbar {
   border-radius: 0 0 14px 14px;
 }
 
@@ -1456,31 +1473,31 @@ headerbar .linked:not(.vertical) > entry:backdrop {
   background-image: none;
 }
 
-headerbar stackswitcher {
+headerbar stackswitcher, headerbar .stack-switcher {
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 6px;
   margin: 8px 0;
   padding: 0;
 }
 
-headerbar stackswitcher button {
+headerbar stackswitcher button, headerbar .stack-switcher button {
   min-height: 26px;
   margin: 0;
   font-weight: 500;
 }
 
-headerbar stackswitcher button:not(:first-child) {
+headerbar stackswitcher button:not(:first-child), headerbar .stack-switcher button:not(:first-child) {
   border-width: 0 0 0 1px;
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom, transparent 16%, rgba(255, 255, 255, 0.1) 16%, rgba(255, 255, 255, 0.1) 84%, transparent 84%) 0 0 0 1/0 0 0 1px stretch;
 }
 
-headerbar stackswitcher button:checked {
+headerbar stackswitcher button:checked, headerbar .stack-switcher button:checked {
   border-image: none;
 }
 
-headerbar stackswitcher button:checked + button {
+headerbar stackswitcher button:checked + button, headerbar .stack-switcher button:checked + button {
   border-image: none;
 }
 
@@ -4771,10 +4788,20 @@ filechooser paned > separator,
   background-repeat: no-repeat;
 }
 
+filechooser paned > separator:dir(ltr),
+.nautilus-window paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser paned > separator:dir(rtl),
+.nautilus-window paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
 filechooser paned > separator:hover,
 .nautilus-window paned > separator:hover {
-  background-image: -gtk-scaled(url("assets/paned-separator-dark.png"), url("assets/paned-separator-dark@2.png"));
-  background-size: 2px 64px;
+  background-image: image(rgba(255, 255, 255, 0.12));
+  background-size: 2px 100px;
   background-position: center center;
 }
 
@@ -5004,6 +5031,11 @@ filechooser paned > separator:hover,
   border-radius: 0;
 }
 
+.nautilus-window placesview row.activatable {
+  border-radius: 6px;
+  margin-right: 6px;
+}
+
 .nautilus-window placesview actionbar.background {
   background-color: #333333;
   margin: 6px;
@@ -5021,13 +5053,14 @@ filechooser placessidebar.sidebar.frame {
   border-right: 1px solid #0e0e0e;
 }
 
-filechooser actionbar {
+filechooser actionbar.background {
   color: #dadada;
   background-color: #333333;
   border-color: rgba(255, 255, 255, 0.12);
+  border-radius: 0 0 14px 0;
 }
 
-filechooser actionbar label, filechooser actionbar combobox {
+filechooser actionbar.background label, filechooser actionbar.background combobox {
   color: #dadada;
 }
 
@@ -6103,6 +6136,11 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-bottom-left-radius: 14px;
 }
 
+hdyviewswitcherbar > actionbar {
+  background: none;
+  border: none;
+}
+
 stack.view.polari-entry-area {
   background-color: #333333;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
@@ -6458,28 +6496,38 @@ flowboxchild.bookmark-tag-widget-selected {
   color: white;
 }
 
+.background.csd.main-window .sidebar.rooms-sidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .documents-scrolledwin {
   background-color: transparent;
 }
 
-.documents-scrolledwin .content-view {
+.documents-scrolledwin .content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
+}
+
+.documents-scrolledwin .content-view:hover {
+  background-color: rgba(222, 222, 222, 0.08);
 }
 
 .documents-scrolledwin viewport.frame {
   background-color: transparent;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view border {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) border {
   border: none;
 }
 
+window.background.csd > box.vertical > overlay > stack > box.vertical > actionbar {
+  border-radius: 0 0 14px 14px;
+}
+
 window.background.csd > box.vertical > scrolledwindow > iconview.view.content-view:not(:hover):not(:selected) {
   background-color: transparent;
   border-radius: 14px;
@@ -6776,6 +6824,7 @@ panel-toplevel.background na-tray-applet {
 panel-toplevel.background button:not(#tasklist-button) {
   color: #dadada;
   border-radius: 6px;
+  background: none;
   border: none;
 }
 
@@ -7625,20 +7674,20 @@ 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(42, 42, 42, 0.95) 0%, rgba(51, 51, 51, 0.95) 100%);
-  border-bottom: 1px solid #0e0e0e;
+  background-image: image(rgba(42, 42, 42, 0.1));
+  border-bottom: none;
   transition: all 100ms ease-in-out;
   color: #dadada;
 }
 
 .menubar.panel .panel.maximized {
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.2);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(42, 42, 42, 0.75);
+  background-color: rgba(42, 42, 42, 0.1);
   background-image: none;
   border: none;
 }
@@ -10104,6 +10153,8 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color placeholder_text_color #A8A8A8;
 @define-color link_color #3484e2;
 @define-color content_view_bg #242424;
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #151515;
 @define-color wm_title alpha(#fdfdfd, 0.8);
 @define-color wm_unfocused_title alpha(#fdfdfd, 0.5);
 @define-color wm_bg #373737;
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 358cbb2..8d43363 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -175,7 +175,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #dadada;
   border: none;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -597,8 +597,8 @@ button:drop(active) {
 
 button.osd {
   color: #dadada;
-  background-color: #2a2a2a;
-  border-color: #161616;
+  background-color: rgba(42, 42, 42, 0.9);
+  border-color: rgba(22, 22, 22, 0.9);
 }
 
 button.osd.image-button {
@@ -609,6 +609,8 @@ button.osd.image-button {
 
 button.osd:hover {
   color: #0860f2;
+  box-shadow: none;
+  background-color: rgba(98, 98, 98, 0.96);
 }
 
 button.osd:active, button.osd:checked {
@@ -1299,9 +1301,24 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
 
 .osd.inline-toolbar, toolbar.osd {
   padding: 8px;
-  border: 1px solid rgba(255, 255, 255, 0.12);
-  border-radius: 6px;
-  background-color: #242424;
+  border: none;
+  border-radius: 10px;
+  background-color: rgba(42, 42, 42, 0.9);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+}
+
+.osd.toolbar.inline-toolbar, toolbar.osd.toolbar {
+  padding: 0;
+  margin: 6px 8px 10px;
+  box-shadow: none;
+  background: none;
+}
+
+.osd.toolbar.inline-toolbar > box.horizontal, toolbar.osd.toolbar > box.horizontal {
+  padding: 8px;
+  border-radius: 10px;
+  background-color: rgba(42, 42, 42, 0.9);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
 }
 
 .osd.left.inline-toolbar, .osd.right.inline-toolbar, .osd.top.inline-toolbar, .osd.bottom.inline-toolbar, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1371,7 +1388,7 @@ actionbar {
   background-color: #2b2b2b;
 }
 
-.background.csd actionbar {
+.background.csd revealer > actionbar {
   border-radius: 0 0 14px 14px;
 }
 
@@ -1456,31 +1473,31 @@ headerbar .linked:not(.vertical) > entry:backdrop {
   background-image: none;
 }
 
-headerbar stackswitcher {
+headerbar stackswitcher, headerbar .stack-switcher {
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 6px;
   margin: 8px 0;
   padding: 0;
 }
 
-headerbar stackswitcher button {
+headerbar stackswitcher button, headerbar .stack-switcher button {
   min-height: 26px;
   margin: 0;
   font-weight: 500;
 }
 
-headerbar stackswitcher button:not(:first-child) {
+headerbar stackswitcher button:not(:first-child), headerbar .stack-switcher button:not(:first-child) {
   border-width: 0 0 0 1px;
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom, transparent 16%, rgba(255, 255, 255, 0.1) 16%, rgba(255, 255, 255, 0.1) 84%, transparent 84%) 0 0 0 1/0 0 0 1px stretch;
 }
 
-headerbar stackswitcher button:checked {
+headerbar stackswitcher button:checked, headerbar .stack-switcher button:checked {
   border-image: none;
 }
 
-headerbar stackswitcher button:checked + button {
+headerbar stackswitcher button:checked + button, headerbar .stack-switcher button:checked + button {
   border-image: none;
 }
 
@@ -4261,7 +4278,7 @@ tooltip {
 }
 
 tooltip.background, tooltip.background.csd {
-  background-color: #444444;
+  background-color: rgba(68, 68, 68, 0.9);
   background-clip: padding-box;
   border-radius: 6px;
 }
@@ -4771,10 +4788,20 @@ filechooser paned > separator,
   background-repeat: no-repeat;
 }
 
+filechooser paned > separator:dir(ltr),
+.nautilus-window paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser paned > separator:dir(rtl),
+.nautilus-window paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
 filechooser paned > separator:hover,
 .nautilus-window paned > separator:hover {
-  background-image: -gtk-scaled(url("assets/paned-separator-dark.png"), url("assets/paned-separator-dark@2.png"));
-  background-size: 2px 64px;
+  background-image: image(rgba(255, 255, 255, 0.12));
+  background-size: 2px 100px;
   background-position: center center;
 }
 
@@ -5000,6 +5027,11 @@ filechooser paned > separator:hover,
   border-radius: 0;
 }
 
+.nautilus-window placesview row.activatable {
+  border-radius: 6px;
+  margin-right: 6px;
+}
+
 .nautilus-window placesview actionbar.background {
   background-color: rgba(51, 51, 51, 0.95);
   margin: 6px;
@@ -5017,13 +5049,14 @@ filechooser placessidebar.sidebar.frame {
   border-right: 1px solid #0e0e0e;
 }
 
-filechooser actionbar {
+filechooser actionbar.background {
   color: #dadada;
   background-color: rgba(51, 51, 51, 0.95);
   border-color: rgba(255, 255, 255, 0.12);
+  border-radius: 0 0 14px 0;
 }
 
-filechooser actionbar label, filechooser actionbar combobox {
+filechooser actionbar.background label, filechooser actionbar.background combobox {
   color: #dadada;
 }
 
@@ -5712,7 +5745,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: #2a2a2a;
+  color: rgba(42, 42, 42, 0.9);
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6099,6 +6132,11 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-bottom-left-radius: 14px;
 }
 
+hdyviewswitcherbar > actionbar {
+  background: none;
+  border: none;
+}
+
 stack.view.polari-entry-area {
   background-color: #333333;
   border-top: 1px solid rgba(255, 255, 255, 0.12);
@@ -6137,8 +6175,8 @@ stack.view.polari-entry-area:disabled {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #ececec;
-  background-color: #2a2a2a;
-  border: 1px solid #161616;
+  background-color: rgba(42, 42, 42, 0.9);
+  border: 1px solid rgba(22, 22, 22, 0.9);
   border-radius: 2px;
 }
 
@@ -6160,7 +6198,7 @@ stack.view.polari-entry-area:disabled {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: #1d1d1d;
+  background-color: rgba(29, 29, 29, 0.9);
 }
 
 #gf-bubble levelbar trough,
@@ -6454,28 +6492,38 @@ flowboxchild.bookmark-tag-widget-selected {
   color: white;
 }
 
+.background.csd.main-window .sidebar.rooms-sidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .documents-scrolledwin {
   background-color: transparent;
 }
 
-.documents-scrolledwin .content-view {
+.documents-scrolledwin .content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
+}
+
+.documents-scrolledwin .content-view:hover {
+  background-color: rgba(222, 222, 222, 0.08);
 }
 
 .documents-scrolledwin viewport.frame {
   background-color: transparent;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view border {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) border {
   border: none;
 }
 
+window.background.csd > box.vertical > overlay > stack > box.vertical > actionbar {
+  border-radius: 0 0 14px 14px;
+}
+
 window.background.csd > box.vertical > scrolledwindow > iconview.view.content-view:not(:hover):not(:selected) {
   background-color: transparent;
   border-radius: 14px;
@@ -6637,7 +6685,7 @@ dialog.background.csd > .dialog-vbox > .dialog-action-box > .dialog-action-area
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid #161616;
+  border: 1px solid rgba(22, 22, 22, 0.9);
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6648,7 +6696,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: #1d1d1d;
+  background-color: rgba(29, 29, 29, 0.9);
   border: none;
   border-radius: 5px;
 }
@@ -6772,6 +6820,7 @@ panel-toplevel.background na-tray-applet {
 panel-toplevel.background button:not(#tasklist-button) {
   color: white;
   border-radius: 6px;
+  background: none;
   border: none;
 }
 
@@ -7621,20 +7670,20 @@ 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(42, 42, 42, 0.95) 0%, rgba(51, 51, 51, 0.95) 100%);
-  border-bottom: 1px solid #0e0e0e;
+  background-image: image(rgba(0, 0, 0, 0.1));
+  border-bottom: none;
   transition: all 100ms ease-in-out;
   color: white;
 }
 
 .menubar.panel .panel.maximized {
-  background-color: rgba(0, 0, 0, 0.16);
+  background-color: rgba(0, 0, 0, 0.2);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(0, 0, 0, 0.75);
+  background-color: rgba(0, 0, 0, 0.1);
   background-image: none;
   border: none;
 }
@@ -8009,7 +8058,7 @@ headerbar.titlebar > grid.linked.horizontal.format-bar:backdrop {
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 14px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(to bottom, #2a2a2a, #2a2a2a);
+  background-image: linear-gradient(to bottom, rgba(42, 42, 42, 0.9), rgba(42, 42, 42, 0.9));
   background-color: transparent;
 }
 
@@ -10100,6 +10149,8 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color placeholder_text_color #A8A8A8;
 @define-color link_color #3484e2;
 @define-color content_view_bg #242424;
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #151515;
 @define-color wm_title alpha(#fdfdfd, 0.8);
 @define-color wm_unfocused_title alpha(#fdfdfd, 0.5);
 @define-color wm_bg #373737;
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index b9ca66f..0fbb388 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -611,6 +611,8 @@ button.osd.image-button {
 
 button.osd:hover {
   color: #0860f2;
+  box-shadow: none;
+  background-color: rgba(98, 98, 98, 0.96);
 }
 
 button.osd:active, button.osd:checked {
@@ -1308,9 +1310,24 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
 
 .osd.inline-toolbar, toolbar.osd {
   padding: 8px;
-  border: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: 6px;
-  background-color: #ffffff;
+  border: none;
+  border-radius: 10px;
+  background-color: #2a2a2a;
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+}
+
+.osd.toolbar.inline-toolbar, toolbar.osd.toolbar {
+  padding: 0;
+  margin: 6px 8px 10px;
+  box-shadow: none;
+  background: none;
+}
+
+.osd.toolbar.inline-toolbar > box.horizontal, toolbar.osd.toolbar > box.horizontal {
+  padding: 8px;
+  border-radius: 10px;
+  background-color: #2a2a2a;
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
 }
 
 .osd.left.inline-toolbar, .osd.right.inline-toolbar, .osd.top.inline-toolbar, .osd.bottom.inline-toolbar, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1380,7 +1397,7 @@ actionbar {
   background-color: #ededed;
 }
 
-.background.csd actionbar {
+.background.csd revealer > actionbar {
   border-radius: 0 0 14px 14px;
 }
 
@@ -1465,31 +1482,31 @@ headerbar .linked:not(.vertical) > entry:backdrop {
   background-image: none;
 }
 
-headerbar stackswitcher {
+headerbar stackswitcher, headerbar .stack-switcher {
   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
   border-radius: 6px;
   margin: 8px 0;
   padding: 0;
 }
 
-headerbar stackswitcher button {
+headerbar stackswitcher button, headerbar .stack-switcher button {
   min-height: 26px;
   margin: 0;
   font-weight: 500;
 }
 
-headerbar stackswitcher button:not(:first-child) {
+headerbar stackswitcher button:not(:first-child), headerbar .stack-switcher button:not(:first-child) {
   border-width: 0 0 0 1px;
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom, transparent 16%, rgba(0, 0, 0, 0.08) 16%, rgba(0, 0, 0, 0.08) 84%, transparent 84%) 0 0 0 1/0 0 0 1px stretch;
 }
 
-headerbar stackswitcher button:checked {
+headerbar stackswitcher button:checked, headerbar .stack-switcher button:checked {
   border-image: none;
 }
 
-headerbar stackswitcher button:checked + button {
+headerbar stackswitcher button:checked + button, headerbar .stack-switcher button:checked + button {
   border-image: none;
 }
 
@@ -4792,10 +4809,20 @@ filechooser paned > separator,
   background-repeat: no-repeat;
 }
 
+filechooser paned > separator:dir(ltr),
+.nautilus-window paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser paned > separator:dir(rtl),
+.nautilus-window paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
 filechooser paned > separator:hover,
 .nautilus-window paned > separator:hover {
-  background-image: -gtk-scaled(url("assets/paned-separator.png"), url("assets/paned-separator@2.png"));
-  background-size: 2px 64px;
+  background-image: image(rgba(0, 0, 0, 0.12));
+  background-size: 2px 100px;
   background-position: center center;
 }
 
@@ -5025,6 +5052,11 @@ filechooser paned > separator:hover,
   border-radius: 0;
 }
 
+.nautilus-window placesview row.activatable {
+  border-radius: 6px;
+  margin-right: 6px;
+}
+
 .nautilus-window placesview actionbar.background {
   background-color: #ffffff;
   margin: 6px;
@@ -5042,13 +5074,14 @@ filechooser placessidebar.sidebar.frame {
   border-right: 1px solid #d6d6d6;
 }
 
-filechooser actionbar {
+filechooser actionbar.background {
   color: #363636;
   background-color: #f0f0f0;
   border-color: rgba(0, 0, 0, 0.12);
+  border-radius: 0 0 14px 0;
 }
 
-filechooser actionbar label, filechooser actionbar combobox {
+filechooser actionbar.background label, filechooser actionbar.background combobox {
   color: #363636;
 }
 
@@ -6125,6 +6158,11 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-bottom-left-radius: 14px;
 }
 
+hdyviewswitcherbar > actionbar {
+  background: none;
+  border: none;
+}
+
 stack.view.polari-entry-area {
   background-color: #f5f5f5;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
@@ -6473,28 +6511,38 @@ flowboxchild.bookmark-tag-widget-selected {
   color: white;
 }
 
+.background.csd.main-window .sidebar.rooms-sidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .documents-scrolledwin {
   background-color: transparent;
 }
 
-.documents-scrolledwin .content-view {
+.documents-scrolledwin .content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
+}
+
+.documents-scrolledwin .content-view:hover {
+  background-color: rgba(36, 36, 36, 0.08);
 }
 
 .documents-scrolledwin viewport.frame {
   background-color: transparent;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view border {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) border {
   border: none;
 }
 
+window.background.csd > box.vertical > overlay > stack > box.vertical > actionbar {
+  border-radius: 0 0 14px 14px;
+}
+
 window.background.csd > box.vertical > scrolledwindow > iconview.view.content-view:not(:hover):not(:selected) {
   background-color: transparent;
   border-radius: 14px;
@@ -6791,6 +6839,7 @@ panel-toplevel.background na-tray-applet {
 panel-toplevel.background button:not(#tasklist-button) {
   color: #363636;
   border-radius: 6px;
+  background: none;
   border: none;
 }
 
@@ -7651,20 +7700,20 @@ 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(255, 255, 255, 0.22);
+  background-image: image(rgba(241, 241, 241, 0.1));
+  border-bottom: none;
   transition: all 100ms ease-in-out;
   color: #363636;
 }
 
 .menubar.panel .panel.maximized {
-  background-color: #f1f1f1;
+  background-color: rgba(241, 241, 241, 0.2);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(241, 241, 241, 0.75);
+  background-color: rgba(241, 241, 241, 0.1);
   background-image: none;
   border: none;
 }
@@ -10140,6 +10189,8 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color placeholder_text_color #A8A8A8;
 @define-color link_color #3484e2;
 @define-color content_view_bg #ffffff;
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #ffffff;
 @define-color wm_title alpha(#575757, 0.8);
 @define-color wm_unfocused_title alpha(#575757, 0.5);
 @define-color wm_bg white;
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 55483dd..1454a58 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -175,7 +175,7 @@ popover.background.osd,
 popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #dadada;
   border: none;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   background-clip: padding-box;
   box-shadow: none;
 }
@@ -599,8 +599,8 @@ button:drop(active) {
 
 button.osd {
   color: #dadada;
-  background-color: #2a2a2a;
-  border-color: #161616;
+  background-color: rgba(42, 42, 42, 0.9);
+  border-color: rgba(22, 22, 22, 0.9);
 }
 
 button.osd.image-button {
@@ -611,6 +611,8 @@ button.osd.image-button {
 
 button.osd:hover {
   color: #0860f2;
+  box-shadow: none;
+  background-color: rgba(98, 98, 98, 0.96);
 }
 
 button.osd:active, button.osd:checked {
@@ -1308,9 +1310,24 @@ combobox .linked:not(.vertical) > entry + button.combo:checked arrow, .linked:no
 
 .osd.inline-toolbar, toolbar.osd {
   padding: 8px;
-  border: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: 6px;
-  background-color: #ffffff;
+  border: none;
+  border-radius: 10px;
+  background-color: rgba(42, 42, 42, 0.9);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+}
+
+.osd.toolbar.inline-toolbar, toolbar.osd.toolbar {
+  padding: 0;
+  margin: 6px 8px 10px;
+  box-shadow: none;
+  background: none;
+}
+
+.osd.toolbar.inline-toolbar > box.horizontal, toolbar.osd.toolbar > box.horizontal {
+  padding: 8px;
+  border-radius: 10px;
+  background-color: rgba(42, 42, 42, 0.9);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
 }
 
 .osd.left.inline-toolbar, .osd.right.inline-toolbar, .osd.top.inline-toolbar, .osd.bottom.inline-toolbar, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1380,7 +1397,7 @@ actionbar {
   background-color: #ededed;
 }
 
-.background.csd actionbar {
+.background.csd revealer > actionbar {
   border-radius: 0 0 14px 14px;
 }
 
@@ -1465,31 +1482,31 @@ headerbar .linked:not(.vertical) > entry:backdrop {
   background-image: none;
 }
 
-headerbar stackswitcher {
+headerbar stackswitcher, headerbar .stack-switcher {
   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
   border-radius: 6px;
   margin: 8px 0;
   padding: 0;
 }
 
-headerbar stackswitcher button {
+headerbar stackswitcher button, headerbar .stack-switcher button {
   min-height: 26px;
   margin: 0;
   font-weight: 500;
 }
 
-headerbar stackswitcher button:not(:first-child) {
+headerbar stackswitcher button:not(:first-child), headerbar .stack-switcher button:not(:first-child) {
   border-width: 0 0 0 1px;
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom, transparent 16%, rgba(0, 0, 0, 0.08) 16%, rgba(0, 0, 0, 0.08) 84%, transparent 84%) 0 0 0 1/0 0 0 1px stretch;
 }
 
-headerbar stackswitcher button:checked {
+headerbar stackswitcher button:checked, headerbar .stack-switcher button:checked {
   border-image: none;
 }
 
-headerbar stackswitcher button:checked + button {
+headerbar stackswitcher button:checked + button, headerbar .stack-switcher button:checked + button {
   border-image: none;
 }
 
@@ -4273,7 +4290,7 @@ tooltip {
 }
 
 tooltip.background, tooltip.background.csd {
-  background-color: #444444;
+  background-color: rgba(68, 68, 68, 0.9);
   background-clip: padding-box;
   border-radius: 6px;
 }
@@ -4792,10 +4809,20 @@ filechooser paned > separator,
   background-repeat: no-repeat;
 }
 
+filechooser paned > separator:dir(ltr),
+.nautilus-window paned > separator:dir(ltr) {
+  margin-left: -1px;
+}
+
+filechooser paned > separator:dir(rtl),
+.nautilus-window paned > separator:dir(rtl) {
+  margin-right: -1px;
+}
+
 filechooser paned > separator:hover,
 .nautilus-window paned > separator:hover {
-  background-image: -gtk-scaled(url("assets/paned-separator.png"), url("assets/paned-separator@2.png"));
-  background-size: 2px 64px;
+  background-image: image(rgba(0, 0, 0, 0.12));
+  background-size: 2px 100px;
   background-position: center center;
 }
 
@@ -5021,6 +5048,11 @@ filechooser paned > separator:hover,
   border-radius: 0;
 }
 
+.nautilus-window placesview row.activatable {
+  border-radius: 6px;
+  margin-right: 6px;
+}
+
 .nautilus-window placesview actionbar.background {
   background-color: rgba(255, 255, 255, 0.95);
   margin: 6px;
@@ -5038,13 +5070,14 @@ filechooser placessidebar.sidebar.frame {
   border-right: 1px solid #d6d6d6;
 }
 
-filechooser actionbar {
+filechooser actionbar.background {
   color: #363636;
   background-color: rgba(240, 240, 240, 0.94);
   border-color: rgba(0, 0, 0, 0.12);
+  border-radius: 0 0 14px 0;
 }
 
-filechooser actionbar label, filechooser actionbar combobox {
+filechooser actionbar.background label, filechooser actionbar.background combobox {
   color: #363636;
 }
 
@@ -5734,7 +5767,7 @@ widget#PROCESSOR list row, widget#MEMORY list row {
 }
 
 widget#PROCESSOR list row.max, widget#MEMORY list row.max {
-  color: #2a2a2a;
+  color: rgba(42, 42, 42, 0.9);
 }
 
 widget#PROCESSOR list separator.list, widget#MEMORY list separator.list {
@@ -6121,6 +6154,11 @@ notebook.main-notebook > header.top > tabs > tab:first-child {
   border-bottom-left-radius: 14px;
 }
 
+hdyviewswitcherbar > actionbar {
+  background: none;
+  border: none;
+}
+
 stack.view.polari-entry-area {
   background-color: #f5f5f5;
   border-top: 1px solid rgba(0, 0, 0, 0.12);
@@ -6159,8 +6197,8 @@ stack.view.polari-entry-area:disabled {
 #gf-candidate-popup,
 #gf-candidate-popup.solid {
   color: #ececec;
-  background-color: #2a2a2a;
-  border: 1px solid #161616;
+  background-color: rgba(42, 42, 42, 0.9);
+  border: 1px solid rgba(22, 22, 22, 0.9);
   border-radius: 2px;
 }
 
@@ -6182,7 +6220,7 @@ stack.view.polari-entry-area:disabled {
 #gf-osd-window levelbar block.empty,
 #gf-input-source-popup levelbar block.empty,
 #gf-candidate-popup levelbar block.empty {
-  background-color: #1d1d1d;
+  background-color: rgba(29, 29, 29, 0.9);
 }
 
 #gf-bubble levelbar trough,
@@ -6469,28 +6507,38 @@ flowboxchild.bookmark-tag-widget-selected {
   color: white;
 }
 
+.background.csd.main-window .sidebar.rooms-sidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .documents-scrolledwin {
   background-color: transparent;
 }
 
-.documents-scrolledwin .content-view {
+.documents-scrolledwin .content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
+}
+
+.documents-scrolledwin .content-view:hover {
+  background-color: rgba(36, 36, 36, 0.08);
 }
 
 .documents-scrolledwin viewport.frame {
   background-color: transparent;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) {
   background-color: transparent;
-  border-radius: 0 0 14px 14px;
 }
 
-.documents-scrolledwin viewport.frame widget > frame.content-view border {
+.documents-scrolledwin viewport.frame widget > frame.content-view:not(:selected):not(:hover) border {
   border: none;
 }
 
+window.background.csd > box.vertical > overlay > stack > box.vertical > actionbar {
+  border-radius: 0 0 14px 14px;
+}
+
 window.background.csd > box.vertical > scrolledwindow > iconview.view.content-view:not(:hover):not(:selected) {
   background-color: transparent;
   border-radius: 14px;
@@ -6652,7 +6700,7 @@ dialog.background.csd > .dialog-vbox > .dialog-action-box > .dialog-action-area
 
 MsdOsdWindow.background.osd {
   border-radius: 2px;
-  border: 1px solid #161616;
+  border: 1px solid rgba(22, 22, 22, 0.9);
 }
 
 MsdOsdWindow.background.osd .progressbar {
@@ -6663,7 +6711,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 MsdOsdWindow.background.osd .trough {
-  background-color: #1d1d1d;
+  background-color: rgba(29, 29, 29, 0.9);
   border: none;
   border-radius: 5px;
 }
@@ -6787,6 +6835,7 @@ panel-toplevel.background na-tray-applet {
 panel-toplevel.background button:not(#tasklist-button) {
   color: white;
   border-radius: 6px;
+  background: none;
   border: none;
 }
 
@@ -7647,20 +7696,20 @@ 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(255, 255, 255, 0.22);
+  background-image: image(rgba(255, 255, 255, 0.1));
+  border-bottom: none;
   transition: all 100ms ease-in-out;
   color: white;
 }
 
 .menubar.panel .panel.maximized {
-  background-color: rgba(255, 255, 255, 0.16);
+  background-color: rgba(255, 255, 255, 0.2);
   background-image: none;
   border: none;
 }
 
 .menubar.panel .panel.translucent {
-  background-color: rgba(255, 255, 255, 0.75);
+  background-color: rgba(255, 255, 255, 0.1);
   background-image: none;
   border: none;
 }
@@ -8039,7 +8088,7 @@ headerbar.titlebar > grid.linked.horizontal.format-bar:backdrop {
   border: 1px solid rgba(0, 0, 0, 0.08);
   border-radius: 14px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(to bottom, #2a2a2a, #2a2a2a);
+  background-image: linear-gradient(to bottom, rgba(42, 42, 42, 0.9), rgba(42, 42, 42, 0.9));
   background-color: transparent;
 }
 
@@ -8529,7 +8578,7 @@ GtkListBox .h4 {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: #2a2a2a;
+  background-color: rgba(42, 42, 42, 0.9);
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -10136,6 +10185,8 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 @define-color placeholder_text_color #A8A8A8;
 @define-color link_color #3484e2;
 @define-color content_view_bg #ffffff;
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #ffffff;
 @define-color wm_title alpha(#575757, 0.8);
 @define-color wm_unfocused_title alpha(#575757, 0.5);
 @define-color wm_bg white;
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 280dc3e..61a4263 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -97,14 +97,14 @@ $sidebar_theme_color:               if($variant == 'light', rgba(black, 0.12), r
 
 //OSD colors
 $osd_fg_color:                      #dadada;
-$osd_bg_color:                      #2a2a2a;
+$osd_bg_color:                      if($trans=='true', rgba(#2a2a2a, 0.9), #2a2a2a);
 $osd_button_bg:                     rgba(lighten($osd_bg_color, 22%), 0.96);
 $osd_button_border:                 $dark_borders_color;
 $osd_entry_bg:                      rgba(lighten($osd_bg_color, 22%), 0.96);
 $osd_entry_border:                  $dark_borders_color;
 $osd_disabled_bg_color:             darken($osd_bg_color, 3%);
 $osd_disabled_fg_color:             mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
-$osd_borders_color:                 $borders_color;
+$osd_borders_color:                 $dark_borders_color;
 
 // Menu colors
 $menu_bg:                           if($variant == 'light', $base_color, $bg_color);
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 3c556fd..ccf7a60 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -31,7 +31,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 // }
 
 stage {
-  font-family: $font-family;
+  // font-family: $font-family;
   @include font(body-1);
   color: $fg_color;
 }
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index f58769d..b19c327 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -92,13 +92,12 @@ filechooser,
     background-position: left bottom;
     background-repeat: no-repeat;
 
-    // &:dir(ltr) { margin-left: -1px; }
-    // &:dir(rtl) { margin-right: -1px; }
+    &:dir(ltr) { margin-left: -1px; }
+    &:dir(rtl) { margin-right: -1px; }
 
     &:hover {
-      background-image: -gtk-scaled(url("assets/paned-separator#{$asset_suffix}.png"),
-                                    url("assets/paned-separator#{$asset_suffix}@2.png"));
-      background-size: 2px 64px;
+      background-image: image($borders_color);
+      background-size: 2px 100px;
       background-position: center center;
     }
   }
@@ -272,7 +271,6 @@ filechooser,
     scrolledwindow {
       .view:not(:hover):not(:active):not(:selected) {
         background-color: transparent;
-        // @extend %view;
       }
     }
 
@@ -324,6 +322,11 @@ filechooser,
   }
 
   placesview {
+    row.activatable {
+      border-radius: $bt_radius;
+      margin-right: 6px;
+    }
+
     actionbar.background {
       background-color: $menu_bg;
       margin: 6px;
@@ -342,10 +345,11 @@ filechooser {
     &.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
   }
 
-  actionbar {
+  actionbar.background {
     color: $dark_sidebar_fg;
     background-color: $dark_sidebar_bg;
     border-color: $borders_color;
+    border-radius: 0 0 $wm_radius 0;
 
     label, combobox { color: $dark_sidebar_fg; }
   }
@@ -1700,6 +1704,8 @@ notebook.main-notebook {
 
 //
 // Gnome Weather
+//
+
 #weather-page,
 #weekly-forecast-frame {
 	border-bottom-right-radius: $wm_radius;
@@ -1710,6 +1716,14 @@ notebook.main-notebook {
 	border-bottom-left-radius: $wm_radius;
 }
 
+//
+// Gnome Clocks
+//
+hdyviewswitcherbar > actionbar {
+  background: none;
+  border: none;
+}
+
 //
 // Polari
 //
@@ -2050,24 +2064,46 @@ flowboxchild.bookmark-tag-widget {
   &-selected { color: $selected_fg_color; } // checked
 }
 
+
+//
+// Fractal
+//
+.background.csd.main-window {
+  .sidebar.rooms-sidebar {
+    border-bottom-left-radius: $wm_radius;
+  }
+}
+
 //
 // documents-scrolledwi (Totem, Documents, EvView)
 //
 .documents-scrolledwin {
   background-color: transparent;
 
-  .content-view {
+  .content-view:not(:selected):not(:hover) {
     background-color: transparent;
-    border-radius: 0 0 $wm_radius $wm_radius;
+    // border-radius: 0 0 $wm_radius $wm_radius;
   }
 
+  .content-view:hover { background-color: rgba($fg_color, 0.08); }
+
   viewport.frame { // Documents
     background-color: transparent;
 
-    widget > frame.content-view {
+    widget > frame.content-view:not(:selected):not(:hover) {
       border { border: none; }
 
       background-color: transparent;
+      // border-radius: 0 0 $wm_radius $wm_radius;
+    }
+  }
+}
+
+// Documents
+
+window.background.csd { // Documents actionbar
+  > box.vertical > overlay > stack > box.vertical {
+    > actionbar {
       border-radius: 0 0 $wm_radius $wm_radius;
     }
   }
@@ -2452,6 +2488,7 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26),
 %panel_button {
   color: $panel_fg;
   border-radius: $bt_radius;
+  background: none;
   border: none;
 
   &:hover:not(:active):not(:checked) {
@@ -3347,20 +3384,20 @@ menubar.-vala-panel-background {
   .panel {
     &, &.color-light, &.color-dark {
       background-color: transparent;
-      background-image: linear-gradient(0deg, rgba($panel_bottom_color, 0.95) 0%, rgba($panel_top_color, 0.95) 100%);
-      border-bottom: 1px solid if($variant == 'light', $panel_border_color, $header_border);
+      background-image: image(rgba($panel_bg, 0.1));
+      border-bottom: none;
       transition: all 100ms ease-in-out;
       color: $panel_fg;
     }
 
     &.maximized {
-      background-color: $panel_bg;
+      background-color: rgba($panel_bg, 0.2);
       background-image: none;
       border: none;
     }
 
     &.translucent {
-      background-color: rgba($panel_bg, 0.75);
+      background-color: rgba($panel_bg, 0.1);
       background-image: none;
       border: none;
     }
diff --git a/src/sass/gtk/_colors-public.scss b/src/sass/gtk/_colors-public.scss
index 3259aa1..7829903 100644
--- a/src/sass/gtk/_colors-public.scss
+++ b/src/sass/gtk/_colors-public.scss
@@ -31,6 +31,9 @@
 @define-color link_color #{"" + $link_color};
 @define-color content_view_bg #{"" + $base_color};
 
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))};
+
 //WM
 $wm_highlight: lighten(opacify($header_highlight, 1), 10%);
 $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index fe0ef06..c1864b6 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -523,7 +523,12 @@ button {
       min-width: 42px;
     }
 
-    &:hover { color: $selected_bg_color; }
+    &:hover {
+      color: $selected_bg_color;
+      box-shadow: none;
+      background-color: $osd_button_bg;
+    }
+
     &:active, &:checked {@include button(osd-active); }
     &:disabled { @include button(osd-insensitive); }
   }
@@ -1098,9 +1103,24 @@ combobox {
 
   &.osd {
     padding: 8px;
-    border: 1px solid $borders_color;
-    border-radius: $bt_radius;
-    background-color: $base_color;
+    border: none;
+    border-radius: $bt_radius + 4px;
+    background-color: $osd_bg_color;
+    box-shadow: $shadow_4;
+
+    &.toolbar {
+      padding: 0;
+      margin: 6px 8px 10px;
+      box-shadow: none;
+      background: none;
+
+      > box.horizontal {
+        padding: 8px;
+        border-radius: $bt_radius + 4px;
+        background-color: $osd_bg_color;
+        box-shadow: $shadow_4;
+      }
+    }
 
     &.left,
     &.right,
@@ -1186,7 +1206,7 @@ actionbar {
   border-top: 1px solid $borders_color;
   background-color: darken($bg_color, 3%);
 
-  .background.csd & {
+  .background.csd revealer > & {
     border-radius: 0 0 $wm_radius $wm_radius;
   }
 }
@@ -1270,7 +1290,7 @@ headerbar {
     &:backdrop { opacity: 0.65; background-image: none; }
   }
 
-  stackswitcher {
+  stackswitcher, .stack-switcher {
     box-shadow: inset 0 0 0 1px $light_borders_color;
     border-radius: $bt_radius;
     margin: 8px 0;