diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 2da8efe2..a69bd98e 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -136,7 +136,7 @@ label {
     label.error:disabled:backdrop {
       color: rgba(191, 23, 23, 0.4); }
 
-.dim-label, .titlebar:not(headerbar) .subtitle,
+.dim-label, .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, label.separator {
   opacity: 0.55;
   text-shadow: none; }
@@ -5476,6 +5476,57 @@ headerbar viewswitcher button > stack > box.wide,
 headerbar hdyviewswitcher > button box.wide {
   margin: -8px 0; }
 
+dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
+  background: #23252e;
+  border: 0;
+  box-shadow: none; }
+
+.titlebar:not(headerbar) button.titlebutton:not(.appmenu),
+headerbar button.titlebutton:not(.appmenu) {
+  color: transparent;
+  background: #383d4b;
+  margin: 0;
+  margin-left: 5px;
+  padding: 0;
+  min-width: 0;
+  min-height: 0;
+  border: 1px solid black;
+  box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05);
+  -gtk-icon-shadow: none;
+  transition: all .2s; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu) + button.titlebutton,
+  headerbar button.titlebutton:not(.appmenu) + button.titlebutton {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child,
+  headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 5px; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover,
+  headerbar button.titlebutton:not(.appmenu):hover {
+    color: #eeeeec;
+    background: #383d4b;
+    border-color: transparent;
+    box-shadow: 0 0 0 1px #0d0e11; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close,
+  headerbar button.titlebutton:not(.appmenu).close {
+    color: black;
+    background: #2777ff;
+    border-color: transparent; }
+    .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover,
+    headerbar button.titlebutton:not(.appmenu).close:hover {
+      color: white;
+      background: #3d85ff; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 0; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop,
+  headerbar button.titlebutton:not(.appmenu):backdrop {
+    color: transparent;
+    background: transparent;
+    box-shadow: none;
+    border-color: #0d0e11;
+    background: rgba(0, 0, 0, 0.3); }
+
 .default-decoration.titlebar:not(headerbar),
 headerbar.default-decoration {
   min-height: 0;
@@ -5486,11 +5537,6 @@ headerbar.default-decoration {
     min-width: 0;
     margin: 0; }
 
-dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
-  background: #23252e;
-  border: 0;
-  box-shadow: none; }
-
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
 headerbar.titlebar headerbar:first-child,
@@ -5960,31 +6006,6 @@ decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
 
-button.titlebutton:not(.appmenu) {
-  margin: 0;
-  margin-left: 6px;
-  padding: 0;
-  min-width: 0;
-  min-height: 0;
-  border: 0;
-  -gtk-icon-shadow: none; }
-  button.titlebutton:not(.appmenu) + button.titlebutton:not(.appmenu) {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):last-child {
-    margin-right: 6px; }
-  button.titlebutton:not(.appmenu):hover:not(:backdrop) {
-    transition: 0;
-    background: rgba(255, 255, 255, 0.2);
-    box-shadow: inset 0 0 0 1px #0d0e11; }
-  .maximized button.titlebutton:not(.appmenu):last-child, .fullscreen button.titlebutton:not(.appmenu):last-child, .tiled button.titlebutton:not(.appmenu):last-child, .tiled-top button.titlebutton:not(.appmenu):last-child, .tiled-right button.titlebutton:not(.appmenu):last-child, .tiled-bottom button.titlebutton:not(.appmenu):last-child, .tiled-left button.titlebutton:not(.appmenu):last-child {
-    margin-right: 0; }
-  .maximized button.titlebutton:not(.appmenu):first-child, .fullscreen button.titlebutton:not(.appmenu):first-child, .tiled button.titlebutton:not(.appmenu):first-child, .tiled-top button.titlebutton:not(.appmenu):first-child, .tiled-right button.titlebutton:not(.appmenu):first-child, .tiled-bottom button.titlebutton:not(.appmenu):first-child, .tiled-left button.titlebutton:not(.appmenu):first-child {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):backdrop {
-    background: transparent; }
-    button.titlebutton:not(.appmenu):backdrop:not(:hover) {
-      border-color: transparent; }
-
 /* Nautilus */
 @define-color disk_space_unknown #383c4a;
 @define-color disk_space_used #2777ff;
@@ -6180,6 +6201,485 @@ wnck-pager {
 .thunar .warning {
   margin: -7px 0; }
 
+.budgie-container {
+  background-color: transparent; }
+
+*:drop(active):focus,
+*:drop(active) {
+  box-shadow: inset 0 0 0 1px #2777ff; }
+
+.budgie-panel {
+  background-color: #272a34;
+  color: white;
+  font-weight: normal; }
+  .budgie-panel image {
+    -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel label {
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel .alert {
+    color: #2777ff; }
+  .budgie-panel:backdrop {
+    color: white;
+    background-color: rgba(39, 42, 52, 0.8); }
+  .budgie-panel.transparent {
+    background-color: rgba(39, 42, 52, 0.8);
+    color: white; }
+  .budgie-panel button {
+    min-height: 16px;
+    min-width: 16px;
+    padding: 0;
+    border-radius: 0; }
+  .budgie-panel.horizontal button {
+    padding: 0 4px; }
+  .budgie-panel.vertical button {
+    padding: 4px 0; }
+  .budgie-panel separator {
+    background-color: rgba(238, 238, 236, 0.4); }
+  .budgie-panel.vertical #tasklist-button {
+    min-height: 32px; }
+  .budgie-panel .end-region {
+    background-color: rgba(0, 0, 0, 0.3);
+    border-radius: 0px; }
+    .budgie-panel .end-region separator {
+      background-color: rgba(255, 255, 255, 0.15); }
+    .budgie-panel .end-region label {
+      font-weight: 700;
+      color: white; }
+
+.budgie-panel button.flat.launcher {
+  padding: 0;
+  border-radius: 0;
+  border: none;
+  background-image: radial-gradient(circle farthest-corner at center, alpha(#eeeeec,0) 100%, transparent 0%), image(alpha(#eeeeec,0));
+  background-position: center center; }
+  .budgie-panel button.flat.launcher > image {
+    opacity: 0.87; }
+  .budgie-panel button.flat.launcher:hover {
+    -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:hover > image {
+      opacity: 1.0; }
+  .budgie-panel button.flat.launcher:active > image {
+    opacity: 1.0; }
+  .budgie-panel button.flat.launcher:checked {
+    background-color: transparent; }
+    .budgie-panel button.flat.launcher:checked:hover {
+      -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:checked > image {
+      opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover,
+.budgie-panel .pinned button.flat.launcher.running:hover {
+  -gtk-icon-effect: highlight; }
+
+.budgie-panel .unpinned button.flat.launcher > image,
+.budgie-panel .pinned button.flat.launcher.running > image {
+  background-size: 2px 2px;
+  background-repeat: no-repeat;
+  opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover > image, .budgie-panel .unpinned button.flat.launcher:active > image, .budgie-panel .unpinned button.flat.launcher:checked > image,
+.budgie-panel .pinned button.flat.launcher.running:hover > image,
+.budgie-panel .pinned button.flat.launcher.running:active > image,
+.budgie-panel .pinned button.flat.launcher.running:checked > image {
+  background-image: none; }
+
+.top .budgie-panel button#tasklist-button:hover,
+.top .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 2px alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.top .budgie-panel button#tasklist-button:active, .top .budgie-panel button#tasklist-button:checked,
+.top .budgie-panel button.flat.launcher:active,
+.top .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.top .budgie-panel .unpinned button.flat.launcher > image,
+.top .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: top center; }
+
+.top .budgie-panel .unpinned button.flat.launcher:hover, .top .budgie-panel .unpinned button.flat.launcher:active, .top .budgie-panel .unpinned button.flat.launcher:checked,
+.top .budgie-panel .pinned button.flat.launcher.running:hover,
+.top .budgie-panel .pinned button.flat.launcher.running:active,
+.top .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.bottom .budgie-panel button#tasklist-button:hover,
+.bottom .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 -2px alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.bottom .budgie-panel button#tasklist-button:active, .bottom .budgie-panel button#tasklist-button:checked,
+.bottom .budgie-panel button.flat.launcher:active,
+.bottom .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher > image,
+.bottom .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: bottom center; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher:hover, .bottom .budgie-panel .unpinned button.flat.launcher:active, .bottom .budgie-panel .unpinned button.flat.launcher:checked,
+.bottom .budgie-panel .pinned button.flat.launcher.running:hover,
+.bottom .budgie-panel .pinned button.flat.launcher.running:active,
+.bottom .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.left .budgie-panel button#tasklist-button:hover,
+.left .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 2px 0 alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.left .budgie-panel button#tasklist-button:active, .left .budgie-panel button#tasklist-button:checked,
+.left .budgie-panel button.flat.launcher:active,
+.left .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.left .budgie-panel .unpinned button.flat.launcher > image,
+.left .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: left center; }
+
+.left .budgie-panel .unpinned button.flat.launcher:hover, .left .budgie-panel .unpinned button.flat.launcher:active, .left .budgie-panel .unpinned button.flat.launcher:checked,
+.left .budgie-panel .pinned button.flat.launcher.running:hover,
+.left .budgie-panel .pinned button.flat.launcher.running:active,
+.left .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.right .budgie-panel button#tasklist-button:hover,
+.right .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset -2px 0 alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.right .budgie-panel button#tasklist-button:active, .right .budgie-panel button#tasklist-button:checked,
+.right .budgie-panel button.flat.launcher:active,
+.right .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.right .budgie-panel .unpinned button.flat.launcher > image,
+.right .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: right center; }
+
+.right .budgie-panel .unpinned button.flat.launcher:hover, .right .budgie-panel .unpinned button.flat.launcher:active, .right .budgie-panel .unpinned button.flat.launcher:checked,
+.right .budgie-panel .pinned button.flat.launcher.running:hover,
+.right .budgie-panel .pinned button.flat.launcher.running:active,
+.right .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.top .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.bottom .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to top, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.left .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to right, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.right .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to left, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.budgie-popover {
+  border-style: none;
+  border-width: 1px;
+  border-color: rgba(0, 0, 0, 0.28);
+  border-radius: 6px;
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.28);
+  background-color: #23252e; }
+  .budgie-popover .container {
+    padding: 2px; }
+  .budgie-popover border {
+    border: none; }
+  .budgie-popover list {
+    background-color: transparent; }
+  .budgie-popover row {
+    padding: 0; }
+    .budgie-popover row:hover {
+      box-shadow: none; }
+  .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
+    min-height: 28px;
+    padding: 0 8px;
+    color: #eeeeec;
+    font-weight: normal; }
+    .budgie-popover:not(.budgie-menu) button.flat:not(.image-button):disabled {
+      color: #888a8d; }
+  .budgie-popover.budgie-menu .container {
+    padding: 0; }
+  .budgie-popover.user-menu .container {
+    padding: 8px; }
+  .budgie-popover.user-menu separator {
+    margin: 4px 0; }
+  .budgie-popover.sound-popover separator {
+    margin: 3px 0; }
+  .budgie-popover.night-light-indicator .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .places-list:not(.always-expand) {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #0d0e11; }
+  .budgie-popover.places-menu .alternative-label {
+    padding: 3px;
+    font-size: 15px; }
+  .budgie-popover.workspace-popover .container {
+    padding: 2px 8px 8px; }
+  .budgie-popover.workspace-popover separator {
+    margin: 4px 0; }
+  .budgie-popover.workspace-popover flowboxchild {
+    padding: 0; }
+
+.workspace-switcher .workspace-layout {
+  border: 0 solid rgba(35, 37, 46, 0.8); }
+  .top .workspace-switcher .workspace-layout:dir(ltr), .bottom .workspace-switcher .workspace-layout:dir(ltr) {
+    border-left-width: 1px; }
+  .top .workspace-switcher .workspace-layout:dir(rtl), .bottom .workspace-switcher .workspace-layout:dir(rtl) {
+    border-right-width: 1px; }
+  .left .workspace-switcher .workspace-layout, .right .workspace-switcher .workspace-layout {
+    border-top-width: 1px; }
+
+.workspace-switcher .workspace-item,
+.workspace-switcher .workspace-add-button {
+  border: 0 solid rgba(24, 26, 32, 0.8); }
+  .top .workspace-switcher .workspace-item:dir(ltr), .bottom .workspace-switcher .workspace-item:dir(ltr), .top .workspace-switcher .workspace-add-button:dir(ltr), .bottom .workspace-switcher .workspace-add-button:dir(ltr) {
+    border-right-width: 1px; }
+  .top .workspace-switcher .workspace-item:dir(rtl), .bottom .workspace-switcher .workspace-item:dir(rtl), .top .workspace-switcher .workspace-add-button:dir(rtl), .bottom .workspace-switcher .workspace-add-button:dir(rtl) {
+    border-left-width: 1px; }
+  .left .workspace-switcher .workspace-item, .right .workspace-switcher .workspace-item, .left .workspace-switcher .workspace-add-button, .right .workspace-switcher .workspace-add-button {
+    border-bottom-width: 1px; }
+
+.workspace-switcher .workspace-item.current-workspace {
+  background-color: rgba(24, 26, 32, 0.8); }
+
+.workspace-switcher .workspace-add-button:hover {
+  box-shadow: none; }
+
+.workspace-switcher .workspace-add-button:active {
+  background-image: none; }
+
+.workspace-switcher .workspace-add-button:active image {
+  margin: 1px 0 -1px; }
+
+.budgie-panel .workspace-switcher .workspace-icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 0;
+  border-radius: 6px; }
+
+.budgie-menu.background {
+  padding: 0;
+  background-color: #272a34; }
+
+.budgie-menu scrollbar,
+.budgie-menu entry.search {
+  background-color: transparent; }
+
+.budgie-menu entry.search {
+  border-style: none;
+  border-bottom: 1px solid #0d0e11;
+  border-radius: 999px;
+  box-shadow: none;
+  font-size: 120%;
+  padding-top: 6px;
+  padding-bottom: 6px; }
+
+.budgie-menu button {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: #eeeeec;
+  font-weight: normal; }
+
+.budgie-menu row {
+  padding: 0; }
+  .budgie-menu row:hover {
+    box-shadow: none; }
+
+button.budgie-menu-launcher {
+  color: white;
+  border: none; }
+  button.budgie-menu-launcher:hover {
+    background-color: rgba(238, 238, 236, 0.4);
+    border: none; }
+
+popover.background.user-menu {
+  padding: 8px; }
+  popover.background.user-menu .content-box {
+    background-color: transparent; }
+  popover.background.user-menu separator {
+    margin: 4px 0; }
+  popover.background.user-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+button.raven-trigger {
+  color: white;
+  border: none; }
+  button.raven-trigger:hover {
+    background-color: rgba(238, 238, 236, 0.4);
+    border: none; }
+
+popover.background.places-menu {
+  padding: 8px; }
+  popover.background.places-menu .name-button.text-button {
+    padding-left: 8px;
+    padding-right: 8px; }
+    popover.background.places-menu .name-button.text-button image:dir(ltr) {
+      margin-right: 3px; }
+    popover.background.places-menu .name-button.text-button image:dir(rtl) {
+      margin-left: 3px; }
+  popover.background.places-menu .places-section-header > image:dir(ltr) {
+    margin: 0 -2px 0 5px; }
+  popover.background.places-menu .places-section-header > image:dir(rtl) {
+    margin: 0 5px 0 -2px; }
+  popover.background.places-menu .places-list {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #0d0e11;
+    background-color: transparent; }
+  popover.background.places-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+frame.raven-frame > border {
+  border-style: none;
+  box-shadow: none; }
+
+.raven {
+  background-color: #23252e;
+  color: #eeeeec;
+  padding: 6px 0 0 0;
+  border: none; }
+  .raven .raven-header {
+    min-height: 32px;
+    padding: 3px; }
+    .raven .raven-header.top {
+      padding: 2px 0;
+      background-color: #23252e;
+      color: #eeeeec; }
+      .raven .raven-header.top stackswitcher button {
+        margin: -6px 0;
+        min-height: 32px; }
+    .raven .raven-header.bottom {
+      border-top: 1px solid #0d0e11; }
+  .raven viewport.frame .raven-header {
+    margin-top: -8px; }
+  .raven .raven-background {
+    border-style: solid none;
+    border-width: 1px;
+    border-color: #0d0e11;
+    background-color: #272a34; }
+  .raven scrolledwindow.raven-background {
+    border-bottom-style: none; }
+  .raven .powerstrip button {
+    margin: 2px 0 1px;
+    padding: 10px; }
+  .raven .option-subtitle {
+    font-size: smaller; }
+
+calendar.raven-calendar {
+  border-style: none;
+  background-color: transparent; }
+  calendar.raven-calendar:selected {
+    border-radius: 6px;
+    background-color: #23252e; }
+
+.raven-mpris {
+  background-color: rgba(35, 37, 46, 0.8);
+  color: #eeeeec; }
+  .raven-mpris label {
+    min-height: 24px; }
+
+.budgie-notification-window, .budgie-osd-window {
+  background-color: transparent;
+  color: white;
+  border-radius: 6px; }
+  .budgie-notification-window .drop-shadow, .budgie-osd-window .drop-shadow {
+    background-color: #303340; }
+
+.budgie-notification, .budgie-switcher, .budgie-switcher-window, .budgie-osd {
+  background-color: #303340;
+  color: white; }
+  .budgie-notification .notification-title, .budgie-switcher .notification-title, .budgie-switcher-window .notification-title, .budgie-osd .notification-title {
+    font-size: 110%;
+    color: white; }
+  .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body {
+    color: white; }
+
+.budgie-osd .budgie-osd-text {
+  font-size: 120%; }
+
+.budgie-switcher-window .drop-shadow {
+  margin: 8px 8px 16px;
+  border-radius: 6px;
+  background-color: #303340;
+  box-shadow: rgba(0, 0, 0, 0.28); }
+  .budgie-switcher-window .drop-shadow label.budgie-switcher-title {
+    color: white; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(ltr) {
+      padding: 0 0 0 6px; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(rtl) {
+      padding: 0 6px 0 0; }
+
+.drop-shadow {
+  margin: 5px 9px;
+  padding: 3px;
+  border-radius: 2px;
+  box-shadow: none;
+  background-color: #23252e; }
+
+.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
+  border-radius: 6px;
+  background-color: #23252e; }
+
+.budgie-session-dialog label:not(:last-child),
+.budgie-session-dialog .dialog-title {
+  font-size: 120%; }
+
+.budgie-session-dialog .linked.horizontal > button {
+  padding: 8px 16px;
+  border-top: 1px solid #0d0e11;
+  border-radius: 6px; }
+  .budgie-session-dialog .linked.horizontal > button:first-child {
+    border-bottom-left-radius: 2px; }
+  .budgie-session-dialog .linked.horizontal > button:last-child {
+    border-bottom-right-radius: 2px; }
+
+.budgie-polkit-dialog .message {
+  color: #eeeeec; }
+
+.budgie-polkit-dialog .failure {
+  color: #a61414; }
+
+.budgie-run-dialog {
+  background-color: #272a34;
+  border-style: none; }
+  .budgie-run-dialog entry.search {
+    font-size: 120%;
+    box-shadow: none;
+    background-color: transparent;
+    border-style: none;
+    border-bottom: 1px solid #0d0e11;
+    border-radius: 0;
+    padding-top: 6px;
+    padding-bottom: 6px; }
+  .budgie-run-dialog list .dim-label, .budgie-run-dialog list label.separator,
+  .budgie-run-dialog list headerbar .subtitle,
+  headerbar .budgie-run-dialog list .subtitle, .budgie-run-dialog list .titlebar:not(headerbar) .subtitle, .titlebar:not(headerbar) .budgie-run-dialog list .subtitle, .budgie-run-dialog list .budgie-notification .notification-body, .budgie-notification .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-osd .notification-body, .budgie-osd .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher-window .notification-body, .budgie-switcher-window .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher .notification-body, .budgie-switcher .budgie-run-dialog list .notification-body {
+    opacity: 1; }
+  .budgie-run-dialog scrolledwindow {
+    border-top: 1px solid #0d0e11; }
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/share/themes/Kali-Dark/gtk-4.0/gtk.css b/share/themes/Kali-Dark/gtk-4.0/gtk.css
index 401b4ae0..583ae016 100644
--- a/share/themes/Kali-Dark/gtk-4.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-4.0/gtk.css
@@ -20,18 +20,7 @@ dnd {
 .large-icons {
   -gtk-icon-size: 32px; }
 
-/*
-   These wildcard seems unavoidable, need to investigate.
-   Wildcards are bad and troublesome, use them with care,
-   or better, just don't.
-   Every time a wildcard is used a kitten dies, painfully.
-*/
-spinner:disabled,
-arrow:disabled,
-scrollbar:disabled,
-check:disabled,
-radio:disabled,
-treeview.expander:disabled {
+image:disabled {
   -gtk-icon-filter: opacity(0.5); }
 
 .view, iconview,
@@ -54,21 +43,22 @@ textview > border {
   background-color: #252831; }
 
 iconview {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-iconview:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-iconview:drop(active) {
-  box-shadow: none; }
-
-iconview > dndtarget:drop(active) {
-  border-style: solid;
-  border-width: 1px;
-  border-color: #00348d; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  iconview {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  iconview:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  iconview:drop(active) {
+    box-shadow: none; }
+  iconview > dndtarget:drop(active) {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #00348d; }
 
 rubberband, .content-view > rubberband, columnview.view > rubberband,
 treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
@@ -77,7 +67,10 @@ treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
 
 flowbox > flowboxchild {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   flowbox > flowboxchild {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -90,7 +83,10 @@ flowbox > flowboxchild {
 
 gridview > child {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   gridview > child {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -110,27 +106,27 @@ coverflow cover {
   border: 1px solid black; }
 
 label {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-label:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-label > selection {
-  background-color: #2777ff;
-  color: #ffffff; }
-
-label:disabled {
-  color: #888a8d; }
-  button label:disabled {
-    color: inherit; }
-
-label.error {
-  color: #bf1717; }
-  label.error:disabled {
-    color: rgba(191, 23, 23, 0.5); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  label {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  label:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  label > selection {
+    background-color: #2777ff;
+    color: #ffffff; }
+  label:disabled {
+    color: #888a8d; }
+    button label:disabled {
+      color: inherit; }
+  label.error {
+    color: #bf1717; }
+    label.error:disabled {
+      color: rgba(191, 23, 23, 0.5); }
 
 .dim-label, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, spinbutton.vertical > text > text > placeholder, spinbutton:not(.vertical) > text > placeholder,
@@ -236,7 +232,10 @@ entry {
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: white;
   border-color: #0d0e11;
-  background-color: #272a34; }
+  background-color: #272a34;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   spinbutton.vertical > text, spinbutton:not(.vertical),
   entry {
     outline: 0 solid transparent;
@@ -277,7 +276,10 @@ entry {
     background-color: #242731; }
   spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
   entry.error {
-    color: #bf1717; }
+    color: #bf1717;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
     entry.error {
       outline: 0 solid transparent;
@@ -292,7 +294,10 @@ entry {
       background-color: #bf1717; }
   spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
   entry.warning {
-    color: #fd7d00; }
+    color: #fd7d00;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
     entry.warning {
       outline: 0 solid transparent;
@@ -440,7 +445,10 @@ button {
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
   background-image: image(#323643);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   notebook > header > tabs > arrow, windowcontrols button,
   button {
     outline: 0 solid transparent;
@@ -457,7 +465,8 @@ button {
     background-image: linear-gradient(to top, #1e2128 20%, #20232b 90%);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     -gtk-icon-filter: brightness(1.2); }
-  notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  notebook > header > tabs > arrow.keyboard-activating, notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  button.keyboard-activating,
   button:active,
   button:checked {
     color: #eeeeec;
@@ -484,8 +493,11 @@ button {
     border-color: #0d0e11;
     background-image: image(#23252e);
     box-shadow: none;
-    transition: 200ms ease-out;
-    -gtk-icon-filter: none; }
+    transition: 200ms ease-out; }
+    notebook > header > tabs > arrow:backdrop:not(:disabled),
+    button:backdrop.flat:not(:disabled),
+    button:backdrop:not(:disabled) {
+      -gtk-icon-filter: none; }
     notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
@@ -515,7 +527,8 @@ button {
   button:disabled {
     color: #888a8d;
     border-color: #0d0e11;
-    background-image: image(#242731); }
+    background-image: image(#242731);
+    -gtk-icon-filter: opacity(0.5); }
     notebook > header > tabs > arrow:disabled:active, notebook > header > tabs > arrow:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
@@ -538,7 +551,8 @@ button {
       background-color: #252831;
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-    button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.keyboard-activating.sidebar-button, notebook > header > tabs > arrow.keyboard-activating, windowcontrols button.keyboard-activating, button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.flat.keyboard-activating,
     button.flat:active,
     button.flat:checked {
       border-color: transparent;
@@ -689,7 +703,10 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #0047c0;
   background-image: image(#4187ff);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.suggested-action {
     outline: 0 solid transparent;
@@ -771,7 +788,10 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #4b0909;
   background-image: image(#bd1616);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.destructive-action {
     outline: 0 solid transparent;
@@ -1030,6 +1050,44 @@ list > row button.image-button:not(.flat) {
     border-color: #0d0e11;
     background-image: image(#13151a);
     box-shadow: none; }
+  popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).suggested-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #0047c0;
+    background-image: image(#4187ff);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).suggested-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).suggested-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.3);
+      outline-width: 2px;
+      outline-offset: -2px; }
+  popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #4b0909;
+    background-image: image(#bd1616);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).destructive-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).destructive-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.3);
+      outline-width: 2px;
+      outline-offset: -2px; }
 
 /*********
  * Links *
@@ -1061,13 +1119,16 @@ link {
     color: #e8f1ff; }
 
 link {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-link:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  link {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  link:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
 
 button.link, button.link:hover, button.link:active, button.link:checked {
   text-shadow: none; }
@@ -1396,7 +1457,6 @@ headerbar {
     border-color: #0d0e11;
     background-color: #23252e;
     background-image: none;
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
     transition: 200ms ease-out; }
   .titlebar:not(headerbar) .title,
   headerbar .title {
@@ -1471,17 +1531,12 @@ headerbar switch {
   margin-top: 10px;
   margin-bottom: 10px; }
 
-headerbar.titlebar headerbar:not(.titlebar) {
-  background: none;
-  box-shadow: none; }
-
 window.csd > .titlebar:not(headerbar) {
   padding: 0;
   background-color: transparent;
   background-image: none;
   border-style: none;
-  border-color: transparent;
-  box-shadow: none; }
+  border-color: transparent; }
 
 .titlebar:not(headerbar) separator {
   background-color: #0d0e11; }
@@ -1523,7 +1578,10 @@ pathbar > button.slider-button {
 columnview.view,
 treeview.view {
   border-left-color: #4f5159;
-  border-top-color: #4f5159; }
+  border-top-color: #4f5159;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   columnview.view,
   treeview.view {
     outline: 0 solid transparent;
@@ -1691,7 +1749,7 @@ popover.background {
   popover.background > contents {
     background-color: #1f222a;
     background-clip: padding-box;
-    border: 1px solid rgba(13, 14, 17, 0.9);
+    border: 1px solid rgba(0, 0, 0, 0.75);
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   popover.background:backdrop {
     background-color: transparent; }
@@ -1832,178 +1890,179 @@ menubar {
 /*************
  * Notebooks *
  *************/
-notebook > header > tabs > tab:checked {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-notebook:focus:focus-visible > header > tabs > tab:checked {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-notebook > header {
-  padding: 1px;
-  border-color: #0d0e11;
-  border-width: 1px;
-  background-color: #1b1d24; }
-  notebook > header > tabs {
-    margin: -1px; }
-  notebook > header.top {
-    border-bottom-style: solid; }
-    notebook > header.top > tabs {
-      margin-bottom: -2px; }
-      notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -4px #0d0e11; }
-      notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -4px #2777ff; }
-  notebook > header.bottom {
-    border-top-style: solid; }
-    notebook > header.bottom > tabs {
-      margin-top: -2px; }
-      notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 4px #0d0e11; }
-      notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 4px #2777ff; }
-  notebook > header.left {
-    border-right-style: solid; }
-    notebook > header.left > tabs {
-      margin-right: -2px; }
-      notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -4px 0 #0d0e11; }
-      notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -4px 0 #2777ff; }
-  notebook > header.right {
-    border-left-style: solid; }
-    notebook > header.right > tabs {
-      margin-left: -2px; }
-      notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 4px 0 #0d0e11; }
-      notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 4px 0 #2777ff; }
-  notebook > header.top > tabs > arrow {
-    border-top-style: none; }
-  notebook > header.bottom > tabs > arrow {
-    border-bottom-style: none; }
-  notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
-    margin-left: -5px;
-    margin-right: -5px;
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-    notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-  notebook > header.left > tabs > arrow {
-    border-left-style: none; }
-  notebook > header.right > tabs > arrow {
-    border-right-style: none; }
-  notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
-    margin-top: -5px;
-    margin-bottom: -5px;
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-    notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-  notebook > header > tabs > arrow {
-    min-height: 16px;
-    min-width: 16px;
-    border-radius: 0; }
-    notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
-      background-clip: padding-box;
-      background-image: none;
-      background-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      box-shadow: none; }
-    notebook > header > tabs > arrow:disabled {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      box-shadow: none; }
-  notebook > header > tabs > tab {
-    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    min-height: 30px;
-    min-width: 30px;
-    padding: 3px 12px;
-    color: #eeeeec;
-    font-weight: normal;
+notebook {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  notebook > header > tabs > tab:checked {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  notebook:focus:focus-visible > header > tabs > tab:checked {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  notebook > header {
+    padding: 1px;
+    border-color: #0d0e11;
     border-width: 1px;
-    border-color: transparent; }
-    notebook > header > tabs > tab:hover {
+    background-color: #1b1d24; }
+    notebook > header > tabs {
+      margin: -1px; }
+    notebook > header.top {
+      border-bottom-style: solid; }
+      notebook > header.top > tabs {
+        margin-bottom: -2px; }
+        notebook > header.top > tabs > tab:hover {
+          box-shadow: inset 0 -4px #0d0e11; }
+        notebook > header.top > tabs > tab:checked {
+          box-shadow: inset 0 -4px #2777ff; }
+    notebook > header.bottom {
+      border-top-style: solid; }
+      notebook > header.bottom > tabs {
+        margin-top: -2px; }
+        notebook > header.bottom > tabs > tab:hover {
+          box-shadow: inset 0 4px #0d0e11; }
+        notebook > header.bottom > tabs > tab:checked {
+          box-shadow: inset 0 4px #2777ff; }
+    notebook > header.left {
+      border-right-style: solid; }
+      notebook > header.left > tabs {
+        margin-right: -2px; }
+        notebook > header.left > tabs > tab:hover {
+          box-shadow: inset -4px 0 #0d0e11; }
+        notebook > header.left > tabs > tab:checked {
+          box-shadow: inset -4px 0 #2777ff; }
+    notebook > header.right {
+      border-left-style: solid; }
+      notebook > header.right > tabs {
+        margin-left: -2px; }
+        notebook > header.right > tabs > tab:hover {
+          box-shadow: inset 4px 0 #0d0e11; }
+        notebook > header.right > tabs > tab:checked {
+          box-shadow: inset 4px 0 #2777ff; }
+    notebook > header.top > tabs > arrow {
+      border-top-style: none; }
+    notebook > header.bottom > tabs > arrow {
+      border-bottom-style: none; }
+    notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
+      margin-left: -5px;
+      margin-right: -5px;
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+      notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    notebook > header.left > tabs > arrow {
+      border-left-style: none; }
+    notebook > header.right > tabs > arrow {
+      border-right-style: none; }
+    notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
+      margin-top: -5px;
+      margin-bottom: -5px;
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+      notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+    notebook > header > tabs > arrow {
+      min-height: 16px;
+      min-width: 16px;
+      border-radius: 0; }
+      notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
+        background-clip: padding-box;
+        background-image: none;
+        background-color: rgba(255, 255, 255, 0.3);
+        border-color: transparent;
+        box-shadow: none; }
+      notebook > header > tabs > arrow:disabled {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: none; }
+    notebook > header > tabs > tab {
+      transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+      min-height: 30px;
+      min-width: 30px;
+      padding: 3px 12px;
       color: #eeeeec;
-      background-color: #121418; }
-      notebook > header > tabs > tab:hover.reorderable-page {
-        border-color: rgba(13, 14, 17, 0.3);
-        background-color: rgba(35, 37, 46, 0.2); }
-    notebook > header > tabs > tab:not(:checked) {
-      outline-color: transparent; }
-    notebook > header > tabs > tab:checked {
-      color: #eeeeec; }
-      notebook > header > tabs > tab:checked.reorderable-page {
-        border-color: rgba(13, 14, 17, 0.5);
-        background-color: rgba(35, 37, 46, 0.5); }
-        notebook > header > tabs > tab:checked.reorderable-page:hover {
-          background-color: rgba(35, 37, 46, 0.7); }
-    notebook > header > tabs > tab button.flat {
-      color: alpha(currentColor,0.3);
-      padding: 0;
-      margin-top: 4px;
-      margin-bottom: 4px;
-      min-width: 20px;
-      min-height: 20px; }
-      notebook > header > tabs > tab button.flat:hover {
-        color: currentColor; }
-      notebook > header > tabs > tab button.flat:last-child {
+      font-weight: normal;
+      border-width: 1px;
+      border-color: transparent; }
+      notebook > header > tabs > tab:hover {
+        color: #eeeeec;
+        background-color: #121418; }
+        notebook > header > tabs > tab:hover.reorderable-page {
+          border-color: rgba(13, 14, 17, 0.3);
+          background-color: rgba(35, 37, 46, 0.2); }
+      notebook > header > tabs > tab:not(:checked) {
+        outline-color: transparent; }
+      notebook > header > tabs > tab:checked {
+        color: #eeeeec; }
+        notebook > header > tabs > tab:checked.reorderable-page {
+          border-color: rgba(13, 14, 17, 0.5);
+          background-color: rgba(35, 37, 46, 0.5); }
+          notebook > header > tabs > tab:checked.reorderable-page:hover {
+            background-color: rgba(35, 37, 46, 0.7); }
+      notebook > header > tabs > tab button.flat {
+        color: alpha(currentColor,0.3);
+        padding: 0;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        min-width: 20px;
+        min-height: 20px; }
+        notebook > header > tabs > tab button.flat:hover {
+          color: currentColor; }
+        notebook > header > tabs > tab button.flat:last-child {
+          margin-left: 4px;
+          margin-right: -4px; }
+        notebook > header > tabs > tab button.flat:first-child {
+          margin-left: -4px;
+          margin-right: 4px; }
+    notebook > header.top > tabs, notebook > header.bottom > tabs {
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
+        margin-left: 3px;
+        margin-right: 3px; }
+        notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
+          margin-left: -1px; }
+        notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
+          margin-right: -1px; }
+      notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
         margin-left: 4px;
-        margin-right: -4px; }
-      notebook > header > tabs > tab button.flat:first-child {
-        margin-left: -4px;
         margin-right: 4px; }
-  notebook > header.top > tabs, notebook > header.bottom > tabs {
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
-      margin-left: 3px;
-      margin-right: 3px; }
-      notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
-        margin-left: -1px; }
-      notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
-        margin-right: -1px; }
-    notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
-      margin-left: 4px;
-      margin-right: 4px; }
-      notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
-        border-style: none solid; }
-  notebook > header.left > tabs, notebook > header.right > tabs {
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
-      margin-top: 3px;
-      margin-bottom: 3px; }
-      notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
-        margin-top: -1px; }
-      notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
-        margin-bottom: -1px; }
-    notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
-      margin-top: 4px;
-      margin-bottom: 4px; }
-      notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
-        border-style: solid none; }
-  notebook > header.top > tabs > tab {
-    padding-bottom: 4px; }
-  notebook > header.bottom > tabs > tab {
-    padding-top: 4px; }
-
-notebook > stack:not(:only-child) {
-  background-color: #272a34; }
+        notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
+          border-style: none solid; }
+    notebook > header.left > tabs, notebook > header.right > tabs {
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
+        margin-top: 3px;
+        margin-bottom: 3px; }
+        notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
+          margin-top: -1px; }
+        notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
+          margin-bottom: -1px; }
+      notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
+        margin-top: 4px;
+        margin-bottom: 4px; }
+        notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
+          border-style: solid none; }
+    notebook > header.top > tabs > tab {
+      padding-bottom: 4px; }
+    notebook > header.bottom > tabs > tab {
+      padding-top: 4px; }
+  notebook > stack:not(:only-child) {
+    background-color: #272a34; }
 
 /**************
  * Scrollbars *
  **************/
 scrollbar {
   background-color: #272a34;
-  transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   scrollbar.top {
     border-bottom: 1px solid #0d0e11; }
   scrollbar.bottom {
@@ -2013,13 +2072,14 @@ scrollbar {
   scrollbar.right {
     border-left: 1px solid #0d0e11; }
   scrollbar > range > trough > slider {
-    min-width: 10px;
-    min-height: 10px;
+    min-width: 8px;
+    min-height: 8px;
     margin: -1px;
     border: 4px solid transparent;
     border-radius: 10px;
     background-clip: padding-box;
-    background-color: #41434b; }
+    background-color: #41434b;
+    transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
     scrollbar > range > trough > slider:hover {
       background-color: #4b4d54; }
     scrollbar > range > trough > slider:hover:active {
@@ -2027,12 +2087,13 @@ scrollbar {
     scrollbar > range > trough > slider:disabled {
       background-color: transparent; }
   scrollbar > range.fine-tune > trough > slider {
+    transition: none;
     min-width: 6px;
     min-height: 6px; }
   scrollbar > range.fine-tune.horizontal > trough > slider {
-    border-width: 6px 4px; }
+    border-width: 5px 4px; }
   scrollbar > range.fine-tune.vertical > trough > slider {
-    border-width: 4px 6px; }
+    border-width: 4px 5px; }
   scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     border-color: transparent;
     opacity: 0.4;
@@ -2071,6 +2132,9 @@ switch {
   color: #eeeeec;
   background-color: #1b1d24;
   transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out;
   /* only show i / o for the accessible theme */ }
   switch {
     outline: 0 solid transparent;
@@ -2245,7 +2309,10 @@ switch {
 checkbutton {
   border-spacing: 4px;
   border-radius: 4px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   checkbutton {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -2409,7 +2476,10 @@ progressbar > trough > progress, scale > trough > highlight {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 12px; }
+  padding: 12px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   scale > trough {
     outline: 0 solid transparent;
     outline-offset: 16px; }
@@ -3061,28 +3131,26 @@ list {
     border-bottom: 1px solid #4f5159; }
 
 row {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-row:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-row.activatable.has-open-popup, row.activatable:hover {
-  background-color: rgba(238, 238, 236, 0.05); }
-
-row.activatable:active {
-  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-
-row.activatable:selected:active {
-  box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-
-row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #3b83fd; }
-
-row:selected {
-  outline-color: rgba(255, 255, 255, 0.3); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  row.activatable.has-open-popup, row.activatable:hover {
+    background-color: rgba(238, 238, 236, 0.05); }
+  row.activatable:active {
+    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
+  row.activatable:selected:active {
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
+  row.activatable:selected.has-open-popup, row.activatable:selected:hover {
+    background-color: #3b83fd; }
+  row:selected {
+    outline-color: rgba(255, 255, 255, 0.3); }
 
 columnview > listview > row {
   padding: 0; }
@@ -3157,20 +3225,22 @@ expander {
   expander:checked {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-expander-widget > box > title {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-expander-widget:focus:focus-visible > box > title {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-expander-widget > box > title {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  border-radius: 4px; }
-  expander-widget > box > title:hover > expander {
-    color: white; }
+expander-widget {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  expander-widget > box > title {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  expander-widget:focus:focus-visible > box > title {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  expander-widget > box > title {
+    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    border-radius: 4px; }
+    expander-widget > box > title:hover > expander {
+      color: white; }
 
 .navigation-sidebar:not(decoration):not(window):drop(active):focus, .navigation-sidebar:not(decoration):not(window):drop(active),
 placessidebar:not(decoration):not(window):drop(active):focus,
@@ -3280,7 +3350,17 @@ stacksidebar list.separators:not(.horizontal) > row:not(.separator) {
   border-bottom: none; }
 
 stacksidebar row {
-  padding: 10px 4px; }
+  padding: 10px 4px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  stacksidebar row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  stacksidebar row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
   stacksidebar row > label {
     padding-left: 6px;
     padding-right: 6px; }
@@ -3292,10 +3372,6 @@ stacksidebar row {
     color: #eeeeec; }
   stacksidebar row:selected:hover:dir(ltr), stacksidebar row:selected:hover:dir(rtl) {
     background-color: #2f3238; }
-  stacksidebar row:focus:focus-visible {
-    outline-width: 0;
-    background-color: #2777ff;
-    color: #ffffff; }
   stacksidebar row.activatable:active, stacksidebar row.activatable:selected:active {
     box-shadow: none; }
 
@@ -3313,20 +3389,24 @@ separator.sidebar {
     min-height: 36px;
     padding: 0 8px;
     border-radius: 5px;
-    margin: 0 5px 2px; }
-    .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {
+    margin: 0 5px 2px;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    .navigation-sidebar > row {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    .navigation-sidebar > row:focus-visible:focus-within {
+      outline-color: rgba(39, 119, 255, 0.7);
+      outline-width: 2px;
+      outline-offset: -2px; }
+    .navigation-sidebar > row:hover {
       background-color: #2f3238; }
     .navigation-sidebar > row:selected {
       background-color: #3b3e46;
       color: inherit; }
       .navigation-sidebar > row:selected:hover {
         background-color: #2f3238; }
-      .navigation-sidebar > row:selected:focus-visible:focus-within {
-        outline-width: 0;
-        color: #ffffff;
-        background-color: #2777ff; }
-        .navigation-sidebar > row:selected:focus-visible:focus-within:hover {
-          background-color: #005af3; }
     .navigation-sidebar > row:disabled {
       color: #888a8d; }
 
@@ -3461,7 +3541,10 @@ tooltip {
  * Color Chooser *
  *****************/
 colorswatch {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   colorswatch {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3543,7 +3626,10 @@ colorswatch {
       border-radius: 4.5px; }
 
 plane {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   plane {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3586,32 +3672,38 @@ colorchooser .popover.osd {
 window {
   border-width: 0px; }
   window.csd {
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(13, 14, 17, 0.9);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.75);
     margin: 0px;
     border-radius: 7px 7px 0 0; }
     window.csd:backdrop {
-      box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.9);
+      box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.75);
       transition: 200ms ease-out; }
     window.csd.popup {
       border-radius: 5px;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
     window.csd.dialog.message {
       border-radius: 7px;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
-    window.csd.solid-csd {
-      margin: 0;
-      padding: 0;
-      border: solid 1px #0d0e11;
-      border-radius: 0;
-      box-shadow: inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); }
-      window.csd.solid-csd:backdrop {
-        box-shadow: inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); }
-  window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
-    border-radius: 0; }
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+  window.solid-csd {
+    margin: 0;
+    padding: 4px;
+    border: solid 1px #0d0e11;
+    border-radius: 0;
+    box-shadow: inset 0 0 0 4px #0d0e11, inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); }
+    window.solid-csd:backdrop {
+      box-shadow: inset 0 0 0 4px #0d0e11, inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); }
+  window.maximized, window.fullscreen {
+    border-radius: 0;
+    box-shadow: none; }
+  window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
+    border-radius: 0;
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+  window:backdrop {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
   window.popup {
     box-shadow: none; }
   window.ssd {
-    box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.9); }
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
 
 tooltip.csd {
   border-radius: 5px;
@@ -3974,6 +4066,45 @@ scale slider {
     background-image: image(#23252e);
     box-shadow: none; }
 
+/*****************
+ * Title buttons *
+ *****************/
+windowcontrols {
+  margin: 0 5px; }
+  windowcontrols.end {
+    margin-left: 11px; }
+  windowcontrols.right {
+    margin-right: 11px; }
+  windowcontrols button {
+    color: transparent;
+    background: #383d4b;
+    margin: 0;
+    padding: 0;
+    min-width: 0;
+    min-height: 0;
+    border: 1px solid black;
+    box-shadow: inset 0 3px 10px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05);
+    -gtk-icon-shadow: none;
+    transition: all .2s; }
+    windowcontrols button:hover {
+      color: #eeeeec;
+      background: #383d4b;
+      border-color: transparent;
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3); }
+    windowcontrols button.close {
+      color: black;
+      background: #2777ff;
+      border-color: transparent; }
+      windowcontrols button.close:hover {
+        color: white;
+        background: #3d85ff; }
+    windowcontrols button:backdrop, windowcontrols button:backdrop:hover {
+      color: transparent;
+      background: transparent;
+      box-shadow: none;
+      border-color: #0d0e11;
+      background: rgba(0, 0, 0, 0.3); }
+
 /***************
  * Header bars *
  ***************/
@@ -4131,9 +4262,6 @@ window.ssd {
 tooltip.csd {
   border: 0; }
 
-windowcontrols button {
-  padding: 5px; }
-
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index 2da8efe2..a69bd98e 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -136,7 +136,7 @@ label {
     label.error:disabled:backdrop {
       color: rgba(191, 23, 23, 0.4); }
 
-.dim-label, .titlebar:not(headerbar) .subtitle,
+.dim-label, .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, label.separator {
   opacity: 0.55;
   text-shadow: none; }
@@ -5476,6 +5476,57 @@ headerbar viewswitcher button > stack > box.wide,
 headerbar hdyviewswitcher > button box.wide {
   margin: -8px 0; }
 
+dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
+  background: #23252e;
+  border: 0;
+  box-shadow: none; }
+
+.titlebar:not(headerbar) button.titlebutton:not(.appmenu),
+headerbar button.titlebutton:not(.appmenu) {
+  color: transparent;
+  background: #383d4b;
+  margin: 0;
+  margin-left: 5px;
+  padding: 0;
+  min-width: 0;
+  min-height: 0;
+  border: 1px solid black;
+  box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05);
+  -gtk-icon-shadow: none;
+  transition: all .2s; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu) + button.titlebutton,
+  headerbar button.titlebutton:not(.appmenu) + button.titlebutton {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child,
+  headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 5px; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover,
+  headerbar button.titlebutton:not(.appmenu):hover {
+    color: #eeeeec;
+    background: #383d4b;
+    border-color: transparent;
+    box-shadow: 0 0 0 1px #0d0e11; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close,
+  headerbar button.titlebutton:not(.appmenu).close {
+    color: black;
+    background: #2777ff;
+    border-color: transparent; }
+    .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover,
+    headerbar button.titlebutton:not(.appmenu).close:hover {
+      color: white;
+      background: #3d85ff; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 0; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop,
+  headerbar button.titlebutton:not(.appmenu):backdrop {
+    color: transparent;
+    background: transparent;
+    box-shadow: none;
+    border-color: #0d0e11;
+    background: rgba(0, 0, 0, 0.3); }
+
 .default-decoration.titlebar:not(headerbar),
 headerbar.default-decoration {
   min-height: 0;
@@ -5486,11 +5537,6 @@ headerbar.default-decoration {
     min-width: 0;
     margin: 0; }
 
-dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
-  background: #23252e;
-  border: 0;
-  box-shadow: none; }
-
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
 headerbar.titlebar headerbar:first-child,
@@ -5960,31 +6006,6 @@ decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
 
-button.titlebutton:not(.appmenu) {
-  margin: 0;
-  margin-left: 6px;
-  padding: 0;
-  min-width: 0;
-  min-height: 0;
-  border: 0;
-  -gtk-icon-shadow: none; }
-  button.titlebutton:not(.appmenu) + button.titlebutton:not(.appmenu) {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):last-child {
-    margin-right: 6px; }
-  button.titlebutton:not(.appmenu):hover:not(:backdrop) {
-    transition: 0;
-    background: rgba(255, 255, 255, 0.2);
-    box-shadow: inset 0 0 0 1px #0d0e11; }
-  .maximized button.titlebutton:not(.appmenu):last-child, .fullscreen button.titlebutton:not(.appmenu):last-child, .tiled button.titlebutton:not(.appmenu):last-child, .tiled-top button.titlebutton:not(.appmenu):last-child, .tiled-right button.titlebutton:not(.appmenu):last-child, .tiled-bottom button.titlebutton:not(.appmenu):last-child, .tiled-left button.titlebutton:not(.appmenu):last-child {
-    margin-right: 0; }
-  .maximized button.titlebutton:not(.appmenu):first-child, .fullscreen button.titlebutton:not(.appmenu):first-child, .tiled button.titlebutton:not(.appmenu):first-child, .tiled-top button.titlebutton:not(.appmenu):first-child, .tiled-right button.titlebutton:not(.appmenu):first-child, .tiled-bottom button.titlebutton:not(.appmenu):first-child, .tiled-left button.titlebutton:not(.appmenu):first-child {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):backdrop {
-    background: transparent; }
-    button.titlebutton:not(.appmenu):backdrop:not(:hover) {
-      border-color: transparent; }
-
 /* Nautilus */
 @define-color disk_space_unknown #383c4a;
 @define-color disk_space_used #2777ff;
@@ -6180,6 +6201,485 @@ wnck-pager {
 .thunar .warning {
   margin: -7px 0; }
 
+.budgie-container {
+  background-color: transparent; }
+
+*:drop(active):focus,
+*:drop(active) {
+  box-shadow: inset 0 0 0 1px #2777ff; }
+
+.budgie-panel {
+  background-color: #272a34;
+  color: white;
+  font-weight: normal; }
+  .budgie-panel image {
+    -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel label {
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel .alert {
+    color: #2777ff; }
+  .budgie-panel:backdrop {
+    color: white;
+    background-color: rgba(39, 42, 52, 0.8); }
+  .budgie-panel.transparent {
+    background-color: rgba(39, 42, 52, 0.8);
+    color: white; }
+  .budgie-panel button {
+    min-height: 16px;
+    min-width: 16px;
+    padding: 0;
+    border-radius: 0; }
+  .budgie-panel.horizontal button {
+    padding: 0 4px; }
+  .budgie-panel.vertical button {
+    padding: 4px 0; }
+  .budgie-panel separator {
+    background-color: rgba(238, 238, 236, 0.4); }
+  .budgie-panel.vertical #tasklist-button {
+    min-height: 32px; }
+  .budgie-panel .end-region {
+    background-color: rgba(0, 0, 0, 0.3);
+    border-radius: 0px; }
+    .budgie-panel .end-region separator {
+      background-color: rgba(255, 255, 255, 0.15); }
+    .budgie-panel .end-region label {
+      font-weight: 700;
+      color: white; }
+
+.budgie-panel button.flat.launcher {
+  padding: 0;
+  border-radius: 0;
+  border: none;
+  background-image: radial-gradient(circle farthest-corner at center, alpha(#eeeeec,0) 100%, transparent 0%), image(alpha(#eeeeec,0));
+  background-position: center center; }
+  .budgie-panel button.flat.launcher > image {
+    opacity: 0.87; }
+  .budgie-panel button.flat.launcher:hover {
+    -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:hover > image {
+      opacity: 1.0; }
+  .budgie-panel button.flat.launcher:active > image {
+    opacity: 1.0; }
+  .budgie-panel button.flat.launcher:checked {
+    background-color: transparent; }
+    .budgie-panel button.flat.launcher:checked:hover {
+      -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:checked > image {
+      opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover,
+.budgie-panel .pinned button.flat.launcher.running:hover {
+  -gtk-icon-effect: highlight; }
+
+.budgie-panel .unpinned button.flat.launcher > image,
+.budgie-panel .pinned button.flat.launcher.running > image {
+  background-size: 2px 2px;
+  background-repeat: no-repeat;
+  opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover > image, .budgie-panel .unpinned button.flat.launcher:active > image, .budgie-panel .unpinned button.flat.launcher:checked > image,
+.budgie-panel .pinned button.flat.launcher.running:hover > image,
+.budgie-panel .pinned button.flat.launcher.running:active > image,
+.budgie-panel .pinned button.flat.launcher.running:checked > image {
+  background-image: none; }
+
+.top .budgie-panel button#tasklist-button:hover,
+.top .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 2px alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.top .budgie-panel button#tasklist-button:active, .top .budgie-panel button#tasklist-button:checked,
+.top .budgie-panel button.flat.launcher:active,
+.top .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.top .budgie-panel .unpinned button.flat.launcher > image,
+.top .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: top center; }
+
+.top .budgie-panel .unpinned button.flat.launcher:hover, .top .budgie-panel .unpinned button.flat.launcher:active, .top .budgie-panel .unpinned button.flat.launcher:checked,
+.top .budgie-panel .pinned button.flat.launcher.running:hover,
+.top .budgie-panel .pinned button.flat.launcher.running:active,
+.top .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.bottom .budgie-panel button#tasklist-button:hover,
+.bottom .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 -2px alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.bottom .budgie-panel button#tasklist-button:active, .bottom .budgie-panel button#tasklist-button:checked,
+.bottom .budgie-panel button.flat.launcher:active,
+.bottom .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher > image,
+.bottom .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: bottom center; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher:hover, .bottom .budgie-panel .unpinned button.flat.launcher:active, .bottom .budgie-panel .unpinned button.flat.launcher:checked,
+.bottom .budgie-panel .pinned button.flat.launcher.running:hover,
+.bottom .budgie-panel .pinned button.flat.launcher.running:active,
+.bottom .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.left .budgie-panel button#tasklist-button:hover,
+.left .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 2px 0 alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.left .budgie-panel button#tasklist-button:active, .left .budgie-panel button#tasklist-button:checked,
+.left .budgie-panel button.flat.launcher:active,
+.left .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.left .budgie-panel .unpinned button.flat.launcher > image,
+.left .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: left center; }
+
+.left .budgie-panel .unpinned button.flat.launcher:hover, .left .budgie-panel .unpinned button.flat.launcher:active, .left .budgie-panel .unpinned button.flat.launcher:checked,
+.left .budgie-panel .pinned button.flat.launcher.running:hover,
+.left .budgie-panel .pinned button.flat.launcher.running:active,
+.left .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.right .budgie-panel button#tasklist-button:hover,
+.right .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset -2px 0 alpha(#eeeeec,0.4);
+  background-color: rgba(238, 238, 236, 0.4);
+  border: none; }
+
+.right .budgie-panel button#tasklist-button:active, .right .budgie-panel button#tasklist-button:checked,
+.right .budgie-panel button.flat.launcher:active,
+.right .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.right .budgie-panel .unpinned button.flat.launcher > image,
+.right .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: right center; }
+
+.right .budgie-panel .unpinned button.flat.launcher:hover, .right .budgie-panel .unpinned button.flat.launcher:active, .right .budgie-panel .unpinned button.flat.launcher:checked,
+.right .budgie-panel .pinned button.flat.launcher.running:hover,
+.right .budgie-panel .pinned button.flat.launcher.running:active,
+.right .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.top .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.bottom .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to top, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.left .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to right, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.right .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to left, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.budgie-popover {
+  border-style: none;
+  border-width: 1px;
+  border-color: rgba(0, 0, 0, 0.28);
+  border-radius: 6px;
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.28);
+  background-color: #23252e; }
+  .budgie-popover .container {
+    padding: 2px; }
+  .budgie-popover border {
+    border: none; }
+  .budgie-popover list {
+    background-color: transparent; }
+  .budgie-popover row {
+    padding: 0; }
+    .budgie-popover row:hover {
+      box-shadow: none; }
+  .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
+    min-height: 28px;
+    padding: 0 8px;
+    color: #eeeeec;
+    font-weight: normal; }
+    .budgie-popover:not(.budgie-menu) button.flat:not(.image-button):disabled {
+      color: #888a8d; }
+  .budgie-popover.budgie-menu .container {
+    padding: 0; }
+  .budgie-popover.user-menu .container {
+    padding: 8px; }
+  .budgie-popover.user-menu separator {
+    margin: 4px 0; }
+  .budgie-popover.sound-popover separator {
+    margin: 3px 0; }
+  .budgie-popover.night-light-indicator .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .places-list:not(.always-expand) {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #0d0e11; }
+  .budgie-popover.places-menu .alternative-label {
+    padding: 3px;
+    font-size: 15px; }
+  .budgie-popover.workspace-popover .container {
+    padding: 2px 8px 8px; }
+  .budgie-popover.workspace-popover separator {
+    margin: 4px 0; }
+  .budgie-popover.workspace-popover flowboxchild {
+    padding: 0; }
+
+.workspace-switcher .workspace-layout {
+  border: 0 solid rgba(35, 37, 46, 0.8); }
+  .top .workspace-switcher .workspace-layout:dir(ltr), .bottom .workspace-switcher .workspace-layout:dir(ltr) {
+    border-left-width: 1px; }
+  .top .workspace-switcher .workspace-layout:dir(rtl), .bottom .workspace-switcher .workspace-layout:dir(rtl) {
+    border-right-width: 1px; }
+  .left .workspace-switcher .workspace-layout, .right .workspace-switcher .workspace-layout {
+    border-top-width: 1px; }
+
+.workspace-switcher .workspace-item,
+.workspace-switcher .workspace-add-button {
+  border: 0 solid rgba(24, 26, 32, 0.8); }
+  .top .workspace-switcher .workspace-item:dir(ltr), .bottom .workspace-switcher .workspace-item:dir(ltr), .top .workspace-switcher .workspace-add-button:dir(ltr), .bottom .workspace-switcher .workspace-add-button:dir(ltr) {
+    border-right-width: 1px; }
+  .top .workspace-switcher .workspace-item:dir(rtl), .bottom .workspace-switcher .workspace-item:dir(rtl), .top .workspace-switcher .workspace-add-button:dir(rtl), .bottom .workspace-switcher .workspace-add-button:dir(rtl) {
+    border-left-width: 1px; }
+  .left .workspace-switcher .workspace-item, .right .workspace-switcher .workspace-item, .left .workspace-switcher .workspace-add-button, .right .workspace-switcher .workspace-add-button {
+    border-bottom-width: 1px; }
+
+.workspace-switcher .workspace-item.current-workspace {
+  background-color: rgba(24, 26, 32, 0.8); }
+
+.workspace-switcher .workspace-add-button:hover {
+  box-shadow: none; }
+
+.workspace-switcher .workspace-add-button:active {
+  background-image: none; }
+
+.workspace-switcher .workspace-add-button:active image {
+  margin: 1px 0 -1px; }
+
+.budgie-panel .workspace-switcher .workspace-icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 0;
+  border-radius: 6px; }
+
+.budgie-menu.background {
+  padding: 0;
+  background-color: #272a34; }
+
+.budgie-menu scrollbar,
+.budgie-menu entry.search {
+  background-color: transparent; }
+
+.budgie-menu entry.search {
+  border-style: none;
+  border-bottom: 1px solid #0d0e11;
+  border-radius: 999px;
+  box-shadow: none;
+  font-size: 120%;
+  padding-top: 6px;
+  padding-bottom: 6px; }
+
+.budgie-menu button {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: #eeeeec;
+  font-weight: normal; }
+
+.budgie-menu row {
+  padding: 0; }
+  .budgie-menu row:hover {
+    box-shadow: none; }
+
+button.budgie-menu-launcher {
+  color: white;
+  border: none; }
+  button.budgie-menu-launcher:hover {
+    background-color: rgba(238, 238, 236, 0.4);
+    border: none; }
+
+popover.background.user-menu {
+  padding: 8px; }
+  popover.background.user-menu .content-box {
+    background-color: transparent; }
+  popover.background.user-menu separator {
+    margin: 4px 0; }
+  popover.background.user-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+button.raven-trigger {
+  color: white;
+  border: none; }
+  button.raven-trigger:hover {
+    background-color: rgba(238, 238, 236, 0.4);
+    border: none; }
+
+popover.background.places-menu {
+  padding: 8px; }
+  popover.background.places-menu .name-button.text-button {
+    padding-left: 8px;
+    padding-right: 8px; }
+    popover.background.places-menu .name-button.text-button image:dir(ltr) {
+      margin-right: 3px; }
+    popover.background.places-menu .name-button.text-button image:dir(rtl) {
+      margin-left: 3px; }
+  popover.background.places-menu .places-section-header > image:dir(ltr) {
+    margin: 0 -2px 0 5px; }
+  popover.background.places-menu .places-section-header > image:dir(rtl) {
+    margin: 0 5px 0 -2px; }
+  popover.background.places-menu .places-list {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #0d0e11;
+    background-color: transparent; }
+  popover.background.places-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+frame.raven-frame > border {
+  border-style: none;
+  box-shadow: none; }
+
+.raven {
+  background-color: #23252e;
+  color: #eeeeec;
+  padding: 6px 0 0 0;
+  border: none; }
+  .raven .raven-header {
+    min-height: 32px;
+    padding: 3px; }
+    .raven .raven-header.top {
+      padding: 2px 0;
+      background-color: #23252e;
+      color: #eeeeec; }
+      .raven .raven-header.top stackswitcher button {
+        margin: -6px 0;
+        min-height: 32px; }
+    .raven .raven-header.bottom {
+      border-top: 1px solid #0d0e11; }
+  .raven viewport.frame .raven-header {
+    margin-top: -8px; }
+  .raven .raven-background {
+    border-style: solid none;
+    border-width: 1px;
+    border-color: #0d0e11;
+    background-color: #272a34; }
+  .raven scrolledwindow.raven-background {
+    border-bottom-style: none; }
+  .raven .powerstrip button {
+    margin: 2px 0 1px;
+    padding: 10px; }
+  .raven .option-subtitle {
+    font-size: smaller; }
+
+calendar.raven-calendar {
+  border-style: none;
+  background-color: transparent; }
+  calendar.raven-calendar:selected {
+    border-radius: 6px;
+    background-color: #23252e; }
+
+.raven-mpris {
+  background-color: rgba(35, 37, 46, 0.8);
+  color: #eeeeec; }
+  .raven-mpris label {
+    min-height: 24px; }
+
+.budgie-notification-window, .budgie-osd-window {
+  background-color: transparent;
+  color: white;
+  border-radius: 6px; }
+  .budgie-notification-window .drop-shadow, .budgie-osd-window .drop-shadow {
+    background-color: #303340; }
+
+.budgie-notification, .budgie-switcher, .budgie-switcher-window, .budgie-osd {
+  background-color: #303340;
+  color: white; }
+  .budgie-notification .notification-title, .budgie-switcher .notification-title, .budgie-switcher-window .notification-title, .budgie-osd .notification-title {
+    font-size: 110%;
+    color: white; }
+  .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body {
+    color: white; }
+
+.budgie-osd .budgie-osd-text {
+  font-size: 120%; }
+
+.budgie-switcher-window .drop-shadow {
+  margin: 8px 8px 16px;
+  border-radius: 6px;
+  background-color: #303340;
+  box-shadow: rgba(0, 0, 0, 0.28); }
+  .budgie-switcher-window .drop-shadow label.budgie-switcher-title {
+    color: white; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(ltr) {
+      padding: 0 0 0 6px; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(rtl) {
+      padding: 0 6px 0 0; }
+
+.drop-shadow {
+  margin: 5px 9px;
+  padding: 3px;
+  border-radius: 2px;
+  box-shadow: none;
+  background-color: #23252e; }
+
+.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
+  border-radius: 6px;
+  background-color: #23252e; }
+
+.budgie-session-dialog label:not(:last-child),
+.budgie-session-dialog .dialog-title {
+  font-size: 120%; }
+
+.budgie-session-dialog .linked.horizontal > button {
+  padding: 8px 16px;
+  border-top: 1px solid #0d0e11;
+  border-radius: 6px; }
+  .budgie-session-dialog .linked.horizontal > button:first-child {
+    border-bottom-left-radius: 2px; }
+  .budgie-session-dialog .linked.horizontal > button:last-child {
+    border-bottom-right-radius: 2px; }
+
+.budgie-polkit-dialog .message {
+  color: #eeeeec; }
+
+.budgie-polkit-dialog .failure {
+  color: #a61414; }
+
+.budgie-run-dialog {
+  background-color: #272a34;
+  border-style: none; }
+  .budgie-run-dialog entry.search {
+    font-size: 120%;
+    box-shadow: none;
+    background-color: transparent;
+    border-style: none;
+    border-bottom: 1px solid #0d0e11;
+    border-radius: 0;
+    padding-top: 6px;
+    padding-bottom: 6px; }
+  .budgie-run-dialog list .dim-label, .budgie-run-dialog list label.separator,
+  .budgie-run-dialog list headerbar .subtitle,
+  headerbar .budgie-run-dialog list .subtitle, .budgie-run-dialog list .titlebar:not(headerbar) .subtitle, .titlebar:not(headerbar) .budgie-run-dialog list .subtitle, .budgie-run-dialog list .budgie-notification .notification-body, .budgie-notification .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-osd .notification-body, .budgie-osd .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher-window .notification-body, .budgie-switcher-window .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher .notification-body, .budgie-switcher .budgie-run-dialog list .notification-body {
+    opacity: 1; }
+  .budgie-run-dialog scrolledwindow {
+    border-top: 1px solid #0d0e11; }
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 96fa9959..0bb34181 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -136,7 +136,7 @@ label {
     label.error:disabled:backdrop {
       color: rgba(191, 23, 23, 0.4); }
 
-.dim-label, .titlebar:not(headerbar) .subtitle,
+.dim-label, .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, label.separator {
   opacity: 0.55;
   text-shadow: none; }
@@ -5497,6 +5497,57 @@ headerbar viewswitcher button > stack > box.wide,
 headerbar hdyviewswitcher > button box.wide {
   margin: -8px 0; }
 
+dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
+  background: #ffffff;
+  border: 0;
+  box-shadow: none; }
+
+.titlebar:not(headerbar) button.titlebutton:not(.appmenu),
+headerbar button.titlebutton:not(.appmenu) {
+  color: transparent;
+  background: white;
+  margin: 0;
+  margin-left: 5px;
+  padding: 0;
+  min-width: 0;
+  min-height: 0;
+  border: 1px solid #c2c2c2;
+  box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.05);
+  -gtk-icon-shadow: none;
+  transition: all .2s; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu) + button.titlebutton,
+  headerbar button.titlebutton:not(.appmenu) + button.titlebutton {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child,
+  headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 5px; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover,
+  headerbar button.titlebutton:not(.appmenu):hover {
+    color: #5c616c;
+    background: white;
+    border-color: transparent;
+    box-shadow: 0 0 0 1px #d9d9d9; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close,
+  headerbar button.titlebutton:not(.appmenu).close {
+    color: white;
+    background: #2777ff;
+    border-color: transparent; }
+    .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover,
+    headerbar button.titlebutton:not(.appmenu).close:hover {
+      color: black;
+      background: #3d85ff; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child {
+    margin-right: 0; }
+  .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child {
+    margin-left: 0; }
+  .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop,
+  headerbar button.titlebutton:not(.appmenu):backdrop {
+    color: transparent;
+    background: transparent;
+    box-shadow: none;
+    border-color: #d9d9d9;
+    background: rgba(0, 0, 0, 0.1); }
+
 .default-decoration.titlebar:not(headerbar),
 headerbar.default-decoration {
   min-height: 0;
@@ -5507,11 +5558,6 @@ headerbar.default-decoration {
     min-width: 0;
     margin: 0; }
 
-dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop {
-  background: #ffffff;
-  border: 0;
-  box-shadow: none; }
-
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
 headerbar.titlebar headerbar:first-child,
@@ -5981,31 +6027,6 @@ decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
 
-button.titlebutton:not(.appmenu) {
-  margin: 0;
-  margin-left: 6px;
-  padding: 0;
-  min-width: 0;
-  min-height: 0;
-  border: 0;
-  -gtk-icon-shadow: none; }
-  button.titlebutton:not(.appmenu) + button.titlebutton:not(.appmenu) {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):last-child {
-    margin-right: 6px; }
-  button.titlebutton:not(.appmenu):hover:not(:backdrop) {
-    transition: 0;
-    background: rgba(255, 255, 255, 0.2);
-    box-shadow: inset 0 0 0 1px #d9d9d9; }
-  .maximized button.titlebutton:not(.appmenu):last-child, .fullscreen button.titlebutton:not(.appmenu):last-child, .tiled button.titlebutton:not(.appmenu):last-child, .tiled-top button.titlebutton:not(.appmenu):last-child, .tiled-right button.titlebutton:not(.appmenu):last-child, .tiled-bottom button.titlebutton:not(.appmenu):last-child, .tiled-left button.titlebutton:not(.appmenu):last-child {
-    margin-right: 0; }
-  .maximized button.titlebutton:not(.appmenu):first-child, .fullscreen button.titlebutton:not(.appmenu):first-child, .tiled button.titlebutton:not(.appmenu):first-child, .tiled-top button.titlebutton:not(.appmenu):first-child, .tiled-right button.titlebutton:not(.appmenu):first-child, .tiled-bottom button.titlebutton:not(.appmenu):first-child, .tiled-left button.titlebutton:not(.appmenu):first-child {
-    margin-left: 0; }
-  button.titlebutton:not(.appmenu):backdrop {
-    background: transparent; }
-    button.titlebutton:not(.appmenu):backdrop:not(:hover) {
-      border-color: transparent; }
-
 /* Nautilus */
 @define-color disk_space_unknown #383c4a;
 @define-color disk_space_used #2777ff;
@@ -6189,6 +6210,485 @@ wnck-pager {
 .thunar .warning {
   margin: -7px 0; }
 
+.budgie-container {
+  background-color: transparent; }
+
+*:drop(active):focus,
+*:drop(active) {
+  box-shadow: inset 0 0 0 1px #2777ff; }
+
+.budgie-panel {
+  background-color: #272a34;
+  color: white;
+  font-weight: normal; }
+  .budgie-panel image {
+    -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel label {
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
+  .budgie-panel .alert {
+    color: #2777ff; }
+  .budgie-panel:backdrop {
+    color: white;
+    background-color: rgba(39, 42, 52, 0.8); }
+  .budgie-panel.transparent {
+    background-color: rgba(39, 42, 52, 0.8);
+    color: white; }
+  .budgie-panel button {
+    min-height: 16px;
+    min-width: 16px;
+    padding: 0;
+    border-radius: 0; }
+  .budgie-panel.horizontal button {
+    padding: 0 4px; }
+  .budgie-panel.vertical button {
+    padding: 4px 0; }
+  .budgie-panel separator {
+    background-color: rgba(92, 97, 108, 0.4); }
+  .budgie-panel.vertical #tasklist-button {
+    min-height: 32px; }
+  .budgie-panel .end-region {
+    background-color: rgba(0, 0, 0, 0.3);
+    border-radius: 0px; }
+    .budgie-panel .end-region separator {
+      background-color: rgba(255, 255, 255, 0.15); }
+    .budgie-panel .end-region label {
+      font-weight: 700;
+      color: white; }
+
+.budgie-panel button.flat.launcher {
+  padding: 0;
+  border-radius: 0;
+  border: none;
+  background-image: radial-gradient(circle farthest-corner at center, alpha(#5c616c,0) 100%, transparent 0%), image(alpha(#5c616c,0));
+  background-position: center center; }
+  .budgie-panel button.flat.launcher > image {
+    opacity: 0.87; }
+  .budgie-panel button.flat.launcher:hover {
+    -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:hover > image {
+      opacity: 1.0; }
+  .budgie-panel button.flat.launcher:active > image {
+    opacity: 1.0; }
+  .budgie-panel button.flat.launcher:checked {
+    background-color: transparent; }
+    .budgie-panel button.flat.launcher:checked:hover {
+      -gtk-icon-effect: highlight; }
+    .budgie-panel button.flat.launcher:checked > image {
+      opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover,
+.budgie-panel .pinned button.flat.launcher.running:hover {
+  -gtk-icon-effect: highlight; }
+
+.budgie-panel .unpinned button.flat.launcher > image,
+.budgie-panel .pinned button.flat.launcher.running > image {
+  background-size: 2px 2px;
+  background-repeat: no-repeat;
+  opacity: 1.0; }
+
+.budgie-panel .unpinned button.flat.launcher:hover > image, .budgie-panel .unpinned button.flat.launcher:active > image, .budgie-panel .unpinned button.flat.launcher:checked > image,
+.budgie-panel .pinned button.flat.launcher.running:hover > image,
+.budgie-panel .pinned button.flat.launcher.running:active > image,
+.budgie-panel .pinned button.flat.launcher.running:checked > image {
+  background-image: none; }
+
+.top .budgie-panel button#tasklist-button:hover,
+.top .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 2px alpha(#5c616c,0.4);
+  background-color: rgba(92, 97, 108, 0.4);
+  border: none; }
+
+.top .budgie-panel button#tasklist-button:active, .top .budgie-panel button#tasklist-button:checked,
+.top .budgie-panel button.flat.launcher:active,
+.top .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.top .budgie-panel .unpinned button.flat.launcher > image,
+.top .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: top center; }
+
+.top .budgie-panel .unpinned button.flat.launcher:hover, .top .budgie-panel .unpinned button.flat.launcher:active, .top .budgie-panel .unpinned button.flat.launcher:checked,
+.top .budgie-panel .pinned button.flat.launcher.running:hover,
+.top .budgie-panel .pinned button.flat.launcher.running:active,
+.top .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 2px #2777ff; }
+
+.bottom .budgie-panel button#tasklist-button:hover,
+.bottom .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 0 -2px alpha(#5c616c,0.4);
+  background-color: rgba(92, 97, 108, 0.4);
+  border: none; }
+
+.bottom .budgie-panel button#tasklist-button:active, .bottom .budgie-panel button#tasklist-button:checked,
+.bottom .budgie-panel button.flat.launcher:active,
+.bottom .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher > image,
+.bottom .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: bottom center; }
+
+.bottom .budgie-panel .unpinned button.flat.launcher:hover, .bottom .budgie-panel .unpinned button.flat.launcher:active, .bottom .budgie-panel .unpinned button.flat.launcher:checked,
+.bottom .budgie-panel .pinned button.flat.launcher.running:hover,
+.bottom .budgie-panel .pinned button.flat.launcher.running:active,
+.bottom .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 0 -2px #2777ff; }
+
+.left .budgie-panel button#tasklist-button:hover,
+.left .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset 2px 0 alpha(#5c616c,0.4);
+  background-color: rgba(92, 97, 108, 0.4);
+  border: none; }
+
+.left .budgie-panel button#tasklist-button:active, .left .budgie-panel button#tasklist-button:checked,
+.left .budgie-panel button.flat.launcher:active,
+.left .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.left .budgie-panel .unpinned button.flat.launcher > image,
+.left .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: left center; }
+
+.left .budgie-panel .unpinned button.flat.launcher:hover, .left .budgie-panel .unpinned button.flat.launcher:active, .left .budgie-panel .unpinned button.flat.launcher:checked,
+.left .budgie-panel .pinned button.flat.launcher.running:hover,
+.left .budgie-panel .pinned button.flat.launcher.running:active,
+.left .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset 2px 0 #2777ff; }
+
+.right .budgie-panel button#tasklist-button:hover,
+.right .budgie-panel button.flat.launcher:hover {
+  box-shadow: inset -2px 0 alpha(#5c616c,0.4);
+  background-color: rgba(92, 97, 108, 0.4);
+  border: none; }
+
+.right .budgie-panel button#tasklist-button:active, .right .budgie-panel button#tasklist-button:checked,
+.right .budgie-panel button.flat.launcher:active,
+.right .budgie-panel button.flat.launcher:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.right .budgie-panel .unpinned button.flat.launcher > image,
+.right .budgie-panel .pinned button.flat.launcher.running > image {
+  background-image: image(#2777ff);
+  background-position: right center; }
+
+.right .budgie-panel .unpinned button.flat.launcher:hover, .right .budgie-panel .unpinned button.flat.launcher:active, .right .budgie-panel .unpinned button.flat.launcher:checked,
+.right .budgie-panel .pinned button.flat.launcher.running:hover,
+.right .budgie-panel .pinned button.flat.launcher.running:active,
+.right .budgie-panel .pinned button.flat.launcher.running:checked {
+  box-shadow: inset -2px 0 #2777ff; }
+
+.top .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.bottom .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to top, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.left .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to right, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.right .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to left, alpha(#000000,0.23), alpha(#000000,0.08), transparent); }
+
+.budgie-popover {
+  border-style: none;
+  border-width: 1px;
+  border-color: rgba(0, 0, 0, 0.28);
+  border-radius: 6px;
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 0.28);
+  background-color: #ffffff; }
+  .budgie-popover .container {
+    padding: 2px; }
+  .budgie-popover border {
+    border: none; }
+  .budgie-popover list {
+    background-color: transparent; }
+  .budgie-popover row {
+    padding: 0; }
+    .budgie-popover row:hover {
+      box-shadow: none; }
+  .budgie-popover:not(.budgie-menu) button.flat:not(.image-button) {
+    min-height: 28px;
+    padding: 0 8px;
+    color: #5c616c;
+    font-weight: normal; }
+    .budgie-popover:not(.budgie-menu) button.flat:not(.image-button):disabled {
+      color: #aeb0b6; }
+  .budgie-popover.budgie-menu .container {
+    padding: 0; }
+  .budgie-popover.user-menu .container {
+    padding: 8px; }
+  .budgie-popover.user-menu separator {
+    margin: 4px 0; }
+  .budgie-popover.sound-popover separator {
+    margin: 3px 0; }
+  .budgie-popover.night-light-indicator .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .container {
+    padding: 8px; }
+  .budgie-popover.places-menu .places-list:not(.always-expand) {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #d9d9d9; }
+  .budgie-popover.places-menu .alternative-label {
+    padding: 3px;
+    font-size: 15px; }
+  .budgie-popover.workspace-popover .container {
+    padding: 2px 8px 8px; }
+  .budgie-popover.workspace-popover separator {
+    margin: 4px 0; }
+  .budgie-popover.workspace-popover flowboxchild {
+    padding: 0; }
+
+.workspace-switcher .workspace-layout {
+  border: 0 solid rgba(255, 255, 255, 0.9); }
+  .top .workspace-switcher .workspace-layout:dir(ltr), .bottom .workspace-switcher .workspace-layout:dir(ltr) {
+    border-left-width: 1px; }
+  .top .workspace-switcher .workspace-layout:dir(rtl), .bottom .workspace-switcher .workspace-layout:dir(rtl) {
+    border-right-width: 1px; }
+  .left .workspace-switcher .workspace-layout, .right .workspace-switcher .workspace-layout {
+    border-top-width: 1px; }
+
+.workspace-switcher .workspace-item,
+.workspace-switcher .workspace-add-button {
+  border: 0 solid rgba(242, 242, 242, 0.9); }
+  .top .workspace-switcher .workspace-item:dir(ltr), .bottom .workspace-switcher .workspace-item:dir(ltr), .top .workspace-switcher .workspace-add-button:dir(ltr), .bottom .workspace-switcher .workspace-add-button:dir(ltr) {
+    border-right-width: 1px; }
+  .top .workspace-switcher .workspace-item:dir(rtl), .bottom .workspace-switcher .workspace-item:dir(rtl), .top .workspace-switcher .workspace-add-button:dir(rtl), .bottom .workspace-switcher .workspace-add-button:dir(rtl) {
+    border-left-width: 1px; }
+  .left .workspace-switcher .workspace-item, .right .workspace-switcher .workspace-item, .left .workspace-switcher .workspace-add-button, .right .workspace-switcher .workspace-add-button {
+    border-bottom-width: 1px; }
+
+.workspace-switcher .workspace-item.current-workspace {
+  background-color: rgba(242, 242, 242, 0.9); }
+
+.workspace-switcher .workspace-add-button:hover {
+  box-shadow: none; }
+
+.workspace-switcher .workspace-add-button:active {
+  background-image: none; }
+
+.workspace-switcher .workspace-add-button:active image {
+  margin: 1px 0 -1px; }
+
+.budgie-panel .workspace-switcher .workspace-icon-button {
+  min-height: 24px;
+  min-width: 24px;
+  padding: 0;
+  border-radius: 6px; }
+
+.budgie-menu.background {
+  padding: 0;
+  background-color: #fafafa; }
+
+.budgie-menu scrollbar,
+.budgie-menu entry.search {
+  background-color: transparent; }
+
+.budgie-menu entry.search {
+  border-style: none;
+  border-bottom: 1px solid #d9d9d9;
+  border-radius: 999px;
+  box-shadow: none;
+  font-size: 120%;
+  padding-top: 6px;
+  padding-bottom: 6px; }
+
+.budgie-menu button {
+  min-height: 32px;
+  padding: 0 8px;
+  border-radius: 0;
+  color: #5c616c;
+  font-weight: normal; }
+
+.budgie-menu row {
+  padding: 0; }
+  .budgie-menu row:hover {
+    box-shadow: none; }
+
+button.budgie-menu-launcher {
+  color: white;
+  border: none; }
+  button.budgie-menu-launcher:hover {
+    background-color: rgba(92, 97, 108, 0.4);
+    border: none; }
+
+popover.background.user-menu {
+  padding: 8px; }
+  popover.background.user-menu .content-box {
+    background-color: transparent; }
+  popover.background.user-menu separator {
+    margin: 4px 0; }
+  popover.background.user-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+button.raven-trigger {
+  color: white;
+  border: none; }
+  button.raven-trigger:hover {
+    background-color: rgba(92, 97, 108, 0.4);
+    border: none; }
+
+popover.background.places-menu {
+  padding: 8px; }
+  popover.background.places-menu .name-button.text-button {
+    padding-left: 8px;
+    padding-right: 8px; }
+    popover.background.places-menu .name-button.text-button image:dir(ltr) {
+      margin-right: 3px; }
+    popover.background.places-menu .name-button.text-button image:dir(rtl) {
+      margin-left: 3px; }
+  popover.background.places-menu .places-section-header > image:dir(ltr) {
+    margin: 0 -2px 0 5px; }
+  popover.background.places-menu .places-section-header > image:dir(rtl) {
+    margin: 0 5px 0 -2px; }
+  popover.background.places-menu .places-list {
+    margin-top: 4px;
+    padding-top: 4px;
+    border-top: 1px solid #d9d9d9;
+    background-color: transparent; }
+  popover.background.places-menu row {
+    padding: 0;
+    box-shadow: none;
+    background-image: none; }
+
+frame.raven-frame > border {
+  border-style: none;
+  box-shadow: none; }
+
+.raven {
+  background-color: #ffffff;
+  color: #5c616c;
+  padding: 6px 0 0 0;
+  border: none; }
+  .raven .raven-header {
+    min-height: 32px;
+    padding: 3px; }
+    .raven .raven-header.top {
+      padding: 2px 0;
+      background-color: #ffffff;
+      color: #5c616c; }
+      .raven .raven-header.top stackswitcher button {
+        margin: -6px 0;
+        min-height: 32px; }
+    .raven .raven-header.bottom {
+      border-top: 1px solid #d9d9d9; }
+  .raven viewport.frame .raven-header {
+    margin-top: -8px; }
+  .raven .raven-background {
+    border-style: solid none;
+    border-width: 1px;
+    border-color: #d9d9d9;
+    background-color: #fafafa; }
+  .raven scrolledwindow.raven-background {
+    border-bottom-style: none; }
+  .raven .powerstrip button {
+    margin: 2px 0 1px;
+    padding: 10px; }
+  .raven .option-subtitle {
+    font-size: smaller; }
+
+calendar.raven-calendar {
+  border-style: none;
+  background-color: transparent; }
+  calendar.raven-calendar:selected {
+    border-radius: 6px;
+    background-color: #ffffff; }
+
+.raven-mpris {
+  background-color: rgba(255, 255, 255, 0.8);
+  color: #5c616c; }
+  .raven-mpris label {
+    min-height: 24px; }
+
+.budgie-notification-window, .budgie-osd-window {
+  background-color: transparent;
+  color: white;
+  border-radius: 6px; }
+  .budgie-notification-window .drop-shadow, .budgie-osd-window .drop-shadow {
+    background-color: #303340; }
+
+.budgie-notification, .budgie-switcher, .budgie-switcher-window, .budgie-osd {
+  background-color: #303340;
+  color: white; }
+  .budgie-notification .notification-title, .budgie-switcher .notification-title, .budgie-switcher-window .notification-title, .budgie-osd .notification-title {
+    font-size: 110%;
+    color: white; }
+  .budgie-notification .notification-body, .budgie-switcher .notification-body, .budgie-switcher-window .notification-body, .budgie-osd .notification-body {
+    color: white; }
+
+.budgie-osd .budgie-osd-text {
+  font-size: 120%; }
+
+.budgie-switcher-window .drop-shadow {
+  margin: 8px 8px 16px;
+  border-radius: 6px;
+  background-color: #303340;
+  box-shadow: rgba(0, 0, 0, 0.28); }
+  .budgie-switcher-window .drop-shadow label.budgie-switcher-title {
+    color: white; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(ltr) {
+      padding: 0 0 0 6px; }
+    .budgie-switcher-window .drop-shadow label.budgie-switcher-title:dir(rtl) {
+      padding: 0 6px 0 0; }
+
+.drop-shadow {
+  margin: 5px 9px;
+  padding: 3px;
+  border-radius: 2px;
+  box-shadow: none;
+  background-color: #ffffff; }
+
+.budgie-run-dialog, .budgie-polkit-dialog, .budgie-session-dialog {
+  border-radius: 6px;
+  background-color: #ffffff; }
+
+.budgie-session-dialog label:not(:last-child),
+.budgie-session-dialog .dialog-title {
+  font-size: 120%; }
+
+.budgie-session-dialog .linked.horizontal > button {
+  padding: 8px 16px;
+  border-top: 1px solid #d9d9d9;
+  border-radius: 6px; }
+  .budgie-session-dialog .linked.horizontal > button:first-child {
+    border-bottom-left-radius: 2px; }
+  .budgie-session-dialog .linked.horizontal > button:last-child {
+    border-bottom-right-radius: 2px; }
+
+.budgie-polkit-dialog .message {
+  color: #5c616c; }
+
+.budgie-polkit-dialog .failure {
+  color: #d41919; }
+
+.budgie-run-dialog {
+  background-color: #fafafa;
+  border-style: none; }
+  .budgie-run-dialog entry.search {
+    font-size: 120%;
+    box-shadow: none;
+    background-color: transparent;
+    border-style: none;
+    border-bottom: 1px solid #d9d9d9;
+    border-radius: 0;
+    padding-top: 6px;
+    padding-bottom: 6px; }
+  .budgie-run-dialog list .dim-label, .budgie-run-dialog list label.separator,
+  .budgie-run-dialog list headerbar .subtitle,
+  headerbar .budgie-run-dialog list .subtitle, .budgie-run-dialog list .titlebar:not(headerbar) .subtitle, .titlebar:not(headerbar) .budgie-run-dialog list .subtitle, .budgie-run-dialog list .budgie-notification .notification-body, .budgie-notification .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-osd .notification-body, .budgie-osd .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher-window .notification-body, .budgie-switcher-window .budgie-run-dialog list .notification-body, .budgie-run-dialog list .budgie-switcher .notification-body, .budgie-switcher .budgie-run-dialog list .notification-body {
+    opacity: 1; }
+  .budgie-run-dialog scrolledwindow {
+    border-top: 1px solid #d9d9d9; }
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/share/themes/Kali-Light/gtk-4.0/gtk-dark.css b/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
index 401b4ae0..583ae016 100644
--- a/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-4.0/gtk-dark.css
@@ -20,18 +20,7 @@ dnd {
 .large-icons {
   -gtk-icon-size: 32px; }
 
-/*
-   These wildcard seems unavoidable, need to investigate.
-   Wildcards are bad and troublesome, use them with care,
-   or better, just don't.
-   Every time a wildcard is used a kitten dies, painfully.
-*/
-spinner:disabled,
-arrow:disabled,
-scrollbar:disabled,
-check:disabled,
-radio:disabled,
-treeview.expander:disabled {
+image:disabled {
   -gtk-icon-filter: opacity(0.5); }
 
 .view, iconview,
@@ -54,21 +43,22 @@ textview > border {
   background-color: #252831; }
 
 iconview {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-iconview:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-iconview:drop(active) {
-  box-shadow: none; }
-
-iconview > dndtarget:drop(active) {
-  border-style: solid;
-  border-width: 1px;
-  border-color: #00348d; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  iconview {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  iconview:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  iconview:drop(active) {
+    box-shadow: none; }
+  iconview > dndtarget:drop(active) {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #00348d; }
 
 rubberband, .content-view > rubberband, columnview.view > rubberband,
 treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
@@ -77,7 +67,10 @@ treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
 
 flowbox > flowboxchild {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   flowbox > flowboxchild {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -90,7 +83,10 @@ flowbox > flowboxchild {
 
 gridview > child {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   gridview > child {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -110,27 +106,27 @@ coverflow cover {
   border: 1px solid black; }
 
 label {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-label:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-label > selection {
-  background-color: #2777ff;
-  color: #ffffff; }
-
-label:disabled {
-  color: #888a8d; }
-  button label:disabled {
-    color: inherit; }
-
-label.error {
-  color: #bf1717; }
-  label.error:disabled {
-    color: rgba(191, 23, 23, 0.5); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  label {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  label:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  label > selection {
+    background-color: #2777ff;
+    color: #ffffff; }
+  label:disabled {
+    color: #888a8d; }
+    button label:disabled {
+      color: inherit; }
+  label.error {
+    color: #bf1717; }
+    label.error:disabled {
+      color: rgba(191, 23, 23, 0.5); }
 
 .dim-label, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, spinbutton.vertical > text > text > placeholder, spinbutton:not(.vertical) > text > placeholder,
@@ -236,7 +232,10 @@ entry {
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: white;
   border-color: #0d0e11;
-  background-color: #272a34; }
+  background-color: #272a34;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   spinbutton.vertical > text, spinbutton:not(.vertical),
   entry {
     outline: 0 solid transparent;
@@ -277,7 +276,10 @@ entry {
     background-color: #242731; }
   spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
   entry.error {
-    color: #bf1717; }
+    color: #bf1717;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
     entry.error {
       outline: 0 solid transparent;
@@ -292,7 +294,10 @@ entry {
       background-color: #bf1717; }
   spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
   entry.warning {
-    color: #fd7d00; }
+    color: #fd7d00;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
     entry.warning {
       outline: 0 solid transparent;
@@ -440,7 +445,10 @@ button {
   outline-color: rgba(39, 119, 255, 0.7);
   border-color: #0d0e11;
   background-image: image(#323643);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   notebook > header > tabs > arrow, windowcontrols button,
   button {
     outline: 0 solid transparent;
@@ -457,7 +465,8 @@ button {
     background-image: linear-gradient(to top, #1e2128 20%, #20232b 90%);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(6, 7, 8, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     -gtk-icon-filter: brightness(1.2); }
-  notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  notebook > header > tabs > arrow.keyboard-activating, notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  button.keyboard-activating,
   button:active,
   button:checked {
     color: #eeeeec;
@@ -484,8 +493,11 @@ button {
     border-color: #0d0e11;
     background-image: image(#23252e);
     box-shadow: none;
-    transition: 200ms ease-out;
-    -gtk-icon-filter: none; }
+    transition: 200ms ease-out; }
+    notebook > header > tabs > arrow:backdrop:not(:disabled),
+    button:backdrop.flat:not(:disabled),
+    button:backdrop:not(:disabled) {
+      -gtk-icon-filter: none; }
     notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
@@ -515,7 +527,8 @@ button {
   button:disabled {
     color: #888a8d;
     border-color: #0d0e11;
-    background-image: image(#242731); }
+    background-image: image(#242731);
+    -gtk-icon-filter: opacity(0.5); }
     notebook > header > tabs > arrow:disabled:active, notebook > header > tabs > arrow:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
@@ -538,7 +551,8 @@ button {
       background-color: #252831;
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-    button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.keyboard-activating.sidebar-button, notebook > header > tabs > arrow.keyboard-activating, windowcontrols button.keyboard-activating, button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.flat.keyboard-activating,
     button.flat:active,
     button.flat:checked {
       border-color: transparent;
@@ -689,7 +703,10 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #0047c0;
   background-image: image(#4187ff);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.suggested-action {
     outline: 0 solid transparent;
@@ -771,7 +788,10 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #4b0909;
   background-image: image(#bd1616);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.destructive-action {
     outline: 0 solid transparent;
@@ -1030,6 +1050,44 @@ list > row button.image-button:not(.flat) {
     border-color: #0d0e11;
     background-image: image(#13151a);
     box-shadow: none; }
+  popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).suggested-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #0047c0;
+    background-image: image(#4187ff);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).suggested-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).suggested-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.3);
+      outline-width: 2px;
+      outline-offset: -2px; }
+  popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #4b0909;
+    background-image: image(#bd1616);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(98, 12, 12, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).destructive-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).destructive-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.3);
+      outline-width: 2px;
+      outline-offset: -2px; }
 
 /*********
  * Links *
@@ -1061,13 +1119,16 @@ link {
     color: #e8f1ff; }
 
 link {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-link:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  link {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  link:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
 
 button.link, button.link:hover, button.link:active, button.link:checked {
   text-shadow: none; }
@@ -1396,7 +1457,6 @@ headerbar {
     border-color: #0d0e11;
     background-color: #23252e;
     background-image: none;
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
     transition: 200ms ease-out; }
   .titlebar:not(headerbar) .title,
   headerbar .title {
@@ -1471,17 +1531,12 @@ headerbar switch {
   margin-top: 10px;
   margin-bottom: 10px; }
 
-headerbar.titlebar headerbar:not(.titlebar) {
-  background: none;
-  box-shadow: none; }
-
 window.csd > .titlebar:not(headerbar) {
   padding: 0;
   background-color: transparent;
   background-image: none;
   border-style: none;
-  border-color: transparent;
-  box-shadow: none; }
+  border-color: transparent; }
 
 .titlebar:not(headerbar) separator {
   background-color: #0d0e11; }
@@ -1523,7 +1578,10 @@ pathbar > button.slider-button {
 columnview.view,
 treeview.view {
   border-left-color: #4f5159;
-  border-top-color: #4f5159; }
+  border-top-color: #4f5159;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   columnview.view,
   treeview.view {
     outline: 0 solid transparent;
@@ -1691,7 +1749,7 @@ popover.background {
   popover.background > contents {
     background-color: #1f222a;
     background-clip: padding-box;
-    border: 1px solid rgba(13, 14, 17, 0.9);
+    border: 1px solid rgba(0, 0, 0, 0.75);
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   popover.background:backdrop {
     background-color: transparent; }
@@ -1832,178 +1890,179 @@ menubar {
 /*************
  * Notebooks *
  *************/
-notebook > header > tabs > tab:checked {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-notebook:focus:focus-visible > header > tabs > tab:checked {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-notebook > header {
-  padding: 1px;
-  border-color: #0d0e11;
-  border-width: 1px;
-  background-color: #1b1d24; }
-  notebook > header > tabs {
-    margin: -1px; }
-  notebook > header.top {
-    border-bottom-style: solid; }
-    notebook > header.top > tabs {
-      margin-bottom: -2px; }
-      notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -4px #0d0e11; }
-      notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -4px #2777ff; }
-  notebook > header.bottom {
-    border-top-style: solid; }
-    notebook > header.bottom > tabs {
-      margin-top: -2px; }
-      notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 4px #0d0e11; }
-      notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 4px #2777ff; }
-  notebook > header.left {
-    border-right-style: solid; }
-    notebook > header.left > tabs {
-      margin-right: -2px; }
-      notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -4px 0 #0d0e11; }
-      notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -4px 0 #2777ff; }
-  notebook > header.right {
-    border-left-style: solid; }
-    notebook > header.right > tabs {
-      margin-left: -2px; }
-      notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 4px 0 #0d0e11; }
-      notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 4px 0 #2777ff; }
-  notebook > header.top > tabs > arrow {
-    border-top-style: none; }
-  notebook > header.bottom > tabs > arrow {
-    border-bottom-style: none; }
-  notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
-    margin-left: -5px;
-    margin-right: -5px;
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-    notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-  notebook > header.left > tabs > arrow {
-    border-left-style: none; }
-  notebook > header.right > tabs > arrow {
-    border-right-style: none; }
-  notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
-    margin-top: -5px;
-    margin-bottom: -5px;
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-    notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-  notebook > header > tabs > arrow {
-    min-height: 16px;
-    min-width: 16px;
-    border-radius: 0; }
-    notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
-      background-clip: padding-box;
-      background-image: none;
-      background-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      box-shadow: none; }
-    notebook > header > tabs > arrow:disabled {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      box-shadow: none; }
-  notebook > header > tabs > tab {
-    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    min-height: 30px;
-    min-width: 30px;
-    padding: 3px 12px;
-    color: #eeeeec;
-    font-weight: normal;
+notebook {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  notebook > header > tabs > tab:checked {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  notebook:focus:focus-visible > header > tabs > tab:checked {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  notebook > header {
+    padding: 1px;
+    border-color: #0d0e11;
     border-width: 1px;
-    border-color: transparent; }
-    notebook > header > tabs > tab:hover {
+    background-color: #1b1d24; }
+    notebook > header > tabs {
+      margin: -1px; }
+    notebook > header.top {
+      border-bottom-style: solid; }
+      notebook > header.top > tabs {
+        margin-bottom: -2px; }
+        notebook > header.top > tabs > tab:hover {
+          box-shadow: inset 0 -4px #0d0e11; }
+        notebook > header.top > tabs > tab:checked {
+          box-shadow: inset 0 -4px #2777ff; }
+    notebook > header.bottom {
+      border-top-style: solid; }
+      notebook > header.bottom > tabs {
+        margin-top: -2px; }
+        notebook > header.bottom > tabs > tab:hover {
+          box-shadow: inset 0 4px #0d0e11; }
+        notebook > header.bottom > tabs > tab:checked {
+          box-shadow: inset 0 4px #2777ff; }
+    notebook > header.left {
+      border-right-style: solid; }
+      notebook > header.left > tabs {
+        margin-right: -2px; }
+        notebook > header.left > tabs > tab:hover {
+          box-shadow: inset -4px 0 #0d0e11; }
+        notebook > header.left > tabs > tab:checked {
+          box-shadow: inset -4px 0 #2777ff; }
+    notebook > header.right {
+      border-left-style: solid; }
+      notebook > header.right > tabs {
+        margin-left: -2px; }
+        notebook > header.right > tabs > tab:hover {
+          box-shadow: inset 4px 0 #0d0e11; }
+        notebook > header.right > tabs > tab:checked {
+          box-shadow: inset 4px 0 #2777ff; }
+    notebook > header.top > tabs > arrow {
+      border-top-style: none; }
+    notebook > header.bottom > tabs > arrow {
+      border-bottom-style: none; }
+    notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
+      margin-left: -5px;
+      margin-right: -5px;
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+      notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    notebook > header.left > tabs > arrow {
+      border-left-style: none; }
+    notebook > header.right > tabs > arrow {
+      border-right-style: none; }
+    notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
+      margin-top: -5px;
+      margin-bottom: -5px;
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+      notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+    notebook > header > tabs > arrow {
+      min-height: 16px;
+      min-width: 16px;
+      border-radius: 0; }
+      notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
+        background-clip: padding-box;
+        background-image: none;
+        background-color: rgba(255, 255, 255, 0.3);
+        border-color: transparent;
+        box-shadow: none; }
+      notebook > header > tabs > arrow:disabled {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: none; }
+    notebook > header > tabs > tab {
+      transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+      min-height: 30px;
+      min-width: 30px;
+      padding: 3px 12px;
       color: #eeeeec;
-      background-color: #121418; }
-      notebook > header > tabs > tab:hover.reorderable-page {
-        border-color: rgba(13, 14, 17, 0.3);
-        background-color: rgba(35, 37, 46, 0.2); }
-    notebook > header > tabs > tab:not(:checked) {
-      outline-color: transparent; }
-    notebook > header > tabs > tab:checked {
-      color: #eeeeec; }
-      notebook > header > tabs > tab:checked.reorderable-page {
-        border-color: rgba(13, 14, 17, 0.5);
-        background-color: rgba(35, 37, 46, 0.5); }
-        notebook > header > tabs > tab:checked.reorderable-page:hover {
-          background-color: rgba(35, 37, 46, 0.7); }
-    notebook > header > tabs > tab button.flat {
-      color: alpha(currentColor,0.3);
-      padding: 0;
-      margin-top: 4px;
-      margin-bottom: 4px;
-      min-width: 20px;
-      min-height: 20px; }
-      notebook > header > tabs > tab button.flat:hover {
-        color: currentColor; }
-      notebook > header > tabs > tab button.flat:last-child {
+      font-weight: normal;
+      border-width: 1px;
+      border-color: transparent; }
+      notebook > header > tabs > tab:hover {
+        color: #eeeeec;
+        background-color: #121418; }
+        notebook > header > tabs > tab:hover.reorderable-page {
+          border-color: rgba(13, 14, 17, 0.3);
+          background-color: rgba(35, 37, 46, 0.2); }
+      notebook > header > tabs > tab:not(:checked) {
+        outline-color: transparent; }
+      notebook > header > tabs > tab:checked {
+        color: #eeeeec; }
+        notebook > header > tabs > tab:checked.reorderable-page {
+          border-color: rgba(13, 14, 17, 0.5);
+          background-color: rgba(35, 37, 46, 0.5); }
+          notebook > header > tabs > tab:checked.reorderable-page:hover {
+            background-color: rgba(35, 37, 46, 0.7); }
+      notebook > header > tabs > tab button.flat {
+        color: alpha(currentColor,0.3);
+        padding: 0;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        min-width: 20px;
+        min-height: 20px; }
+        notebook > header > tabs > tab button.flat:hover {
+          color: currentColor; }
+        notebook > header > tabs > tab button.flat:last-child {
+          margin-left: 4px;
+          margin-right: -4px; }
+        notebook > header > tabs > tab button.flat:first-child {
+          margin-left: -4px;
+          margin-right: 4px; }
+    notebook > header.top > tabs, notebook > header.bottom > tabs {
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
+        margin-left: 3px;
+        margin-right: 3px; }
+        notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
+          margin-left: -1px; }
+        notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
+          margin-right: -1px; }
+      notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
         margin-left: 4px;
-        margin-right: -4px; }
-      notebook > header > tabs > tab button.flat:first-child {
-        margin-left: -4px;
         margin-right: 4px; }
-  notebook > header.top > tabs, notebook > header.bottom > tabs {
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
-      margin-left: 3px;
-      margin-right: 3px; }
-      notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
-        margin-left: -1px; }
-      notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
-        margin-right: -1px; }
-    notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
-      margin-left: 4px;
-      margin-right: 4px; }
-      notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
-        border-style: none solid; }
-  notebook > header.left > tabs, notebook > header.right > tabs {
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
-      margin-top: 3px;
-      margin-bottom: 3px; }
-      notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
-        margin-top: -1px; }
-      notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
-        margin-bottom: -1px; }
-    notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
-      margin-top: 4px;
-      margin-bottom: 4px; }
-      notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
-        border-style: solid none; }
-  notebook > header.top > tabs > tab {
-    padding-bottom: 4px; }
-  notebook > header.bottom > tabs > tab {
-    padding-top: 4px; }
-
-notebook > stack:not(:only-child) {
-  background-color: #272a34; }
+        notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
+          border-style: none solid; }
+    notebook > header.left > tabs, notebook > header.right > tabs {
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
+        margin-top: 3px;
+        margin-bottom: 3px; }
+        notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
+          margin-top: -1px; }
+        notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
+          margin-bottom: -1px; }
+      notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
+        margin-top: 4px;
+        margin-bottom: 4px; }
+        notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
+          border-style: solid none; }
+    notebook > header.top > tabs > tab {
+      padding-bottom: 4px; }
+    notebook > header.bottom > tabs > tab {
+      padding-top: 4px; }
+  notebook > stack:not(:only-child) {
+    background-color: #272a34; }
 
 /**************
  * Scrollbars *
  **************/
 scrollbar {
   background-color: #272a34;
-  transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   scrollbar.top {
     border-bottom: 1px solid #0d0e11; }
   scrollbar.bottom {
@@ -2013,13 +2072,14 @@ scrollbar {
   scrollbar.right {
     border-left: 1px solid #0d0e11; }
   scrollbar > range > trough > slider {
-    min-width: 10px;
-    min-height: 10px;
+    min-width: 8px;
+    min-height: 8px;
     margin: -1px;
     border: 4px solid transparent;
     border-radius: 10px;
     background-clip: padding-box;
-    background-color: #41434b; }
+    background-color: #41434b;
+    transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
     scrollbar > range > trough > slider:hover {
       background-color: #4b4d54; }
     scrollbar > range > trough > slider:hover:active {
@@ -2027,12 +2087,13 @@ scrollbar {
     scrollbar > range > trough > slider:disabled {
       background-color: transparent; }
   scrollbar > range.fine-tune > trough > slider {
+    transition: none;
     min-width: 6px;
     min-height: 6px; }
   scrollbar > range.fine-tune.horizontal > trough > slider {
-    border-width: 6px 4px; }
+    border-width: 5px 4px; }
   scrollbar > range.fine-tune.vertical > trough > slider {
-    border-width: 4px 6px; }
+    border-width: 4px 5px; }
   scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     border-color: transparent;
     opacity: 0.4;
@@ -2071,6 +2132,9 @@ switch {
   color: #eeeeec;
   background-color: #1b1d24;
   transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out;
   /* only show i / o for the accessible theme */ }
   switch {
     outline: 0 solid transparent;
@@ -2245,7 +2309,10 @@ switch {
 checkbutton {
   border-spacing: 4px;
   border-radius: 4px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   checkbutton {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -2409,7 +2476,10 @@ progressbar > trough > progress, scale > trough > highlight {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 12px; }
+  padding: 12px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   scale > trough {
     outline: 0 solid transparent;
     outline-offset: 16px; }
@@ -3061,28 +3131,26 @@ list {
     border-bottom: 1px solid #4f5159; }
 
 row {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-row:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-row.activatable.has-open-popup, row.activatable:hover {
-  background-color: rgba(238, 238, 236, 0.05); }
-
-row.activatable:active {
-  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-
-row.activatable:selected:active {
-  box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-
-row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #3b83fd; }
-
-row:selected {
-  outline-color: rgba(255, 255, 255, 0.3); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  row.activatable.has-open-popup, row.activatable:hover {
+    background-color: rgba(238, 238, 236, 0.05); }
+  row.activatable:active {
+    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
+  row.activatable:selected:active {
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
+  row.activatable:selected.has-open-popup, row.activatable:selected:hover {
+    background-color: #3b83fd; }
+  row:selected {
+    outline-color: rgba(255, 255, 255, 0.3); }
 
 columnview > listview > row {
   padding: 0; }
@@ -3157,20 +3225,22 @@ expander {
   expander:checked {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-expander-widget > box > title {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-expander-widget:focus:focus-visible > box > title {
-  outline-color: rgba(39, 119, 255, 0.7);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-expander-widget > box > title {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  border-radius: 4px; }
-  expander-widget > box > title:hover > expander {
-    color: white; }
+expander-widget {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  expander-widget > box > title {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  expander-widget:focus:focus-visible > box > title {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  expander-widget > box > title {
+    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    border-radius: 4px; }
+    expander-widget > box > title:hover > expander {
+      color: white; }
 
 .navigation-sidebar:not(decoration):not(window):drop(active):focus, .navigation-sidebar:not(decoration):not(window):drop(active),
 placessidebar:not(decoration):not(window):drop(active):focus,
@@ -3280,7 +3350,17 @@ stacksidebar list.separators:not(.horizontal) > row:not(.separator) {
   border-bottom: none; }
 
 stacksidebar row {
-  padding: 10px 4px; }
+  padding: 10px 4px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  stacksidebar row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  stacksidebar row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.7);
+    outline-width: 2px;
+    outline-offset: -2px; }
   stacksidebar row > label {
     padding-left: 6px;
     padding-right: 6px; }
@@ -3292,10 +3372,6 @@ stacksidebar row {
     color: #eeeeec; }
   stacksidebar row:selected:hover:dir(ltr), stacksidebar row:selected:hover:dir(rtl) {
     background-color: #2f3238; }
-  stacksidebar row:focus:focus-visible {
-    outline-width: 0;
-    background-color: #2777ff;
-    color: #ffffff; }
   stacksidebar row.activatable:active, stacksidebar row.activatable:selected:active {
     box-shadow: none; }
 
@@ -3313,20 +3389,24 @@ separator.sidebar {
     min-height: 36px;
     padding: 0 8px;
     border-radius: 5px;
-    margin: 0 5px 2px; }
-    .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {
+    margin: 0 5px 2px;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    .navigation-sidebar > row {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    .navigation-sidebar > row:focus-visible:focus-within {
+      outline-color: rgba(39, 119, 255, 0.7);
+      outline-width: 2px;
+      outline-offset: -2px; }
+    .navigation-sidebar > row:hover {
       background-color: #2f3238; }
     .navigation-sidebar > row:selected {
       background-color: #3b3e46;
       color: inherit; }
       .navigation-sidebar > row:selected:hover {
         background-color: #2f3238; }
-      .navigation-sidebar > row:selected:focus-visible:focus-within {
-        outline-width: 0;
-        color: #ffffff;
-        background-color: #2777ff; }
-        .navigation-sidebar > row:selected:focus-visible:focus-within:hover {
-          background-color: #005af3; }
     .navigation-sidebar > row:disabled {
       color: #888a8d; }
 
@@ -3461,7 +3541,10 @@ tooltip {
  * Color Chooser *
  *****************/
 colorswatch {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   colorswatch {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3543,7 +3626,10 @@ colorswatch {
       border-radius: 4.5px; }
 
 plane {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   plane {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3586,32 +3672,38 @@ colorchooser .popover.osd {
 window {
   border-width: 0px; }
   window.csd {
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(13, 14, 17, 0.9);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.75);
     margin: 0px;
     border-radius: 7px 7px 0 0; }
     window.csd:backdrop {
-      box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.9);
+      box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.75);
       transition: 200ms ease-out; }
     window.csd.popup {
       border-radius: 5px;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
     window.csd.dialog.message {
       border-radius: 7px;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
-    window.csd.solid-csd {
-      margin: 0;
-      padding: 0;
-      border: solid 1px #0d0e11;
-      border-radius: 0;
-      box-shadow: inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); }
-      window.csd.solid-csd:backdrop {
-        box-shadow: inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); }
-  window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
-    border-radius: 0; }
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+  window.solid-csd {
+    margin: 0;
+    padding: 4px;
+    border: solid 1px #0d0e11;
+    border-radius: 0;
+    box-shadow: inset 0 0 0 4px #0d0e11, inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); }
+    window.solid-csd:backdrop {
+      box-shadow: inset 0 0 0 4px #0d0e11, inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); }
+  window.maximized, window.fullscreen {
+    border-radius: 0;
+    box-shadow: none; }
+  window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
+    border-radius: 0;
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+  window:backdrop {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
   window.popup {
     box-shadow: none; }
   window.ssd {
-    box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.9); }
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
 
 tooltip.csd {
   border-radius: 5px;
@@ -3974,6 +4066,45 @@ scale slider {
     background-image: image(#23252e);
     box-shadow: none; }
 
+/*****************
+ * Title buttons *
+ *****************/
+windowcontrols {
+  margin: 0 5px; }
+  windowcontrols.end {
+    margin-left: 11px; }
+  windowcontrols.right {
+    margin-right: 11px; }
+  windowcontrols button {
+    color: transparent;
+    background: #383d4b;
+    margin: 0;
+    padding: 0;
+    min-width: 0;
+    min-height: 0;
+    border: 1px solid black;
+    box-shadow: inset 0 3px 10px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05);
+    -gtk-icon-shadow: none;
+    transition: all .2s; }
+    windowcontrols button:hover {
+      color: #eeeeec;
+      background: #383d4b;
+      border-color: transparent;
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3); }
+    windowcontrols button.close {
+      color: black;
+      background: #2777ff;
+      border-color: transparent; }
+      windowcontrols button.close:hover {
+        color: white;
+        background: #3d85ff; }
+    windowcontrols button:backdrop, windowcontrols button:backdrop:hover {
+      color: transparent;
+      background: transparent;
+      box-shadow: none;
+      border-color: #0d0e11;
+      background: rgba(0, 0, 0, 0.3); }
+
 /***************
  * Header bars *
  ***************/
@@ -4131,9 +4262,6 @@ window.ssd {
 tooltip.csd {
   border: 0; }
 
-windowcontrols button {
-  padding: 5px; }
-
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/share/themes/Kali-Light/gtk-4.0/gtk.css b/share/themes/Kali-Light/gtk-4.0/gtk.css
index c9a9923a..3cc3f7ee 100644
--- a/share/themes/Kali-Light/gtk-4.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-4.0/gtk.css
@@ -20,18 +20,7 @@ dnd {
 .large-icons {
   -gtk-icon-size: 32px; }
 
-/*
-   These wildcard seems unavoidable, need to investigate.
-   Wildcards are bad and troublesome, use them with care,
-   or better, just don't.
-   Every time a wildcard is used a kitten dies, painfully.
-*/
-spinner:disabled,
-arrow:disabled,
-scrollbar:disabled,
-check:disabled,
-radio:disabled,
-treeview.expander:disabled {
+image:disabled {
   -gtk-icon-filter: opacity(0.5); }
 
 .view, iconview,
@@ -54,21 +43,22 @@ textview > border {
   background-color: #fcfcfc; }
 
 iconview {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-iconview:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-iconview:drop(active) {
-  box-shadow: none; }
-
-iconview > dndtarget:drop(active) {
-  border-style: solid;
-  border-width: 1px;
-  border-color: #0051da; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  iconview {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  iconview:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  iconview:drop(active) {
+    box-shadow: none; }
+  iconview > dndtarget:drop(active) {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #0051da; }
 
 rubberband, .content-view > rubberband, columnview.view > rubberband,
 treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
@@ -77,7 +67,10 @@ treeview.view > rubberband, gridview > rubberband, flowbox > rubberband {
 
 flowbox > flowboxchild {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   flowbox > flowboxchild {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -90,7 +83,10 @@ flowbox > flowboxchild {
 
 gridview > child {
   padding: 3px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   gridview > child {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -110,27 +106,27 @@ coverflow cover {
   border: 1px solid black; }
 
 label {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-label:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-label > selection {
-  background-color: #2777ff;
-  color: #ffffff; }
-
-label:disabled {
-  color: #aeb0b6; }
-  button label:disabled {
-    color: inherit; }
-
-label.error {
-  color: #bf1717; }
-  label.error:disabled {
-    color: rgba(191, 23, 23, 0.5); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  label {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  label:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  label > selection {
+    background-color: #2777ff;
+    color: #ffffff; }
+  label:disabled {
+    color: #aeb0b6; }
+    button label:disabled {
+      color: inherit; }
+  label.error {
+    color: #bf1717; }
+    label.error:disabled {
+      color: rgba(191, 23, 23, 0.5); }
 
 .dim-label, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle, spinbutton.vertical > text > text > placeholder, spinbutton:not(.vertical) > text > placeholder,
@@ -236,7 +232,10 @@ entry {
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: black;
   border-color: #d9d9d9;
-  background-color: #fafafa; }
+  background-color: #fafafa;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   spinbutton.vertical > text, spinbutton:not(.vertical),
   entry {
     outline: 0 solid transparent;
@@ -277,7 +276,10 @@ entry {
     background-color: #fdfdfd; }
   spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
   entry.error {
-    color: #bf1717; }
+    color: #bf1717;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.error, spinbutton.error:not(.vertical),
     entry.error {
       outline: 0 solid transparent;
@@ -292,7 +294,10 @@ entry {
       background-color: #bf1717; }
   spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
   entry.warning {
-    color: #fd7d00; }
+    color: #fd7d00;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
     spinbutton.vertical > text.warning, spinbutton.warning:not(.vertical),
     entry.warning {
       outline: 0 solid transparent;
@@ -440,7 +445,10 @@ button {
   outline-color: rgba(39, 119, 255, 0.5);
   border-color: #d9d9d9;
   background-image: image(white);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   notebook > header > tabs > arrow, windowcontrols button,
   button {
     outline: 0 solid transparent;
@@ -457,7 +465,8 @@ button {
     background-image: linear-gradient(to top, #d6d6d6, #ebebeb 1px);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
     -gtk-icon-filter: brightness(1.2); }
-  notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  notebook > header > tabs > arrow.keyboard-activating, notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
+  button.keyboard-activating,
   button:active,
   button:checked {
     color: #5c616c;
@@ -484,8 +493,11 @@ button {
     border-color: #d9d9d9;
     background-image: image(#ffffff);
     box-shadow: none;
-    transition: 200ms ease-out;
-    -gtk-icon-filter: none; }
+    transition: 200ms ease-out; }
+    notebook > header > tabs > arrow:backdrop:not(:disabled),
+    button:backdrop.flat:not(:disabled),
+    button:backdrop:not(:disabled) {
+      -gtk-icon-filter: none; }
     notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
@@ -515,7 +527,8 @@ button {
   button:disabled {
     color: #aeb0b6;
     border-color: #d9d9d9;
-    background-image: image(#fdfdfd); }
+    background-image: image(#fdfdfd);
+    -gtk-icon-filter: opacity(0.5); }
     notebook > header > tabs > arrow:disabled:active, notebook > header > tabs > arrow:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
@@ -538,7 +551,8 @@ button {
       background-color: #dbdbdb;
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-    button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.keyboard-activating.sidebar-button, notebook > header > tabs > arrow.keyboard-activating, windowcontrols button.keyboard-activating, button.sidebar-button:active, notebook > header > tabs > arrow:active, windowcontrols button:active, button.sidebar-button:checked, notebook > header > tabs > arrow:checked, windowcontrols button:checked,
+    button.flat.keyboard-activating,
     button.flat:active,
     button.flat:checked {
       border-color: transparent;
@@ -692,7 +706,10 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.8);
   border-color: #0047c0;
   background-image: image(#4187ff);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.suggested-action {
     outline: 0 solid transparent;
@@ -774,7 +791,10 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.8);
   border-color: #790e0e;
   background-image: image(#e52222);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(144, 17, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(144, 17, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   
   button.destructive-action {
     outline: 0 solid transparent;
@@ -1039,6 +1059,44 @@ list > row button.image-button:not(.flat) {
     border-color: #d9d9d9;
     background-image: image(#dbdbdb);
     box-shadow: none; }
+  popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).suggested-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.8);
+    border-color: #0047c0;
+    background-image: image(#4187ff);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(0, 81, 218, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).suggested-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.suggested-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).suggested-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.8);
+      outline-width: 2px;
+      outline-offset: -2px; }
+  popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+  list > row button.image-button:not(.flat).destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.8);
+    border-color: #790e0e;
+    background-image: image(#e52222);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0px rgba(144, 17, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model,
+    list > row button.image-button:not(.flat).destructive-action {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    popover.menu box.circular-buttons button.destructive-action.circular.image-button.model:focus:focus-visible,
+    list > row button.image-button:not(.flat).destructive-action:focus:focus-visible {
+      outline-color: rgba(255, 255, 255, 0.8);
+      outline-width: 2px;
+      outline-offset: -2px; }
 
 /*********
  * Links *
@@ -1070,13 +1128,16 @@ link {
     color: #ccdefd; }
 
 link {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-link:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  link {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  link:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
 
 button.link, button.link:hover, button.link:active, button.link:checked {
   text-shadow: none; }
@@ -1405,7 +1466,6 @@ headerbar {
     border-color: #d9d9d9;
     background-color: #ffffff;
     background-image: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.8);
     transition: 200ms ease-out; }
   .titlebar:not(headerbar) .title,
   headerbar .title {
@@ -1480,17 +1540,12 @@ headerbar switch {
   margin-top: 10px;
   margin-bottom: 10px; }
 
-headerbar.titlebar headerbar:not(.titlebar) {
-  background: none;
-  box-shadow: none; }
-
 window.csd > .titlebar:not(headerbar) {
   padding: 0;
   background-color: transparent;
   background-image: none;
   border-style: none;
-  border-color: transparent;
-  box-shadow: none; }
+  border-color: transparent; }
 
 .titlebar:not(headerbar) separator {
   background-color: #d9d9d9; }
@@ -1532,7 +1587,10 @@ pathbar > button.slider-button {
 columnview.view,
 treeview.view {
   border-left-color: #dfdfdf;
-  border-top-color: #dfdfdf; }
+  border-top-color: #dfdfdf;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   columnview.view,
   treeview.view {
     outline: 0 solid transparent;
@@ -1843,178 +1901,179 @@ menubar {
 /*************
  * Notebooks *
  *************/
-notebook > header > tabs > tab:checked {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-notebook:focus:focus-visible > header > tabs > tab:checked {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-notebook > header {
-  padding: 1px;
-  border-color: #d9d9d9;
-  border-width: 1px;
-  background-color: #f2f2f2; }
-  notebook > header > tabs {
-    margin: -1px; }
-  notebook > header.top {
-    border-bottom-style: solid; }
-    notebook > header.top > tabs {
-      margin-bottom: -2px; }
-      notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -4px #d9d9d9; }
-      notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -4px #2777ff; }
-  notebook > header.bottom {
-    border-top-style: solid; }
-    notebook > header.bottom > tabs {
-      margin-top: -2px; }
-      notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 4px #d9d9d9; }
-      notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 4px #2777ff; }
-  notebook > header.left {
-    border-right-style: solid; }
-    notebook > header.left > tabs {
-      margin-right: -2px; }
-      notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -4px 0 #d9d9d9; }
-      notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -4px 0 #2777ff; }
-  notebook > header.right {
-    border-left-style: solid; }
-    notebook > header.right > tabs {
-      margin-left: -2px; }
-      notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 4px 0 #d9d9d9; }
-      notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 4px 0 #2777ff; }
-  notebook > header.top > tabs > arrow {
-    border-top-style: none; }
-  notebook > header.bottom > tabs > arrow {
-    border-bottom-style: none; }
-  notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
-    margin-left: -5px;
-    margin-right: -5px;
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-    notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-  notebook > header.left > tabs > arrow {
-    border-left-style: none; }
-  notebook > header.right > tabs > arrow {
-    border-right-style: none; }
-  notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
-    margin-top: -5px;
-    margin-bottom: -5px;
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-    notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-  notebook > header > tabs > arrow {
-    min-height: 16px;
-    min-width: 16px;
-    border-radius: 0; }
-    notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
-      background-clip: padding-box;
-      background-image: none;
-      background-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
-      box-shadow: none; }
-    notebook > header > tabs > arrow:disabled {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      box-shadow: none; }
-  notebook > header > tabs > tab {
-    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    min-height: 30px;
-    min-width: 30px;
-    padding: 3px 12px;
-    color: #5c616c;
-    font-weight: normal;
+notebook {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  notebook > header > tabs > tab:checked {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  notebook:focus:focus-visible > header > tabs > tab:checked {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  notebook > header {
+    padding: 1px;
+    border-color: #d9d9d9;
     border-width: 1px;
-    border-color: transparent; }
-    notebook > header > tabs > tab:hover {
+    background-color: #f2f2f2; }
+    notebook > header > tabs {
+      margin: -1px; }
+    notebook > header.top {
+      border-bottom-style: solid; }
+      notebook > header.top > tabs {
+        margin-bottom: -2px; }
+        notebook > header.top > tabs > tab:hover {
+          box-shadow: inset 0 -4px #d9d9d9; }
+        notebook > header.top > tabs > tab:checked {
+          box-shadow: inset 0 -4px #2777ff; }
+    notebook > header.bottom {
+      border-top-style: solid; }
+      notebook > header.bottom > tabs {
+        margin-top: -2px; }
+        notebook > header.bottom > tabs > tab:hover {
+          box-shadow: inset 0 4px #d9d9d9; }
+        notebook > header.bottom > tabs > tab:checked {
+          box-shadow: inset 0 4px #2777ff; }
+    notebook > header.left {
+      border-right-style: solid; }
+      notebook > header.left > tabs {
+        margin-right: -2px; }
+        notebook > header.left > tabs > tab:hover {
+          box-shadow: inset -4px 0 #d9d9d9; }
+        notebook > header.left > tabs > tab:checked {
+          box-shadow: inset -4px 0 #2777ff; }
+    notebook > header.right {
+      border-left-style: solid; }
+      notebook > header.right > tabs {
+        margin-left: -2px; }
+        notebook > header.right > tabs > tab:hover {
+          box-shadow: inset 4px 0 #d9d9d9; }
+        notebook > header.right > tabs > tab:checked {
+          box-shadow: inset 4px 0 #2777ff; }
+    notebook > header.top > tabs > arrow {
+      border-top-style: none; }
+    notebook > header.bottom > tabs > arrow {
+      border-bottom-style: none; }
+    notebook > header.top > tabs > arrow, notebook > header.bottom > tabs > arrow {
+      margin-left: -5px;
+      margin-right: -5px;
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+      notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    notebook > header.left > tabs > arrow {
+      border-left-style: none; }
+    notebook > header.right > tabs > arrow {
+      border-right-style: none; }
+    notebook > header.left > tabs > arrow, notebook > header.right > tabs > arrow {
+      margin-top: -5px;
+      margin-bottom: -5px;
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
+        -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+      notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
+        -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+    notebook > header > tabs > arrow {
+      min-height: 16px;
+      min-width: 16px;
+      border-radius: 0; }
+      notebook > header > tabs > arrow:hover:not(:active):not(:backdrop) {
+        background-clip: padding-box;
+        background-image: none;
+        background-color: rgba(255, 255, 255, 0.3);
+        border-color: transparent;
+        box-shadow: none; }
+      notebook > header > tabs > arrow:disabled {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: none; }
+    notebook > header > tabs > tab {
+      transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+      min-height: 30px;
+      min-width: 30px;
+      padding: 3px 12px;
       color: #5c616c;
-      background-color: #e8e8e8; }
-      notebook > header > tabs > tab:hover.reorderable-page {
-        border-color: rgba(217, 217, 217, 0.3);
-        background-color: rgba(255, 255, 255, 0.2); }
-    notebook > header > tabs > tab:not(:checked) {
-      outline-color: transparent; }
-    notebook > header > tabs > tab:checked {
-      color: #5c616c; }
-      notebook > header > tabs > tab:checked.reorderable-page {
-        border-color: rgba(217, 217, 217, 0.5);
-        background-color: rgba(255, 255, 255, 0.5); }
-        notebook > header > tabs > tab:checked.reorderable-page:hover {
-          background-color: rgba(255, 255, 255, 0.7); }
-    notebook > header > tabs > tab button.flat {
-      color: alpha(currentColor,0.3);
-      padding: 0;
-      margin-top: 4px;
-      margin-bottom: 4px;
-      min-width: 20px;
-      min-height: 20px; }
-      notebook > header > tabs > tab button.flat:hover {
-        color: currentColor; }
-      notebook > header > tabs > tab button.flat:last-child {
+      font-weight: normal;
+      border-width: 1px;
+      border-color: transparent; }
+      notebook > header > tabs > tab:hover {
+        color: #5c616c;
+        background-color: #e8e8e8; }
+        notebook > header > tabs > tab:hover.reorderable-page {
+          border-color: rgba(217, 217, 217, 0.3);
+          background-color: rgba(255, 255, 255, 0.2); }
+      notebook > header > tabs > tab:not(:checked) {
+        outline-color: transparent; }
+      notebook > header > tabs > tab:checked {
+        color: #5c616c; }
+        notebook > header > tabs > tab:checked.reorderable-page {
+          border-color: rgba(217, 217, 217, 0.5);
+          background-color: rgba(255, 255, 255, 0.5); }
+          notebook > header > tabs > tab:checked.reorderable-page:hover {
+            background-color: rgba(255, 255, 255, 0.7); }
+      notebook > header > tabs > tab button.flat {
+        color: alpha(currentColor,0.3);
+        padding: 0;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        min-width: 20px;
+        min-height: 20px; }
+        notebook > header > tabs > tab button.flat:hover {
+          color: currentColor; }
+        notebook > header > tabs > tab button.flat:last-child {
+          margin-left: 4px;
+          margin-right: -4px; }
+        notebook > header > tabs > tab button.flat:first-child {
+          margin-left: -4px;
+          margin-right: 4px; }
+    notebook > header.top > tabs, notebook > header.bottom > tabs {
+      padding-left: 4px;
+      padding-right: 4px; }
+      notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
+        margin-left: 3px;
+        margin-right: 3px; }
+        notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
+          margin-left: -1px; }
+        notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
+          margin-right: -1px; }
+      notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
         margin-left: 4px;
-        margin-right: -4px; }
-      notebook > header > tabs > tab button.flat:first-child {
-        margin-left: -4px;
         margin-right: 4px; }
-  notebook > header.top > tabs, notebook > header.bottom > tabs {
-    padding-left: 4px;
-    padding-right: 4px; }
-    notebook > header.top > tabs:not(:only-child), notebook > header.bottom > tabs:not(:only-child) {
-      margin-left: 3px;
-      margin-right: 3px; }
-      notebook > header.top > tabs:not(:only-child):first-child, notebook > header.bottom > tabs:not(:only-child):first-child {
-        margin-left: -1px; }
-      notebook > header.top > tabs:not(:only-child):last-child, notebook > header.bottom > tabs:not(:only-child):last-child {
-        margin-right: -1px; }
-    notebook > header.top > tabs > tab, notebook > header.bottom > tabs > tab {
-      margin-left: 4px;
-      margin-right: 4px; }
-      notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
-        border-style: none solid; }
-  notebook > header.left > tabs, notebook > header.right > tabs {
-    padding-top: 4px;
-    padding-bottom: 4px; }
-    notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
-      margin-top: 3px;
-      margin-bottom: 3px; }
-      notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
-        margin-top: -1px; }
-      notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
-        margin-bottom: -1px; }
-    notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
-      margin-top: 4px;
-      margin-bottom: 4px; }
-      notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
-        border-style: solid none; }
-  notebook > header.top > tabs > tab {
-    padding-bottom: 4px; }
-  notebook > header.bottom > tabs > tab {
-    padding-top: 4px; }
-
-notebook > stack:not(:only-child) {
-  background-color: #fafafa; }
+        notebook > header.top > tabs > tab.reorderable-page, notebook > header.bottom > tabs > tab.reorderable-page {
+          border-style: none solid; }
+    notebook > header.left > tabs, notebook > header.right > tabs {
+      padding-top: 4px;
+      padding-bottom: 4px; }
+      notebook > header.left > tabs:not(:only-child), notebook > header.right > tabs:not(:only-child) {
+        margin-top: 3px;
+        margin-bottom: 3px; }
+        notebook > header.left > tabs:not(:only-child):first-child, notebook > header.right > tabs:not(:only-child):first-child {
+          margin-top: -1px; }
+        notebook > header.left > tabs:not(:only-child):last-child, notebook > header.right > tabs:not(:only-child):last-child {
+          margin-bottom: -1px; }
+      notebook > header.left > tabs > tab, notebook > header.right > tabs > tab {
+        margin-top: 4px;
+        margin-bottom: 4px; }
+        notebook > header.left > tabs > tab.reorderable-page, notebook > header.right > tabs > tab.reorderable-page {
+          border-style: solid none; }
+    notebook > header.top > tabs > tab {
+      padding-bottom: 4px; }
+    notebook > header.bottom > tabs > tab {
+      padding-top: 4px; }
+  notebook > stack:not(:only-child) {
+    background-color: #fafafa; }
 
 /**************
  * Scrollbars *
  **************/
 scrollbar {
   background-color: #fafafa;
-  transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   scrollbar.top {
     border-bottom: 1px solid #d9d9d9; }
   scrollbar.bottom {
@@ -2024,13 +2083,14 @@ scrollbar {
   scrollbar.right {
     border-left: 1px solid #d9d9d9; }
   scrollbar > range > trough > slider {
-    min-width: 10px;
-    min-height: 10px;
+    min-width: 8px;
+    min-height: 8px;
     margin: -1px;
     border: 4px solid transparent;
     border-radius: 10px;
     background-clip: padding-box;
-    background-color: #ced0d3; }
+    background-color: #ced0d3;
+    transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
     scrollbar > range > trough > slider:hover {
       background-color: #c6c8cc; }
     scrollbar > range > trough > slider:hover:active {
@@ -2038,12 +2098,13 @@ scrollbar {
     scrollbar > range > trough > slider:disabled {
       background-color: transparent; }
   scrollbar > range.fine-tune > trough > slider {
+    transition: none;
     min-width: 6px;
     min-height: 6px; }
   scrollbar > range.fine-tune.horizontal > trough > slider {
-    border-width: 6px 4px; }
+    border-width: 5px 4px; }
   scrollbar > range.fine-tune.vertical > trough > slider {
-    border-width: 4px 6px; }
+    border-width: 4px 5px; }
   scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     border-color: transparent;
     opacity: 0.4;
@@ -2082,6 +2143,9 @@ switch {
   color: #5c616c;
   background-color: #f2f2f2;
   transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out;
   /* only show i / o for the accessible theme */ }
   switch {
     outline: 0 solid transparent;
@@ -2260,7 +2324,10 @@ switch {
 checkbutton {
   border-spacing: 4px;
   border-radius: 4px;
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   checkbutton {
     outline: 0 solid transparent;
     outline-offset: 4px; }
@@ -2427,7 +2494,10 @@ progressbar > trough > progress, scale > trough > highlight {
 scale {
   min-height: 10px;
   min-width: 10px;
-  padding: 12px; }
+  padding: 12px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   scale > trough {
     outline: 0 solid transparent;
     outline-offset: 16px; }
@@ -3079,28 +3149,26 @@ list {
     border-bottom: 1px solid #dfdfdf; }
 
 row {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-row:focus:focus-visible {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-row.activatable.has-open-popup, row.activatable:hover {
-  background-color: rgba(92, 97, 108, 0.05); }
-
-row.activatable:active {
-  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-
-row.activatable:selected:active {
-  box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-
-row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #2c75f0; }
-
-row:selected {
-  outline-color: rgba(255, 255, 255, 0.8); }
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  row.activatable.has-open-popup, row.activatable:hover {
+    background-color: rgba(92, 97, 108, 0.05); }
+  row.activatable:active {
+    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
+  row.activatable:selected:active {
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
+  row.activatable:selected.has-open-popup, row.activatable:selected:hover {
+    background-color: #2c75f0; }
+  row:selected {
+    outline-color: rgba(255, 255, 255, 0.8); }
 
 columnview > listview > row {
   padding: 0; }
@@ -3175,20 +3243,22 @@ expander {
   expander:checked {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-expander-widget > box > title {
-  outline: 0 solid transparent;
-  outline-offset: 4px; }
-
-expander-widget:focus:focus-visible > box > title {
-  outline-color: rgba(39, 119, 255, 0.5);
-  outline-width: 2px;
-  outline-offset: -2px; }
-
-expander-widget > box > title {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  border-radius: 4px; }
-  expander-widget > box > title:hover > expander {
-    color: #aaaeb7; }
+expander-widget {
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  expander-widget > box > title {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  expander-widget:focus:focus-visible > box > title {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
+  expander-widget > box > title {
+    transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    border-radius: 4px; }
+    expander-widget > box > title:hover > expander {
+      color: #aaaeb7; }
 
 .navigation-sidebar:not(decoration):not(window):drop(active):focus, .navigation-sidebar:not(decoration):not(window):drop(active),
 placessidebar:not(decoration):not(window):drop(active):focus,
@@ -3298,7 +3368,17 @@ stacksidebar list.separators:not(.horizontal) > row:not(.separator) {
   border-bottom: none; }
 
 stacksidebar row {
-  padding: 10px 4px; }
+  padding: 10px 4px;
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
+  stacksidebar row {
+    outline: 0 solid transparent;
+    outline-offset: 4px; }
+  stacksidebar row:focus:focus-visible {
+    outline-color: rgba(39, 119, 255, 0.5);
+    outline-width: 2px;
+    outline-offset: -2px; }
   stacksidebar row > label {
     padding-left: 6px;
     padding-right: 6px; }
@@ -3310,10 +3390,6 @@ stacksidebar row {
     color: #5c616c; }
   stacksidebar row:selected:hover:dir(ltr), stacksidebar row:selected:hover:dir(rtl) {
     background-color: #dddee0; }
-  stacksidebar row:focus:focus-visible {
-    outline-width: 0;
-    background-color: #2777ff;
-    color: #ffffff; }
   stacksidebar row.activatable:active, stacksidebar row.activatable:selected:active {
     box-shadow: none; }
 
@@ -3331,20 +3407,24 @@ separator.sidebar {
     min-height: 36px;
     padding: 0 8px;
     border-radius: 5px;
-    margin: 0 5px 2px; }
-    .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {
+    margin: 0 5px 2px;
+    transition-property: outline, outline-width, outline-offset, outline-color;
+    transition-duration: 300ms;
+    animation-timing-function: ease-in-out; }
+    .navigation-sidebar > row {
+      outline: 0 solid transparent;
+      outline-offset: 4px; }
+    .navigation-sidebar > row:focus-visible:focus-within {
+      outline-color: rgba(39, 119, 255, 0.5);
+      outline-width: 2px;
+      outline-offset: -2px; }
+    .navigation-sidebar > row:hover {
       background-color: #dddee0; }
     .navigation-sidebar > row:selected {
       background-color: #eaebec;
       color: inherit; }
       .navigation-sidebar > row:selected:hover {
         background-color: #dddee0; }
-      .navigation-sidebar > row:selected:focus-visible:focus-within {
-        outline-width: 0;
-        color: #ffffff;
-        background-color: #2777ff; }
-        .navigation-sidebar > row:selected:focus-visible:focus-within:hover {
-          background-color: #005af3; }
     .navigation-sidebar > row:disabled {
       color: #aeb0b6; }
 
@@ -3479,7 +3559,10 @@ tooltip {
  * Color Chooser *
  *****************/
 colorswatch {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   colorswatch {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3561,7 +3644,10 @@ colorswatch {
       border-radius: 4.5px; }
 
 plane {
-  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  transition: outline-width 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94), outline-offset 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: outline, outline-width, outline-offset, outline-color;
+  transition-duration: 300ms;
+  animation-timing-function: ease-in-out; }
   plane {
     outline: 0 solid transparent;
     outline-offset: 6px; }
@@ -3616,16 +3702,22 @@ window {
     window.csd.dialog.message {
       border-radius: 7px;
       box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-    window.csd.solid-csd {
-      margin: 0;
-      padding: 0;
-      border: solid 1px #d9d9d9;
-      border-radius: 0;
-      box-shadow: inset 0 0 0 3px white, inset 0 1px rgba(255, 255, 255, 0.8); }
-      window.csd.solid-csd:backdrop {
-        box-shadow: inset 0 0 0 3px #ffffff, inset 0 1px rgba(255, 255, 255, 0.8); }
-  window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
-    border-radius: 0; }
+  window.solid-csd {
+    margin: 0;
+    padding: 4px;
+    border: solid 1px #d9d9d9;
+    border-radius: 0;
+    box-shadow: inset 0 0 0 4px #d9d9d9, inset 0 0 0 3px white, inset 0 1px rgba(255, 255, 255, 0.8); }
+    window.solid-csd:backdrop {
+      box-shadow: inset 0 0 0 4px #d9d9d9, inset 0 0 0 3px #ffffff, inset 0 1px rgba(255, 255, 255, 0.8); }
+  window.maximized, window.fullscreen {
+    border-radius: 0;
+    box-shadow: none; }
+  window.tiled, window.tiled-top, window.tiled-left, window.tiled-right, window.tiled-bottom {
+    border-radius: 0;
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18), 0 0 0 20px transparent; }
+  window:backdrop {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18), 0 0 0 20px transparent; }
   window.popup {
     box-shadow: none; }
   window.ssd {
@@ -3992,6 +4084,45 @@ scale slider {
     background-image: image(#ffffff);
     box-shadow: none; }
 
+/*****************
+ * Title buttons *
+ *****************/
+windowcontrols {
+  margin: 0 5px; }
+  windowcontrols.end {
+    margin-left: 11px; }
+  windowcontrols.right {
+    margin-right: 11px; }
+  windowcontrols button {
+    color: transparent;
+    background: white;
+    margin: 0;
+    padding: 0;
+    min-width: 0;
+    min-height: 0;
+    border: 1px solid #c2c2c2;
+    box-shadow: inset 0 3px 10px -4px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.05);
+    -gtk-icon-shadow: none;
+    transition: all .2s; }
+    windowcontrols button:hover {
+      color: #5c616c;
+      background: white;
+      border-color: transparent;
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); }
+    windowcontrols button.close {
+      color: white;
+      background: #2777ff;
+      border-color: transparent; }
+      windowcontrols button.close:hover {
+        color: black;
+        background: #3d85ff; }
+    windowcontrols button:backdrop, windowcontrols button:backdrop:hover {
+      color: transparent;
+      background: transparent;
+      box-shadow: none;
+      border-color: #d9d9d9;
+      background: rgba(0, 0, 0, 0.1); }
+
 /***************
  * Header bars *
  ***************/
@@ -4149,9 +4280,6 @@ window.ssd {
 tooltip.csd {
   border: 0; }
 
-windowcontrols button {
-  padding: 5px; }
-
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */