From a8cc0d701f1beb8d76fc4b99b78907ecf4dadf28 Mon Sep 17 00:00:00 2001
From: Lee Jordan <duracell80@users.noreply.github.com>
Date: Mon, 24 Jul 2023 00:10:49 -0500
Subject: [PATCH] Update Fluent

---
 theme/gnome-shell/assets/activities.svg |   4 +-
 theme/gnome-shell/gnome-shell.css       | 291 ++++++++++++++-----
 theme/gtk-3.0/gtk-dark.css              | 358 +++++++++++++++++-------
 theme/gtk-3.0/gtk.css                   | 358 +++++++++++++++++-------
 theme/gtk-4.0/gtk-dark.css              | 154 ++++++----
 theme/gtk-4.0/gtk.css                   | 156 +++++++----
 6 files changed, 934 insertions(+), 387 deletions(-)

diff --git a/theme/gnome-shell/assets/activities.svg b/theme/gnome-shell/assets/activities.svg
index aeb3114..eb66f1c 100644
--- a/theme/gnome-shell/assets/activities.svg
+++ b/theme/gnome-shell/assets/activities.svg
@@ -1,3 +1 @@
-<svg width="24" height="24" enable-background="new" version="1.0" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 2c-1.662 0-3 1.338-3 3v6h9v-9zm7 0v9h9v-6c0-1.662-1.338-3-3-3zm-10 10v6c0 1.662 1.338 3 3 3h6v-9zm10 0v9h6c1.662 0 3-1.338 3-3v-6z" fill="#383838" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.0"><path fill="#383838" d="M6 2C4.338 2 3 3.338 3 5v6h9V2zm7 0v9h9V5c0-1.662-1.338-3-3-3zM3 12v6c0 1.662 1.338 3 3 3h6v-9zm10 0v9h6c1.662 0 3-1.338 3-3v-6z" style="paint-order:stroke fill markers"/></svg>
\ No newline at end of file
diff --git a/theme/gnome-shell/gnome-shell.css b/theme/gnome-shell/gnome-shell.css
index 031ce49..f3f3e9f 100644
--- a/theme/gnome-shell/gnome-shell.css
+++ b/theme/gnome-shell/gnome-shell.css
@@ -71,6 +71,37 @@ stage {
   color: rgba(255, 255, 255, 0.45);
 }
 
+/* General Typography */
+.message-list .message-list-placeholder {
+  font-weight: 800;
+  font-size: 15pt;
+}
+
+.quick-toggle-menu .header .title {
+  font-weight: 700;
+  font-size: 15pt;
+}
+
+.bt-menu-placeholder.popup-menu-item {
+  font-weight: 700;
+  font-size: 13pt;
+}
+
+.background-app-item .title {
+  font-weight: 700;
+  font-size: 11pt;
+}
+
+.quick-toggle-menu .header .subtitle {
+  font-weight: 700;
+  font-size: 9pt;
+}
+
+.background-app-item .subtitle {
+  font-weight: 400;
+  font-size: 9pt;
+}
+
 /* WIDGETS */
 .shell-link {
   border-radius: 5px;
@@ -89,11 +120,11 @@ stage {
 }
 
 .lowres-icon {
-  icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+  icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
 }
 
 .icon-dropshadow {
-  icon-shadow: 0 1px 5px rgba(0, 0, 0, 0.8);
+  icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.25);
 }
 
 /* Entries */
