diff --git a/install.sh b/install.sh
index c6d5e48..5f44f1b 100755
--- a/install.sh
+++ b/install.sh
@@ -795,14 +795,33 @@ customize_theme_dialogs() {
   fi
 }
 
-run_customize_theme_dialogs() {
-  install_dialog && customize_theme_dialogs && change_transparency && change_size && force_nautilus_use_colors && parse_sass
+gnome_version() {
+  if [[ -z "${GS_VERSION:-}" ]]; then
+    # Set a proper gnome-shell theme version
+    if [[ "$(command -v gnome-shell)" ]]; then
+      SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -2)"
+      if [[ "${SHELL_VERSION:-}" == '40.0' ]]; then
+        GS_VERSION="new"
+      else
+        GS_VERSION="old"
+      fi
+    else
+      echo "'gnome-shell' not found, using styles for last gnome-shell version available."
+      GS_VERSION="new"
+    fi
+  fi
+
+  sed -i.bak "s/gs_version/$GS_VERSION/g" "$SRC_DIR/sass/_theme-options.scss"
 }
 
 parse_sass() {
   cd ${REPO_DIR} && ./parse-sass.sh
 }
 
+run_customize_theme_dialogs() {
+  install_dialog && customize_theme_dialogs && change_transparency && change_size && force_nautilus_use_colors && parse_sass
+}
+
 change_size() {
   if [[ "${sidebar_size:-}" != 'default' ]]; then
     cd ${SRC_DIR}/sass/gtk
@@ -814,14 +833,14 @@ change_size() {
 change_transparency() {
   if [[ "${panel_opacity:-}" != 'default' ]]; then
     cd ${SRC_DIR}/sass
-    sed -i.bak "/\$panel_opacity/s/0.16/0.${panel_opacity}/" _variables.scss
+    sed -i.bak "/\$panel_opacity/s/0.16/0.${panel_opacity}/" _theme-options.scss
     prompt -w "Change panel transparency ..."
   fi
 }
 
 force_nautilus_use_colors() {
   cd ${SRC_DIR}/sass
-  sed -i.bak "/\$nautilus_use_colors/s/false/true/" _variables.scss
+  sed -i.bak "/\$nautilus_use_colors/s/false/true/" _theme-options.scss
   prompt -w "Forcing nautilus to use colors instead of images ..."
 }
 
@@ -834,11 +853,11 @@ restore_files() {
     prompt -w "Restore _applications.scss file ..."
   fi
 
-  if [[ -f ${SRC_DIR}/sass/_variables.scss.bak ]]; then
+  if [[ -f ${SRC_DIR}/sass/_theme-options.scss.bak ]]; then
     local restore_file='true'
     cd ${SRC_DIR}/sass
-    rm -rf _variables.scss
-    mv -f _variables.scss.bak _variables.scss
+    rm -rf _theme-options.scss
+    mv -f _theme-options.scss.bak _theme-options.scss
     prompt -w "Restore _variables.scss file ..."
   fi
 
@@ -857,6 +876,9 @@ if [ ! "$(which glib-compile-resources 2> /dev/null)" ]; then
   fi
 fi
 
+# Check gnome-shell version
+gnome_version
+
 # Install themes
 if [[ "${remove:-}" != 'true' && "${gdm:-}" != 'true' ]]; then
   if [[ "${dialogs:-}" == 'true' ]]; then
@@ -864,7 +886,7 @@ if [[ "${remove:-}" != 'true' && "${gdm:-}" != 'true' ]]; then
   fi
 
   if [[ "${size:-}" != 'true' && "${panel:-}" != 'true' && "${nautilus_use_colors:-}" != 'true' ]]; then
-    install_theme
+    parse_sass && install_theme
   else
     install_customize_theme && parse_sass && install_theme "${panel_opacity}" "${sidebar_size}"
   fi
@@ -872,7 +894,7 @@ fi
 
 # Install GDM theme
 if [[ "${gdm:-}" == 'true' && "${remove:-}" != 'true' && "$UID" -eq "$ROOT_UID" ]]; then
-  install_theme && install_gdm "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${color}" "${opacity}" "${theme}" "${icon}"
+  parse_sass && install_theme && install_gdm "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${color}" "${opacity}" "${theme}" "${icon}"
 fi
 
 # Remove themes
diff --git a/src/main/gtk-3.0/gtk-dark-blue.css b/src/main/gtk-3.0/gtk-dark-blue.css
index 1a220a2..6cc9acc 100644
--- a/src/main/gtk-3.0/gtk-dark-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-blue.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #78aafa;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-green.css b/src/main/gtk-3.0/gtk-dark-green.css
index 48cc36e..56cdfcc 100644
--- a/src/main/gtk-3.0/gtk-dark-green.css
+++ b/src/main/gtk-3.0/gtk-dark-green.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #a4ce8d;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-grey.css b/src/main/gtk-3.0/gtk-dark-grey.css
index 4999369..1ef999e 100644
--- a/src/main/gtk-3.0/gtk-dark-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-grey.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b2b2b2;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-orange.css b/src/main/gtk-3.0/gtk-dark-orange.css
index 4b69509..ecb3522 100644
--- a/src/main/gtk-3.0/gtk-dark-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-orange.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f1b17f;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-pink.css b/src/main/gtk-3.0/gtk-dark-pink.css
index 104d0cd..ec20c5e 100644
--- a/src/main/gtk-3.0/gtk-dark-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-pink.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f0a0c5;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-purple.css b/src/main/gtk-3.0/gtk-dark-purple.css
index 96d3f1c..11b5bf0 100644
--- a/src/main/gtk-3.0/gtk-dark-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-purple.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b987bf;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-red.css b/src/main/gtk-3.0/gtk-dark-red.css
index 6531cce..41d0d6d 100644
--- a/src/main/gtk-3.0/gtk-dark-red.css
+++ b/src/main/gtk-3.0/gtk-dark-red.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f5a3a2;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-blue.css b/src/main/gtk-3.0/gtk-dark-solid-blue.css
index cdf3b34..b4ac916 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-blue.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #78aafa;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-green.css b/src/main/gtk-3.0/gtk-dark-solid-green.css
index d660f3e..a154013 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-green.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #a4ce8d;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-grey.css b/src/main/gtk-3.0/gtk-dark-solid-grey.css
index 01ff603..0068364 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-grey.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b2b2b2;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-orange.css b/src/main/gtk-3.0/gtk-dark-solid-orange.css
index f046e0f..bbfd86a 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-orange.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f1b17f;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-pink.css b/src/main/gtk-3.0/gtk-dark-solid-pink.css
index 2abfd1d..fdf6afc 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-pink.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f0a0c5;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-purple.css b/src/main/gtk-3.0/gtk-dark-solid-purple.css
index 3f981d9..2772d52 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-purple.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b987bf;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-red.css b/src/main/gtk-3.0/gtk-dark-solid-red.css
index f875c00..40cf653 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-red.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f5a3a2;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-yellow.css b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
index de62bf4..8b7af53 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f8d593;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index df326df..42bbbb4 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #4d8ef9;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,18 +4895,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #333333 0%, #333333 95%, transparent 95%, transparent 100%);
 }
 
@@ -4899,7 +4935,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4908,23 +4945,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5995,11 +6037,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6015,7 +6059,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6026,26 +6070,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6101,7 +6151,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6321,6 +6372,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6854,6 +6935,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-yellow.css b/src/main/gtk-3.0/gtk-dark-yellow.css
index dcf0573..73464ee 100644
--- a/src/main/gtk-3.0/gtk-dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-yellow.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f8d593;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 905daac..f3703aa 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: padding-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #c5c5c5;
   background-color: rgba(255, 255, 255, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.25);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(255, 255, 255, 0.35);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(222, 222, 222, 0.35);
 }
 
@@ -1604,6 +1604,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #f8f8f8;
+  background-color: rgba(253, 253, 253, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #FDFDFD;
+  background-color: rgba(253, 253, 253, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #4d8ef9;
@@ -1911,12 +1938,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #FDFDFD;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #FDFDFD;
@@ -2401,13 +2422,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2428,6 +2461,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(36, 36, 36, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(222, 222, 222, 0.675);
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: #444444;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #dedede;
+  background-color: #373737;
+  border-color: #444444;
+}
+
 notebook {
   padding: 0;
 }
@@ -2611,25 +2663,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(222, 222, 222, 0.35);
-  background-color: rgba(36, 36, 36, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(222, 222, 222, 0.675);
-  background-color: rgba(255, 255, 255, 0.05);
-  border-color: #444444;
-}
-
-notebook > header tabs > tab:checked {
-  color: #dedede;
-  background-color: #373737;
-  border-color: #444444;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4060,21 +4093,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #333333;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(255, 255, 255, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(255, 255, 255, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #333333;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4862,14 +4895,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4895,7 +4930,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#242424);
@@ -4904,23 +4940,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -5991,11 +6032,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #0e0e0e;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#0e0e0e);
@@ -6011,7 +6054,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(255, 255, 255, 0.03), inset 0 0 3px rgba(255, 255, 255, 0.02), inset 0 0 0 1px rgba(255, 255, 255, 0.04), inset 0 1px rgba(255, 255, 255, 0.06);
   background-color: rgba(255, 255, 255, 0.05);
@@ -6022,26 +6065,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6097,7 +6146,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #242424;
   border-bottom-right-radius: 12px;
 }
@@ -6317,6 +6367,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #1e1e1e;
+  box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #dedede;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #f8f8f8;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6850,6 +6930,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-blue.css b/src/main/gtk-3.0/gtk-light-blue.css
index 497ddd9..e23b041 100644
--- a/src/main/gtk-3.0/gtk-light-blue.css
+++ b/src/main/gtk-3.0/gtk-light-blue.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #78aafa;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-green.css b/src/main/gtk-3.0/gtk-light-green.css
index 4fb088e..4545ea3 100644
--- a/src/main/gtk-3.0/gtk-light-green.css
+++ b/src/main/gtk-3.0/gtk-light-green.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #a4ce8d;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-grey.css b/src/main/gtk-3.0/gtk-light-grey.css
index 5e59654..13e3858 100644
--- a/src/main/gtk-3.0/gtk-light-grey.css
+++ b/src/main/gtk-3.0/gtk-light-grey.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b2b2b2;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-orange.css b/src/main/gtk-3.0/gtk-light-orange.css
index 3d6d833..0604bdd 100644
--- a/src/main/gtk-3.0/gtk-light-orange.css
+++ b/src/main/gtk-3.0/gtk-light-orange.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f1b17f;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-pink.css b/src/main/gtk-3.0/gtk-light-pink.css
index bd7a39d..0a0b73c 100644
--- a/src/main/gtk-3.0/gtk-light-pink.css
+++ b/src/main/gtk-3.0/gtk-light-pink.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f0a0c5;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-purple.css b/src/main/gtk-3.0/gtk-light-purple.css
index b819d2d..1cdbaef 100644
--- a/src/main/gtk-3.0/gtk-light-purple.css
+++ b/src/main/gtk-3.0/gtk-light-purple.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b987bf;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-red.css b/src/main/gtk-3.0/gtk-light-red.css
index 5656fe8..e682d79 100644
--- a/src/main/gtk-3.0/gtk-light-red.css
+++ b/src/main/gtk-3.0/gtk-light-red.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f5a3a2;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-blue.css b/src/main/gtk-3.0/gtk-light-solid-blue.css
index 243c599..58c1cb4 100644
--- a/src/main/gtk-3.0/gtk-light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-light-solid-blue.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #78aafa;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-green.css b/src/main/gtk-3.0/gtk-light-solid-green.css
index 59ee74b..1882eb8 100644
--- a/src/main/gtk-3.0/gtk-light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-light-solid-green.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #a4ce8d;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-grey.css b/src/main/gtk-3.0/gtk-light-solid-grey.css
index 120da3d..025a9d4 100644
--- a/src/main/gtk-3.0/gtk-light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-light-solid-grey.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b2b2b2;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-orange.css b/src/main/gtk-3.0/gtk-light-solid-orange.css
index 16de2b9..f45d252 100644
--- a/src/main/gtk-3.0/gtk-light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-light-solid-orange.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f1b17f;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-pink.css b/src/main/gtk-3.0/gtk-light-solid-pink.css
index a589205..a7071cf 100644
--- a/src/main/gtk-3.0/gtk-light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-light-solid-pink.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f0a0c5;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-purple.css b/src/main/gtk-3.0/gtk-light-solid-purple.css
index 7489ac5..a0677ca 100644
--- a/src/main/gtk-3.0/gtk-light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-light-solid-purple.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #b987bf;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-red.css b/src/main/gtk-3.0/gtk-light-solid-red.css
index 5c5dc73..63345cd 100644
--- a/src/main/gtk-3.0/gtk-light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-light-solid-red.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f5a3a2;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-yellow.css b/src/main/gtk-3.0/gtk-light-solid-yellow.css
index 188f087..ba194a2 100644
--- a/src/main/gtk-3.0/gtk-light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-solid-yellow.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f8d593;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 6d35e35..82fe075 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #4d8ef9;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,18 +4917,21 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal {
+.nautilus-window.background.csd > headerbar.titlebar > box.left.horizontal,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > box.left.horizontal {
   background-image: linear-gradient(0deg, #f0f0f0 0%, #f0f0f0 95%, transparent 95%, transparent 100%);
 }
 
@@ -4921,7 +4957,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4930,23 +4967,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6018,11 +6060,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6038,7 +6082,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6049,26 +6093,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6124,7 +6174,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6344,6 +6395,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6870,6 +6951,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light-yellow.css b/src/main/gtk-3.0/gtk-light-yellow.css
index d09b922..2bbfd08 100644
--- a/src/main/gtk-3.0/gtk-light-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-yellow.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #f8d593;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 6e12d17..7dd5efb 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -518,37 +518,37 @@ entry progress {
   }
 }
 
-.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, .nemo-window .toolbar > button, button.flat {
+.raven .raven-header:not(.top) button, .budgie-panel button.flat.launcher, button.budgie-menu-launcher, tabbox > tab button, .nemo-window .toolbar > button, button.flat {
   border: none;
   background-color: transparent;
   box-shadow: none;
   background-clip: border-box;
 }
 
-.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
+.raven .raven-header:not(.top) button:hover, .budgie-panel button.flat.launcher:hover, button.budgie-menu-launcher:hover, tabbox > tab button:hover, .nemo-window .toolbar > button:hover, button.flat:hover {
   color: #0b0b0b;
   background-color: rgba(0, 0, 0, 0.15);
   background-image: none;
   box-shadow: none;
 }
 
-.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, .nemo-window .toolbar > button:active, button.flat:active {
+.raven .raven-header:not(.top) button:active, .budgie-panel button.flat.launcher:active, button.budgie-menu-launcher:active, tabbox > tab button:active, .nemo-window .toolbar > button:active, button.flat:active {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
+.raven .raven-header:not(.top) button:checked, .budgie-panel button.flat.launcher:checked, button.budgie-menu-launcher:checked, tabbox > tab button:checked, .nemo-window .toolbar > button:checked, button.flat:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.65);
 }
 
-.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   background-color: transparent;
 }
 
-.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
+.raven .raven-header:not(.top) button:disabled label, .budgie-panel button.flat.launcher:disabled label, button.budgie-menu-launcher:disabled label, tabbox > tab button:disabled label, .nemo-window .toolbar > button:disabled label, button.flat:disabled label, .raven .raven-header:not(.top) button:disabled, .budgie-panel button.flat.launcher:disabled, button.budgie-menu-launcher:disabled, tabbox > tab button:disabled, .nemo-window .toolbar > button:disabled, button.flat:disabled {
   color: rgba(36, 36, 36, 0.45);
 }
 
@@ -1612,6 +1612,33 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none;
 }
 
+headerbar.windowhandle viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+  border-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+headerbar.windowhandle > button.popup:hover {
+  color: #525252;
+  background-color: rgba(87, 87, 87, 0.1);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:active, headerbar.windowhandle > button.popup:active:hover {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.25);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.windowhandle > button.popup:checked {
+  color: #575757;
+  background-color: rgba(87, 87, 87, 0.12);
+  background-image: none;
+  box-shadow: none;
+}
+
 .selection-mode headerbar, headerbar.selection-mode {
   color: white;
   background-color: #4d8ef9;
@@ -1919,12 +1946,6 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
   transition-duration: 300ms;
 }
 
-window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
-window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
-  color: #575757;
-}
-
 window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
 window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
   color: #575757;
@@ -2409,13 +2430,25 @@ popover.background entry {
 popover > list,
 popover > .view,
 popover > toolbar,
+popover > scrolledwindow > viewport > list,
 popover.background > list,
 popover.background > .view,
-popover.background > toolbar {
+popover.background > toolbar,
+popover.background > scrolledwindow > viewport > list {
   border-style: none;
   background-color: transparent;
 }
 
+popover > scrolledwindow > viewport > list,
+popover.background > scrolledwindow > viewport > list {
+  margin: 6px;
+}
+
+popover > scrolledwindow > viewport > list row,
+popover.background > scrolledwindow > viewport > list row {
+  border-radius: 6px;
+}
+
 popover.touch-selection, .csd popover.touch-selection,
 popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial;
@@ -2436,6 +2469,25 @@ cursor-handle.bottom {
   -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
+tabbox > tab, notebook > header tabs > tab {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(255, 255, 255, 0);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+}
+
+tabbox > tab:hover:not(:checked), notebook > header tabs > tab:hover:not(:checked) {
+  color: rgba(36, 36, 36, 0.725);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: #d9d9d9;
+}
+
+tabbox > tab:checked, notebook > header tabs > tab:checked {
+  color: #242424;
+  background-color: #ffffff;
+  border-color: #d9d9d9;
+}
+
 notebook {
   padding: 0;
 }
@@ -2623,25 +2675,6 @@ notebook > header.left tabs > tab:last-child, notebook > header.right tabs > tab
   border-bottom-style: none;
 }
 
-notebook > header tabs > tab {
-  color: rgba(36, 36, 36, 0.45);
-  background-color: rgba(255, 255, 255, 0);
-  border: 1px solid transparent;
-  transition: all 150ms ease-out;
-}
-
-notebook > header tabs > tab:hover:not(:checked) {
-  color: rgba(36, 36, 36, 0.725);
-  background-color: rgba(255, 255, 255, 0.2);
-  border-color: #d9d9d9;
-}
-
-notebook > header tabs > tab:checked {
-  color: #242424;
-  background-color: #ffffff;
-  border-color: #d9d9d9;
-}
-
 notebook > header tabs > tab button.flat {
   min-height: 20px;
   min-width: 20px;
@@ -4071,21 +4104,21 @@ filechooserbutton:drop(active) {
   border-color: transparent;
 }
 
-.sidebar {
-  border-style: none;
-  background-color: #f5f5f5;
-}
-
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left {
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list {
   border-right: 1px solid rgba(0, 0, 0, 0.12);
   border-left-style: none;
 }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right {
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list {
   border-left: 1px solid rgba(0, 0, 0, 0.12);
   border-right-style: none;
 }
 
+.sidebar {
+  border-style: none;
+  background-color: #f5f5f5;
+}
+
 .sidebar list {
   background-color: transparent;
 }
@@ -4884,14 +4917,16 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar {
+.nautilus-window.background.csd > headerbar.titlebar,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border: none;
   background-color: transparent;
   background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
-.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
+.nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child,
+.nautilus-window.background.csd > deck > box > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
@@ -4917,7 +4952,8 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-color: transparent;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator {
+.nautilus-window > grid.horizontal > paned.horizontal > separator,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator {
   border-left: none;
   background-color: transparent;
   background-image: image(#ffffff);
@@ -4926,23 +4962,28 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
   background-repeat: no-repeat;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: -1px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(ltr),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(ltr) {
   margin-left: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl) {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:dir(rtl),
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:dir(rtl) {
   margin-right: 2px;
 }
 
-.nautilus-window > grid.horizontal > paned.horizontal > separator:hover {
+.nautilus-window > grid.horizontal > paned.horizontal > separator:hover,
+.nautilus-window > deck > box.vertical > paned.horizontal > separator:hover {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 2px 100px;
   background-position: center center;
@@ -6014,11 +6055,13 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
   border-color: #d6d6d6;
 }
 
-.geary-main-window.background.csd > overlay > box.vertical > paned > separator,
+.geary-main-window.background.csd leaflet > leaflet > sidebar.separator,
+window#GearyMainWindow.background.csd leaflet > leaflet > sidebar.separator, .geary-main-window.background.csd > overlay > box.vertical > paned > separator,
 window#GearyMainWindow.background.csd > overlay > box.vertical > paned > separator, window.background.csd > overlay > hdyleaflet > separator.sidebar,
 window.background.csd > overlay > leaflet > separator.sidebar, box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar, window.background.csd > box.horizontal:not(.titlebar) > separator.vertical, window.background.csd > headerbar.titlebar > box.horizontal > separator.sidebar,
 window.background.csd > headerbar.titlebar > hdyleaflet > separator.sidebar,
 window.background.csd > headerbar.titlebar > leaflet > separator.sidebar, window.background.csd > hdyleaflet > separator.vertical, window.background.csd > leaflet > separator.vertical, window.background.csd > box.horizontal > separator.vertical, .titlebar:not(headerbar) > separator, window.org-gnome-gedit > paned.titlebar > separator, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator, window.org-gnome-gedit > paned.titlebar > separator:backdrop, window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned > separator:backdrop {
   background-image: image(#d6d6d6);
@@ -6034,7 +6077,7 @@ window.background.csd > stack > box > stack > scrolledwindow > viewport frame >
 window.background.csd > stack > box > stack > box > scrolledwindow > viewport > frame > list,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list, window.background.csd > stack > list,
 window.background.csd > stack > scrolledwindow > viewport > box > list,
-window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) {
+window.background.csd > box > stack > scrolledwindow > viewport > box > list, .tweak-group-startup, list.tweak-group list, hdyleaflet list.view, hdyleaflet list.frame, leaflet list.view, leaflet list.frame, box.horizontal > stack.background list.view, box.horizontal > stack.background list.frame, hdyleaflet frame.view, leaflet frame.view, box.horizontal > stack.background frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list), preferencesgroup list {
   border-radius: 12px;
   box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.02), inset 0 0 3px rgba(0, 0, 0, 0.01), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 0 1px rgba(0, 0, 0, 0.05);
   background-color: rgba(0, 0, 0, 0.03);
@@ -6045,26 +6088,32 @@ window.background.csd stack stack stack frame > list > separator,
 window.background.csd > stack > stack > box > frame > list > separator,
 window.background.csd > stack > box > stack > scrolledwindow > viewport frame > list > separator,
 window.background.csd > stack > grid > scrolledwindow > viewport > box > frame > list > separator, window.background.csd > stack > list > separator,
-window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator {
+window.background.csd > stack > scrolledwindow > viewport > box > list > separator, .tweak-group-startup > separator, list.tweak-group list > separator, hdyleaflet list.view > separator, hdyleaflet list.frame > separator, leaflet list.view > separator, leaflet list.frame > separator, box.horizontal > stack.background list.view > separator, box.horizontal > stack.background list.frame > separator, hdyleaflet frame.view > separator, leaflet frame.view > separator, box.horizontal > stack.background frame.view > separator, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) > separator, leaflet frame:not(.view) list:not(.contacts-contact-list) > separator, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) > separator, preferencesgroup list > separator {
   background: none;
   min-height: 0;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child {
+window.background.csd stack stack stack frame > list row.activatable:first-child, window.background.csd > stack > list row.activatable:first-child, list.tweak-group list row.activatable:first-child, hdyleaflet list.view row.activatable:first-child, hdyleaflet list.frame row.activatable:first-child, leaflet list.view row.activatable:first-child, leaflet list.frame row.activatable:first-child, box.horizontal > stack.background list.view row.activatable:first-child, box.horizontal > stack.background list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, box.horizontal > stack.background frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, preferencesgroup list row.activatable:first-child {
   border-top-left-radius: 12px;
   border-top-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child {
+window.background.csd stack stack stack frame > list row.activatable:last-child, window.background.csd > stack > list row.activatable:last-child, list.tweak-group list row.activatable:last-child, hdyleaflet list.view row.activatable:last-child, hdyleaflet list.frame row.activatable:last-child, leaflet list.view row.activatable:last-child, leaflet list.frame row.activatable:last-child, box.horizontal > stack.background list.view row.activatable:last-child, box.horizontal > stack.background list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, box.horizontal > stack.background frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, preferencesgroup list row.activatable:last-child {
   border-bottom-left-radius: 12px;
   border-bottom-right-radius: 12px;
 }
 
-window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child {
+window.background.csd stack stack stack frame > list row.activatable:only-child, window.background.csd > stack > list row.activatable:only-child, list.tweak-group list row.activatable:only-child, hdyleaflet list.view row.activatable:only-child, hdyleaflet list.frame row.activatable:only-child, leaflet list.view row.activatable:only-child, leaflet list.frame row.activatable:only-child, box.horizontal > stack.background list.view row.activatable:only-child, box.horizontal > stack.background list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, box.horizontal > stack.background frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, box.horizontal > stack.background frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, preferencesgroup list row.activatable:only-child {
   border-radius: 12px;
 }
 
-hdyleaflet list > row.activatable, leaflet list > row.activatable, box.horizontal > stack.background list > row.activatable {
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+hdyleaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+leaflet > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable, box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > list > row.activatable,
+box.horizontal > stack.background > box.vertical > scrolledwindow > viewport.frame > stack > box.vertical > list > row.activatable {
   margin: 2px 4px;
   border-radius: 8px;
   -gtk-outline-radius: 6px;
@@ -6120,7 +6169,8 @@ row#AutostartTitle.tweak {
   background: none;
 }
 
-window.background.csd > hdyleaflet > box.vertical > stack.main-container {
+window.background.csd > hdyleaflet > box.vertical > stack.main-container,
+window.background.csd > leaflet > box.vertical > stack.main-container {
   background-color: #ffffff;
   border-bottom-right-radius: 12px;
 }
@@ -6340,6 +6390,36 @@ notebook.main-notebook webkitwebview {
   border-radius: 0 0 12px 12px;
 }
 
+tabbox {
+  background-color: #e6e6e6;
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
+}
+
+tabbox > tab {
+  border-top: none;
+  padding: 2px 10px;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+tabbox > tab button {
+  min-height: 20px;
+  min-width: 20px;
+  border-radius: 3px;
+  border: none;
+  padding: 0;
+}
+
+tabbox > tab button:hover {
+  color: #242424;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+tabbox > tab button:active, tabbox > tab button:active:hover {
+  color: #0b0b0b;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 window.background.csd > box.vertical > overlay > stack.background {
   border-radius: 0 0 12px 12px;
 }
@@ -6866,6 +6946,10 @@ dialog.background.csd > headerbar.titlebar > label:not(.title):not(.subtitle) {
   font-weight: 700;
 }
 
+dialog.background.csd > box.vertical.dialog-vbox.view {
+  background: none;
+}
+
 dialog.background.csd > box.vertical.dialog-vbox > grid.horizontal > scrolledwindow.frame {
   border: none;
 }
diff --git a/src/sass/_theme-options.scss b/src/sass/_theme-options.scss
new file mode 100644
index 0000000..6017627
--- /dev/null
+++ b/src/sass/_theme-options.scss
@@ -0,0 +1,19 @@
+//
+// THEME OPTIONS
+//
+
+// Gnome shell version
+$gnome_version: gs_version; // 3.38/old || 40.0/new
+
+// Force nautilus styles to exclusively use colors instead of linear-gradients
+$nautilus_use_colors: false;
+
+// Nautilus sidebar sizes (when nautilus_use_colors is false)
+$sidebar_size_default: 200px;
+$sidebar_size_220: 220px;
+$sidebar_size_240: 240px;
+$sidebar_size_260: 260px;
+$sidebar_size_280: 280px;
+
+// Gnome-shell panel opacity
+$panel_opacity: 0.16;
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index f76315e..ac9ac4e 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -1,3 +1,5 @@
+@import 'theme-options';
+
 $asset_suffix: if($variant == 'dark', '-dark', '');
 $con_asset_suffix: if($variant=='dark', '', '-dark');
 $extra_background_clip: if($variant == 'light', padding-box, border-box);
@@ -21,8 +23,6 @@ $secondary_opacity: 0.75;
 $hint_opacity: 0.6;
 $disabled_opacity: 0.45;
 
-$panel_opacity: 0.16;
-
 // sizes
 $small_size: if($laptop == 'false', 24px, 20px);
 $medium_size: if($laptop == 'false', 36px, 32px);
@@ -30,12 +30,6 @@ $large_size: if($laptop == 'false', 48px, 44px);
 $menuitem_size: if($laptop == 'false', 32px, 28px);
 $container_padding: if($laptop == 'false', 6px, 4px);
 
-$sidebar_size_default: 200px;
-$sidebar_size_220: 220px;
-$sidebar_size_240: 240px;
-$sidebar_size_260: 260px;
-$sidebar_size_280: 280px;
-
 // radiuses
 $circular_radius: 9999px;
 $bt_radius: 6px;
@@ -76,6 +70,3 @@ $shadow_6: 0 0 8px rgba(black, 0.2), 0 0 4px rgba(black, 0.3);              // S
 $text_shadow: 0 -1px rgba(white, 0.04), -1px 0 rgba(black, 0.05),
               1px 0 rgba(black, 0.05), 0 1px rgba(black, 0.3),
               0 2px rgba(black, 0.05);                                      // text and icon shadow
-
-// Force nautilus styles to exclusively use colors instead of linear-gradients
-$nautilus_use_colors: false;
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 87c8258..a7265dc 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -65,11 +65,18 @@ window.background.csd { // gnome-terminal 3.32 setting
 $nautilus_radius: $wm_radius + 2px;
 $nautilus_sidebar_size: $sidebar_size_default;
 $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
-                                        $dark_sidebar_bg $nautilus_sidebar_size,
-                                        darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
-                                        darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
-                                        $base_color ($nautilus_sidebar_size + 1px),
-                                        $base_color 100%);
+                                       $dark_sidebar_bg $nautilus_sidebar_size,
+                                       darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+                                       darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+                                       $base_color ($nautilus_sidebar_size + 1px),
+                                       $base_color 100%);
+
+$nautilus_header_image_alt: linear-gradient(90deg, transparent 0%,
+                                           transparent $nautilus_sidebar_size,
+                                           darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+                                           darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+                                           $base_color ($nautilus_sidebar_size + 1px),
+                                           $base_color 100%);
 
 $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
                                         $dark_sidebar_bg $nautilus_sidebar_size,
@@ -77,32 +84,33 @@ $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
                                         transparent 100%);
 
 $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
-                                        $dark_sidebar_bg $nautilus_sidebar_size,
-                                        darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
-                                        darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
-                                        $base_color ($nautilus_sidebar_size + 1px),
-                                        $base_color 100%);
+                                           $dark_sidebar_bg $nautilus_sidebar_size,
+                                           darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+                                           darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+                                           $base_color ($nautilus_sidebar_size + 1px),
+                                           $base_color 100%);
 
 .nautilus-window {
   &.background.csd {
     border-radius: 0 0 $wm_radius $wm_radius;
 
-    @if $nautilus_use_colors {
+    @if $nautilus_use_colors == 'true' {
       background-color: $dark_sidebar_bg;
     } @else {
       background-color: transparent;
       background-image: $nautilus_background_image;
     }
 
-    > headerbar.titlebar {
+    > headerbar.titlebar,
+    > deck > box > headerbar.titlebar {
       box-shadow: inset 0 1px rgba(white, 0.1);
 
-      @if $nautilus_use_colors {
+      @if $nautilus_use_colors == 'true' {
         background-color: $header_bg;
       } @else {
         border: none;
         background-color: transparent;
-        background-image: $nautilus_header_image;
+        background-image: if($gnome_version == 'new', $nautilus_header_image_alt, $nautilus_header_image);
 
         > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
 
@@ -142,7 +150,8 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
     }
   }
 
-  > grid.horizontal > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
+  > grid.horizontal > paned.horizontal > separator,
+  > deck > box.vertical > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
     border-left: none;
     background-color: transparent;
     background-image: image($base_color);
@@ -153,7 +162,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
     &:dir(ltr) { margin-left: -1px; }
     &:dir(rtl) { margin-right: -1px; }
 
-    @if $nautilus_use_colors {} @else {
+    @if $nautilus_use_colors == 'true' {} @else {
       &:dir(ltr) { margin-left: 2px; }
       &:dir(rtl) { margin-right: 2px; }
 
@@ -166,7 +175,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
   }
 
   placessidebar.sidebar {
-    @if $nautilus_use_colors {
+    @if $nautilus_use_colors == 'true' {
       background-color: transparent;
       &.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
     } @else {
@@ -191,7 +200,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
 
       &:backdrop { opacity: 0.85; }
 
-      @if $nautilus_use_colors {
+      @if $nautilus_use_colors == 'true' {
         border-radius: $bt_radius;
         margin: 0 6px;
         padding: 2px 4px;
@@ -374,6 +383,14 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
   }
 }
 
+preferencesgroup { // gnome 40.0 preferences window
+  list {
+    @extend %circular_list;
+
+    row.activatable { @extend %circular_row; }
+  }
+}
+
 .nautilus-canvas-item { border-radius: 5px; }
 
 // .view.nautilus-desktop,
@@ -1459,7 +1476,13 @@ hdyleaflet, leaflet, box.horizontal > stack.background {
     row.activatable { @extend %circular_row; }
   }
 
-  list > row.activatable { @extend %sidebar_row; }
+  > box.vertical > scrolledwindow > viewport.frame {
+    &,
+    > stack,
+    > stack > box.vertical {
+      > list > row.activatable { @extend %sidebar_row; }
+    }
+  }
 }
 
 list {
@@ -1531,7 +1554,8 @@ window.background.csd {
     }
   }
 
-  > hdyleaflet > box.vertical > stack.main-container { // Right side
+  > hdyleaflet > box.vertical > stack.main-container,
+  > leaflet > box.vertical > stack.main-container { // Right side
     background-color: $base_color;
     border-bottom-right-radius: $wm_radius;
   }
@@ -1671,7 +1695,8 @@ window.background.csd {
 
 box.horizontal > separator.sidebar,
 hdyleaflet > separator.sidebar,
-leaflet > separator.sidebar { // reset
+leaflet > separator.sidebar,
+leaflet > leaflet > separator.sidebar { // reset
   @extend %side_separator;
 }
 
@@ -1846,6 +1871,39 @@ notebook.main-notebook {
   }
 }
 
+// gnome 40.0
+tabbox {
+  background-color: darken($header_bg, 10%);
+  box-shadow: inset 0 -1px $borders_color;
+
+  > tab {
+    @extend %tabs_tab;
+    border-top: none;
+    padding: 2px 10px;
+    min-width: 24px;
+    min-height: 24px;
+
+    button {
+      min-height: 20px;
+      min-width: 20px;
+      border-radius: 3px;
+      border: none;
+      padding: 0;
+      @extend %flat_button;
+
+      &:hover {
+        color: $fg_color;
+        background-color: rgba($borders_color, 0.1);
+      }
+
+      &:active, &:active:hover {
+        color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
+        background-color: rgba($borders_color, 0.2);
+      }
+    }
+  }
+}
+
 //
 // Gnome Music
 //
@@ -2470,6 +2528,8 @@ dialog.background.csd {
   }
 
   > box.vertical.dialog-vbox {
+    &.view { background: none; }
+
     > grid.horizontal {
       > scrolledwindow.frame { //removed ugly boders for nautilus batch renaming dialog
         border: none;
@@ -3134,6 +3194,10 @@ window#GearyMainWindow.background.csd {
     }
   }
 
+  leaflet > leaflet > sidebar.separator {
+    @extend %side_separator;
+  }
+
   &.maximized, &.tiled, &.fullscreen {
     > overlay > box.vertical {
       > paned {
diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss
index a41e1e6..15ebd95 100644
--- a/src/sass/gtk/_common.scss
+++ b/src/sass/gtk/_common.scss
@@ -1441,6 +1441,28 @@ headerbar {
     box-shadow: none;
   }
 
+  &.windowhandle {
+    viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
+      border-radius: 0;
+      margin-top: 0;
+      margin-bottom: 0;
+    }
+
+    > button.popup {
+      &:hover {
+        @include button(header-hover);
+      }
+
+      &:active, &:active:hover {
+        @include button(header-active);
+      }
+
+      &:checked {
+        @include button(header-checked);
+      }
+    }
+  }
+
   // Selectionmode
   .selection-mode &,
   &.selection-mode {
@@ -1748,7 +1770,7 @@ headerbar, .titlebar {
     transition-duration: 300ms;
   }
 
-  &:active:hover, &:checked { color: $header_fg; }
+  // &:active:hover, &:checked { color: $header_fg; }
 
   &:checked {
     @include button(header-checked);
@@ -2170,11 +2192,18 @@ popover.background {
 
   > list,
   > .view,
-  > toolbar {
+  > toolbar,
+  > scrolledwindow > viewport > list {
     border-style: none;
     background-color: transparent;
   }
 
+  > scrolledwindow > viewport > list {
+    margin: $container_padding;
+
+    row { border-radius: $bt_radius; }
+  }
+
   &, .csd & {
     &.osd, &.magnifier { @extend %osd; }
     &.touch-selection { font: initial; }
@@ -2196,6 +2225,26 @@ cursor-handle {
 //
 // Notebooks and Tabs
 //
+
+%tabs_tab {
+  color: $disabled_fg_color;
+  background-color: transparentize($base_color, 1);
+  border: 1px solid transparent;
+  transition: all 150ms ease-out;
+
+  &:hover:not(:checked) {
+    color: mix($fg_color, $disabled_fg_color, 50%);
+    background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05));
+    border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
+  }
+
+  &:checked {
+    color: $fg_color;
+    background-color: $header_bg;
+    border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
+  }
+}
+
 notebook {
   padding: 0;
   // margin-top: -1px;
@@ -2348,22 +2397,7 @@ notebook {
     }
 
     tabs > tab {
-      color: $disabled_fg_color;
-      background-color: transparentize($base_color, 1);
-      border: 1px solid transparent;
-      transition: all 150ms ease-out;
-
-      &:hover:not(:checked) {
-        color: mix($fg_color, $disabled_fg_color, 50%);
-        background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05));
-        border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
-      }
-
-      &:checked {
-        color: $fg_color;
-        background-color: $header_bg;
-        border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
-      }
+      @extend %tabs_tab;
 
       // close button
       button.flat {
@@ -3374,24 +3408,33 @@ filechooserbutton:drop(active) {
 //
 // Sidebar
 //
+
+%sidebar_left {
+  border-right: 1px solid $borders_color;
+  border-left-style: none;
+}
+
+%sidebar_right {
+  border-left: 1px solid $borders_color;
+  border-right-style: none;
+}
+
 .sidebar {
   border-style: none;
   background-color: $bg_color;
 
-  @at-root %sidebar_left,
-  &:dir(ltr),
-  &.left,
-  &.left:dir(rtl) {
-    border-right: 1px solid $borders_color;
-    border-left-style: none;
-  }
-
-  @at-root %sidebar_right,
-  &:dir(rtl),
-  &.right {
-    border-left: 1px solid $borders_color;
-    border-right-style: none;
-  }
+  // &:dir(ltr),
+  // &.left,
+  // &.left:dir(rtl) {
+  //   border-right: 1px solid $borders_color;
+  //   border-left-style: none;
+  // }
+  //
+  // &:dir(rtl),
+  // &.right {
+  //   border-left: 1px solid $borders_color;
+  //   border-right-style: none;
+  // }
 
   list {
     background-color: transparent;
diff --git a/test.sh b/test.sh
index f4949a1..0f112d2 100755
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,4 @@
 #! /usr/bin/env bash
-set -ueo pipefail
-set -o physical
-#set -x
 
 REPO_DIR=$(cd $(dirname $0) && pwd)
 SRC_DIR=${REPO_DIR}/src