@@ -102,6 +133,7 @@ StEntry {
   padding: 3px 9px;
   border-radius: 5px;
   border-width: 0;
+  caret-color: rgba(0, 0, 0, 0.54);
   selection-background-color: #1A73E8;
   selected-color: #FFFFFF !important;
   font-size: 12pt;
@@ -198,6 +230,13 @@ StEntry StLabel.hint-text {
   box-shadow: 0 0 transparent;
 }
 
+.screenshot-ui-show-pointer-button:checked, .screenshot-ui-type-button:checked {
+  color: rgba(255, 255, 255, 0.85);
+  background-color: #1A73E8;
+  border-color: #1A73E8;
+  box-shadow: none;
+}
+
 .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
   color: rgba(0, 0, 0, 0.26);
   background-color: transparent;
@@ -361,7 +400,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-content {
   border-image: url("assets/menu.svg") 24 32 28 28;
   padding: 10px 12px 14px !important;
-  margin: 0 !important;
+  margin: 2px !important;
   border: none;
   background-color: transparent;
   box-shadow: none;
@@ -375,6 +414,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   transition-duration: 100ms;
   border-radius: 5px;
   background-image: none;
+  background-gradient-direction: none !important;
 }
 
 .popup-menu-item:ltr {
@@ -390,10 +430,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-item:checked {
   background-color: rgba(0, 0, 0, 0.08) !important;
   font-weight: normal;
-  border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0 !important;
   border: none;
   box-shadow: none;
   color: rgba(0, 0, 0, 0.87) !important;
+  background-gradient-direction: none !important;
 }
 
 .popup-menu-item:checked.selected, .popup-menu-item:checked:hover, .popup-menu-item:checked:focus {
@@ -414,12 +455,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(0, 0, 0, 0.06) !important;
   color: rgba(0, 0, 0, 0.87) !important;
   transition-duration: 0ms;
+  background-gradient-direction: none !important;
 }
 
 .popup-menu-item:active {
   background-color: rgba(0, 0, 0, 0.2) !important;
   color: rgba(0, 0, 0, 0.87) !important;
   transition-duration: 150ms;
+  background-gradient-direction: none !important;
 }
 
 .popup-menu-item.selected:active {
@@ -445,29 +488,39 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .popup-sub-menu {
   margin: 0;
-  background-color: rgba(0, 0, 0, 0.08);
-  border-radius: 0 0 5px 5px;
+  background-color: rgba(0, 0, 0, 0.08) !important;
+  border-radius: 0 0 5px 5px !important;
   border: none;
   box-shadow: none;
-  background-image: none;
+  background-image: none !important;
 }
 
 .popup-sub-menu .popup-menu-item {
   margin: 0;
   border-radius: 0;
-  background-image: none;
+  background-image: none !important;
+  background-color: transparent !important;
 }
 
-.popup-sub-menu .popup-menu-item:hover {
-  background-color: rgba(0, 0, 0, 0.06);
+.popup-sub-menu .popup-menu-item.selected, .popup-sub-menu .popup-menu-item:hover, .popup-sub-menu .popup-menu-item:focus {
+  background-color: rgba(0, 0, 0, 0.06) !important;
 }
 
 .popup-sub-menu .popup-menu-item:active {
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: rgba(0, 0, 0, 0.2) !important;
+}
+
+.popup-sub-menu .popup-menu-item:last-child {
+  border-radius: 0 0 5px 5px !important;
+  border-bottom-width: 0;
+}
+
+.popup-sub-menu .popup-menu-section .popup-menu-item:last-child:hover, .popup-sub-menu .popup-menu-section .popup-menu-item:last-child:focus {
+  border-radius: 0;
 }
 
-.popup-sub-menu:last-child .popup-menu-item:last-child, .popup-sub-menu .popup-menu-section:last-child .popup-menu-item:last-child {
-  border-radius: 0 0 5px 5px;
+.popup-sub-menu .popup-menu-section:last-child .popup-menu-item:last-child {
+  border-radius: 0 0 5px 5px !important;
 }
 
 .popup-menu-ornament {
@@ -568,8 +621,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .datemenu-calendar-column {
   spacing: 6px;
-  border: 0 solid rgba(0, 0, 0, 0.12);
-  padding: 0 12px;
+  border: none;
+  padding: 0;
+  margin: 0;
   color: rgba(0, 0, 0, 0.54);
 }
 
@@ -585,12 +639,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .datemenu-calendar-column:ltr {
   margin-right: 4px;
-  border-left-width: 1px;
+  margin-left: 10px;
+  border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
   margin-left: 4px;
-  border-right-width: 1px;
+  margin-right: 10px;
+  border-right-width: 0;
 }
 
 .datemenu-calendar-column .datemenu-displays-section {
@@ -787,7 +843,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .calendar-week-number {
   height: 1.8em !important;
   width: 2.6em !important;
-  padding: 0 !important;
+  padding: 0 2px !important;
   margin: 6px 0 !important;
   border-radius: 9999px;
   background-color: rgba(0, 0, 0, 0.04);
@@ -853,11 +909,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .events-button .events-box {
   spacing: 6px;
+  color: rgba(0, 0, 0, 0.54);
 }
 
 .events-button .events-list {
   spacing: 12px;
   text-shadow: none;
+  color: rgba(0, 0, 0, 0.54);
 }
 
 .events-button .event-time {
@@ -927,29 +985,31 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Message List */
 .message-list {
-  width: 31.5em;
+  width: 30em;
   padding: 0;
   color: rgba(0, 0, 0, 0.54);
   text-shadow: none;
   box-shadow: none;
+  border: 0 solid rgba(0, 0, 0, 0.12);
 }
 
 .message-list:ltr {
-  margin-left: 0;
+  margin-left: 6px;
   margin-right: 0;
-  padding-right: 0;
-  border-right-width: 0;
+  padding-right: 12px;
+  border-right-width: 1px;
 }
 
 .message-list:rtl {
-  margin-right: 0;
+  margin-right: 6px;
   margin-left: 0;
-  padding-left: 0;
-  border-left-width: 0;
+  padding-left: 12px;
+  border-left-width: 1px;
 }
 
 .message-list .message-list-placeholder {
   spacing: 12px;
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .message-list .message-list-placeholder > StIcon {
@@ -960,7 +1020,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message-list-sections {
   spacing: 6px;
-  margin: 0 8px;
+  margin: 0;
+  padding-bottom: 6px;
+}
+
+.message-list-sections:ltr {
+  margin-right: 0;
+}
+
+.message-list-sections:rtl {
+  margin-left: 0;
 }
 
 .message-list-section,
@@ -976,16 +1045,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .message {
   background-color: rgba(255, 255, 255, 0.35);
-  border-radius: 8px;
+  border-radius: 5px;
   color: rgba(0, 0, 0, 0.54);
   text-shadow: none;
   box-shadow: 0 3px 8px -2px rgba(0, 0, 0, 0.15);
-  margin: 0 8px 11px 8px;
   border: 1px solid rgba(0, 0, 0, 0.12);
 }
 
 .popup-menu .message {
   box-shadow: none;
+  margin: 0 0 4px;
 }
 
 .message:hover, .message:focus {
@@ -1198,7 +1267,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   min-height: 64px;
   width: 34em;
   font-size: 1em;
-  margin: 5px;
+  margin: 9px 8px 12px;
   border-radius: 5px;
   color: rgba(0, 0, 0, 0.87);
   background-color: rgba(255, 255, 255, 0.92);
@@ -1394,6 +1463,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .modal-dialog .modal-dialog-linked-button {
   min-height: 32px;
+  background-gradient-direction: none !important;
 }
 
 /* End Session Dialog */
@@ -1486,6 +1556,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 .prompt-dialog .modal-dialog-linked-button:last-child {
   border-image: url("assets/prompt-modal-button-right.svg") 16 16 16 16;
+  background-gradient-direction: none !important;
 }
 
 .prompt-dialog .modal-dialog-linked-button:last-child:hover {
@@ -1824,6 +1895,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: normal;
   font-feature-settings: "tnum";
   transition-duration: 250ms;
+  border: none;
+  box-shadow: none;
   padding: 0 2px !important;
   background-color: rgba(255, 255, 255, 0.75);
   margin: 0;
@@ -1846,7 +1919,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button {
   -natural-hpadding: 8px;
-  -minimum-hpadding: 4px;
+  -minimum-hpadding: 8px;
   font-weight: normal;
   color: rgba(0, 0, 0, 0.75);
   transition-duration: 150ms;
@@ -2248,6 +2321,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #dash .overview-icon {
   padding: 5px;
+  border-radius: 8px;
 }
 
 .dash-background {
@@ -2285,7 +2359,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon, .search-provider-icon, .list-search-result {
   color: rgba(255, 255, 255, 0.85);
-  border-radius: 8px;
+  border-radius: 10px;
   padding: 6px;
   border: 1px solid transparent;
   box-shadow: inset 0 1px transparent;
@@ -2404,6 +2478,7 @@ StWidget.focused .app-well-app-running-dot {
   border: none;
   color: #FFFFFF;
   background-color: rgba(255, 255, 255, 0.15);
+  caret-color: #FFFFFF;
   selection-background-color: #1A73E8;
   selected-color: #FFFFFF;
   width: 300px;
@@ -2529,7 +2604,7 @@ StWidget.focused .app-well-app-running-dot {
   border-radius: 0px 15px 15px 0px;
 }
 
-.page-navigation-arrow > StIcon {
+.page-navigation-arrow {
   margin: 6px;
   padding: 18px;
   width: 24px;
@@ -2538,17 +2613,17 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.page-navigation-arrow:insensitive > StIcon {
+.page-navigation-arrow:insensitive {
   background-color: rgba(255, 255, 255, 0.05);
   color: rgba(255, 255, 255, 0.45);
 }
 
-.page-navigation-arrow:hover > StIcon {
+.page-navigation-arrow:hover {
   background-color: rgba(255, 255, 255, 0.1);
   color: white;
 }
 
-.page-navigation-arrow:active > StIcon {
+.page-navigation-arrow:active {
   background-color: rgba(255, 255, 255, 0.2);
   color: white;
 }
@@ -2957,25 +3032,33 @@ StWidget.focused .app-well-app-running-dot {
 
 .quick-settings {
   border-radius: 23px !important;
+  margin-top: 6px !important;
   padding: 16px 18px 20px !important;
 }
 
-.quick-settings .icon-button, .quick-settings .button {
+.quick-settings .icon-button, .quick-settings .background-app-item .close-button, .background-app-item .quick-settings .close-button, .quick-settings .button {
   padding: 9px;
 }
 
+.quick-settings .icon-button > StIcon, .quick-settings .background-app-item .close-button > StIcon, .background-app-item .quick-settings .close-button > StIcon, .quick-settings .button > StIcon {
+  icon-size: 16px;
+}
+
 .quick-settings-grid {
   spacing-rows: 12px;
   spacing-columns: 12px;
 }
 
-.quick-toggle {
+.quick-toggle, .quick-menu-toggle {
   border-radius: 5px;
   min-width: 12em;
   max-width: 12em;
-  min-height: 40px;
+  min-height: 44px;
   padding: 0;
   border: none;
+}
+
+.quick-toggle {
   background-color: rgba(0, 0, 0, 0.06) !important;
   /* Move padding into the box; this is to allow menu arrows
      to extend to the border */
@@ -3005,7 +3088,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .quick-toggle > StBoxLayout {
-  spacing: 6px;
+  spacing: 9px;
 }
 
 .quick-toggle.button {
@@ -3024,41 +3107,88 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 15px;
 }
 
-.quick-toggle .quick-toggle-label {
+.quick-toggle .quick-toggle-title {
   font-weight: bold;
 }
 
-.quick-toggle .quick-toggle-icon, .quick-toggle .quick-toggle-arrow {
+.quick-toggle StBoxLayout > .quick-toggle-subtitle {
+  font-weight: normal;
+  font-size: 12px;
+}
+
+.quick-toggle .quick-toggle-icon {
   icon-size: 16px;
 }
 
-.quick-menu-toggle:ltr > StBoxLayout {
-  padding-right: 0;
+.quick-menu-toggle .quick-toggle {
+  min-width: auto;
+  max-width: auto;
 }
 
-.quick-menu-toggle:rtl > StBoxLayout {
-  padding-left: 0;
+.quick-menu-toggle .quick-toggle:ltr {
+  border-radius: 5px 0 0 5px;
+}
+
+.quick-menu-toggle .quick-toggle:ltr > StBoxLayout {
+  padding-right: 9px;
+}
+
+.quick-menu-toggle .quick-toggle:rtl {
+  border-radius: 0 5px 5px 0;
+}
+
+.quick-menu-toggle .quick-toggle:rtr > StBoxLayout {
+  padding-left: 9px;
+}
+
+.quick-menu-toggle .quick-toggle:ltr:last-child {
+  border-radius: 5px;
+}
+
+.quick-menu-toggle .quick-toggle:rtl:last-child {
+  border-radius: 5px;
 }
 
 .quick-menu-toggle .quick-toggle-arrow {
   background-color: rgba(0, 0, 0, 0.06) !important;
   padding: 6px 12px;
+  border-width: 0;
+  color: rgba(0, 0, 0, 0.54);
 }
 
-.quick-menu-toggle .quick-toggle-arrow:active {
+.quick-menu-toggle .quick-toggle-arrow:hover {
   background-color: rgba(0, 0, 0, 0.12) !important;
+  color: rgba(0, 0, 0, 0.87);
+}
+
+.quick-menu-toggle .quick-toggle-arrow:active {
+  background-color: rgba(0, 0, 0, 0.15) !important;
+  color: rgba(0, 0, 0, 0.87);
+}
+
+.quick-menu-toggle .quick-toggle-arrow:checked {
+  background-color: #1A73E8 !important;
+  color: white;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:checked:hover {
+  background-color: rgba(25, 110, 221, 0.9922) !important;
+  color: white;
+}
+
+.quick-menu-toggle .quick-toggle-arrow:checked:active {
+  background-color: rgba(23, 101, 204, 0.9805) !important;
+  color: white;
 }
 
 .quick-menu-toggle .quick-toggle-arrow:ltr {
   border-radius: 0 5px 5px 0;
+  border-left-width: 0;
 }
 
 .quick-menu-toggle .quick-toggle-arrow:rtl {
   border-radius: 5px 0 0 5px;
-}
-
-.quick-slider {
-  padding: 0 6px;
+  border-right-width: 0;
 }
 
 .quick-slider > StBoxLayout {
@@ -3084,18 +3214,18 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 16px;
 }
 
-.quick-slider .icon-button {
+.quick-slider .icon-button, .quick-slider .background-app-item .close-button, .background-app-item .quick-slider .close-button {
   min-width: 22px;
   min-height: 22px;
   background-color: transparent;
   color: rgba(0, 0, 0, 0.87) !important;
 }
 
-.quick-slider .icon-button:hover {
+.quick-slider .icon-button:hover, .quick-slider .background-app-item .close-button:hover, .background-app-item .quick-slider .close-button:hover {
   background-color: rgba(0, 0, 0, 0.06);
 }
 
-.quick-slider .icon-button:active {
+.quick-slider .icon-button:active, .quick-slider .background-app-item .close-button:active, .background-app-item .quick-slider .close-button:active {
   background-color: rgba(0, 0, 0, 0.12);
 }
 
@@ -3104,7 +3234,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(0, 0, 0, 0.87) !important;
   border-radius: 8px !important;
   padding: 12px;
-  margin: 12px 18px 0;
+  margin: 12px 20px 0 !important;
 }
 
 .quick-toggle-menu .popup-menu-item {
@@ -3148,7 +3278,7 @@ StWidget.focused .app-well-app-running-dot {
   spacing: 12px;
 }
 
-.quick-settings-system-item .icon-button {
+.quick-settings-system-item .icon-button, .quick-settings-system-item .background-app-item .close-button, .background-app-item .quick-settings-system-item .close-button {
   background-color: rgba(0, 0, 0, 0.06);
   color: rgba(0, 0, 0, 0.87);
   border-radius: 5px;
@@ -3156,15 +3286,15 @@ StWidget.focused .app-well-app-running-dot {
   min-width: 22px;
 }
 
-.quick-settings-system-item .icon-button:hover {
+.quick-settings-system-item .icon-button:hover, .quick-settings-system-item .background-app-item .close-button:hover, .background-app-item .quick-settings-system-item .close-button:hover {
   background-color: rgba(0, 0, 0, 0.12);
 }
 
-.quick-settings-system-item .icon-button:active {
+.quick-settings-system-item .icon-button:active, .quick-settings-system-item .background-app-item .close-button:active, .background-app-item .quick-settings-system-item .close-button:active {
   background-color: rgba(0, 0, 0, 0.2);
 }
 
-.quick-settings-system-item .icon-button > StIcon {
+.quick-settings-system-item .icon-button > StIcon, .quick-settings-system-item .background-app-item .close-button > StIcon, .background-app-item .quick-settings-system-item .close-button > StIcon {
   -st-icon-style: symbolic;
   icon-size: 16px;
 }
@@ -3186,6 +3316,41 @@ StWidget.focused .app-well-app-running-dot {
   icon-size: 8px;
 }
 
+.bt-device-item .popup-menu-icon {
+  -st-icon-style: symbolic;
+}
+
+.bt-menu-placeholder.popup-menu-item {
+  text-align: center;
+  padding: 2em 4em;
+}
+
+.device-subtitle {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+.background-apps-quick-toggle {
+  min-height: 40px;
+  background-color: transparent;
+}
+
+.background-apps-quick-toggle StIcon {
+  icon-size: 16px !important;
+}
+
+.background-app-item .popup-menu-icon {
+  icon-size: 32px !important;
+  -st-icon-style: regular !important;
+}
+
+.background-app-item .close-button {
+  padding: 6px;
+}
+
+.background-app-item.popup-inactive-menu-item {
+  color: rgba(0, 0, 0, 0.87);
+}
+
 .icon-label-button-container {
   spacing: 6px;
   font-size: 9pt;
@@ -3224,7 +3389,7 @@ StWidget.focused .app-well-app-running-dot {
 .screenshot-ui-capture-button {
   width: 36px;
   height: 36px;
-  border-radius: 1000px;
+  border-radius: 9999px;
   border: 4px rgba(255, 255, 255, 0.85);
   padding: 4px;
 }
@@ -3232,7 +3397,7 @@ StWidget.focused .app-well-app-running-dot {
 .screenshot-ui-capture-button .screenshot-ui-capture-button-circle {
   background-color: rgba(255, 255, 255, 0.85);
   transition-duration: 200ms;
-  border-radius: 1000px;
+  border-radius: 9999px;
 }
 
 .screenshot-ui-capture-button .screenshot-ui-capture-button-circle:hover, .screenshot-ui-capture-button .screenshot-ui-capture-button-circle:focus {
@@ -3298,7 +3463,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-show-pointer-button {
-  border-radius: 1000px;
+  border-radius: 9999px;
   padding: 12px !important;
 }
 
@@ -3319,7 +3484,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-area-selector-handle {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-color: white;
   box-shadow: 0 1px 3px 2px rgba(0, 0, 0, 0.2);
   width: 24px;
@@ -3347,7 +3512,7 @@ StWidget.focused .app-well-app-running-dot {
 .screenshot-ui-window-selector-check {
   transition-duration: 200ms;
   color: transparent;
-  border-radius: 1000px;
+  border-radius: 9999px;
   border-width: 12px;
   icon-size: 24px;
 }
diff --git a/theme/gtk-3.0/gtk-dark.css b/theme/gtk-3.0/gtk-dark.css
index cda1a95..b2f4f33 100644
--- a/theme/gtk-3.0/gtk-dark.css
+++ b/theme/gtk-3.0/gtk-dark.css
@@ -99,6 +99,7 @@
 
 .view:hover {
   background-color: alpha(currentColor, 0.08);
+  color: white;
 }
 
 .view:disabled {
@@ -552,14 +553,14 @@ button:drop(active) {
   border-color: rgba(255, 255, 255, 0.3);
 }
 
-.budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, treeview.view header button button.circular, row.activatable button.circular, check,
+.budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu row.activatable > button.flat button.circular, treeview.view header button button.circular, row.activatable button.circular, check,
 radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
-.menuitem.button.flat, .nemo-window .toolbar button, #buttonbox_frame button, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:not(.flat), .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
+.menuitem.button.flat, .nemo-window.background .toolbar button, #buttonbox_frame button, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:not(.flat), .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button, layouttabbar button, filechooser #pathbarbox > stack > box > button, messagedialog .dialog-action-box > .linked > button, messagedialog.csd .dialog-action-box > .linked > button, .app-notification button, popover.menu button,
 popover button.model,
 popover.background.menu button,
 popover.background button.model, .caja-pathbar button,
-.path-bar.linked:not(.vertical) > button, .nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), .raven-mpris button.image-button, infobar.error > revealer > box button, infobar.error:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.action > revealer > box button, infobar.action:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:backdrop > revealer > box button, .selection-mode headerbar button.titlebutton:not(.suggested-action):not(.destructive-action), button.flat {
+.path-bar.linked:not(.vertical) > button, .nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), .raven-mpris button.image-button, infobar.error > revealer > box button, infobar.error:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.action > revealer > box button, infobar.action:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:backdrop > revealer > box button, .selection-mode headerbar button.titlebutton:not(.suggested-action):not(.destructive-action), button.flat {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 300ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -568,34 +569,34 @@ popover.background button.model, .caja-pathbar button,
   color: rgba(255, 255, 255, 0.7);
 }
 
-.budgie-session-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
+.budgie-session-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:focus, treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
 radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
-.menuitem.button.flat:focus, .nemo-window .toolbar button:focus, #buttonbox_frame button:focus, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:focus:not(.flat), .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
+.menuitem.button.flat:focus, .nemo-window.background .toolbar button:focus, #buttonbox_frame button:focus, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:focus:not(.flat), .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus, layouttabbar button:focus, filechooser #pathbarbox > stack > box > button:focus, messagedialog .dialog-action-box > .linked > button:focus, .app-notification button:focus, popover.menu button:focus,
 popover button.model:focus, .caja-pathbar button:focus,
-.path-bar.linked:not(.vertical) > button:focus, .nemo-window .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), .raven-mpris button.image-button:focus, infobar.error > revealer > box button:focus, infobar.warning > revealer > box button:focus, infobar.action > revealer > box button:focus, infobar.question > revealer > box button:focus, .selection-mode headerbar button.titlebutton:focus:not(.suggested-action):not(.destructive-action), button.flat:focus, button.flat:checked:focus {
+.path-bar.linked:not(.vertical) > button:focus, .nemo-window.background .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), .raven-mpris button.image-button:focus, infobar.error > revealer > box button:focus, infobar.warning > revealer > box button:focus, infobar.action > revealer > box button:focus, infobar.question > revealer > box button:focus, .selection-mode headerbar button.titlebutton:focus:not(.suggested-action):not(.destructive-action), button.flat:focus, button.flat:checked:focus {
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   background-color: transparent;
   color: white;
 }
 
-.budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
+.budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:hover, treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
 radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
-.menuitem.button.flat:hover, .nemo-window .toolbar button:hover, #buttonbox_frame button:hover, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:hover:not(.flat), .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
+.menuitem.button.flat:hover, .nemo-window.background .toolbar button:hover, #buttonbox_frame button:hover, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:hover:not(.flat), .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover, layouttabbar button:hover, filechooser #pathbarbox > stack > box > button:hover, messagedialog .dialog-action-box > .linked > button:hover, .app-notification button:hover, popover.menu button:hover,
 popover button.model:hover, .caja-pathbar button:hover,
-.path-bar.linked:not(.vertical) > button:hover, .nemo-window .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), .raven-mpris button.image-button:hover, infobar.error > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.action > revealer > box button:hover, infobar.question > revealer > box button:hover, .selection-mode headerbar button.titlebutton:hover:not(.suggested-action):not(.destructive-action), button.flat:hover {
+.path-bar.linked:not(.vertical) > button:hover, .nemo-window.background .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), .raven-mpris button.image-button:hover, infobar.error > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.action > revealer > box button:hover, infobar.question > revealer > box button:hover, .selection-mode headerbar button.titlebutton:hover:not(.suggested-action):not(.destructive-action), button.flat:hover {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
   background-color: transparent;
   color: white;
 }
 
-.budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
+.budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:active, treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
 radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
-.menuitem.button.flat:active, .nemo-window .toolbar button:active, #buttonbox_frame button:active, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:active:not(.flat), .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
+.menuitem.button.flat:active, .nemo-window.background .toolbar button:active, #buttonbox_frame button:active, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:active:not(.flat), .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active, layouttabbar button:active, filechooser #pathbarbox > stack > box > button:active, messagedialog .dialog-action-box > .linked > button:active, .app-notification button:active, popover.menu button:active,
 popover button.model:active, .caja-pathbar button:active,
-.path-bar.linked:not(.vertical) > button:active, .nemo-window .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), .raven-mpris button.image-button:active, infobar.error > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.action > revealer > box button:active, infobar.question > revealer > box button:active, .selection-mode headerbar button.titlebutton:active:not(.suggested-action):not(.destructive-action), button.flat:active {
+.path-bar.linked:not(.vertical) > button:active, .nemo-window.background .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), .raven-mpris button.image-button:active, infobar.error > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.action > revealer > box button:active, infobar.question > revealer > box button:active, .selection-mode headerbar button.titlebutton:active:not(.suggested-action):not(.destructive-action), button.flat:active {
   animation: none;
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 300ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.16);
@@ -603,29 +604,29 @@ popover button.model:active, .caja-pathbar button:active,
   color: white;
 }
 
-.budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
+.budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:disabled, treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
 radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
-.menuitem.button.flat:disabled, .nemo-window .toolbar button:disabled, #buttonbox_frame button:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:disabled:not(.flat), .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
+.menuitem.button.flat:disabled, .nemo-window.background .toolbar button:disabled, #buttonbox_frame button:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:disabled:not(.flat), .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled, layouttabbar button:disabled, filechooser #pathbarbox > stack > box > button:disabled, messagedialog .dialog-action-box > .linked > button:disabled, .app-notification button:disabled, popover.menu button:disabled,
 popover button.model:disabled, .caja-pathbar button:disabled,
-.path-bar.linked:not(.vertical) > button:disabled, .nemo-window .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), .raven-mpris button.image-button:disabled, infobar.error > revealer > box button:disabled, infobar.warning > revealer > box button:disabled, infobar.action > revealer > box button:disabled, infobar.question > revealer > box button:disabled, .selection-mode headerbar button.titlebutton:disabled:not(.suggested-action):not(.destructive-action), button.flat:disabled {
+.path-bar.linked:not(.vertical) > button:disabled, .nemo-window.background .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), .raven-mpris button.image-button:disabled, infobar.error > revealer > box button:disabled, infobar.warning > revealer > box button:disabled, infobar.action > revealer > box button:disabled, infobar.question > revealer > box button:disabled, .selection-mode headerbar button.titlebutton:disabled:not(.suggested-action):not(.destructive-action), button.flat:disabled {
   box-shadow: none;
   background-color: transparent;
   color: rgba(255, 255, 255, 0.3);
 }
 
-.nemo-window .toolbar button:checked, #buttonbox_frame button:checked, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:not(.flat), .raven stackswitcher.linked > button:checked, .lock-dialog button:checked, .mate-panel-menu-bar button:checked, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked,
+.nemo-window.background .toolbar button:checked, #buttonbox_frame button:checked, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:not(.flat), .raven stackswitcher.linked > button:checked, .lock-dialog button:checked, .mate-panel-menu-bar button:checked, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked, layouttabbar button:checked, filechooser #pathbarbox > stack > box > button:checked, messagedialog .dialog-action-box > .linked > button:checked, .app-notification button:checked, popover.menu button:checked,
 popover button.model:checked, .caja-pathbar button:checked,
-.path-bar.linked:not(.vertical) > button:checked, .nemo-window .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action), toolbar button:checked, combobox > .linked:not(.vertical) > button:checked:not(:only-child), .raven-mpris button.image-button:checked, infobar.error > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.action > revealer > box button:checked, infobar.question > revealer > box button:checked, .selection-mode headerbar button.titlebutton:checked:not(.suggested-action):not(.destructive-action), button.flat:checked, button.flat:checked:hover {
+.path-bar.linked:not(.vertical) > button:checked, .nemo-window.background .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action), toolbar button:checked, combobox > .linked:not(.vertical) > button:checked:not(:only-child), .raven-mpris button.image-button:checked, infobar.error > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.action > revealer > box button:checked, infobar.question > revealer > box button:checked, .selection-mode headerbar button.titlebutton:checked:not(.suggested-action):not(.destructive-action), button.flat:checked, button.flat:checked:hover {
   background-color: alpha(currentColor, 0.1);
   color: white;
 }
 
-.nemo-window .toolbar button:checked:disabled, #buttonbox_frame button:checked:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:disabled:not(.flat), .raven stackswitcher.linked > button:checked:disabled, .lock-dialog button:checked:disabled, .mate-panel-menu-bar button:checked:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled,
+.nemo-window.background .toolbar button:checked:disabled, #buttonbox_frame button:checked:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:disabled:not(.flat), .raven stackswitcher.linked > button:checked:disabled, .lock-dialog button:checked:disabled, .mate-panel-menu-bar button:checked:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled, layouttabbar button:checked:disabled, filechooser #pathbarbox > stack > box > button:checked:disabled, messagedialog .dialog-action-box > .linked > button:checked:disabled, .app-notification button:checked:disabled, popover.menu button:checked:disabled,
 popover button.model:checked:disabled, .caja-pathbar button:checked:disabled,
-.path-bar.linked:not(.vertical) > button:checked:disabled, .nemo-window .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action), toolbar button:checked:disabled, combobox > .linked:not(.vertical) > button:checked:disabled:not(:only-child), .raven-mpris button.image-button:checked:disabled, infobar.error > revealer > box button:checked:disabled, infobar.warning > revealer > box button:checked:disabled, infobar.action > revealer > box button:checked:disabled, infobar.question > revealer > box button:checked:disabled, .selection-mode headerbar button.titlebutton:checked:disabled:not(.suggested-action):not(.destructive-action), button.flat:checked:disabled {
+.path-bar.linked:not(.vertical) > button:checked:disabled, .nemo-window.background .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action), toolbar button:checked:disabled, combobox > .linked:not(.vertical) > button:checked:disabled:not(:only-child), .raven-mpris button.image-button:checked:disabled, infobar.error > revealer > box button:checked:disabled, infobar.warning > revealer > box button:checked:disabled, infobar.action > revealer > box button:checked:disabled, infobar.question > revealer > box button:checked:disabled, .selection-mode headerbar button.titlebutton:checked:disabled:not(.suggested-action):not(.destructive-action), button.flat:checked:disabled {
   background-color: alpha(currentColor, 0.1);
   color: rgba(255, 255, 255, 0.5);
 }
@@ -1266,12 +1267,12 @@ frame.documents-dropdown, .app-notification, toolbar.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
 frame.documents-dropdown:backdrop, .app-notification:backdrop, toolbar.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 frame.left.documents-dropdown, .left.app-notification, frame.right.documents-dropdown, .right.app-notification, frame.top.documents-dropdown, .top.app-notification, frame.bottom.documents-dropdown, .bottom.app-notification, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1346,44 +1347,44 @@ searchbar > revealer > box {
 /***************
  * Header bars *
  ***************/
-.nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.nemo-window .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:focus, .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:hover, .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:active, .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked, .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:focus, .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:hover, .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:active, .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked, .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action) {
   color: white;
 }
 
-.nemo-window .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:disabled, .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:disabled, .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.3);
 }
 
-.nemo-window .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked:disabled, .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked:disabled, .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action) {
   background-color: transparent;
   color: rgba(255, 255, 255, 0.5);
 }
 
-.nemo-window .primary-toolbar button:backdrop:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop, .xfce4-panel.background button:backdrop, .titlebar button:backdrop:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop, .xfce4-panel.background button:backdrop, .titlebar button:backdrop:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.5);
 }
 
-.nemo-window .primary-toolbar button:backdrop:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:focus, .xfce4-panel.background button:backdrop:focus, .titlebar button:backdrop:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:backdrop:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:hover, .xfce4-panel.background button:backdrop:hover, .titlebar button:backdrop:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:backdrop:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:active, .xfce4-panel.background button:backdrop:active, .titlebar button:backdrop:active:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:focus, .xfce4-panel.background button:backdrop:focus, .titlebar button:backdrop:focus:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:backdrop:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:hover, .xfce4-panel.background button:backdrop:hover, .titlebar button:backdrop:hover:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:backdrop:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:active, .xfce4-panel.background button:backdrop:active, .titlebar button:backdrop:active:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.nemo-window .primary-toolbar button:backdrop:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:disabled, .xfce4-panel.background button:backdrop:disabled, .titlebar button:backdrop:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:disabled, .xfce4-panel.background button:backdrop:disabled, .titlebar button:backdrop:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.3);
 }
 
-.nemo-window .primary-toolbar button:backdrop:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked, .xfce4-panel.background button:backdrop:checked, .titlebar button:backdrop:checked:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked, .xfce4-panel.background button:backdrop:checked, .titlebar button:backdrop:checked:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.nemo-window .primary-toolbar button:backdrop:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked:disabled, .xfce4-panel.background button:backdrop:checked:disabled, .titlebar button:backdrop:checked:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked:disabled, .xfce4-panel.background button:backdrop:checked:disabled, .titlebar button:backdrop:checked:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(255, 255, 255, 0.3);
 }
 
-.nemo-window .primary-toolbar entry, .thunar toolbar entry, .titlebar entry {
+.nemo-window.background .primary-toolbar entry, .thunar toolbar entry, .titlebar entry {
   background-color: rgba(255, 255, 255, 0.12);
   color: white;
   border: none;
@@ -1392,37 +1393,37 @@ searchbar > revealer > box {
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry:hover, .thunar toolbar entry:hover, .titlebar entry:hover {
+.nemo-window.background .primary-toolbar entry:hover, .thunar toolbar entry:hover, .titlebar entry:hover {
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(255, 255, 255, 0.12);
 }
 
-.nemo-window .primary-toolbar entry:focus, .thunar toolbar entry:focus, .titlebar entry:focus {
+.nemo-window.background .primary-toolbar entry:focus, .thunar toolbar entry:focus, .titlebar entry:focus {
   box-shadow: inset 0 0 0 2px #a6c8f6;
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry:disabled, .thunar toolbar entry:disabled, .titlebar entry:disabled {
+.nemo-window.background .primary-toolbar entry:disabled, .thunar toolbar entry:disabled, .titlebar entry:disabled {
   background-color: rgba(255, 255, 255, 0.04);
   color: rgba(255, 255, 255, 0.5);
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry image, .thunar toolbar entry image, .titlebar entry image {
+.nemo-window.background .primary-toolbar entry image, .thunar toolbar entry image, .titlebar entry image {
   color: rgba(255, 255, 255, 0.7);
 }
 
-.nemo-window .primary-toolbar entry image:hover, .thunar toolbar entry image:hover, .titlebar entry image:hover, .nemo-window .primary-toolbar entry image:active, .thunar toolbar entry image:active, .titlebar entry image:active {
+.nemo-window.background .primary-toolbar entry image:hover, .thunar toolbar entry image:hover, .titlebar entry image:hover, .nemo-window.background .primary-toolbar entry image:active, .thunar toolbar entry image:active, .titlebar entry image:active {
   color: white;
 }
 
-.nemo-window .primary-toolbar entry image:disabled, .thunar toolbar entry image:disabled, .titlebar entry image:disabled {
+.nemo-window.background .primary-toolbar entry image:disabled, .thunar toolbar entry image:disabled, .titlebar entry image:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
 headerbar button.titlebutton:not(.suggested-action):not(.destructive-action) {
   min-height: 26px;
   min-width: 26px;
-  padding: 0 0;
+  padding: 0;
   margin-left: 1px;
   margin-right: 1px;
 }
@@ -1815,8 +1816,12 @@ treeview.view:selected {
   color: white;
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: #4b4b4b;
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: #383838;
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: #404040;
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -2119,13 +2124,13 @@ popover.background {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 2px;
   background-color: rgba(60, 60, 60, 0.98);
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.1), 0 4px 3px 0 rgba(0, 0, 0, 0.08), 0 1px 6px 0 rgba(0, 0, 0, 0.06);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06), 0 3px 4px rgba(0, 0, 0, 0.08), 0 1px 6px rgba(0, 0, 0, 0.06);
   background-clip: border-box;
 }
 
 popover:backdrop,
 popover.background:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 popover, .csd popover,
@@ -2193,6 +2198,20 @@ popover.background button.model {
   border-radius: 4px;
 }
 
+popover.menu button:focus,
+popover button.model:focus,
+popover.background.menu button:focus,
+popover.background button.model:focus {
+  box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
+  background-color: transparent;
+  color: white;
+}
+
+popover button.model,
+popover.background button.model {
+  min-width: 32px;
+}
+
 popover separator,
 popover.background separator {
   margin: 4px 0;
@@ -2680,7 +2699,7 @@ switch:checked slider {
 .view.content-view.check:not(list):hover, .view.content-view.check:not(list):active,
 .content-view .tile check:not(list):hover,
 .content-view .tile check:not(list):active {
-  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 4px 3px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
 }
 
 .view.content-view.check:not(list),
@@ -3385,10 +3404,10 @@ list {
 }
 
 list row {
-  padding: 3px;
+  padding: 3px 6px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, treeview.view header button, row.activatable {
   outline: none;
   background-image: image(rgba(50, 129, 234, 0));
   background-position: 3px center;
@@ -3397,12 +3416,12 @@ list row {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, treeview.view header button:hover, row.activatable:hover {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1), background-image 0;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
   transition: background-image 1200ms cubic-bezier(0, 0, 0.2, 1), box-shadow 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.16);
 }
@@ -3439,6 +3458,10 @@ row.expander:checked list.nested > row.activatable {
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12), inset 0 1px rgba(255, 255, 255, 0.12);
 }
 
+.frame list > row > label {
+  margin: 0 6px;
+}
+
 /*********************
  * App Notifications *
  *********************/
@@ -3884,7 +3907,7 @@ infobar.error > revealer > box *:link, infobar.error:backdrop > revealer > box *
  ************/
 tooltip {
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
 }
 
 tooltip.background {
@@ -3991,12 +4014,12 @@ colorswatch#editor-color-sample overlay {
 colorchooser .popover.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
 colorchooser .popover.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 /********
@@ -4017,12 +4040,12 @@ colorchooser .popover.osd:backdrop {
 decoration {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 8px;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(255, 255, 255, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13), 0 0 0 1px rgba(255, 255, 255, 0.12), 0 15px 30px transparent;
   margin: 8px;
 }
 
 decoration:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(255, 255, 255, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(255, 255, 255, 0.12), 0 15px 30px transparent;
 }
 
 .maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration {
@@ -4040,7 +4063,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(255, 255, 255, 0.2);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(255, 255, 255, 0.2);
 }
 
 tooltip.csd decoration {
@@ -4064,17 +4087,17 @@ messagedialog.csd decoration {
   background-color: #2C2C2C;
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, .background.csd .view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, .background.csd .view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected, row:selected, calendar:selected {
   background-color: alpha(currentColor, 0.06);
 }
 
-.nemo-window .nemo-window-pane notebook .view:selected, textview text selection, textview text selection:focus, flowbox flowboxchild:selected {
+.nemo-window.background .nemo-window-pane notebook .view:selected, textview text selection, textview text selection:focus, flowbox flowboxchild:selected {
   color: #3281EA;
   background-color: rgba(50, 129, 234, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, #MozillaGtkWidget > widget text:selected, #MozillaGtkWidget > widget text selection, #MozillaGtkWidget > widget text selection:focus, window.background.chromium > textview.view selection, window.background.chromium textview selection, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, .nautilus-window notebook .view:not(treeview) selection, .nautilus-window notebook .view:not(treeview):selected, .nautilus-window flowboxchild:selected .icon-item-background, .view:selected, widget.view:selected, .background.csd textview text selection, .background.csd textview text selection:focus, label selection,
+.nemo-window.background .nemo-window-pane widget.entry:selected, #MozillaGtkWidget > widget text:selected, #MozillaGtkWidget > widget text selection, #MozillaGtkWidget > widget text selection:focus, window.background.chromium > textview.view selection, window.background.chromium textview selection, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, .nautilus-window notebook .view:not(treeview) selection, .nautilus-window notebook .view:not(treeview):selected, .nautilus-window flowboxchild:selected .icon-item-background, .view:selected, widget.view:selected, .background.csd textview text selection, .background.csd textview text selection:focus, label selection,
 entry selection, spinbutton:not(.vertical) selection, spinbutton.vertical selection {
   color: white;
   background-color: #3281EA;
@@ -4199,6 +4222,14 @@ viewswitcher button:not(.suggested-action):not(.destructive-action) > stack > bo
 /*************
  * App Icons *
  *************/
+.lowres-icon {
+  -gtk-icon-shadow: none;
+}
+
+.icon-dropshadow {
+  -gtk-icon-shadow: none;
+}
+
 /*********
  * Emoji *
  *********/
@@ -4613,7 +4644,7 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
 .gedit-search-slider {
   margin: 0 6px 10px;
   padding: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #3C3C3C;
   border-radius: 0 0 6px 6px;
 }
@@ -5397,7 +5428,7 @@ GdMainIconView.content-view {
 .documents-counter {
   margin: 8px;
   border-radius: 9999px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #3281EA;
   color: white;
   font-weight: bold;
@@ -5940,7 +5971,7 @@ window.background.csd.unified.fullscreen > decoration-overlay {
  *********/
 overlay > revealer.left > scrolledwindow.frame, overlay > revealer.right > scrolledwindow.frame {
   border-style: none;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13);
 }
 
 overlay > revealer.left > scrolledwindow.frame {
@@ -6300,27 +6331,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #202020;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #2C2C2C;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #2B2B2B;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }
@@ -6388,7 +6419,7 @@ UnityDecoration .menuitem:hover {
 
 .background:not(.csd) headerbar:not(.titlebar) {
   border-radius: 0;
-  box-shadow: 0 2px 2px -2px rgba(0, 0, 0, 0.3), 0 1px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 2px -0.6px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
 .background:not(.csd) headerbar:not(.titlebar).inline-toolbar {
@@ -6911,16 +6942,21 @@ MsdOsdWindow.background.osd .progressbar {
   border: none;
   border-color: transparent;
   border-radius: 5px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #3C3C3C;
 }
 
 .budgie-popover .container {
+  padding: 6px;
+}
+
+.budgie-popover .container .container {
   padding: 0;
 }
 
-.budgie-popover separator {
+.budgie-popover widget > separator {
   margin: 3px 0;
+  background-color: rgba(255, 255, 255, 0.3);
 }
 
 .budgie-popover border {
@@ -6973,16 +7009,56 @@ MsdOsdWindow.background.osd .progressbar {
   box-shadow: none;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
+.budgie-popover.budgie-menu list.left-overlay-menu {
+  background-color: #2B2B2B;
+  padding: 6px;
+  margin: 6px;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+  padding: 3px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
+  min-height: 16px;
+  min-width: 16px;
+  padding: 6px;
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
+  border-radius: 9999px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
+  margin-right: 6px;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7002,6 +7078,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(255, 255, 255, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover scrolledwindow.sidebar:not(.categories) {
   background: none;
   border-right: none;
@@ -7068,10 +7148,6 @@ MsdOsdWindow.background.osd .progressbar {
   margin: 0 6px;
 }
 
-.budgie-popover.caffeine-popover .container {
-  padding: 6px;
-}
-
 .budgie-popover.places-menu .container {
   padding: 3px;
 }
@@ -7179,6 +7255,46 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(31, 31, 31, 0.8);
 }
 
+.bottom .budgie-panel.dock-mode {
+  border-radius: 8px 8px 0 0;
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist button.launcher:checked, .bottom .budgie-panel.dock-mode .icon-tasklist button.launcher:active {
+  color: white;
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist > box > revealer:first-child > button.launcher {
+  border-top-left-radius: 8px;
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist > box > revealer:last-child > button.launcher {
+  border-top-right-radius: 8px;
+}
+
+.left .budgie-panel.dock-mode {
+  border-radius: 0 8px 8px 0;
+}
+
+.left .budgie-panel.dock-mode .icon-tasklist .launcher:first-child {
+  border-top-right-radius: 8px;
+}
+
+.left .budgie-panel.dock-mode .icon-tasklist .launcher:last-child {
+  border-bottom-right-radius: 8px;
+}
+
+.right .budgie-panel.dock-mode {
+  border-radius: 8px 0 0 8px;
+}
+
+.right .budgie-panel.dock-mode .icon-tasklist .launcher:first-child {
+  border-top-left-radius: 8px;
+}
+
+.right .budgie-panel.dock-mode .icon-tasklist .launcher:last-child {
+  border-bottom-left-radius: 8px;
+}
+
 .budgie-panel button, .budgie-panel button.flat, .budgie-panel button.image-button {
   color: rgba(255, 255, 255, 0.7);
   background: none;
@@ -7231,10 +7347,6 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 4px 0;
 }
 
-.budgie-panel separator {
-  background-color: rgba(255, 255, 255, 0.3);
-}
-
 .budgie-panel .alert {
   color: #F28B82;
 }
@@ -7319,6 +7431,36 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #3281EA 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7373,7 +7515,7 @@ frame.raven-frame > border {
 
 .raven {
   background-color: #3C3C3C;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13);
 }
 
 .raven > box {
@@ -7491,6 +7633,12 @@ calendar.raven-calendar:selected {
   padding: 10px;
 }
 
+image.raven-mpris {
+  background-color: rgba(255, 255, 255, 0.12);
+  color: rgba(255, 255, 255, 0.7);
+  border-radius: 4px;
+}
+
 .raven-notifications-view > .raven-background > viewport.frame {
   padding: 0;
 }
@@ -7548,9 +7696,9 @@ calendar.raven-calendar:selected {
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 6px;
   border-radius: 8px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
@@ -7567,6 +7715,10 @@ calendar.raven-calendar:selected {
   border-radius: 8px;
 }
 
+.budgie-run-dialog > box > grid, .budgie-polkit-dialog > box > grid, .budgie-session-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog label:not(:last-child),
 .budgie-session-dialog .dialog-title {
   font-size: 120%;
@@ -7594,6 +7746,10 @@ calendar.raven-calendar:selected {
   color: #F28B82;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding-bottom: 0;
+}
+
 .budgie-run-dialog {
   background-color: #2B2B2B;
 }
@@ -7686,6 +7842,12 @@ XfdesktopIconView.view .rubberband {
   border-radius: 0;
 }
 
+#XfceNotifyWindow {
+  box-shadow: none;
+  border: none;
+  border-radius: 8px;
+}
+
 #XfceNotifyWindow buttonbox {
   padding: 0;
 }
@@ -7853,7 +8015,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
 #restart_dialog {
   margin: 8px;
   border-radius: 4px;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
@@ -7877,78 +8039,72 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
 /********
  * Nemo *
  ********/
-.nemo-window .primary-toolbar {
+.nemo-window.background .primary-toolbar {
   background-color: #202020;
   border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   padding: 6px 4px;
 }
 
-.nemo-window .primary-toolbar:backdrop {
+.nemo-window.background .primary-toolbar:backdrop {
   background-color: #2C2C2C;
 }
 
-.nemo-window .primary-toolbar entry {
+.nemo-window.background .primary-toolbar entry {
   margin: 0 2px;
 }
 
-.nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action) {
   margin: 0 2px;
   border-radius: 4px;
   padding: 3px 8px;
 }
 
-.nemo-window .primary-toolbar button.text-button {
+.nemo-window.background .primary-toolbar button.text-button {
   padding-left: 8px;
   padding-right: 8px;
   color: rgba(255, 255, 255, 0.7);
   margin: 0 0;
 }
 
-.nemo-window .primary-toolbar button.text-button:hover, .nemo-window .primary-toolbar button.text-button:active, .nemo-window .primary-toolbar button.text-button:checked {
+.nemo-window.background .primary-toolbar button.text-button:hover, .nemo-window.background .primary-toolbar button.text-button:active, .nemo-window.background .primary-toolbar button.text-button:checked {
   color: white;
 }
 
-.nemo-window .primary-toolbar button.text-button:disabled {
+.nemo-window.background .primary-toolbar button.text-button:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
-.nemo-window .primary-toolbar button:not(.text-button):not(.image-button) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.image-button) {
   padding-left: 4px;
   padding-right: 4px;
 }
 
-.nemo-window scrolledwindow.frame {
+.nemo-window.background scrolledwindow.frame {
   border-style: none;
 }
 
-.nemo-window scrolledwindow.frame .view:not(:selected) {
-  background-color: transparent;
-}
-
-.nemo-window .nemo-inactive-pane .view:not(:selected) {
+.nemo-window.background .nemo-inactive-pane .view:not(:selected):not(:hover) {
   background-color: #303030;
 }
 
-.nemo-window .nemo-window-pane widget.entry {
+.nemo-window.background .nemo-window-pane widget.entry {
   border-radius: 4px;
   background-color: rgba(255, 255, 255, 0.04);
 }
 
-.nemo-window .toolbar button {
+.nemo-window.background .toolbar button {
   border-radius: 4px;
-  margin: 0 0;
+  margin: 0;
   padding: 0 6px;
 }
 
-.places-treeview {
+.nemo-window.background .places-treeview {
   -NemoPlacesTreeView-disk-full-bg-color: #707070;
   -NemoPlacesTreeView-disk-full-fg-color: #3281EA;
   -NemoPlacesTreeView-disk-full-bar-width: 2px;
   -NemoPlacesTreeView-disk-full-bar-radius: 0;
   -NemoPlacesTreeView-disk-full-bottom-padding: 1px;
   -NemoPlacesTreeView-disk-full-max-length: 80px;
-  padding-top: 3px;
-  padding-bottom: 3px;
 }
 
 /* GTK NAMED COLORS
diff --git a/theme/gtk-3.0/gtk.css b/theme/gtk-3.0/gtk.css
index 1668e1c..1cf2091 100644
--- a/theme/gtk-3.0/gtk.css
+++ b/theme/gtk-3.0/gtk.css
@@ -99,6 +99,7 @@
 
 .view:hover {
   background-color: alpha(currentColor, 0.08);
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .view:disabled {
@@ -552,14 +553,14 @@ button:drop(active) {
   border-color: rgba(0, 0, 0, 0.26);
 }
 
-.budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, treeview.view header button button.circular, row.activatable button.circular, check,
+.budgie-session-dialog .linked.horizontal > button, .drop-shadow button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu row.activatable > button.flat button.circular, treeview.view header button button.circular, row.activatable button.circular, check,
 radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
-.menuitem.button.flat, .nemo-window .toolbar button, #buttonbox_frame button, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:not(.flat), .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
+.menuitem.button.flat, .nemo-window.background .toolbar button, #buttonbox_frame button, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:not(.flat), .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button, layouttabbar button, filechooser #pathbarbox > stack > box > button, messagedialog .dialog-action-box > .linked > button, messagedialog.csd .dialog-action-box > .linked > button, .app-notification button, popover.menu button,
 popover button.model,
 popover.background.menu button,
 popover.background button.model, .caja-pathbar button,
-.path-bar.linked:not(.vertical) > button, .nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), .raven-mpris button.image-button, infobar.error > revealer > box button, infobar.error:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.action > revealer > box button, infobar.action:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:backdrop > revealer > box button, .selection-mode headerbar button.titlebutton:not(.suggested-action):not(.destructive-action), button.flat {
+.path-bar.linked:not(.vertical) > button, .nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), .raven-mpris button.image-button, infobar.error > revealer > box button, infobar.error:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.action > revealer > box button, infobar.action:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:backdrop > revealer > box button, .selection-mode headerbar button.titlebutton:not(.suggested-action):not(.destructive-action), button.flat {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 300ms cubic-bezier(0, 0, 0.2, 1);
   outline: none;
   box-shadow: inset 0 0 0 9999px transparent;
@@ -568,34 +569,34 @@ popover.background button.model, .caja-pathbar button,
   color: rgba(0, 0, 0, 0.6);
 }
 
-.budgie-session-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
+.budgie-session-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:focus, treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
 radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
-.menuitem.button.flat:focus, .nemo-window .toolbar button:focus, #buttonbox_frame button:focus, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:focus:not(.flat), .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
+.menuitem.button.flat:focus, .nemo-window.background .toolbar button:focus, #buttonbox_frame button:focus, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:focus:not(.flat), .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus, layouttabbar button:focus, filechooser #pathbarbox > stack > box > button:focus, messagedialog .dialog-action-box > .linked > button:focus, .app-notification button:focus, popover.menu button:focus,
 popover button.model:focus, .caja-pathbar button:focus,
-.path-bar.linked:not(.vertical) > button:focus, .nemo-window .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), .raven-mpris button.image-button:focus, infobar.error > revealer > box button:focus, infobar.warning > revealer > box button:focus, infobar.action > revealer > box button:focus, infobar.question > revealer > box button:focus, .selection-mode headerbar button.titlebutton:focus:not(.suggested-action):not(.destructive-action), button.flat:focus, button.flat:checked:focus {
+.path-bar.linked:not(.vertical) > button:focus, .nemo-window.background .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), .raven-mpris button.image-button:focus, infobar.error > revealer > box button:focus, infobar.warning > revealer > box button:focus, infobar.action > revealer > box button:focus, infobar.question > revealer > box button:focus, .selection-mode headerbar button.titlebutton:focus:not(.suggested-action):not(.destructive-action), button.flat:focus, button.flat:checked:focus {
   box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
   background-color: transparent;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
+.budgie-session-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:hover, treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
 radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
-.menuitem.button.flat:hover, .nemo-window .toolbar button:hover, #buttonbox_frame button:hover, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:hover:not(.flat), .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
+.menuitem.button.flat:hover, .nemo-window.background .toolbar button:hover, #buttonbox_frame button:hover, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:hover:not(.flat), .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover, layouttabbar button:hover, filechooser #pathbarbox > stack > box > button:hover, messagedialog .dialog-action-box > .linked > button:hover, .app-notification button:hover, popover.menu button:hover,
 popover button.model:hover, .caja-pathbar button:hover,
-.path-bar.linked:not(.vertical) > button:hover, .nemo-window .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), .raven-mpris button.image-button:hover, infobar.error > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.action > revealer > box button:hover, infobar.question > revealer > box button:hover, .selection-mode headerbar button.titlebutton:hover:not(.suggested-action):not(.destructive-action), button.flat:hover {
+.path-bar.linked:not(.vertical) > button:hover, .nemo-window.background .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), .raven-mpris button.image-button:hover, infobar.error > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.action > revealer > box button:hover, infobar.question > revealer > box button:hover, .selection-mode headerbar button.titlebutton:hover:not(.suggested-action):not(.destructive-action), button.flat:hover {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
   background-color: transparent;
   color: rgba(0, 0, 0, 0.87);
 }
 
-.budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
+.budgie-session-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:active, treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
 radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
-.menuitem.button.flat:active, .nemo-window .toolbar button:active, #buttonbox_frame button:active, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:active:not(.flat), .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
+.menuitem.button.flat:active, .nemo-window.background .toolbar button:active, #buttonbox_frame button:active, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:active:not(.flat), .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active, layouttabbar button:active, filechooser #pathbarbox > stack > box > button:active, messagedialog .dialog-action-box > .linked > button:active, .app-notification button:active, popover.menu button:active,
 popover button.model:active, .caja-pathbar button:active,
-.path-bar.linked:not(.vertical) > button:active, .nemo-window .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), .raven-mpris button.image-button:active, infobar.error > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.action > revealer > box button:active, infobar.question > revealer > box button:active, .selection-mode headerbar button.titlebutton:active:not(.suggested-action):not(.destructive-action), button.flat:active {
+.path-bar.linked:not(.vertical) > button:active, .nemo-window.background .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), .raven-mpris button.image-button:active, infobar.error > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.action > revealer > box button:active, infobar.question > revealer > box button:active, .selection-mode headerbar button.titlebutton:active:not(.suggested-action):not(.destructive-action), button.flat:active {
   animation: none;
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 300ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.16);
@@ -603,29 +604,29 @@ popover button.model:active, .caja-pathbar button:active,
   color: rgba(0, 0, 0, 0.87);
 }
 
-.budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
+.budgie-session-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu row.activatable > button.flat button.circular:disabled, treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
 radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
-.menuitem.button.flat:disabled, .nemo-window .toolbar button:disabled, #buttonbox_frame button:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:disabled:not(.flat), .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
+.menuitem.button.flat:disabled, .nemo-window.background .toolbar button:disabled, #buttonbox_frame button:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:disabled:not(.flat), .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled, layouttabbar button:disabled, filechooser #pathbarbox > stack > box > button:disabled, messagedialog .dialog-action-box > .linked > button:disabled, .app-notification button:disabled, popover.menu button:disabled,
 popover button.model:disabled, .caja-pathbar button:disabled,
-.path-bar.linked:not(.vertical) > button:disabled, .nemo-window .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), .raven-mpris button.image-button:disabled, infobar.error > revealer > box button:disabled, infobar.warning > revealer > box button:disabled, infobar.action > revealer > box button:disabled, infobar.question > revealer > box button:disabled, .selection-mode headerbar button.titlebutton:disabled:not(.suggested-action):not(.destructive-action), button.flat:disabled {
+.path-bar.linked:not(.vertical) > button:disabled, .nemo-window.background .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), .raven-mpris button.image-button:disabled, infobar.error > revealer > box button:disabled, infobar.warning > revealer > box button:disabled, infobar.action > revealer > box button:disabled, infobar.question > revealer > box button:disabled, .selection-mode headerbar button.titlebutton:disabled:not(.suggested-action):not(.destructive-action), button.flat:disabled {
   box-shadow: none;
   background-color: transparent;
   color: rgba(0, 0, 0, 0.26);
 }
 
-.nemo-window .toolbar button:checked, #buttonbox_frame button:checked, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:not(.flat), .raven stackswitcher.linked > button:checked, .lock-dialog button:checked, .mate-panel-menu-bar button:checked, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked,
+.nemo-window.background .toolbar button:checked, #buttonbox_frame button:checked, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:not(.flat), .raven stackswitcher.linked > button:checked, .lock-dialog button:checked, .mate-panel-menu-bar button:checked, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked, layouttabbar button:checked, filechooser #pathbarbox > stack > box > button:checked, messagedialog .dialog-action-box > .linked > button:checked, .app-notification button:checked, popover.menu button:checked,
 popover button.model:checked, .caja-pathbar button:checked,
-.path-bar.linked:not(.vertical) > button:checked, .nemo-window .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action), toolbar button:checked, combobox > .linked:not(.vertical) > button:checked:not(:only-child), .raven-mpris button.image-button:checked, infobar.error > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.action > revealer > box button:checked, infobar.question > revealer > box button:checked, .selection-mode headerbar button.titlebutton:checked:not(.suggested-action):not(.destructive-action), button.flat:checked, button.flat:checked:hover {
+.path-bar.linked:not(.vertical) > button:checked, .nemo-window.background .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action), toolbar button:checked, combobox > .linked:not(.vertical) > button:checked:not(:only-child), .raven-mpris button.image-button:checked, infobar.error > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.action > revealer > box button:checked, infobar.question > revealer > box button:checked, .selection-mode headerbar button.titlebutton:checked:not(.suggested-action):not(.destructive-action), button.flat:checked, button.flat:checked:hover {
   background-color: alpha(currentColor, 0.1);
   color: rgba(0, 0, 0, 0.87);
 }
 
-.nemo-window .toolbar button:checked:disabled, #buttonbox_frame button:checked:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:disabled:not(.flat), .raven stackswitcher.linked > button:checked:disabled, .lock-dialog button:checked:disabled, .mate-panel-menu-bar button:checked:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled,
+.nemo-window.background .toolbar button:checked:disabled, #buttonbox_frame button:checked:disabled, .thunar toolbar > toolitem > widget > widget.linked.path-bar > button.path-bar-button:checked:disabled:not(.flat), .raven stackswitcher.linked > button:checked:disabled, .lock-dialog button:checked:disabled, .mate-panel-menu-bar button:checked:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:checked:disabled, layouttabbar button:checked:disabled, filechooser #pathbarbox > stack > box > button:checked:disabled, messagedialog .dialog-action-box > .linked > button:checked:disabled, .app-notification button:checked:disabled, popover.menu button:checked:disabled,
 popover button.model:checked:disabled, .caja-pathbar button:checked:disabled,
-.path-bar.linked:not(.vertical) > button:checked:disabled, .nemo-window .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action), toolbar button:checked:disabled, combobox > .linked:not(.vertical) > button:checked:disabled:not(:only-child), .raven-mpris button.image-button:checked:disabled, infobar.error > revealer > box button:checked:disabled, infobar.warning > revealer > box button:checked:disabled, infobar.action > revealer > box button:checked:disabled, infobar.question > revealer > box button:checked:disabled, .selection-mode headerbar button.titlebutton:checked:disabled:not(.suggested-action):not(.destructive-action), button.flat:checked:disabled {
+.path-bar.linked:not(.vertical) > button:checked:disabled, .nemo-window.background .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action), toolbar button:checked:disabled, combobox > .linked:not(.vertical) > button:checked:disabled:not(:only-child), .raven-mpris button.image-button:checked:disabled, infobar.error > revealer > box button:checked:disabled, infobar.warning > revealer > box button:checked:disabled, infobar.action > revealer > box button:checked:disabled, infobar.question > revealer > box button:checked:disabled, .selection-mode headerbar button.titlebutton:checked:disabled:not(.suggested-action):not(.destructive-action), button.flat:checked:disabled {
   background-color: alpha(currentColor, 0.1);
   color: rgba(0, 0, 0, 0.38);
 }
@@ -1266,12 +1267,12 @@ frame.documents-dropdown, .app-notification, toolbar.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
 frame.documents-dropdown:backdrop, .app-notification:backdrop, toolbar.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 frame.left.documents-dropdown, .left.app-notification, frame.right.documents-dropdown, .right.app-notification, frame.top.documents-dropdown, .top.app-notification, frame.bottom.documents-dropdown, .bottom.app-notification, toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
@@ -1346,44 +1347,44 @@ searchbar > revealer > box {
 /***************
  * Header bars *
  ***************/
-.nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button, .xfce4-panel.background button, .titlebar button:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.nemo-window .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:focus, .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:hover, .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:active, .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked, .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:focus, .xfce4-panel.background button:focus, .titlebar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:hover, .xfce4-panel.background button:hover, .titlebar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:active, .xfce4-panel.background button:active, .titlebar button:active:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked, .xfce4-panel.background button:checked, .titlebar button:checked:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.nemo-window .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:disabled, .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:disabled, .xfce4-panel.background button:disabled, .titlebar button:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.26);
 }
 
-.nemo-window .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked:disabled, .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:checked:disabled, .xfce4-panel.background button:checked:disabled, .titlebar button:checked:disabled:not(.suggested-action):not(.destructive-action) {
   background-color: transparent;
   color: rgba(0, 0, 0, 0.38);
 }
 
-.nemo-window .primary-toolbar button:backdrop:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop, .xfce4-panel.background button:backdrop, .titlebar button:backdrop:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop, .xfce4-panel.background button:backdrop, .titlebar button:backdrop:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.38);
 }
 
-.nemo-window .primary-toolbar button:backdrop:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:focus, .xfce4-panel.background button:backdrop:focus, .titlebar button:backdrop:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:backdrop:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:hover, .xfce4-panel.background button:backdrop:hover, .titlebar button:backdrop:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:backdrop:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:active, .xfce4-panel.background button:backdrop:active, .titlebar button:backdrop:active:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:focus:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:focus, .xfce4-panel.background button:backdrop:focus, .titlebar button:backdrop:focus:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:backdrop:hover:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:hover, .xfce4-panel.background button:backdrop:hover, .titlebar button:backdrop:hover:not(.suggested-action):not(.destructive-action), .nemo-window.background .primary-toolbar button:backdrop:active:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:active, .xfce4-panel.background button:backdrop:active, .titlebar button:backdrop:active:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.nemo-window .primary-toolbar button:backdrop:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:disabled, .xfce4-panel.background button:backdrop:disabled, .titlebar button:backdrop:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:disabled, .xfce4-panel.background button:backdrop:disabled, .titlebar button:backdrop:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.26);
 }
 
-.nemo-window .primary-toolbar button:backdrop:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked, .xfce4-panel.background button:backdrop:checked, .titlebar button:backdrop:checked:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:checked:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked, .xfce4-panel.background button:backdrop:checked, .titlebar button:backdrop:checked:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.nemo-window .primary-toolbar button:backdrop:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked:disabled, .xfce4-panel.background button:backdrop:checked:disabled, .titlebar button:backdrop:checked:disabled:not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:backdrop:checked:disabled:not(.text-button):not(.suggested-action):not(.destructive-action), .thunar toolbar button:backdrop:checked:disabled, .xfce4-panel.background button:backdrop:checked:disabled, .titlebar button:backdrop:checked:disabled:not(.suggested-action):not(.destructive-action) {
   color: rgba(0, 0, 0, 0.26);
 }
 
-.nemo-window .primary-toolbar entry, .thunar toolbar entry, .titlebar entry {
+.nemo-window.background .primary-toolbar entry, .thunar toolbar entry, .titlebar entry {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
   border: none;
@@ -1392,37 +1393,37 @@ searchbar > revealer > box {
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry:hover, .thunar toolbar entry:hover, .titlebar entry:hover {
+.nemo-window.background .primary-toolbar entry:hover, .thunar toolbar entry:hover, .titlebar entry:hover {
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(0, 0, 0, 0.12);
 }
 
-.nemo-window .primary-toolbar entry:focus, .thunar toolbar entry:focus, .titlebar entry:focus {
+.nemo-window.background .primary-toolbar entry:focus, .thunar toolbar entry:focus, .titlebar entry:focus {
   box-shadow: inset 0 0 0 2px #8ebaf4;
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry:disabled, .thunar toolbar entry:disabled, .titlebar entry:disabled {
+.nemo-window.background .primary-toolbar entry:disabled, .thunar toolbar entry:disabled, .titlebar entry:disabled {
   background-color: rgba(0, 0, 0, 0.04);
   color: rgba(0, 0, 0, 0.38);
   border-image: none;
 }
 
-.nemo-window .primary-toolbar entry image, .thunar toolbar entry image, .titlebar entry image {
+.nemo-window.background .primary-toolbar entry image, .thunar toolbar entry image, .titlebar entry image {
   color: rgba(0, 0, 0, 0.6);
 }
 
-.nemo-window .primary-toolbar entry image:hover, .thunar toolbar entry image:hover, .titlebar entry image:hover, .nemo-window .primary-toolbar entry image:active, .thunar toolbar entry image:active, .titlebar entry image:active {
+.nemo-window.background .primary-toolbar entry image:hover, .thunar toolbar entry image:hover, .titlebar entry image:hover, .nemo-window.background .primary-toolbar entry image:active, .thunar toolbar entry image:active, .titlebar entry image:active {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.nemo-window .primary-toolbar entry image:disabled, .thunar toolbar entry image:disabled, .titlebar entry image:disabled {
+.nemo-window.background .primary-toolbar entry image:disabled, .thunar toolbar entry image:disabled, .titlebar entry image:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
 headerbar button.titlebutton:not(.suggested-action):not(.destructive-action) {
   min-height: 26px;
   min-width: 26px;
-  padding: 0 0;
+  padding: 0;
   margin-left: 1px;
   margin-right: 1px;
 }
@@ -1815,8 +1816,12 @@ treeview.view:selected {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: rgba(224, 224, 224, 0.9805);
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: rgba(243, 243, 243, 0.9922);
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: rgba(235, 235, 235, 0.987);
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -2119,13 +2124,13 @@ popover.background {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 2px;
   background-color: rgba(255, 255, 255, 0.98);
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.1), 0 4px 3px 0 rgba(0, 0, 0, 0.08), 0 1px 6px 0 rgba(0, 0, 0, 0.06);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06), 0 3px 4px rgba(0, 0, 0, 0.08), 0 1px 6px rgba(0, 0, 0, 0.06);
   background-clip: padding-box;
 }
 
 popover:backdrop,
 popover.background:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 popover, .csd popover,
@@ -2193,6 +2198,20 @@ popover.background button.model {
   border-radius: 4px;
 }
 
+popover.menu button:focus,
+popover button.model:focus,
+popover.background.menu button:focus,
+popover.background button.model:focus {
+  box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08);
+  background-color: transparent;
+  color: rgba(0, 0, 0, 0.87);
+}
+
+popover button.model,
+popover.background button.model {
+  min-width: 32px;
+}
+
 popover separator,
 popover.background separator {
   margin: 4px 0;
@@ -2680,7 +2699,7 @@ switch:checked slider {
 .view.content-view.check:not(list):hover, .view.content-view.check:not(list):active,
 .content-view .tile check:not(list):hover,
 .content-view .tile check:not(list):active {
-  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 4px 3px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
 }
 
 .view.content-view.check:not(list),
@@ -3385,10 +3404,10 @@ list {
 }
 
 list row {
-  padding: 3px;
+  padding: 3px 6px;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item), treeview.view header button, row.activatable {
+.budgie-popover.budgie-menu row.activatable > button.flat, treeview.view header button, row.activatable {
   outline: none;
   background-image: image(rgba(26, 115, 232, 0));
   background-position: 3px center;
@@ -3397,12 +3416,12 @@ list row {
   box-shadow: inset 0 0 0 9999px transparent;
 }
 
-.budgie-popover.budgie-menu button.flat:hover:not(.image-button):not(.indicator-item), treeview.view header button:hover, row.activatable:hover {
+.budgie-popover.budgie-menu row.activatable > button.flat:hover, treeview.view header button:hover, row.activatable:hover {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1), background-image 0;
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
-.budgie-popover.budgie-menu button.has-open-popup.flat:not(.image-button):not(.indicator-item), treeview.view header button.has-open-popup, .budgie-popover.budgie-menu button.flat:active:not(.image-button):not(.indicator-item), treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
+.budgie-popover.budgie-menu row.activatable > button.has-open-popup.flat, treeview.view header button.has-open-popup, .budgie-popover.budgie-menu row.activatable > button.flat:active, treeview.view header button:active, row.activatable.has-open-popup, row.activatable:active {
   transition: background-image 1200ms cubic-bezier(0, 0, 0.2, 1), box-shadow 1200ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.16);
 }
@@ -3439,6 +3458,10 @@ row.expander:checked list.nested > row.activatable {
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.08), inset 0 1px rgba(0, 0, 0, 0.08);
 }
 
+.frame list > row > label {
+  margin: 0 6px;
+}
+
 /*********************
  * App Notifications *
  *********************/
@@ -3884,7 +3907,7 @@ infobar.error > revealer > box *:link, infobar.error:backdrop > revealer > box *
  ************/
 tooltip {
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
 }
 
 tooltip.background {
@@ -3991,12 +4014,12 @@ colorswatch#editor-color-sample overlay {
 colorchooser .popover.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
 colorchooser .popover.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 /********
@@ -4017,12 +4040,12 @@ colorchooser .popover.osd:backdrop {
 decoration {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 8px;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13), 0 0 0 1px rgba(0, 0, 0, 0.12), 0 15px 30px transparent;
   margin: 8px;
 }
 
 decoration:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12), 0 15px 30px transparent;
 }
 
 .maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration {
@@ -4040,7 +4063,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
   border-radius: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.06);
 }
 
 tooltip.csd decoration {
@@ -4064,17 +4087,17 @@ messagedialog.csd decoration {
   background-color: #F2F2F2;
 }
 
-XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, .background.csd .view:selected, modelbutton.flat:selected,
+XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu row.activatable > button.flat:checked, box.vertical > widget > widget:selected, .background.csd .view:selected, modelbutton.flat:selected,
 .menuitem.button.flat:selected, row:selected, calendar:selected {
   background-color: alpha(currentColor, 0.06);
 }
 
-.nemo-window .nemo-window-pane notebook .view:selected, textview text selection, textview text selection:focus, flowbox flowboxchild:selected {
+.nemo-window.background .nemo-window-pane notebook .view:selected, textview text selection, textview text selection:focus, flowbox flowboxchild:selected {
   color: #1A73E8;
   background-color: rgba(26, 115, 232, 0.2);
 }
 
-.nemo-window .nemo-window-pane widget.entry:selected, #MozillaGtkWidget > widget text:selected, #MozillaGtkWidget > widget text selection, #MozillaGtkWidget > widget text selection:focus, window.background.chromium > textview.view selection, window.background.chromium textview selection, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, .nautilus-window notebook .view:not(treeview) selection, .nautilus-window notebook .view:not(treeview):selected, .nautilus-window flowboxchild:selected .icon-item-background, .view:selected, widget.view:selected, .background.csd textview text selection, .background.csd textview text selection:focus, label selection,
+.nemo-window.background .nemo-window-pane widget.entry:selected, #MozillaGtkWidget > widget text:selected, #MozillaGtkWidget > widget text selection, #MozillaGtkWidget > widget text selection:focus, window.background.chromium > textview.view selection, window.background.chromium textview selection, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, .nautilus-window notebook .view:not(treeview) selection, .nautilus-window notebook .view:not(treeview):selected, .nautilus-window flowboxchild:selected .icon-item-background, .view:selected, widget.view:selected, .background.csd textview text selection, .background.csd textview text selection:focus, label selection,
 entry selection, spinbutton:not(.vertical) selection, spinbutton.vertical selection {
   color: white;
   background-color: #1A73E8;
@@ -4199,6 +4222,14 @@ viewswitcher button:not(.suggested-action):not(.destructive-action) > stack > bo
 /*************
  * App Icons *
  *************/
+.lowres-icon {
+  -gtk-icon-shadow: none;
+}
+
+.icon-dropshadow {
+  -gtk-icon-shadow: none;
+}
+
 /*********
  * Emoji *
  *********/
@@ -4613,7 +4644,7 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s
 .gedit-search-slider {
   margin: 0 6px 10px;
   padding: 6px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #FFFFFF;
   border-radius: 0 0 6px 6px;
 }
@@ -5397,7 +5428,7 @@ GdMainIconView.content-view {
 .documents-counter {
   margin: 8px;
   border-radius: 9999px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #1A73E8;
   color: white;
   font-weight: bold;
@@ -5940,7 +5971,7 @@ window.background.csd.unified.fullscreen > decoration-overlay {
  *********/
 overlay > revealer.left > scrolledwindow.frame, overlay > revealer.right > scrolledwindow.frame {
   border-style: none;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13);
 }
 
 overlay > revealer.left > scrolledwindow.frame {
@@ -6300,27 +6331,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #F7F7F7;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #F2F2F2;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #FFFFFF;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }
@@ -6388,7 +6419,7 @@ UnityDecoration .menuitem:hover {
 
 .background:not(.csd) headerbar:not(.titlebar) {
   border-radius: 0;
-  box-shadow: 0 2px 2px -2px rgba(0, 0, 0, 0.3), 0 1px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 2px -0.6px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
 .background:not(.csd) headerbar:not(.titlebar).inline-toolbar {
@@ -6911,16 +6942,21 @@ MsdOsdWindow.background.osd .progressbar {
   border: none;
   border-color: transparent;
   border-radius: 5px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   background-color: #FFFFFF;
 }
 
 .budgie-popover .container {
+  padding: 6px;
+}
+
+.budgie-popover .container .container {
   padding: 0;
 }
 
-.budgie-popover separator {
+.budgie-popover widget > separator {
   margin: 3px 0;
+  background-color: rgba(0, 0, 0, 0.26);
 }
 
 .budgie-popover border {
@@ -6973,16 +7009,56 @@ MsdOsdWindow.background.osd .progressbar {
   box-shadow: none;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) {
+.budgie-popover.budgie-menu row.activatable > button.flat {
   min-height: 32px;
   padding: 0 8px;
   border-radius: 0;
 }
 
-.budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked:disabled {
+.budgie-popover.budgie-menu row.activatable > button.flat:checked:disabled {
   background-color: transparent;
 }
 
+.budgie-popover.budgie-menu list.left-overlay-menu {
+  background-color: #FFFFFF;
+  padding: 6px;
+  margin: 6px;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable {
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable:not(:last-child) {
+  margin-bottom: 3px;
+}
+
+.budgie-popover.budgie-menu list.left-overlay-menu > row.activatable button.menuitem {
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.08);
+  padding: 3px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat {
+  min-height: 16px;
+  min-width: 16px;
+  padding: 6px;
+  border-radius: 4px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button {
+  border-radius: 9999px;
+}
+
+.budgie-popover.budgie-menu .budgie-menu-footer button.flat.image-button:not(.last-child) {
+  margin-right: 6px;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7002,6 +7078,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover scrolledwindow.sidebar:not(.categories) {
   background: none;
   border-right: none;
@@ -7068,10 +7148,6 @@ MsdOsdWindow.background.osd .progressbar {
   margin: 0 6px;
 }
 
-.budgie-popover.caffeine-popover .container {
-  padding: 6px;
-}
-
 .budgie-popover.places-menu .container {
   padding: 3px;
 }
@@ -7179,6 +7255,46 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(247, 247, 247, 0.8);
 }
 
+.bottom .budgie-panel.dock-mode {
+  border-radius: 8px 8px 0 0;
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist button.launcher:checked, .bottom .budgie-panel.dock-mode .icon-tasklist button.launcher:active {
+  color: rgba(0, 0, 0, 0.87);
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist > box > revealer:first-child > button.launcher {
+  border-top-left-radius: 8px;
+}
+
+.bottom .budgie-panel.dock-mode .icon-tasklist > box > revealer:last-child > button.launcher {
+  border-top-right-radius: 8px;
+}
+
+.left .budgie-panel.dock-mode {
+  border-radius: 0 8px 8px 0;
+}
+
+.left .budgie-panel.dock-mode .icon-tasklist .launcher:first-child {
+  border-top-right-radius: 8px;
+}
+
+.left .budgie-panel.dock-mode .icon-tasklist .launcher:last-child {
+  border-bottom-right-radius: 8px;
+}
+
+.right .budgie-panel.dock-mode {
+  border-radius: 8px 0 0 8px;
+}
+
+.right .budgie-panel.dock-mode .icon-tasklist .launcher:first-child {
+  border-top-left-radius: 8px;
+}
+
+.right .budgie-panel.dock-mode .icon-tasklist .launcher:last-child {
+  border-bottom-left-radius: 8px;
+}
+
 .budgie-panel button, .budgie-panel button.flat, .budgie-panel button.image-button {
   color: rgba(0, 0, 0, 0.6);
   background: none;
@@ -7231,10 +7347,6 @@ MsdOsdWindow.background.osd .progressbar {
   padding: 4px 0;
 }
 
-.budgie-panel separator {
-  background-color: rgba(0, 0, 0, 0.26);
-}
-
 .budgie-panel .alert {
   color: #D93025;
 }
@@ -7319,6 +7431,36 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel > box > widget > widget > image,
+.budgie-panel > box > widget > widget > stack > image,
+.budgie-panel > box > widget > widget > box > image {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > image + label {
+  margin-left: -4px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > image {
+  margin-left: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > stack > widget > label {
+  margin-right: 6px;
+}
+
+.budgie-panel > box > widget > widget > box > widget > widget > image {
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
+.budgie-panel .budgie-clock-applet > widget > box,
+.budgie-panel .budgie-calendar-applet > widget > box {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), #1A73E8 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7373,7 +7515,7 @@ frame.raven-frame > border {
 
 .raven {
   background-color: #FFFFFF;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13);
 }
 
 .raven > box {
@@ -7491,6 +7633,12 @@ calendar.raven-calendar:selected {
   padding: 10px;
 }
 
+image.raven-mpris {
+  background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.6);
+  border-radius: 4px;
+}
+
 .raven-notifications-view > .raven-background > viewport.frame {
   padding: 0;
 }
@@ -7548,9 +7696,9 @@ calendar.raven-calendar:selected {
 
 .drop-shadow {
   margin: 5px 9px;
-  padding: 3px;
+  padding: 6px;
   border-radius: 8px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
@@ -7567,6 +7715,10 @@ calendar.raven-calendar:selected {
   border-radius: 8px;
 }
 
+.budgie-run-dialog > box > grid, .budgie-polkit-dialog > box > grid, .budgie-session-dialog > box > grid {
+  padding: 24px;
+}
+
 .budgie-session-dialog label:not(:last-child),
 .budgie-session-dialog .dialog-title {
   font-size: 120%;
@@ -7594,6 +7746,10 @@ calendar.raven-calendar:selected {
   color: #D93025;
 }
 
+.budgie-polkit-dialog > box > grid {
+  padding-bottom: 0;
+}
+
 .budgie-run-dialog {
   background-color: #FFFFFF;
 }
@@ -7686,6 +7842,12 @@ XfdesktopIconView.view .rubberband {
   border-radius: 0;
 }
 
+#XfceNotifyWindow {
+  box-shadow: none;
+  border: none;
+  border-radius: 8px;
+}
+
 #XfceNotifyWindow buttonbox {
   padding: 0;
 }
@@ -7841,7 +8003,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
 #restart_dialog {
   margin: 8px;
   border-radius: 4px;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
@@ -7865,78 +8027,72 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind
 /********
  * Nemo *
  ********/
-.nemo-window .primary-toolbar {
+.nemo-window.background .primary-toolbar {
   background-color: #F7F7F7;
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
   padding: 6px 4px;
 }
 
-.nemo-window .primary-toolbar:backdrop {
+.nemo-window.background .primary-toolbar:backdrop {
   background-color: #F2F2F2;
 }
 
-.nemo-window .primary-toolbar entry {
+.nemo-window.background .primary-toolbar entry {
   margin: 0 2px;
 }
 
-.nemo-window .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.suggested-action):not(.destructive-action) {
   margin: 0 2px;
   border-radius: 4px;
   padding: 3px 8px;
 }
 
-.nemo-window .primary-toolbar button.text-button {
+.nemo-window.background .primary-toolbar button.text-button {
   padding-left: 8px;
   padding-right: 8px;
   color: rgba(0, 0, 0, 0.6);
   margin: 0 0;
 }
 
-.nemo-window .primary-toolbar button.text-button:hover, .nemo-window .primary-toolbar button.text-button:active, .nemo-window .primary-toolbar button.text-button:checked {
+.nemo-window.background .primary-toolbar button.text-button:hover, .nemo-window.background .primary-toolbar button.text-button:active, .nemo-window.background .primary-toolbar button.text-button:checked {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.nemo-window .primary-toolbar button.text-button:disabled {
+.nemo-window.background .primary-toolbar button.text-button:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
-.nemo-window .primary-toolbar button:not(.text-button):not(.image-button) {
+.nemo-window.background .primary-toolbar button:not(.text-button):not(.image-button) {
   padding-left: 4px;
   padding-right: 4px;
 }
 
-.nemo-window scrolledwindow.frame {
+.nemo-window.background scrolledwindow.frame {
   border-style: none;
 }
 
-.nemo-window scrolledwindow.frame .view:not(:selected) {
-  background-color: transparent;
-}
-
-.nemo-window .nemo-inactive-pane .view:not(:selected) {
+.nemo-window.background .nemo-inactive-pane .view:not(:selected):not(:hover) {
   background-color: #FAFAFA;
 }
 
-.nemo-window .nemo-window-pane widget.entry {
+.nemo-window.background .nemo-window-pane widget.entry {
   border-radius: 4px;
   background-color: rgba(0, 0, 0, 0.04);
 }
 
-.nemo-window .toolbar button {
+.nemo-window.background .toolbar button {
   border-radius: 4px;
-  margin: 0 0;
+  margin: 0;
   padding: 0 6px;
 }
 
-.places-treeview {
+.nemo-window.background .places-treeview {
   -NemoPlacesTreeView-disk-full-bg-color: rgba(182, 182, 182, 0.961);
   -NemoPlacesTreeView-disk-full-fg-color: #1A73E8;
   -NemoPlacesTreeView-disk-full-bar-width: 2px;
   -NemoPlacesTreeView-disk-full-bar-radius: 0;
   -NemoPlacesTreeView-disk-full-bottom-padding: 1px;
   -NemoPlacesTreeView-disk-full-max-length: 80px;
-  padding-top: 3px;
-  padding-bottom: 3px;
 }
 
 /* GTK NAMED COLORS
diff --git a/theme/gtk-4.0/gtk-dark.css b/theme/gtk-4.0/gtk-dark.css
index db24e86..92a0c8a 100644
--- a/theme/gtk-4.0/gtk-dark.css
+++ b/theme/gtk-4.0/gtk-dark.css
@@ -26,6 +26,10 @@ dnd {
   -gtk-icon-size: 32px;
 }
 
+.lowres-icon:not(.large-icons) {
+  -gtk-icon-size: 16px;
+}
+
 spinner:disabled,
 arrow:disabled,
 scrollbar:disabled,
@@ -147,7 +151,7 @@ popover.background.magnifier > contents, .osd {
   background-clip: padding-box;
   border-radius: 4px;
   border: none;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 
 .osd {
@@ -1521,7 +1525,7 @@ toolbar.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
   border-radius: 8px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   border: none;
   color: white;
@@ -1529,7 +1533,7 @@ toolbar.osd {
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
 toolbar.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .left.app-notification, .right.app-notification, .top.app-notification, .bottom.app-notification, .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom,
@@ -1695,12 +1699,21 @@ headerbar entry image:disabled {
   color: rgba(255, 255, 255, 0.5);
 }
 
+headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) {
+  min-height: 26px;
+  min-width: 26px;
+  padding: 0;
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
 headerbar {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1), color 75ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
   color: white;
   min-height: 44px;
   margin: 0;
+  padding: 0;
   background-color: rgba(32, 32, 32, 0.98);
 }
 
@@ -1888,19 +1901,11 @@ headerbar windowcontrols:not(.empty).start:dir(rtl), headerbar windowcontrols:no
   margin-left: 6px;
 }
 
-headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) {
-  min-height: 26px;
-  min-width: 26px;
-  padding: 0;
-  margin-left: 3px;
-  margin-right: 3px;
-}
-
 headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) > image {
   background: none;
 }
 
-headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:hover {
+headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:hover, headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:backdrop:hover {
   background-color: #E57373;
   color: white;
 }
@@ -1912,8 +1917,8 @@ headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action
 
 headerbar.default-decoration {
   background-color: #202020;
-  min-height: 22px;
-  padding: 6px;
+  min-height: 32px;
+  padding: 0;
   border-radius: 4px 4px 0 0;
   box-shadow: none;
 }
@@ -2087,8 +2092,8 @@ columnview.view.expander,
 treeview.view.expander {
   min-width: 16px;
   min-height: 16px;
-  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   color: rgba(255, 255, 255, 0.7);
+  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
 
 columnview.view.expander:dir(rtl),
@@ -2096,17 +2101,17 @@ treeview.view.expander:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
 
+columnview.view.expander:checked,
+treeview.view.expander:checked {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
 columnview.view.expander:hover, columnview.view.expander:active,
 treeview.view.expander:hover,
 treeview.view.expander:active {
   color: white;
 }
 
-columnview.view.expander:checked,
-treeview.view.expander:checked {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
 columnview.view.expander:disabled,
 treeview.view.expander:disabled {
   color: rgba(255, 255, 255, 0.3);
@@ -2315,7 +2320,7 @@ popover.background > arrow,
 popover.background > contents {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
   background-color: rgba(60, 60, 60, 0.98);
   border-radius: 6px;
   color: white;
@@ -2325,7 +2330,7 @@ popover.background > contents {
 
 popover.background:backdrop > arrow,
 popover.background:backdrop > contents {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 popover.background > contents > list,
@@ -2933,31 +2938,40 @@ switch:checked > slider {
 /*************************
  * Check and Radio items *
  *************************/
-.view.content-view.check:not(list),
-.content-view .tile check:not(list) {
+checkbutton.selection-mode {
   min-height: 40px;
   min-width: 40px;
   margin: 0;
   padding: 0;
+  border-radius: 0;
   box-shadow: none;
   background-color: transparent;
   background-image: none;
   -gtk-icon-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 2px 2px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
-.view.content-view.check:not(list):hover, .view.content-view.check:not(list):active,
-.content-view .tile check:not(list):hover,
-.content-view .tile check:not(list):active {
-  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 4px 3px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+checkbutton.selection-mode:hover, checkbutton.selection-mode:active {
+  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+}
+
+checkbutton.selection-mode check, checkbutton.selection-mode radio {
+  padding: 0;
+  border-radius: 0;
+}
+
+checkbutton.selection-mode label:dir(ltr) {
+  margin-right: 6px;
+}
+
+checkbutton.selection-mode label:dir(rtl) {
+  margin-left: 6px;
 }
 
-.view.content-view.check:not(list),
-.content-view .tile check:not(list) {
+checkbutton.selection-mode check {
   -gtk-icon-source: -gtk-scaled(url("assets/selectionmode-checkbox-unchecked-dark.png"), url("assets/selectionmode-checkbox-unchecked-dark@2.png"));
 }
 
-.view.content-view.check:not(list):checked,
-.content-view .tile check:not(list):checked {
+checkbutton.selection-mode check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selectionmode-checkbox-checked-dark.png"), url("assets/selectionmode-checkbox-checked-dark@2.png"));
 }
 
@@ -3596,6 +3610,7 @@ actionbar > revealer > box {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
   background-color: #2B2B2B;
   background-clip: border-box;
+  box-shadow: none;
 }
 
 actionbar > revealer > box entry, actionbar > revealer > box button, actionbar > revealer > box menubutton {
@@ -3826,6 +3841,10 @@ expander:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
 
+expander:checked {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
 expander:hover, expander:active {
   color: white;
 }
@@ -3976,6 +3995,14 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 4px;
+}
+
+window.aboutdialog .large-icons {
+  -gtk-icon-size: 128px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4037,7 +4064,7 @@ separator.sidebar {
  * Navigation Sidebar *
  **********************/
 .navigation-sidebar {
-  padding: 4px 0;
+  padding: 6px 0;
   border-right: none;
 }
 
@@ -4075,6 +4102,11 @@ separator.sidebar {
   color: rgba(255, 255, 255, 0.5);
 }
 
+.navigation-sidebar > separator {
+  background-color: rgba(255, 255, 255, 0.12);
+  margin: 6px 0;
+}
+
 /****************
  * File chooser *
  ****************/
@@ -4092,7 +4124,7 @@ placessidebar > viewport.frame {
 }
 
 placessidebar list {
-  padding: 1px 0 4px;
+  padding: 6px 0;
 }
 
 placessidebar .navigation-sidebar > row {
@@ -4320,7 +4352,7 @@ tooltip {
 tooltip.background {
   background-color: rgba(54, 54, 54, 0.9);
   color: white;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   border-radius: 8px;
   margin: 2px 6px 8px 6px;
 }
@@ -4412,12 +4444,12 @@ colorswatch#editor-color-sample overlay {
 colorchooser .popover.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
 }
 
 colorchooser .popover.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 /********
@@ -4431,41 +4463,46 @@ colorchooser .popover.osd:backdrop {
  * Window Decorations *
  **********************/
 window {
-  transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
+  border: none;
+}
+
+window.csd {
   border-radius: 8px;
   margin: 0;
   outline: none;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(255, 255, 255, 0.12);
+  transition: none;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13), 0 0 0 1px rgba(255, 255, 255, 0.12), 0 1px 2px rgba(0, 0, 0, 0.01), 0 3px 4px rgba(0, 0, 0, 0.01), 0 1px 6px rgba(0, 0, 0, 0.01);
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(255, 255, 255, 0.12);
+window.csd:backdrop {
+  transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(255, 255, 255, 0.12), 0 1px 3px rgba(0, 0, 0, 0.01), 0 16px 18px rgba(0, 0, 0, 0.01), 0 11px 23px rgba(0, 0, 0, 0.01);
 }
 
-window.popup {
-  border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 8px;
+window.csd.maximized, window.csd.fullscreen {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
+  border: none;
   box-shadow: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #202020;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #2C2C2C;
 }
 
-.maximized window, .fullscreen window, .tiled window, .tiled-top window, .tiled-right window, .tiled-bottom window, .tiled-left window {
-  border-radius: 0;
+window.solid-csd.maximized, window.solid-csd.fullscreen {
+  box-shadow: none;
 }
 
 .view:selected, iconview:selected, gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:selected, calendar > grid > label.day-number:selected {
@@ -4587,11 +4624,11 @@ stackswitcher.circular button.text-button.circular {
  * App Icons *
  *************/
 .lowres-icon {
-  -gtk-icon-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 1px 1px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 .icon-dropshadow {
-  -gtk-icon-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 
 /*********
@@ -4685,7 +4722,7 @@ statusbar {
   border-radius: 4px;
   background-color: #3281EA;
   color: white;
-  box-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 .nautilus-window .floating-bar button {
@@ -5119,6 +5156,10 @@ menubutton stack > box {
   border-spacing: 6px;
 }
 
+.contacts-contact-list {
+  border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;
@@ -5389,11 +5430,6 @@ splitbutton > separator {
   background: none;
 }
 
-splitbutton > menubutton > button {
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
 splitbutton.image-button > button {
   min-width: 24px;
   padding-left: 6px;
@@ -5648,7 +5684,7 @@ viewswitcher {
 }
 
 viewswitcher.wide {
-  border-spacing: 3px;
+  border-spacing: 0;
   border-radius: 4px;
   background-color: rgba(255, 255, 255, 0.04);
   margin-top: 6px;
diff --git a/theme/gtk-4.0/gtk.css b/theme/gtk-4.0/gtk.css
index 764f31d..2ea2f46 100644
--- a/theme/gtk-4.0/gtk.css
+++ b/theme/gtk-4.0/gtk.css
@@ -26,6 +26,10 @@ dnd {
   -gtk-icon-size: 32px;
 }
 
+.lowres-icon:not(.large-icons) {
+  -gtk-icon-size: 16px;
+}
+
 spinner:disabled,
 arrow:disabled,
 scrollbar:disabled,
@@ -147,7 +151,7 @@ popover.background.magnifier > contents, .osd {
   background-clip: padding-box;
   border-radius: 4px;
   border: none;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 
 .osd {
@@ -1521,7 +1525,7 @@ toolbar.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
   border-radius: 8px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   border: none;
   color: rgba(0, 0, 0, 0.87);
@@ -1529,7 +1533,7 @@ toolbar.osd {
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
 toolbar.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 .left.app-notification, .right.app-notification, .top.app-notification, .bottom.app-notification, .toolbar.osd.left, .toolbar.osd.right, .toolbar.osd.top, .toolbar.osd.bottom,
@@ -1695,12 +1699,21 @@ headerbar entry image:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
 
+headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) {
+  min-height: 26px;
+  min-width: 26px;
+  padding: 0;
+  margin-left: 3px;
+  margin-right: 3px;
+}
+
 headerbar {
   transition: background-color 75ms cubic-bezier(0, 0, 0.2, 1), color 75ms cubic-bezier(0, 0, 0.2, 1);
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
   color: rgba(0, 0, 0, 0.87);
   min-height: 44px;
   margin: 0;
+  padding: 0;
   background-color: rgba(247, 247, 247, 0.98);
 }
 
@@ -1888,19 +1901,11 @@ headerbar windowcontrols:not(.empty).start:dir(rtl), headerbar windowcontrols:no
   margin-left: 6px;
 }
 
-headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) {
-  min-height: 26px;
-  min-width: 26px;
-  padding: 0;
-  margin-left: 3px;
-  margin-right: 3px;
-}
-
 headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action) > image {
   background: none;
 }
 
-headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:hover {
+headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:hover, headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action).close:backdrop:hover {
   background-color: #E57373;
   color: white;
 }
@@ -1912,8 +1917,8 @@ headerbar windowcontrols > button:not(.suggested-action):not(.destructive-action
 
 headerbar.default-decoration {
   background-color: #F7F7F7;
-  min-height: 22px;
-  padding: 6px;
+  min-height: 32px;
+  padding: 0;
   border-radius: 4px 4px 0 0;
   box-shadow: none;
 }
@@ -2087,8 +2092,8 @@ columnview.view.expander,
 treeview.view.expander {
   min-width: 16px;
   min-height: 16px;
-  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
   color: rgba(0, 0, 0, 0.6);
+  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
 
 columnview.view.expander:dir(rtl),
@@ -2096,17 +2101,17 @@ treeview.view.expander:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
 
+columnview.view.expander:checked,
+treeview.view.expander:checked {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
 columnview.view.expander:hover, columnview.view.expander:active,
 treeview.view.expander:hover,
 treeview.view.expander:active {
   color: rgba(0, 0, 0, 0.87);
 }
 
-columnview.view.expander:checked,
-treeview.view.expander:checked {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
 columnview.view.expander:disabled,
 treeview.view.expander:disabled {
   color: rgba(0, 0, 0, 0.26);
@@ -2315,17 +2320,17 @@ popover.background > arrow,
 popover.background > contents {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   padding: 6px;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
   background-color: rgba(255, 255, 255, 0.98);
   border-radius: 6px;
   color: rgba(0, 0, 0, 0.87);
   border: none;
-  box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.12);
 }
 
 popover.background:backdrop > arrow,
 popover.background:backdrop > contents {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 popover.background > contents > list,
@@ -2933,31 +2938,40 @@ switch:checked > slider {
 /*************************
  * Check and Radio items *
  *************************/
-.view.content-view.check:not(list),
-.content-view .tile check:not(list) {
+checkbutton.selection-mode {
   min-height: 40px;
   min-width: 40px;
   margin: 0;
   padding: 0;
+  border-radius: 0;
   box-shadow: none;
   background-color: transparent;
   background-image: none;
   -gtk-icon-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 2px 2px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
-.view.content-view.check:not(list):hover, .view.content-view.check:not(list):active,
-.content-view .tile check:not(list):hover,
-.content-view .tile check:not(list):active {
-  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 4px 3px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+checkbutton.selection-mode:hover, checkbutton.selection-mode:active {
+  -gtk-icon-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
+}
+
+checkbutton.selection-mode check, checkbutton.selection-mode radio {
+  padding: 0;
+  border-radius: 0;
+}
+
+checkbutton.selection-mode label:dir(ltr) {
+  margin-right: 6px;
+}
+
+checkbutton.selection-mode label:dir(rtl) {
+  margin-left: 6px;
 }
 
-.view.content-view.check:not(list),
-.content-view .tile check:not(list) {
+checkbutton.selection-mode check {
   -gtk-icon-source: -gtk-scaled(url("assets/selectionmode-checkbox-unchecked.png"), url("assets/selectionmode-checkbox-unchecked@2.png"));
 }
 
-.view.content-view.check:not(list):checked,
-.content-view .tile check:not(list):checked {
+checkbutton.selection-mode check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selectionmode-checkbox-checked.png"), url("assets/selectionmode-checkbox-checked@2.png"));
 }
 
@@ -3596,6 +3610,7 @@ actionbar > revealer > box {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
   background-color: #FFFFFF;
   background-clip: border-box;
+  box-shadow: none;
 }
 
 actionbar > revealer > box entry, actionbar > revealer > box button, actionbar > revealer > box menubutton {
@@ -3826,6 +3841,10 @@ expander:dir(rtl) {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
 
+expander:checked {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
 expander:hover, expander:active {
   color: rgba(0, 0, 0, 0.87);
 }
@@ -3976,6 +3995,14 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
+window.aboutdialog stack scrolledwindow.frame, window.aboutdialog stack scrolledwindow.frame > .view, window.aboutdialog stack scrolledwindow.frame > .view > text {
+  border-radius: 4px;
+}
+
+window.aboutdialog .large-icons {
+  -gtk-icon-size: 128px;
+}
+
 /***********
  * Sidebar *
  ***********/
@@ -4037,7 +4064,7 @@ separator.sidebar {
  * Navigation Sidebar *
  **********************/
 .navigation-sidebar {
-  padding: 4px 0;
+  padding: 6px 0;
   border-right: none;
 }
 
@@ -4075,6 +4102,11 @@ separator.sidebar {
   color: rgba(0, 0, 0, 0.38);
 }
 
+.navigation-sidebar > separator {
+  background-color: rgba(0, 0, 0, 0.08);
+  margin: 6px 0;
+}
+
 /****************
  * File chooser *
  ****************/
@@ -4092,7 +4124,7 @@ placessidebar > viewport.frame {
 }
 
 placessidebar list {
-  padding: 1px 0 4px;
+  padding: 6px 0;
 }
 
 placessidebar .navigation-sidebar > row {
@@ -4320,7 +4352,7 @@ tooltip {
 tooltip.background {
   background-color: rgba(54, 54, 54, 0.9);
   color: white;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12);
   border-radius: 8px;
   margin: 2px 6px 8px 6px;
 }
@@ -4412,12 +4444,12 @@ colorswatch#editor-color-sample overlay {
 colorchooser .popover.osd {
   transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
   border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
 }
 
 colorchooser .popover.osd:backdrop {
-  box-shadow: 0 3px 2px -3px rgba(0, 0, 0, 0.3), 0 2px 2px -1px rgba(0, 0, 0, 0.24), 0 1px 3px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.15), 0 2px 2px rgba(0, 0, 0, 0.16), 0 1px 3px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
 }
 
 /********
@@ -4431,41 +4463,46 @@ colorchooser .popover.osd:backdrop {
  * Window Decorations *
  **********************/
 window {
-  transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
+  border: none;
+}
+
+window.csd {
   border-radius: 8px;
   margin: 0;
   outline: none;
-  box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(0, 0, 0, 0.12);
+  transition: none;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 16px 18px rgba(0, 0, 0, 0.15), 0 11px 23px rgba(0, 0, 0, 0.13), 0 0 0 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.01), 0 3px 4px rgba(0, 0, 0, 0.01), 0 1px 6px rgba(0, 0, 0, 0.01);
 }
 
-window:backdrop {
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent, 0 0 0 1px rgba(0, 0, 0, 0.12);
+window.csd:backdrop {
+  transition: box-shadow 75ms cubic-bezier(0, 0, 0.2, 1);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 3px 4px rgba(0, 0, 0, 0.14), 0 1px 6px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.12), 0 1px 3px rgba(0, 0, 0, 0.01), 0 16px 18px rgba(0, 0, 0, 0.01), 0 11px 23px rgba(0, 0, 0, 0.01);
 }
 
-window.popup {
-  border-radius: 4px;
-  box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12);
+window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
+  border-radius: 0;
 }
 
-window.dialog.message {
-  border-radius: 8px;
+window.csd.maximized, window.csd.fullscreen {
+  box-shadow: none;
 }
 
-.solid-csd window {
+window.solid-csd {
   margin: 0;
   padding: 2px;
   border-radius: 0;
+  border: none;
   box-shadow: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #F7F7F7;
 }
 
-.solid-csd window:backdrop {
+window.solid-csd:backdrop {
   background-color: #F2F2F2;
 }
 
-.maximized window, .fullscreen window, .tiled window, .tiled-top window, .tiled-right window, .tiled-bottom window, .tiled-left window {
-  border-radius: 0;
+window.solid-csd.maximized, window.solid-csd.fullscreen {
+  box-shadow: none;
 }
 
 .view:selected, iconview:selected, gridview > child:selected, modelbutton.flat:selected, row:selected, calendar:selected, calendar > grid > label.day-number:selected {
@@ -4587,11 +4624,11 @@ stackswitcher.circular button.text-button.circular {
  * App Icons *
  *************/
 .lowres-icon {
-  -gtk-icon-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 1px 1px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 .icon-dropshadow {
-  -gtk-icon-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.2), 0 6px 6px 0 rgba(0, 0, 0, 0.14), 0 1px 10.8px 0 rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 4px 5px 0 rgba(0, 0, 0, 0.16), 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 
 /*********
@@ -4685,7 +4722,7 @@ statusbar {
   border-radius: 4px;
   background-color: #1A73E8;
   color: white;
-  box-shadow: 0 3px 2px -2px rgba(0, 0, 0, 0.2), 0 3px 2.4px 0 rgba(0, 0, 0, 0.14), 0 1px 4.8px 0 rgba(0, 0, 0, 0.12);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.08), 0 2px 3px rgba(0, 0, 0, 0.14), 0 1px 3px rgba(0, 0, 0, 0.12);
 }
 
 .nautilus-window .floating-bar button {
@@ -5119,6 +5156,10 @@ menubutton stack > box {
   border-spacing: 6px;
 }
 
+.contacts-contact-list {
+  border-top: 1px solid rgba(0, 0, 0, 0.08);
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;
@@ -5389,11 +5430,6 @@ splitbutton > separator {
   background: none;
 }
 
-splitbutton > menubutton > button {
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
 splitbutton.image-button > button {
   min-width: 24px;
   padding-left: 6px;
@@ -5648,7 +5684,7 @@ viewswitcher {
 }
 
 viewswitcher.wide {
-  border-spacing: 3px;
+  border-spacing: 0;
   border-radius: 4px;
   background-color: rgba(0, 0, 0, 0.04);
   margin-top: 6px;