From dcbb4e6e4b752c5ee00528150ce5014df6cd854e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniruiz@kali.org>
Date: Mon, 30 Aug 2021 21:12:12 +0200
Subject: [PATCH] Gnome-Shell: Update for GNOME 40

---
 .../assets/view-grid-symbolic-checked.svg     |   1 -
 .../Kali-Dark/gnome-shell/gnome-shell.css     | 731 ++++++++++--------
 .../Kali-Light/gnome-shell/gnome-shell.css    | 718 +++++++++--------
 src/themes/Kali/sass/common/_colors.scss      |   1 +
 src/themes/Kali/sass/gnome-shell-dark.scss    |   1 -
 src/themes/Kali/sass/gnome-shell.scss         |   1 -
 .../Kali/sass/gnome-shell/_common-tweaks.scss | 169 ++--
 .../Kali/sass/gnome-shell/_extensions.scss    |   1 -
 .../extensions/workspace-indicator.scss       |  10 -
 .../upstream/gnome-shell-high-contrast.scss   |  25 +
 .../upstream/gnome-shell-sass/_colors.scss    |  44 ++
 .../upstream/gnome-shell-sass/_common.scss    |  15 +-
 .../gnome-shell-sass/_common.scss.patch       |   4 +
 .../upstream/gnome-shell-sass/_drawing.scss   |   3 +-
 .../_high-contrast-colors.scss                |  41 +
 .../upstream/gnome-shell-sass/_widgets.scss   |   2 +-
 .../gnome-shell-sass/widgets/_app-grid.scss   |  70 +-
 .../gnome-shell-sass/widgets/_base.scss       |   2 +-
 .../gnome-shell-sass/widgets/_calendar.scss   |   6 +-
 .../gnome-shell-sass/widgets/_dash.scss       |  52 +-
 .../gnome-shell-sass/widgets/_dialogs.scss    |   9 +
 .../widgets/_login-dialog.scss                |  27 +-
 .../widgets/_message-list.scss                |   2 +-
 .../gnome-shell-sass/widgets/_misc.scss       |  23 +-
 .../gnome-shell-sass/widgets/_overview.scss   |  11 +-
 .../gnome-shell-sass/widgets/_panel.scss      |  96 ++-
 .../widgets/_screen-shield.scss               |   2 +-
 .../widgets/_search-entry.scss                |   4 +-
 .../widgets/_window-picker.scss               |  47 +-
 .../widgets/_workspace-thumbnails.scss        |  14 +-
 .../Kali/sass/gnome-shell/upstream/sync.sh    |  10 +-
 31 files changed, 1208 insertions(+), 934 deletions(-)
 delete mode 100644 share/themes/Kali-Dark/gnome-shell/assets/view-grid-symbolic-checked.svg
 delete mode 100644 src/themes/Kali/sass/gnome-shell/_extensions.scss
 delete mode 100644 src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss
 create mode 100644 src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss
 create mode 100644 src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch
 create mode 100644 src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_high-contrast-colors.scss

diff --git a/share/themes/Kali-Dark/gnome-shell/assets/view-grid-symbolic-checked.svg b/share/themes/Kali-Dark/gnome-shell/assets/view-grid-symbolic-checked.svg
deleted file mode 100644
index 78e01cba..00000000
--- a/share/themes/Kali-Dark/gnome-shell/assets/view-grid-symbolic-checked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg"><defs><filter id="a" x="-.12" y="-.12" width="1.24" height="1.24" style="color-interpolation-filters:sRGB"><feGaussianBlur stdDeviation="1.7"/></filter></defs><path d="m5 7v12h12v-12zm22 0v12h12v-12zm-19 3h6v6h-6zm22 0h6v6h-6zm-25 19v12h12v-12zm22 0v12h12v-12zm-19 3h6v6h-6zm22 0h6v6h-6z" style="filter:url(#a);opacity:.5;stroke-width:.5625"/><path d="m5 5v12h12v-12h-12zm22 0v12h12v-12h-12zm-19 3h6v6h-6v-6zm22 0h6v6h-6v-6zm-25 19v12h12v-12h-12zm22 0v12h12v-12h-12zm-19 3h6v6h-6v-6zm22 0h6v6h-6v-6z" style="fill:#2777ff;stroke-width:.5625"/></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 2ebad711..c50579a9 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -19,7 +19,7 @@
  */
 /* Global Values */
 stage {
-  font-size: 11pt;
+  font-size: 10pt;
   color: #eeeeec; }
 
 /* Common Stylings */
@@ -31,18 +31,16 @@ stage {
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
   color: white;
   background-color: #303340;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 14px;
+  border-radius: 20px;
   padding: 12px; }
 
-.workspace-thumbnails, #dash {
+.workspace-thumbnails .workspace-thumbnail {
   color: white;
-  background-color: rgba(48, 51, 64, 0.8);
-  border: 1px solid rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.1); }
 
-.show-apps .overview-icon, .app-well-app .overview-icon,
-.grid-search-result .overview-icon, .list-search-result, .search-provider-icon {
-  border-radius: 9px;
+.app-well-app .overview-icon,
+.grid-search-result .overview-icon, .show-apps .overview-icon, .list-search-result, .search-provider-icon {
+  border-radius: 12px;
   padding: 6px;
   border: 2px solid transparent;
   transition-duration: 100ms;
@@ -54,7 +52,7 @@ stage {
   border: 1px solid #0d0e11; }
 
 .app-folder-dialog .folder-name-container .edit-folder-button, .button {
-  border-radius: 5px;
+  border-radius: 8px;
   border-style: solid;
   border-width: 1px;
   min-height: 22px;
@@ -111,6 +109,11 @@ stage {
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
+  .modal-dialog .modal-dialog-linked-button:focus, .hotplug-notification-item:focus, .notification-banner .notification-button:focus {
+    color: #eeeeec;
+    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
   .modal-dialog .modal-dialog-linked-button:hover, .hotplug-notification-item:hover, .notification-banner .notification-button:hover {
     color: #eeeeec;
     background-color: #2e313d;
@@ -118,11 +121,6 @@ stage {
     box-shadow: none;
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2); }
-  .modal-dialog .modal-dialog-linked-button:focus, .hotplug-notification-item:focus, .notification-banner .notification-button:focus {
-    color: #eeeeec;
-    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
-    icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
-    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
   .modal-dialog .modal-dialog-linked-button:active, .hotplug-notification-item:active, .notification-banner .notification-button:active {
     color: #eeeeec;
     background-color: #1c1e25;
@@ -131,12 +129,12 @@ stage {
     icon-shadow: none;
     box-shadow: none; }
   .modal-dialog .modal-dialog-linked-button:first-child, .hotplug-notification-item:first-child, .notification-banner .notification-button:first-child {
-    border-radius: 0 0 0 8px; }
+    border-radius: 0 0 0 14px; }
   .modal-dialog .modal-dialog-linked-button:last-child, .hotplug-notification-item:last-child, .notification-banner .notification-button:last-child {
     border-right-width: 0;
-    border-radius: 0 0 8px 0; }
+    border-radius: 0 0 14px 0; }
   .modal-dialog .modal-dialog-linked-button:first-child:last-child, .hotplug-notification-item:first-child:last-child, .notification-banner .notification-button:first-child:last-child {
-    border-radius: 0 0 8px 8px; }
+    border-radius: 0 0 14px 14px; }
 
 /* WIDGETS */
 .shell-link {
@@ -148,11 +146,11 @@ stage {
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
 .icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); }
+  icon-shadow: 0 1px 5px rgba(0, 0, 0, 0.8); }
 
 /* Entries */
 StEntry {
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 8px;
   border-width: 1px;
   color: #eeeeec;
@@ -254,7 +252,7 @@ StScrollBar {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 9px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: #23252e;
   -arrow-border-width: 1px;
   -arrow-border-color: #0d0e11;
@@ -344,10 +342,10 @@ StScrollBar {
 
 /* Date/Time Menu */
 .clock-display-box {
-  spacing: 3px; }
+  spacing: 2px; }
   .clock-display-box .clock {
-    padding-left: 6px;
-    padding-right: 6px; }
+    padding-left: 12px;
+    padding-right: 12px; }
 
 #calendarArea {
   padding: 0; }
@@ -368,7 +366,7 @@ StScrollBar {
 .events-section-title {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -403,7 +401,7 @@ StScrollBar {
 .datemenu-today-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -432,17 +430,17 @@ StScrollBar {
     icon-shadow: none;
     box-shadow: none; }
   .datemenu-today-button .day-label {
-    font-size: 12pt;
+    font-size: 11pt;
     font-weight: bold; }
   .datemenu-today-button .date-label {
-    font-size: 18pt;
+    font-size: 17pt;
     font-weight: 1000; }
 
 /* Calendar */
 .calendar {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #eeeeec;
   background-color: #292c37;
@@ -481,13 +479,13 @@ StScrollBar {
     background-color: transparent;
     height: 32px;
     width: 32px;
-    border-radius: 5px; }
+    border-radius: 8px; }
     .calendar .pager-button:hover, .calendar .pager-button:focus {
       background-color: #383d4b; }
     .calendar .pager-button:active {
       background-color: #0f1014; }
   .calendar .calendar-day-base {
-    font-size: 8pt;
+    font-size: 7pt;
     text-align: center;
     width: 32px;
     height: 32px;
@@ -504,7 +502,7 @@ StScrollBar {
     .calendar .calendar-day-base.calendar-day-heading {
       color: white;
       margin-top: 1em;
-      font-size: 7pt; }
+      font-size: 6pt; }
   .calendar .calendar-day {
     border-width: 0; }
   .calendar .calendar-day-top {
@@ -535,7 +533,7 @@ StScrollBar {
   .calendar .calendar-other-month-day {
     color: rgba(238, 238, 236, 0.5); }
   .calendar .calendar-week-number {
-    font-size: 7pt;
+    font-size: 6pt;
     font-weight: bold;
     height: 1.8em;
     width: 2.3em;
@@ -548,7 +546,7 @@ StScrollBar {
 .events-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #eeeeec;
   background-color: #292c37;
@@ -587,13 +585,13 @@ StScrollBar {
   .events-button .event-time {
     color: #bebeb6;
     font-feature-settings: "tnum";
-    font-size: 10pt; }
+    font-size: 9pt; }
 
 /* World clocks */
 .world-clocks-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #eeeeec;
   background-color: #292c37;
@@ -629,13 +627,13 @@ StScrollBar {
     font-weight: bold; }
   .world-clocks-button .world-clocks-city {
     color: #eeeeec;
-    font-size: 11pt;
+    font-size: 10pt;
     font-weight: normal; }
   .world-clocks-button .world-clocks-time {
     font-weight: bold;
     color: #eeeeec;
     font-feature-settings: "tnum";
-    font-size: 11pt; }
+    font-size: 10pt; }
     .world-clocks-button .world-clocks-time:ltr {
       text-align: right; }
     .world-clocks-button .world-clocks-time:rtl {
@@ -643,13 +641,13 @@ StScrollBar {
   .world-clocks-button .world-clocks-timezone {
     color: #bebeb6;
     font-feature-settings: "tnum";
-    font-size: 10pt; }
+    font-size: 9pt; }
 
 /* Weather */
 .weather-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #eeeeec;
   background-color: #292c37;
@@ -686,14 +684,14 @@ StScrollBar {
     font-weight: bold; }
     .weather-button .weather-header.location {
       font-weight: normal;
-      font-size: 10pt; }
+      font-size: 9pt; }
   .weather-button .weather-grid {
     spacing-rows: 6px;
     spacing-columns: 12px; }
   .weather-button .weather-forecast-time {
     color: #a6a69b;
     font-feature-settings: "tnum";
-    font-size: 9pt;
+    font-size: 8pt;
     font-weight: normal;
     padding-top: 0.2em;
     padding-bottom: 0.4em; }
@@ -725,7 +723,7 @@ StScrollBar {
 .message {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #eeeeec;
   background-color: #292c37;
@@ -771,7 +769,7 @@ StScrollBar {
     padding: 0 8px; }
     .message .message-secondary-bin > .event-time {
       color: rgba(238, 238, 236, 0.5);
-      font-size: 9pt;
+      font-size: 8pt;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em; }
       .message .message-secondary-bin > .event-time:ltr {
@@ -792,7 +790,7 @@ StScrollBar {
 
 /* Media Controls */
 .message-media-control {
-  padding: 12px 24px;
+  padding: 12px 1.64em;
   color: #cacac4; }
   .message-media-control:hover {
     background-color: #383d4b;
@@ -803,18 +801,18 @@ StScrollBar {
   .message-media-control:insensitive {
     color: #8e8e80; }
   .message-media-control:last-child:ltr {
-    border-radius: 0 7px 7px 0; }
+    border-radius: 0 10px 10px 0; }
   .message-media-control:last-child:rtl {
-    border-radius: 7px 0 0 7px; }
+    border-radius: 10px 0 0 10px; }
 
 .media-message-cover-icon {
   icon-size: 2.18em !important;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .media-message-cover-icon.fallback {
     color: #c5c5be;
     background-color: #23252e;
     border: 1px solid transparent;
-    border-radius: 5px;
+    border-radius: 8px;
     icon-size: 2.18em !important; }
 
 .candidate-popup-content {
@@ -827,7 +825,7 @@ StScrollBar {
 
 .candidate-box {
   padding: 0.3em 0.5em 0.3em 0.5em;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .candidate-box:selected, .candidate-box:hover {
     background-color: #2777ff;
     color: #ffffff; }
@@ -843,11 +841,11 @@ StScrollBar {
   padding: 4px; }
 
 .candidate-page-button-previous {
-  border-radius: 5px 0px 0px 5px;
+  border-radius: 8px 0px 0px 8px;
   border-right-width: 0; }
 
 .candidate-page-button-next {
-  border-radius: 0px 5px 5px 0px; }
+  border-radius: 0px 8px 8px 0px; }
 
 .candidate-page-button-icon {
   icon-size: 1em; }
@@ -860,7 +858,7 @@ StScrollBar {
     spacing: 0; }
 
 .summary-source-counter {
-  font-size: 10pt;
+  font-size: 9pt;
   font-weight: bold;
   height: 1.6em;
   width: 1.6em;
@@ -899,7 +897,7 @@ StScrollBar {
 
 .chat-meta-message {
   padding-left: 4px;
-  font-size: 9pt;
+  font-size: 8pt;
   font-weight: bold;
   color: white; }
   .chat-meta-message:rtl {
@@ -912,10 +910,10 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 12pt; }
+  font-size: 11pt; }
 
 .modal-dialog {
-  border-radius: 10px; }
+  border-radius: 16px; }
   .modal-dialog .modal-dialog-content-box {
     margin: 32px 40px;
     spacing: 32px;
@@ -957,7 +955,7 @@ StScrollBar {
         font-weight: bold; }
       .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description {
         color: #e2e2df;
-        font-size: 10pt; }
+        font-size: 9pt; }
 
 /* Run Dialog */
 .run-dialog .modal-dialog-content-box {
@@ -968,7 +966,7 @@ StScrollBar {
   width: 20em; }
 
 .run-dialog .run-dialog-description {
-  font-size: 10pt;
+  font-size: 9pt;
   text-align: center;
   color: #bebeb6; }
 
@@ -998,7 +996,7 @@ StScrollBar {
 .prompt-dialog-info-label,
 .prompt-dialog-null-label {
   text-align: center;
-  font-size: 10pt; }
+  font-size: 9pt; }
 
 .prompt-dialog-error-label {
   color: #fd7d00; }
@@ -1034,6 +1032,14 @@ StScrollBar {
 .audio-selection-device-icon {
   icon-size: 4.36em; }
 
+/* Welcome dialog */
+.welcome-dialog-image {
+  background-image: url("assets/gnome-shell-start.svg");
+  background-size: contain;
+  /* Reasonable maximum dimensions */
+  height: 300px;
+  width: 300px; }
+
 /* Network Dialogs */
 .nm-dialog {
   max-height: 34em;
@@ -1069,7 +1075,7 @@ StScrollBar {
   background-color: #1c1e25; }
 
 .nm-dialog-item {
-  font-size: 11pt;
+  font-size: 10pt;
   border-bottom: 1px solid #0d0e11;
   padding: 12px;
   spacing: 0px; }
@@ -1128,7 +1134,7 @@ StScrollBar {
 
 .switcher-list .item-box {
   padding: 8px;
-  border-radius: 6px;
+  border-radius: 9px;
   border: 1px solid transparent; }
   .switcher-list .item-box:outlined {
     background-color: rgba(255, 255, 255, 0.3); }
@@ -1180,7 +1186,7 @@ StScrollBar {
   height: 50px;
   background-size: 32px;
   border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 8px; }
+  border-radius: 11px; }
 
 .ws-switcher-active-up,
 .ws-switcher-active-down,
@@ -1189,58 +1195,62 @@ StScrollBar {
   height: 52px;
   background-color: #2777ff;
   border: 1px solid #4187ff;
-  border-radius: 8px;
+  border-radius: 11px;
   color: #ffffff; }
 
 /* Top Bar */
 #panel {
   background-color: #000;
   font-weight: bold;
-  height: 1.86em;
-  font-feature-settings: "tnum"; }
-  #panel.unlock-screen, #panel.login-screen {
+  height: 2.2em;
+  font-feature-settings: "tnum";
+  transition-duration: 250ms; }
+  #panel.unlock-screen, #panel.login-screen, #panel:overview {
     background-color: transparent; }
-    #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent; }
-  #panel #panelLeft, #panel #panelCenter {
-    spacing: 6px; }
+    #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel:overview .panel-corner {
+      -panel-corner-opacity: 0; }
   #panel .panel-corner {
-    -panel-corner-radius: 6px;
+    -panel-corner-radius: 9px;
     -panel-corner-background-color: #000;
     -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent; }
-    #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
-      -panel-corner-border-color: #4187ff; }
+    -panel-corner-border-color: transparent;
+    -panel-corner-opacity: 1;
+    transition-duration: 250ms; }
   #panel .panel-button {
     font-weight: bold;
-    color: #ccc;
+    color: #ddd;
     -natural-hpadding: 12px;
-    -minimum-hpadding: 6px; }
-    #panel .panel-button:hover {
-      color: white; }
-    #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-      color: white; }
+    -minimum-hpadding: 6px;
+    transition-duration: 150ms;
+    border: 3px solid transparent;
+    border-radius: 99px; }
+    #panel .panel-button.clock-display .clock {
+      transition-duration: 150ms;
+      border: 3px solid transparent;
+      border-radius: 99px; }
+    #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+      #panel .panel-button:hover.clock-display, #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
+        box-shadow: none; }
+        #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
+          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
     #panel .panel-button .system-status-icon {
       icon-size: 1.09em;
-      padding: 5px; }
+      padding: 5px;
+      margin: 0 4px; }
+    #panel .panel-button .panel-status-indicators-box .system-status-icon,
+    #panel .panel-button .panel-status-menu-box .system-status-icon {
+      margin: 0; }
     #panel .panel-button .app-menu-icon {
-      margin-left: 4px;
-      margin-right: 4px;
       -st-icon-style: symbolic; }
-    .unlock-screen #panel .panel-button, .login-screen #panel .panel-button {
-      color: white; }
-      .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active {
-        color: white; }
-  #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-    background-color: rgba(0, 0, 0, 0.01);
-    box-shadow: inset 0 -2px 0 0 #4187ff; }
-  #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
-    box-shadow: none; }
-    #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
-      background-color: rgba(0, 0, 0, 0.01);
-      box-shadow: inset 0 -2px 0 0 #4187ff; }
+    #panel .panel-button#panelActivities {
+      -natural-hpadding: 18px; }
+  #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
+    box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+    #panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
+      box-shadow: none; }
+      #panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
+        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
@@ -1255,6 +1265,10 @@ StScrollBar {
   #appMenu .label-shadow {
     color: transparent; }
 
+#appMenu .panel-status-menu-box {
+  padding: 0 6px;
+  spacing: 6px; }
+
 /* Activities Ripple */
 .ripple-box {
   background-color: rgba(243, 247, 255, 0.3);
@@ -1266,49 +1280,45 @@ StScrollBar {
     border-radius: 0 0 0 52px; }
 
 /* OVERVIEW */
-#overview {
-  spacing: 24px;
-  background-color: transparent; }
+.controls-manager, .secondary-monitor-workspaces {
+  spacing: 12px; }
+
+#overviewGroup {
+  background-color: #272a34; }
 
 .overview-controls {
   padding-bottom: 32px; }
 
 /* Window Picker */
 .window-picker {
-  spacing: 6px;
-  padding: 12px; }
-  .window-picker.external-monitor {
-    padding: 12px; }
-
-.window-clone-border {
-  border-width: 6px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.35);
-  border-radius: 7px;
-  box-shadow: inset 0 0 0 1px rgba(13, 14, 17, 0.2); }
+  spacing: 6px; }
 
 .window-caption {
   color: white;
   background-color: #303340;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 6px;
-  padding: 6px 12px;
-  font-weight: bold;
-  font-size: 12pt; }
+  border-radius: 99px;
+  padding: 6px 12px; }
 
 .window-close {
-  background-color: #2777ff;
-  color: #ffffff;
-  border: none;
-  border-radius: 18px;
+  background-color: #303340;
+  color: white;
+  border-radius: 21px;
   padding: 3px;
-  height: 24px;
-  width: 24px;
-  box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); }
+  height: 30px;
+  width: 30px;
+  box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5);
+  transition-duration: 300ms; }
+  .window-close StIcon {
+    icon-size: 24px; }
   .window-close:hover {
-    background-color: #4187ff; }
+    background-color: #51576b; }
   .window-close:active {
-    background-color: #0e67ff; }
+    color: rgba(255, 255, 255, 0.8);
+    background-color: #252831; }
+
+.workspace-background {
+  border-radius: 30px;
+  box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.3); }
 
 
 .search-entry {
@@ -1317,7 +1327,9 @@ StScrollBar {
   border-radius: 18px;
   color: rgba(238, 238, 236, 0.7);
   background-color: #23252e;
-  border-color: #0d0e11; }
+  border-color: #0d0e11;
+  margin-top: 12px;
+  margin-bottom: 6px; }
   
   .search-entry:hover {
     background-color: #2e313d;
@@ -1350,7 +1362,7 @@ StScrollBar {
 
 .search-section-content {
   background-color: rgba(59, 63, 78, 0.8);
-  border-radius: 13px;
+  border-radius: 19px;
   border: 1px solid rgba(255, 255, 255, 0.1);
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.3);
   text-shadow: 0 1px rgba(0, 0, 0, 0.2);
@@ -1387,12 +1399,73 @@ StScrollBar {
 .list-search-result .list-search-result-description {
   color: #b3b3b3; }
 
+/* Dash */
+#dash {
+  font-size: 8pt;
+  margin-top: 18px;
+  padding: 0 10px; }
+  #dash .placeholder {
+    background-image: none;
+    background-size: contain;
+    height: 32px; }
+  #dash .empty-dash-drop-target {
+    width: 32px;
+    height: 32px; }
+  #dash .overview-icon {
+    padding: 5px; }
+
+.dash-background {
+  background-color: #3b3b3b;
+  margin-bottom: 16px;
+  padding: 10px;
+  border-radius: 24px; }
+
+.dash-item-container .app-well-app, .show-apps {
+  padding: 10px 1.5px 26px; }
+
+.dash-separator {
+  width: 1px;
+  margin: 0 6.5px 16px;
+  background-color: rgba(255, 255, 255, 0.3); }
+
+.dash-label {
+  color: white;
+  background-color: #303340;
+  border-radius: 99px;
+  padding: 6px 12px;
+  text-align: center;
+  -y-offset: 12px; }
+
+.show-apps .overview-icon {
+  color: white; }
+
+.show-apps:hover .overview-icon, .show-apps:selected .overview-icon {
+  background-color: rgba(255, 255, 255, 0.1); }
+
+.show-apps:focus .overview-icon {
+  background-color: rgba(255, 255, 255, 0.3); }
+
+.show-apps:drop .overview-icon {
+  border: 2px solid #2777ff;
+  background-color: rgba(39, 119, 255, 0.2); }
+
+.show-apps:active .overview-icon, .show-apps:checked .overview-icon {
+  background-color: rgba(26, 28, 35, 0.5); }
+
+.show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
+  background-color: rgba(48, 51, 64, 0.5);
+  color: #eeeeec; }
+
 /* App Grid */
 .icon-grid {
-  row-spacing: 36px;
-  column-spacing: 36px;
+  row-spacing: 12px;
+  column-spacing: 12px;
   max-row-spacing: 72px;
-  max-column-spacing: 72px; }
+  max-column-spacing: 72px;
+  page-padding-top: 24px;
+  page-padding-bottom: 24px;
+  page-padding-left: 12px;
+  page-padding-right: 12px; }
 
 /* App Icons */
 .app-well-app .overview-icon,
@@ -1410,7 +1483,8 @@ StScrollBar {
 
 .app-well-app:drop .overview-icon,
 .grid-search-result:drop .overview-icon {
-  background-color: rgba(39, 119, 255, 0.85); }
+  border: 2px solid #2777ff;
+  background-color: rgba(39, 119, 255, 0.2); }
 
 .app-well-app:active .overview-icon, .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
@@ -1426,14 +1500,13 @@ StScrollBar {
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: rgba(48, 51, 64, 0.2);
-  border-radius: 9px; }
+  background-color: #3b3b3b;
+  border-radius: 12px; }
 
 .app-folder-dialog {
-  border-radius: 15px;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  background-color: rgba(26, 28, 35, 0.95);
-  padding: 12px; }
+  border-radius: 24px;
+  background-color: #3b3b3b;
+  padding: 12px 0px 12px 0px; }
   .app-folder-dialog .folder-name-container {
     padding: 24px 36px 0;
     spacing: 12px;
@@ -1455,22 +1528,19 @@ StScrollBar {
         icon-size: 16px; }
   .app-folder-dialog .icon-grid {
     row-spacing: 12px;
-    column-spacing: 30px; }
+    column-spacing: 30px;
+    page-padding-top: 0;
+    page-padding-bottom: 0;
+    page-padding-left: 0;
+    page-padding-right: 0; }
   .app-folder-dialog .page-indicators {
     margin-bottom: 18px; }
-    .app-folder-dialog .page-indicators .page-indicator {
-      padding: 15px 12px; }
 
 .app-folder-dialog-container {
   padding: 12px;
   width: 620px;
   height: 620px; }
 
-.app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px; }
-
 .app-well-app-running-dot {
   height: 5px;
   width: 5px;
@@ -1488,15 +1558,15 @@ StScrollBar {
   max-width: 27.25em; }
 
 .page-indicator {
-  padding: 15px 20px; }
+  padding: 6px 12px 0; }
   .page-indicator .page-indicator-icon {
     width: 10px;
     height: 10px;
     border-radius: 10px;
     background-color: white; }
 
-.all-apps {
-  padding: 0px 88px 10px 88px; }
+.apps-scroll-view {
+  padding: 0; }
 
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
@@ -1504,69 +1574,37 @@ StScrollBar {
   border-radius: 99px;
   icon-size: 48px; }
 
-/* Dash */
-#dash {
-  font-size: 9pt;
-  padding: 5px 0;
-  border-radius: 0 15px 15px 0;
-  border-left-width: 0; }
-  #dash:rtl {
-    border-radius: 15px 0 0 15px;
-    border-right-width: 0; }
-  #dash .placeholder {
-    background-image: none;
-    background-size: contain;
-    height: 32px; }
-  #dash .empty-dash-drop-target {
-    width: 32px;
-    height: 32px; }
+.page-navigation-hint {
+  width: 300px; }
+  .page-navigation-hint.dnd {
+    background: rgba(255, 255, 255, 0.1); }
+  .page-navigation-hint.next:ltr, .page-navigation-hint.previous:rtl {
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px; }
+  .page-navigation-hint.previous:ltr, .page-navigation-hint.next:rtl {
+    background-gradient-start: transparent;
+    background-gradient-end: rgba(255, 255, 255, 0.05);
+    background-gradient-direction: horizontal;
+    border-radius: 0px 15px 15px 0px; }
 
-.dash-item-container > StWidget {
-  padding: 5px 10px; }
-
-.dash-label {
-  background-color: rgba(48, 51, 64, 0.95);
-  border-radius: 7px;
-  border: none;
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
-  color: white;
-  padding: 6px 8px;
-  text-align: center;
-  -x-offset: 8px; }
-
-.show-apps .overview-icon {
-  color: white; }
-
-.show-apps:hover .overview-icon, .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.show-apps:focus .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3); }
-
-.show-apps:drop .overview-icon {
-  background-color: rgba(39, 119, 255, 0.85); }
-
-.show-apps:active .overview-icon, .show-apps:checked .overview-icon {
-  background-color: rgba(26, 28, 35, 0.5); }
-
-.show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
-  background-color: #1a1c23;
-  color: #eeeeec; }
+.page-navigation-arrow {
+  margin: 6px;
+  width: 24px;
+  height: 24px; }
 
 /* Workspace pager */
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 6px;
-  padding: 6px;
-  border-radius: 10px 0 0 10px;
-  border-right-width: 0; }
-  .workspace-thumbnails:rtl {
-    border-radius: 0 10px 10px 0;
-    border-left-width: 0; }
+  padding: 6px; }
+  .workspace-thumbnails .workspace-thumbnail {
+    border-radius: 3px; }
   .workspace-thumbnails .placeholder {
-    background-image: url("assets/dash-placeholder.svg");
+    background-image: url("assets/workspace-placeholder.svg");
     background-size: contain;
-    height: 24px; }
+    width: 18px; }
 
 .workspace-thumbnail-indicator {
   border: 3px solid #2777ff;
@@ -1600,12 +1638,17 @@ StScrollBar {
   background-size: contain;
   color: white;
   border-radius: 99px;
-  border: 2px white; }
+  icon-size: 4.36em; }
   .user-icon:hover {
     color: white; }
   .user-icon StIcon {
     background-color: rgba(255, 255, 255, 0.05);
-    border-radius: 99px; }
+    border-radius: 99px;
+    padding: 12px;
+    width: 2.725em;
+    height: 2.725em; }
+  .user-icon.user-avatar {
+    border: 2px white; }
 
 .user-widget.vertical .user-icon {
   icon-size: 6.54em; }
@@ -1616,13 +1659,6 @@ StScrollBar {
     width: 5.995em;
     height: 5.995em; }
 
-.user-widget.horizontal .user-icon {
-  icon-size: 4.36em; }
-  .user-widget.horizontal .user-icon StIcon {
-    padding: 12px;
-    width: 2.725em;
-    height: 2.725em; }
-
 .lightbox {
   background-color: black; }
 
@@ -1635,22 +1671,26 @@ StScrollBar {
 .caps-lock-warning-label {
   text-align: center;
   padding-bottom: 8px;
-  font-size: 10pt;
+  font-size: 9pt;
   color: #fd7d00; }
 
+/* Workspace animation */
+.workspace-animation {
+  background-color: #272a34; }
+
 /* Tiled window previews */
 .tile-preview {
   background-color: rgba(39, 119, 255, 0.5);
   border: 1px solid #2777ff; }
 
 .tile-preview-left.on-primary {
-  border-radius: 6px 0 0 0; }
+  border-radius: 9px 0 0 0; }
 
 .tile-preview-right.on-primary {
-  border-radius: 0 6px 0 0; }
+  border-radius: 0 9px 0 0; }
 
 .tile-preview-left.tile-preview-right.on-primary {
-  border-radius: 6px 6px 0 0; }
+  border-radius: 9px 9px 0 0; }
 
 /* On-screen Keyboard */
 #keyboard {
@@ -1673,12 +1713,12 @@ StScrollBar {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3);
   text-shadow: 0 1px rgba(0, 0, 0, 0.2);
   icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
-  font-size: 16pt;
+  font-size: 15pt;
   min-height: 1.2em;
   min-width: 1.2em;
   border-width: 1px;
   border-style: solid;
-  border-radius: 8px; }
+  border-radius: 11px; }
   .keyboard-key:focus {
     color: #eeeeec;
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
@@ -1751,7 +1791,7 @@ StScrollBar {
 
 .keyboard-subkeys {
   color: white;
-  -arrow-border-radius: 10px;
+  -arrow-border-radius: 16px;
   -arrow-background-color: #303340;
   -arrow-border-width: 1px;
   -arrow-border-color: #43495a;
@@ -1765,7 +1805,7 @@ StScrollBar {
     box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
-    border-radius: 5px; }
+    border-radius: 8px; }
     .keyboard-subkeys .keyboard-key:focus {
       color: #eeeeec;
       text-shadow: 0 1px rgba(0, 0, 0, 0.2);
@@ -1796,7 +1836,7 @@ StScrollBar {
   background-color: #2777ff; }
 
 .word-suggestions {
-  font-size: 14pt;
+  font-size: 13pt;
   spacing: 12px;
   min-height: 20pt; }
 
@@ -1806,11 +1846,11 @@ StScrollBar {
   spacing: 6px;
   padding: 4px;
   border: 1px solid rgba(255, 255, 255, 0.2);
-  border-radius: 5px;
+  border-radius: 8px;
   color: white; }
   #LookingGlassDialog > #Toolbar {
     border: none;
-    border-radius: 5px;
+    border-radius: 8px;
     background-color: #303340; }
   #LookingGlassDialog .labels {
     spacing: 6px; }
@@ -1867,7 +1907,7 @@ StScrollBar {
 .lg-obj-inspector-button {
   border: 1px solid black;
   padding: 4px;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .lg-obj-inspector-button:hover {
     border: 1px solid #ffffff; }
 
@@ -1881,7 +1921,7 @@ StScrollBar {
 .lg-extension {
   border: 1px solid #0d0d0d;
   background-color: #3b3f4e;
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 4px; }
 
 .lg-extension-name {
@@ -1893,7 +1933,7 @@ StScrollBar {
 #LookingGlassPropertyInspector {
   background: #303340;
   border: 1px solid black;
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 6px; }
 
 /* Login Dialog */
@@ -1901,38 +1941,47 @@ StScrollBar {
   padding-top: 24px;
   max-width: 23em; }
 
-.login-dialog {
+.login-dialog,
+.unlock-dialog {
   border: none;
   background-color: transparent; }
-  .login-dialog StEntry {
-    background-color: rgba(45, 44, 46, 0.5);
-    color: white; }
-  .login-dialog .modal-dialog-button-box {
+  .login-dialog StEntry,
+  .unlock-dialog StEntry {
+    background-color: #20232b;
+    color: #eeeeec; }
+  .login-dialog .modal-dialog-button-box,
+  .unlock-dialog .modal-dialog-button-box {
     spacing: 3px; }
-  .login-dialog .modal-dialog-button {
+  .login-dialog .modal-dialog-button,
+  .unlock-dialog .modal-dialog-button {
     padding: 4px 18px;
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-    background-color: #5b666a;
-    border-color: #5b666a;
-    color: #eeeeec; }
-    .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus {
-      background-color: #667478;
-      border-color: #667478; }
-    .login-dialog .modal-dialog-button:active {
+    background-color: #20232b;
+    border-color: #20232b;
+    color: white; }
+    .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus,
+    .unlock-dialog .modal-dialog-button:hover,
+    .unlock-dialog .modal-dialog-button:focus {
+      background-color: #323643;
+      border-color: #323643; }
+    .login-dialog .modal-dialog-button:active,
+    .unlock-dialog .modal-dialog-button:active {
       box-shadow: none;
-      background-color: #4f595d;
-      border-color: #4f595d; }
-    .login-dialog .modal-dialog-button:insensitive {
+      background-color: #1c1e25;
+      border-color: #1c1e25; }
+    .login-dialog .modal-dialog-button:insensitive,
+    .unlock-dialog .modal-dialog-button:insensitive {
       color: #888a8d;
       border-color: #0d0e11;
       background-color: #242731;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: #4f595d;
-      background-color: #4f595d;
-      color: rgba(238, 238, 236, 0.7); }
-    .login-dialog .modal-dialog-button:default {
+      border-color: #1c1e25;
+      background-color: #1c1e25;
+      color: rgba(255, 255, 255, 0.7); }
+    .login-dialog .modal-dialog-button:default,
+    .unlock-dialog .modal-dialog-button:default {
       color: #ffffff;
       background-color: #3681ff;
       border-color: #136aff;
@@ -1940,7 +1989,9 @@ StScrollBar {
       text-shadow: 0 1px rgba(0, 0, 0, 0.2);
       icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
       border-color: #2777ff; }
-      .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
+      .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus,
+      .unlock-dialog .modal-dialog-button:default:hover,
+      .unlock-dialog .modal-dialog-button:default:focus {
         color: #ffffff;
         background-color: #4187ff;
         border-color: #136aff;
@@ -1949,7 +2000,8 @@ StScrollBar {
         icon-shadow: 0 1px rgba(0, 0, 0, 0.2);
         background-color: #4187ff;
         border-color: #4187ff; }
-      .login-dialog .modal-dialog-button:default:active {
+      .login-dialog .modal-dialog-button:default:active,
+      .unlock-dialog .modal-dialog-button:default:active {
         color: #ffffff;
         background-color: #186eff;
         border-color: #0058ee;
@@ -1958,7 +2010,8 @@ StScrollBar {
         box-shadow: none;
         background-color: #0e67ff;
         border-color: #0e67ff; }
-      .login-dialog .modal-dialog-button:default:insensitive {
+      .login-dialog .modal-dialog-button:default:insensitive,
+      .unlock-dialog .modal-dialog-button:default:insensitive {
         color: #888a8d;
         border-color: #0d0e11;
         background-color: #242731;
@@ -1970,19 +2023,27 @@ StScrollBar {
         color: rgba(255, 255, 255, 0.7); }
   .login-dialog .cancel-button,
   .login-dialog .switch-user-button,
-  .login-dialog .login-dialog-session-list-button {
+  .login-dialog .login-dialog-session-list-button,
+  .unlock-dialog .cancel-button,
+  .unlock-dialog .switch-user-button,
+  .unlock-dialog .login-dialog-session-list-button {
     padding: 0;
     border-radius: 99px;
     width: 2.18em;
     height: 2.18em;
-    border-color: rgba(35, 37, 46, 0.3);
-    background-color: rgba(35, 37, 46, 0.3); }
+    border-color: #20232b;
+    background-color: #20232b; }
     .login-dialog .cancel-button StIcon,
     .login-dialog .switch-user-button StIcon,
-    .login-dialog .login-dialog-session-list-button StIcon {
+    .login-dialog .login-dialog-session-list-button StIcon,
+    .unlock-dialog .cancel-button StIcon,
+    .unlock-dialog .switch-user-button StIcon,
+    .unlock-dialog .login-dialog-session-list-button StIcon {
       icon-size: 1.09em; }
   .login-dialog .caps-lock-warning-label,
-  .login-dialog .login-dialog-message-warning {
+  .login-dialog .login-dialog-message-warning,
+  .unlock-dialog .caps-lock-warning-label,
+  .unlock-dialog .login-dialog-message-warning {
     color: white; }
 
 .login-dialog-logo-bin {
@@ -1998,10 +2059,6 @@ StScrollBar {
 .login-dialog-message {
   text-align: center; }
 
-.login-dialog-message-hint {
-  padding-top: 0;
-  padding-bottom: 20px; }
-
 .login-dialog-user-selection-box {
   padding: 100px 0px; }
 
@@ -2011,7 +2068,7 @@ StScrollBar {
     color: white; }
 
 .login-dialog-not-listed-label {
-  font-size: 10pt;
+  font-size: 9pt;
   font-weight: bold;
   color: #b3b3b3;
   padding-top: 1em; }
@@ -2029,7 +2086,7 @@ StScrollBar {
     border-right: 2px solid #2777ff; }
 
 .login-dialog-user-list-item {
-  border-radius: 9px;
+  border-radius: 12px;
   padding: 6px;
   color: #b3b3b3; }
   .login-dialog-user-list-item:ltr .user-widget {
@@ -2047,7 +2104,7 @@ StScrollBar {
   color: white; }
 
 .user-widget.horizontal .user-widget-label {
-  font-size: 13pt;
+  font-size: 12pt;
   font-weight: bold;
   padding-left: 15px; }
   .user-widget.horizontal .user-widget-label:ltr {
@@ -2058,11 +2115,15 @@ StScrollBar {
     text-align: right; }
 
 .user-widget.vertical .user-widget-label {
-  font-size: 16pt;
+  font-size: 15pt;
   text-align: center;
   font-weight: normal;
   padding-top: 16px; }
 
+.login-dialog-timed-login-indicator {
+  height: 2px;
+  background-color: #8e8e80; }
+
 .login-dialog-prompt-layout {
   padding-top: 24px;
   padding-bottom: 12px;
@@ -2074,7 +2135,7 @@ StScrollBar {
 
 .login-dialog-prompt-label {
   color: #cccccc;
-  font-size: 12pt;
+  font-size: 11pt;
   padding-top: 1em; }
 
 /* Screen Shield */
@@ -2112,7 +2173,7 @@ StScrollBar {
     border: none;
     background-color: rgba(48, 51, 64, 0.3);
     color: white;
-    border-radius: 10px; }
+    border-radius: 16px; }
     .unlock-dialog-notifications-container .notification.critical,
     .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
       background-color: rgba(48, 51, 64, 0.9); }
@@ -2133,7 +2194,7 @@ StScrollBar {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.6); }
 
 #lockDialogGroup {
-  background-color: #41494c; }
+  background-color: #272a34; }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
   background-color: rgba(35, 37, 46, 0.3); }
@@ -2147,14 +2208,15 @@ StScrollBar {
   font-weight: bold;
   background-color: #23252e;
   color: #eeeeec;
-  border: 1px solid #0d0e11; }
+  border: 1px solid #0d0e11;
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2); }
   .osd-window StIcon, .resize-popup StIcon, .switcher-list StIcon, .workspace-switcher-container StIcon {
-    color: white;
-    icon-shadow: rgba(0, 0, 0, 0.7) 0 1px 6px; }
+    color: #eeeeec;
+    icon-shadow: 0 0 6px rgba(0, 0, 0, 0.4); }
 
 .osd-window .level {
-  -barlevel-background-color: rgba(255, 255, 255, 0.1);
-  -barlevel-active-background-color: white; }
+  -barlevel-background-color: rgba(238, 238, 236, 0.1);
+  -barlevel-active-background-color: #eeeeec; }
 
 /* Slider */
 .slider {
@@ -2181,16 +2243,21 @@ StScrollBar {
 .check-box:focus:checked StBin {
   background-image: url("assets/checkbox-focused-dark.svg"); }
 
+/* Switches */
+.toggle-switch {
+  background-image: url("assets/toggle-off-dark.svg"); }
+  .toggle-switch:checked {
+    background-image: url("assets/toggle-on-dark.svg"); }
+
 /* App Switcher */
 .switcher-list .item-box:outlined {
   padding: 6px;
-  border: 3px solid #2777ff;
-  border-radius: 8px; }
+  border: 3px solid #2777ff; }
 
 .switcher-list .item-box:selected {
   background-color: #2777ff;
   color: #ffffff;
-  text-shadow: rgba(0, 0, 0, 0.9) 0 1px 2px; }
+  text-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); }
 
 /* Workspace Switcher */
 .ws-switcher-box {
@@ -2199,38 +2266,29 @@ StScrollBar {
 .workspace-switcher-container {
   padding: 7px; }
 
-.ws-switcher-active-up,
-.ws-switcher-active-down,
-.ws-switcher-active-left,
-.ws-switcher-active-right {
-  box-shadow: 0 0px 6px rgba(0, 0, 0, 0.5); }
-
 /* Window Picker */
-.window-clone-border {
-  border-color: rgba(255, 255, 255, 0.25); }
-
 .window-caption {
-  font-size: .9em;
   color: black;
   background-color: white;
-  border: none;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4); }
 
 .window-close {
   background-image: url("assets/close-window.svg");
   background-size: 32px;
   background-color: transparent;
-  border: 0;
   box-shadow: none;
   color: transparent;
   height: 32px;
-  width: 32px; }
+  width: 32px;
+  transition-duration: .2s; }
   .window-close:hover {
     background-image: url("assets/close-window-hover.svg");
     background-color: transparent; }
   .window-close:active {
     background-image: url("assets/close-window-active.svg");
-    background-color: transparent; }
+    background-color: transparent;
+    color: transparent;
+    transition-duration: 0s; }
 
 /* Tiled window previews */
 .tile-preview-left.on-primary,
@@ -2241,19 +2299,26 @@ StScrollBar {
 /* TOP BAR */
 #panel {
   background: rgba(35, 37, 46, 0.8);
-  text-shadow: rgba(0, 0, 0, 0.5) 0 1px 2px; }
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
   #panel .popup-menu-arrow {
     width: 0; }
   #panel StIcon {
-    icon-shadow: rgba(0, 0, 0, 0.5) 0 1px 2px; }
+    icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen, #panel:overview {
     background-color: transparent; }
     #panel.unlock-screen .panel-button, #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:checked, #panel.lock-screen .panel-button, #panel.lock-screen .panel-button:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:checked, #panel:overview .panel-button, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:focus, #panel:overview .panel-button:overview, #panel:overview .panel-button:checked {
       color: white; }
   #panel .panel-corner {
     -panel-corner-radius: 0; }
-  #panel .panel-button, #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:focus, #panel .panel-button:overview, #panel .panel-button:checked {
+  #panel .panel-button {
     color: white; }
+    #panel .panel-button:active, #panel .panel-button:focus, #panel .panel-button:overview, #panel .panel-button:checked {
+      color: white;
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+  #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
+    box-shadow: none; }
+    #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
   #panel #panelActivities.panel-button {
     margin-left: .4em; }
     #panel #panelActivities.panel-button StLabel {
@@ -2263,7 +2328,7 @@ StScrollBar {
       height: 1.5em;
       color: transparent; }
     #panel #panelActivities.panel-button:overview StLabel {
-      background-image: url("assets/view-grid-symbolic-checked.svg"); }
+      background-image: url("assets/view-grid-symbolic-dark.svg"); }
 
 /* Date/Time Menu */
 #calendarArea {
@@ -2280,7 +2345,7 @@ StScrollBar {
 .calendar {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2307,17 +2372,18 @@ StScrollBar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none; }
-
-/* Message list */
-.message-list {
-  width: 31.5em;
-  background: rgba(35, 37, 46, 0.7); }
+  .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
+    color: #eeeeec;
+    background-color: #383d4b; }
+  .calendar .calendar-today:active, .calendar .calendar-today:selected {
+    background: #2777ff;
+    color: #ffffff; }
 
 /* Events */
 .events-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2349,7 +2415,7 @@ StScrollBar {
 .world-clocks-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2380,7 +2446,7 @@ StScrollBar {
 .weather-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2411,10 +2477,11 @@ StScrollBar {
 /* Search */
 .search-entry {
   color: black;
-  font-weight: bold;
-  background-color: rgba(255, 255, 255, 0.2);
   text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9);
-  border-radius: 100px;
+  font-weight: bold;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 999px;
+  font-size: 1.1em;
   transition-duration: 200ms; }
   .search-entry StLabel.hint-text {
     color: white; }
@@ -2426,8 +2493,8 @@ StScrollBar {
     background-color: white;
     color: black;
     font-weight: normal;
-    text-shadow: none;
-    box-shadow: none; }
+    box-shadow: none;
+    text-shadow: none; }
     .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
@@ -2437,18 +2504,10 @@ StScrollBar {
     color: white;
     icon-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9); }
 
-.search-section .search-section-separator {
-  height: 1px;
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.search-section:last-child .search-section-separator {
-  background-color: transparent; }
-
 .search-section-content {
-  background-color: transparent;
-  border-radius: 0;
-  border: 0;
-  box-shadow: 0; }
+  background-color: rgba(255, 255, 255, 0.1);
+  box-shadow: none;
+  border: none; }
 
 .search-provider-icon .list-search-provider-content .list-search-provider-details {
   font-weight: bold; }
@@ -2461,39 +2520,31 @@ StScrollBar {
   border-color: transparent; }
   #dash .overview-icon StIcon {
     color: white;
-    icon-shadow: rgba(0, 0, 0, 0.7) 0 2px 6px; }
+    icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
+
+.dash-background {
+  background: rgba(255, 255, 255, 0.1); }
+
+.dash-separator {
+  background: rgba(255, 255, 255, 0.1); }
 
 .show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.2);
+  background-color: rgba(255, 255, 255, 0.1);
   color: black; }
 
-/* Workspace pager */
-.workspace-thumbnails {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
-  .workspace-thumbnails .placeholder {
-    background-image: none; }
-
 /* App Folders */
-.app-well-app.app-folder {
-  background-color: rgba(255, 255, 255, 0.2);
-  box-shadow: 0 2px 5px black; }
-  .app-well-app.app-folder:checked {
-    background: black; }
+.app-well-app.app-folder, .app-well-app.app-folder .overview-icon.overview-icon-with-label {
+  background-color: rgba(255, 255, 255, 0.1); }
+
+.app-well-app.app-folder:checked {
+  background: black; }
 
 .app-folder-dialog {
   background: black;
-  box-shadow: 0 0 20px black;
-  border: none; }
+  box-shadow: 0 0 20px black; }
   .app-folder-dialog .folder-name-container .edit-folder-button, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:active {
     background: white;
     color: black; }
 
-.panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px white;
-  color: black;
-  border-radius: 3px; }
-
-#panel:overview .panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px black;
-  color: white; }
+.app-folder-dialog-container {
+  width: 720px; }
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index b8b160e1..ac47a0ef 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -19,7 +19,7 @@
  */
 /* Global Values */
 stage {
-  font-size: 11pt;
+  font-size: 10pt;
   color: #5c616c; }
 
 /* Common Stylings */
@@ -31,18 +31,16 @@ stage {
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
   color: white;
   background-color: #303340;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 14px;
+  border-radius: 20px;
   padding: 12px; }
 
-.workspace-thumbnails, #dash {
+.workspace-thumbnails .workspace-thumbnail {
   color: white;
-  background-color: rgba(48, 51, 64, 0.8);
-  border: 1px solid rgba(255, 255, 255, 0.1); }
+  background-color: rgba(255, 255, 255, 0.1); }
 
-.show-apps .overview-icon, .app-well-app .overview-icon,
-.grid-search-result .overview-icon, .list-search-result, .search-provider-icon {
-  border-radius: 9px;
+.app-well-app .overview-icon,
+.grid-search-result .overview-icon, .show-apps .overview-icon, .list-search-result, .search-provider-icon {
+  border-radius: 12px;
   padding: 6px;
   border: 2px solid transparent;
   transition-duration: 100ms;
@@ -54,7 +52,7 @@ stage {
   border: 1px solid rgba(0, 0, 0, 0.6); }
 
 .app-folder-dialog .folder-name-container .edit-folder-button, .button {
-  border-radius: 5px;
+  border-radius: 8px;
   border-style: solid;
   border-width: 1px;
   min-height: 22px;
@@ -111,6 +109,11 @@ stage {
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
+  .modal-dialog .modal-dialog-linked-button:focus, .hotplug-notification-item:focus, .notification-banner .notification-button:focus {
+    color: #5c616c;
+    text-shadow: 0 1px rgba(255, 255, 255, 0.3);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
   .modal-dialog .modal-dialog-linked-button:hover, .hotplug-notification-item:hover, .notification-banner .notification-button:hover {
     color: #5c616c;
     background-color: white;
@@ -118,11 +121,6 @@ stage {
     box-shadow: none;
     text-shadow: 0 1px rgba(255, 255, 255, 0.3);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.3); }
-  .modal-dialog .modal-dialog-linked-button:focus, .hotplug-notification-item:focus, .notification-banner .notification-button:focus {
-    color: #5c616c;
-    text-shadow: 0 1px rgba(255, 255, 255, 0.3);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
-    box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
   .modal-dialog .modal-dialog-linked-button:active, .hotplug-notification-item:active, .notification-banner .notification-button:active {
     color: #5c616c;
     background-color: #f7f7f7;
@@ -131,12 +129,12 @@ stage {
     icon-shadow: none;
     box-shadow: none; }
   .modal-dialog .modal-dialog-linked-button:first-child, .hotplug-notification-item:first-child, .notification-banner .notification-button:first-child {
-    border-radius: 0 0 0 8px; }
+    border-radius: 0 0 0 14px; }
   .modal-dialog .modal-dialog-linked-button:last-child, .hotplug-notification-item:last-child, .notification-banner .notification-button:last-child {
     border-right-width: 0;
-    border-radius: 0 0 8px 0; }
+    border-radius: 0 0 14px 0; }
   .modal-dialog .modal-dialog-linked-button:first-child:last-child, .hotplug-notification-item:first-child:last-child, .notification-banner .notification-button:first-child:last-child {
-    border-radius: 0 0 8px 8px; }
+    border-radius: 0 0 14px 14px; }
 
 /* WIDGETS */
 .shell-link {
@@ -148,11 +146,11 @@ stage {
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
 .icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); }
+  icon-shadow: 0 1px 5px rgba(0, 0, 0, 0.8); }
 
 /* Entries */
 StEntry {
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 8px;
   border-width: 1px;
   color: #5c616c;
@@ -254,7 +252,7 @@ StScrollBar {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 9px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: #ffffff;
   -arrow-border-width: 1px;
   -arrow-border-color: #d9d9d9;
@@ -343,10 +341,10 @@ StScrollBar {
 
 /* Date/Time Menu */
 .clock-display-box {
-  spacing: 3px; }
+  spacing: 2px; }
   .clock-display-box .clock {
-    padding-left: 6px;
-    padding-right: 6px; }
+    padding-left: 12px;
+    padding-right: 12px; }
 
 #calendarArea {
   padding: 0; }
@@ -367,7 +365,7 @@ StScrollBar {
 .events-section-title {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -402,7 +400,7 @@ StScrollBar {
 .datemenu-today-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -431,17 +429,17 @@ StScrollBar {
     icon-shadow: none;
     box-shadow: none; }
   .datemenu-today-button .day-label {
-    font-size: 12pt;
+    font-size: 11pt;
     font-weight: bold; }
   .datemenu-today-button .date-label {
-    font-size: 18pt;
+    font-size: 17pt;
     font-weight: 1000; }
 
 /* Calendar */
 .calendar {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #5c616c;
   background-color: white;
@@ -480,13 +478,13 @@ StScrollBar {
     background-color: transparent;
     height: 32px;
     width: 32px;
-    border-radius: 5px; }
+    border-radius: 8px; }
     .calendar .pager-button:hover, .calendar .pager-button:focus {
       background-color: white; }
     .calendar .pager-button:active {
       background-color: #ededed; }
   .calendar .calendar-day-base {
-    font-size: 8pt;
+    font-size: 7pt;
     text-align: center;
     width: 32px;
     height: 32px;
@@ -503,7 +501,7 @@ StScrollBar {
     .calendar .calendar-day-base.calendar-day-heading {
       color: #737a88;
       margin-top: 1em;
-      font-size: 7pt; }
+      font-size: 6pt; }
   .calendar .calendar-day {
     border-width: 0; }
   .calendar .calendar-day-top {
@@ -534,7 +532,7 @@ StScrollBar {
   .calendar .calendar-other-month-day {
     color: rgba(92, 97, 108, 0.5); }
   .calendar .calendar-week-number {
-    font-size: 7pt;
+    font-size: 6pt;
     font-weight: bold;
     height: 1.8em;
     width: 2.3em;
@@ -547,7 +545,7 @@ StScrollBar {
 .events-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #5c616c;
   background-color: white;
@@ -586,13 +584,13 @@ StScrollBar {
   .events-button .event-time {
     color: #2d3035;
     font-feature-settings: "tnum";
-    font-size: 10pt; }
+    font-size: 9pt; }
 
 /* World clocks */
 .world-clocks-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #5c616c;
   background-color: white;
@@ -628,13 +626,13 @@ StScrollBar {
     font-weight: bold; }
   .world-clocks-button .world-clocks-city {
     color: #5c616c;
-    font-size: 11pt;
+    font-size: 10pt;
     font-weight: normal; }
   .world-clocks-button .world-clocks-time {
     font-weight: bold;
     color: #5c616c;
     font-feature-settings: "tnum";
-    font-size: 11pt; }
+    font-size: 10pt; }
     .world-clocks-button .world-clocks-time:ltr {
       text-align: right; }
     .world-clocks-button .world-clocks-time:rtl {
@@ -642,13 +640,13 @@ StScrollBar {
   .world-clocks-button .world-clocks-timezone {
     color: #2d3035;
     font-feature-settings: "tnum";
-    font-size: 10pt; }
+    font-size: 9pt; }
 
 /* Weather */
 .weather-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #5c616c;
   background-color: white;
@@ -685,14 +683,14 @@ StScrollBar {
     font-weight: bold; }
     .weather-button .weather-header.location {
       font-weight: normal;
-      font-size: 10pt; }
+      font-size: 9pt; }
   .weather-button .weather-grid {
     spacing-rows: 6px;
     spacing-columns: 12px; }
   .weather-button .weather-forecast-time {
     color: #161719;
     font-feature-settings: "tnum";
-    font-size: 9pt;
+    font-size: 8pt;
     font-weight: normal;
     padding-top: 0.2em;
     padding-bottom: 0.4em; }
@@ -724,7 +722,7 @@ StScrollBar {
 .message {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   color: #5c616c;
   background-color: white;
@@ -770,7 +768,7 @@ StScrollBar {
     padding: 0 8px; }
     .message .message-secondary-bin > .event-time {
       color: rgba(92, 97, 108, 0.5);
-      font-size: 9pt;
+      font-size: 8pt;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em; }
       .message .message-secondary-bin > .event-time:ltr {
@@ -791,7 +789,7 @@ StScrollBar {
 
 /* Media Controls */
 .message-media-control {
-  padding: 12px 24px;
+  padding: 12px 1.64em;
   color: #393c43; }
   .message-media-control:hover {
     background-color: white;
@@ -802,18 +800,18 @@ StScrollBar {
   .message-media-control:insensitive {
     color: black; }
   .message-media-control:last-child:ltr {
-    border-radius: 0 7px 7px 0; }
+    border-radius: 0 10px 10px 0; }
   .message-media-control:last-child:rtl {
-    border-radius: 7px 0 0 7px; }
+    border-radius: 10px 0 0 10px; }
 
 .media-message-cover-icon {
   icon-size: 2.18em !important;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .media-message-cover-icon.fallback {
     color: #34373d;
     background-color: #ffffff;
     border: 1px solid transparent;
-    border-radius: 5px;
+    border-radius: 8px;
     icon-size: 2.18em !important; }
 
 .candidate-popup-content {
@@ -826,7 +824,7 @@ StScrollBar {
 
 .candidate-box {
   padding: 0.3em 0.5em 0.3em 0.5em;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .candidate-box:selected, .candidate-box:hover {
     background-color: #2777ff;
     color: #ffffff; }
@@ -842,11 +840,11 @@ StScrollBar {
   padding: 4px; }
 
 .candidate-page-button-previous {
-  border-radius: 5px 0px 0px 5px;
+  border-radius: 8px 0px 0px 8px;
   border-right-width: 0; }
 
 .candidate-page-button-next {
-  border-radius: 0px 5px 5px 0px; }
+  border-radius: 0px 8px 8px 0px; }
 
 .candidate-page-button-icon {
   icon-size: 1em; }
@@ -859,7 +857,7 @@ StScrollBar {
     spacing: 0; }
 
 .summary-source-counter {
-  font-size: 10pt;
+  font-size: 9pt;
   font-weight: bold;
   height: 1.6em;
   width: 1.6em;
@@ -898,7 +896,7 @@ StScrollBar {
 
 .chat-meta-message {
   padding-left: 4px;
-  font-size: 9pt;
+  font-size: 8pt;
   font-weight: bold;
   color: #898f9b; }
   .chat-meta-message:rtl {
@@ -911,10 +909,10 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 12pt; }
+  font-size: 11pt; }
 
 .modal-dialog {
-  border-radius: 10px; }
+  border-radius: 16px; }
   .modal-dialog .modal-dialog-content-box {
     margin: 32px 40px;
     spacing: 32px;
@@ -956,7 +954,7 @@ StScrollBar {
         font-weight: bold; }
       .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description {
         color: #50555e;
-        font-size: 10pt; }
+        font-size: 9pt; }
 
 /* Run Dialog */
 .run-dialog .modal-dialog-content-box {
@@ -967,7 +965,7 @@ StScrollBar {
   width: 20em; }
 
 .run-dialog .run-dialog-description {
-  font-size: 10pt;
+  font-size: 9pt;
   text-align: center;
   color: #2d3035; }
 
@@ -997,7 +995,7 @@ StScrollBar {
 .prompt-dialog-info-label,
 .prompt-dialog-null-label {
   text-align: center;
-  font-size: 10pt; }
+  font-size: 9pt; }
 
 .prompt-dialog-error-label {
   color: #fd7d00; }
@@ -1033,6 +1031,14 @@ StScrollBar {
 .audio-selection-device-icon {
   icon-size: 4.36em; }
 
+/* Welcome dialog */
+.welcome-dialog-image {
+  background-image: url("assets/gnome-shell-start.svg");
+  background-size: contain;
+  /* Reasonable maximum dimensions */
+  height: 300px;
+  width: 300px; }
+
 /* Network Dialogs */
 .nm-dialog {
   max-height: 34em;
@@ -1068,7 +1074,7 @@ StScrollBar {
   background-color: #f7f7f7; }
 
 .nm-dialog-item {
-  font-size: 11pt;
+  font-size: 10pt;
   border-bottom: 1px solid #d9d9d9;
   padding: 12px;
   spacing: 0px; }
@@ -1127,7 +1133,7 @@ StScrollBar {
 
 .switcher-list .item-box {
   padding: 8px;
-  border-radius: 6px;
+  border-radius: 9px;
   border: 1px solid transparent; }
   .switcher-list .item-box:outlined {
     background-color: rgba(255, 255, 255, 0.3); }
@@ -1179,7 +1185,7 @@ StScrollBar {
   height: 50px;
   background-size: 32px;
   border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 8px; }
+  border-radius: 11px; }
 
 .ws-switcher-active-up,
 .ws-switcher-active-down,
@@ -1188,58 +1194,62 @@ StScrollBar {
   height: 52px;
   background-color: #2777ff;
   border: 1px solid #005efd;
-  border-radius: 8px;
+  border-radius: 11px;
   color: #ffffff; }
 
 /* Top Bar */
 #panel {
   background-color: #000;
   font-weight: bold;
-  height: 1.86em;
-  font-feature-settings: "tnum"; }
-  #panel.unlock-screen, #panel.login-screen {
+  height: 2.2em;
+  font-feature-settings: "tnum";
+  transition-duration: 250ms; }
+  #panel.unlock-screen, #panel.login-screen, #panel:overview {
     background-color: transparent; }
-    #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent; }
-  #panel #panelLeft, #panel #panelCenter {
-    spacing: 6px; }
+    #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel:overview .panel-corner {
+      -panel-corner-opacity: 0; }
   #panel .panel-corner {
-    -panel-corner-radius: 6px;
+    -panel-corner-radius: 9px;
     -panel-corner-background-color: #000;
     -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent; }
-    #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
-      -panel-corner-border-color: #4187ff; }
+    -panel-corner-border-color: transparent;
+    -panel-corner-opacity: 1;
+    transition-duration: 250ms; }
   #panel .panel-button {
     font-weight: bold;
-    color: #ccc;
+    color: #ddd;
     -natural-hpadding: 12px;
-    -minimum-hpadding: 6px; }
-    #panel .panel-button:hover {
-      color: white; }
-    #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-      color: white; }
+    -minimum-hpadding: 6px;
+    transition-duration: 150ms;
+    border: 3px solid transparent;
+    border-radius: 99px; }
+    #panel .panel-button.clock-display .clock {
+      transition-duration: 150ms;
+      border: 3px solid transparent;
+      border-radius: 99px; }
+    #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
+      #panel .panel-button:hover.clock-display, #panel .panel-button:active.clock-display, #panel .panel-button:overview.clock-display, #panel .panel-button:focus.clock-display, #panel .panel-button:checked.clock-display {
+        box-shadow: none; }
+        #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock {
+          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); }
     #panel .panel-button .system-status-icon {
       icon-size: 1.09em;
-      padding: 5px; }
+      padding: 5px;
+      margin: 0 4px; }
+    #panel .panel-button .panel-status-indicators-box .system-status-icon,
+    #panel .panel-button .panel-status-menu-box .system-status-icon {
+      margin: 0; }
     #panel .panel-button .app-menu-icon {
-      margin-left: 4px;
-      margin-right: 4px;
       -st-icon-style: symbolic; }
-    .unlock-screen #panel .panel-button, .login-screen #panel .panel-button {
-      color: #737a88; }
-      .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active {
-        color: #737a88; }
-  #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
-    background-color: rgba(0, 0, 0, 0.01);
-    box-shadow: inset 0 -2px 0 0 #4187ff; }
-  #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
-    box-shadow: none; }
-    #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
-      background-color: rgba(0, 0, 0, 0.01);
-      box-shadow: inset 0 -2px 0 0 #4187ff; }
+    #panel .panel-button#panelActivities {
+      -natural-hpadding: 18px; }
+  #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
+    box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
+    #panel.unlock-screen .panel-button:hover.clock-display, #panel.unlock-screen .panel-button:active.clock-display, #panel.unlock-screen .panel-button:overview.clock-display, #panel.unlock-screen .panel-button:focus.clock-display, #panel.unlock-screen .panel-button:checked.clock-display, #panel.login-screen .panel-button:hover.clock-display, #panel.login-screen .panel-button:active.clock-display, #panel.login-screen .panel-button:overview.clock-display, #panel.login-screen .panel-button:focus.clock-display, #panel.login-screen .panel-button:checked.clock-display, #panel:overview .panel-button:hover.clock-display, #panel:overview .panel-button:active.clock-display, #panel:overview .panel-button:overview.clock-display, #panel:overview .panel-button:focus.clock-display, #panel:overview .panel-button:checked.clock-display {
+      box-shadow: none; }
+      #panel.unlock-screen .panel-button:hover.clock-display .clock, #panel.unlock-screen .panel-button:active.clock-display .clock, #panel.unlock-screen .panel-button:overview.clock-display .clock, #panel.unlock-screen .panel-button:focus.clock-display .clock, #panel.unlock-screen .panel-button:checked.clock-display .clock, #panel.login-screen .panel-button:hover.clock-display .clock, #panel.login-screen .panel-button:active.clock-display .clock, #panel.login-screen .panel-button:overview.clock-display .clock, #panel.login-screen .panel-button:focus.clock-display .clock, #panel.login-screen .panel-button:checked.clock-display .clock, #panel:overview .panel-button:hover.clock-display .clock, #panel:overview .panel-button:active.clock-display .clock, #panel:overview .panel-button:overview.clock-display .clock, #panel:overview .panel-button:focus.clock-display .clock, #panel:overview .panel-button:checked.clock-display .clock {
+        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15); }
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
@@ -1254,6 +1264,10 @@ StScrollBar {
   #appMenu .label-shadow {
     color: transparent; }
 
+#appMenu .panel-status-menu-box {
+  padding: 0 6px;
+  spacing: 6px; }
+
 /* Activities Ripple */
 .ripple-box {
   background-color: rgba(243, 247, 255, 0.3);
@@ -1265,49 +1279,45 @@ StScrollBar {
     border-radius: 0 0 0 52px; }
 
 /* OVERVIEW */
-#overview {
-  spacing: 24px;
-  background-color: transparent; }
+.controls-manager, .secondary-monitor-workspaces {
+  spacing: 12px; }
+
+#overviewGroup {
+  background-color: #272a34; }
 
 .overview-controls {
   padding-bottom: 32px; }
 
 /* Window Picker */
 .window-picker {
-  spacing: 6px;
-  padding: 12px; }
-  .window-picker.external-monitor {
-    padding: 12px; }
-
-.window-clone-border {
-  border-width: 6px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.35);
-  border-radius: 7px;
-  box-shadow: inset 0 0 0 1px rgba(217, 217, 217, 0.2); }
+  spacing: 6px; }
 
 .window-caption {
   color: white;
   background-color: #303340;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 6px;
-  padding: 6px 12px;
-  font-weight: bold;
-  font-size: 12pt; }
+  border-radius: 99px;
+  padding: 6px 12px; }
 
 .window-close {
-  background-color: #2777ff;
-  color: #ffffff;
-  border: none;
-  border-radius: 18px;
+  background-color: #303340;
+  color: white;
+  border-radius: 21px;
   padding: 3px;
-  height: 24px;
-  width: 24px;
-  box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); }
+  height: 30px;
+  width: 30px;
+  box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5);
+  transition-duration: 300ms; }
+  .window-close StIcon {
+    icon-size: 24px; }
   .window-close:hover {
-    background-color: #4187ff; }
+    background-color: #51576b; }
   .window-close:active {
-    background-color: #0e67ff; }
+    color: rgba(255, 255, 255, 0.8);
+    background-color: #252831; }
+
+.workspace-background {
+  border-radius: 30px;
+  box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.3); }
 
 
 .search-entry {
@@ -1316,7 +1326,9 @@ StScrollBar {
   border-radius: 18px;
   color: rgba(92, 97, 108, 0.7);
   background-color: #ffffff;
-  border-color: #d9d9d9; }
+  border-color: #d9d9d9;
+  margin-top: 12px;
+  margin-bottom: 6px; }
   
   .search-entry:hover {
     background-color: #f7f7f7;
@@ -1349,7 +1361,7 @@ StScrollBar {
 
 .search-section-content {
   background-color: rgba(59, 63, 78, 0.8);
-  border-radius: 13px;
+  border-radius: 19px;
   border: 1px solid rgba(255, 255, 255, 0.1);
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
   text-shadow: 0 1px rgba(255, 255, 255, 0.2);
@@ -1386,12 +1398,73 @@ StScrollBar {
 .list-search-result .list-search-result-description {
   color: #b3b3b3; }
 
+/* Dash */
+#dash {
+  font-size: 8pt;
+  margin-top: 18px;
+  padding: 0 10px; }
+  #dash .placeholder {
+    background-image: none;
+    background-size: contain;
+    height: 32px; }
+  #dash .empty-dash-drop-target {
+    width: 32px;
+    height: 32px; }
+  #dash .overview-icon {
+    padding: 5px; }
+
+.dash-background {
+  background-color: #3b3b3b;
+  margin-bottom: 16px;
+  padding: 10px;
+  border-radius: 24px; }
+
+.dash-item-container .app-well-app, .show-apps {
+  padding: 10px 1.5px 26px; }
+
+.dash-separator {
+  width: 1px;
+  margin: 0 6.5px 16px;
+  background-color: rgba(255, 255, 255, 0.3); }
+
+.dash-label {
+  color: white;
+  background-color: #303340;
+  border-radius: 99px;
+  padding: 6px 12px;
+  text-align: center;
+  -y-offset: 12px; }
+
+.show-apps .overview-icon {
+  color: white; }
+
+.show-apps:hover .overview-icon, .show-apps:selected .overview-icon {
+  background-color: rgba(255, 255, 255, 0.1); }
+
+.show-apps:focus .overview-icon {
+  background-color: rgba(255, 255, 255, 0.3); }
+
+.show-apps:drop .overview-icon {
+  border: 2px solid #2777ff;
+  background-color: rgba(39, 119, 255, 0.2); }
+
+.show-apps:active .overview-icon, .show-apps:checked .overview-icon {
+  background-color: rgba(26, 28, 35, 0.5); }
+
+.show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
+  background-color: rgba(48, 51, 64, 0.5);
+  color: #5c616c; }
+
 /* App Grid */
 .icon-grid {
-  row-spacing: 36px;
-  column-spacing: 36px;
+  row-spacing: 12px;
+  column-spacing: 12px;
   max-row-spacing: 72px;
-  max-column-spacing: 72px; }
+  max-column-spacing: 72px;
+  page-padding-top: 24px;
+  page-padding-bottom: 24px;
+  page-padding-left: 12px;
+  page-padding-right: 12px; }
 
 /* App Icons */
 .app-well-app .overview-icon,
@@ -1409,7 +1482,8 @@ StScrollBar {
 
 .app-well-app:drop .overview-icon,
 .grid-search-result:drop .overview-icon {
-  background-color: rgba(39, 119, 255, 0.85); }
+  border: 2px solid #2777ff;
+  background-color: rgba(39, 119, 255, 0.2); }
 
 .app-well-app:active .overview-icon, .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
@@ -1425,14 +1499,13 @@ StScrollBar {
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: rgba(48, 51, 64, 0.2);
-  border-radius: 9px; }
+  background-color: #3b3b3b;
+  border-radius: 12px; }
 
 .app-folder-dialog {
-  border-radius: 15px;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  background-color: rgba(26, 28, 35, 0.95);
-  padding: 12px; }
+  border-radius: 24px;
+  background-color: #3b3b3b;
+  padding: 12px 0px 12px 0px; }
   .app-folder-dialog .folder-name-container {
     padding: 24px 36px 0;
     spacing: 12px;
@@ -1454,22 +1527,19 @@ StScrollBar {
         icon-size: 16px; }
   .app-folder-dialog .icon-grid {
     row-spacing: 12px;
-    column-spacing: 30px; }
+    column-spacing: 30px;
+    page-padding-top: 0;
+    page-padding-bottom: 0;
+    page-padding-left: 0;
+    page-padding-right: 0; }
   .app-folder-dialog .page-indicators {
     margin-bottom: 18px; }
-    .app-folder-dialog .page-indicators .page-indicator {
-      padding: 15px 12px; }
 
 .app-folder-dialog-container {
   padding: 12px;
   width: 620px;
   height: 620px; }
 
-.app-folder-icon {
-  padding: 6px;
-  spacing-rows: 6px;
-  spacing-columns: 6px; }
-
 .app-well-app-running-dot {
   height: 5px;
   width: 5px;
@@ -1487,15 +1557,15 @@ StScrollBar {
   max-width: 27.25em; }
 
 .page-indicator {
-  padding: 15px 20px; }
+  padding: 6px 12px 0; }
   .page-indicator .page-indicator-icon {
     width: 10px;
     height: 10px;
     border-radius: 10px;
     background-color: white; }
 
-.all-apps {
-  padding: 0px 88px 10px 88px; }
+.apps-scroll-view {
+  padding: 0; }
 
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
@@ -1503,69 +1573,37 @@ StScrollBar {
   border-radius: 99px;
   icon-size: 48px; }
 
-/* Dash */
-#dash {
-  font-size: 9pt;
-  padding: 5px 0;
-  border-radius: 0 15px 15px 0;
-  border-left-width: 0; }
-  #dash:rtl {
-    border-radius: 15px 0 0 15px;
-    border-right-width: 0; }
-  #dash .placeholder {
-    background-image: none;
-    background-size: contain;
-    height: 32px; }
-  #dash .empty-dash-drop-target {
-    width: 32px;
-    height: 32px; }
+.page-navigation-hint {
+  width: 300px; }
+  .page-navigation-hint.dnd {
+    background: rgba(255, 255, 255, 0.1); }
+  .page-navigation-hint.next:ltr, .page-navigation-hint.previous:rtl {
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px; }
+  .page-navigation-hint.previous:ltr, .page-navigation-hint.next:rtl {
+    background-gradient-start: transparent;
+    background-gradient-end: rgba(255, 255, 255, 0.05);
+    background-gradient-direction: horizontal;
+    border-radius: 0px 15px 15px 0px; }
 
-.dash-item-container > StWidget {
-  padding: 5px 10px; }
-
-.dash-label {
-  background-color: rgba(48, 51, 64, 0.95);
-  border-radius: 7px;
-  border: none;
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
-  color: white;
-  padding: 6px 8px;
-  text-align: center;
-  -x-offset: 8px; }
-
-.show-apps .overview-icon {
-  color: white; }
-
-.show-apps:hover .overview-icon, .show-apps:selected .overview-icon {
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.show-apps:focus .overview-icon {
-  background-color: rgba(255, 255, 255, 0.3); }
-
-.show-apps:drop .overview-icon {
-  background-color: rgba(39, 119, 255, 0.85); }
-
-.show-apps:active .overview-icon, .show-apps:checked .overview-icon {
-  background-color: rgba(26, 28, 35, 0.5); }
-
-.show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
-  background-color: #1a1c23;
-  color: #5c616c; }
+.page-navigation-arrow {
+  margin: 6px;
+  width: 24px;
+  height: 24px; }
 
 /* Workspace pager */
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 6px;
-  padding: 6px;
-  border-radius: 10px 0 0 10px;
-  border-right-width: 0; }
-  .workspace-thumbnails:rtl {
-    border-radius: 0 10px 10px 0;
-    border-left-width: 0; }
+  padding: 6px; }
+  .workspace-thumbnails .workspace-thumbnail {
+    border-radius: 3px; }
   .workspace-thumbnails .placeholder {
-    background-image: url("assets/dash-placeholder.svg");
+    background-image: url("assets/workspace-placeholder.svg");
     background-size: contain;
-    height: 24px; }
+    width: 18px; }
 
 .workspace-thumbnail-indicator {
   border: 3px solid #2777ff;
@@ -1599,12 +1637,17 @@ StScrollBar {
   background-size: contain;
   color: white;
   border-radius: 99px;
-  border: 2px white; }
+  icon-size: 4.36em; }
   .user-icon:hover {
     color: white; }
   .user-icon StIcon {
     background-color: rgba(255, 255, 255, 0.05);
-    border-radius: 99px; }
+    border-radius: 99px;
+    padding: 12px;
+    width: 2.725em;
+    height: 2.725em; }
+  .user-icon.user-avatar {
+    border: 2px white; }
 
 .user-widget.vertical .user-icon {
   icon-size: 6.54em; }
@@ -1615,13 +1658,6 @@ StScrollBar {
     width: 5.995em;
     height: 5.995em; }
 
-.user-widget.horizontal .user-icon {
-  icon-size: 4.36em; }
-  .user-widget.horizontal .user-icon StIcon {
-    padding: 12px;
-    width: 2.725em;
-    height: 2.725em; }
-
 .lightbox {
   background-color: black; }
 
@@ -1634,22 +1670,26 @@ StScrollBar {
 .caps-lock-warning-label {
   text-align: center;
   padding-bottom: 8px;
-  font-size: 10pt;
+  font-size: 9pt;
   color: #fd7d00; }
 
+/* Workspace animation */
+.workspace-animation {
+  background-color: #272a34; }
+
 /* Tiled window previews */
 .tile-preview {
   background-color: rgba(39, 119, 255, 0.5);
   border: 1px solid #2777ff; }
 
 .tile-preview-left.on-primary {
-  border-radius: 6px 0 0 0; }
+  border-radius: 9px 0 0 0; }
 
 .tile-preview-right.on-primary {
-  border-radius: 0 6px 0 0; }
+  border-radius: 0 9px 0 0; }
 
 .tile-preview-left.tile-preview-right.on-primary {
-  border-radius: 6px 6px 0 0; }
+  border-radius: 9px 9px 0 0; }
 
 /* On-screen Keyboard */
 #keyboard {
@@ -1672,12 +1712,12 @@ StScrollBar {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
   text-shadow: 0 1px rgba(255, 255, 255, 0.3);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
-  font-size: 16pt;
+  font-size: 15pt;
   min-height: 1.2em;
   min-width: 1.2em;
   border-width: 1px;
   border-style: solid;
-  border-radius: 8px; }
+  border-radius: 11px; }
   .keyboard-key:focus {
     color: #5c616c;
     text-shadow: 0 1px rgba(255, 255, 255, 0.3);
@@ -1750,7 +1790,7 @@ StScrollBar {
 
 .keyboard-subkeys {
   color: white;
-  -arrow-border-radius: 10px;
+  -arrow-border-radius: 16px;
   -arrow-background-color: #303340;
   -arrow-border-width: 1px;
   -arrow-border-color: #43495a;
@@ -1764,7 +1804,7 @@ StScrollBar {
     box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
     text-shadow: 0 1px rgba(255, 255, 255, 0.3);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
-    border-radius: 5px; }
+    border-radius: 8px; }
     .keyboard-subkeys .keyboard-key:focus {
       color: #5c616c;
       text-shadow: 0 1px rgba(255, 255, 255, 0.3);
@@ -1795,7 +1835,7 @@ StScrollBar {
   background-color: #2777ff; }
 
 .word-suggestions {
-  font-size: 14pt;
+  font-size: 13pt;
   spacing: 12px;
   min-height: 20pt; }
 
@@ -1805,11 +1845,11 @@ StScrollBar {
   spacing: 6px;
   padding: 4px;
   border: 1px solid rgba(255, 255, 255, 0.2);
-  border-radius: 5px;
+  border-radius: 8px;
   color: white; }
   #LookingGlassDialog > #Toolbar {
     border: none;
-    border-radius: 5px;
+    border-radius: 8px;
     background-color: #303340; }
   #LookingGlassDialog .labels {
     spacing: 6px; }
@@ -1866,7 +1906,7 @@ StScrollBar {
 .lg-obj-inspector-button {
   border: 1px solid black;
   padding: 4px;
-  border-radius: 5px; }
+  border-radius: 8px; }
   .lg-obj-inspector-button:hover {
     border: 1px solid #ffffff; }
 
@@ -1880,7 +1920,7 @@ StScrollBar {
 .lg-extension {
   border: 1px solid #0d0d0d;
   background-color: #3b3f4e;
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 4px; }
 
 .lg-extension-name {
@@ -1892,7 +1932,7 @@ StScrollBar {
 #LookingGlassPropertyInspector {
   background: #303340;
   border: 1px solid black;
-  border-radius: 5px;
+  border-radius: 8px;
   padding: 6px; }
 
 /* Login Dialog */
@@ -1900,35 +1940,43 @@ StScrollBar {
   padding-top: 24px;
   max-width: 23em; }
 
-.login-dialog {
+.login-dialog,
+.unlock-dialog {
   border: none;
   background-color: transparent; }
-  .login-dialog .modal-dialog-button-box {
+  .login-dialog .modal-dialog-button-box,
+  .unlock-dialog .modal-dialog-button-box {
     spacing: 3px; }
-  .login-dialog .modal-dialog-button {
+  .login-dialog .modal-dialog-button,
+  .unlock-dialog .modal-dialog-button {
     padding: 4px 18px;
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-    background-color: #5b666a;
-    border-color: #5b666a;
-    color: #5c616c; }
-    .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus {
-      background-color: #667478;
-      border-color: #667478; }
-    .login-dialog .modal-dialog-button:active {
+    background-color: #20232b;
+    border-color: #20232b;
+    color: white; }
+    .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus,
+    .unlock-dialog .modal-dialog-button:hover,
+    .unlock-dialog .modal-dialog-button:focus {
+      background-color: #323643;
+      border-color: #323643; }
+    .login-dialog .modal-dialog-button:active,
+    .unlock-dialog .modal-dialog-button:active {
       box-shadow: none;
-      background-color: #4f595d;
-      border-color: #4f595d; }
-    .login-dialog .modal-dialog-button:insensitive {
+      background-color: #1c1e25;
+      border-color: #1c1e25; }
+    .login-dialog .modal-dialog-button:insensitive,
+    .unlock-dialog .modal-dialog-button:insensitive {
       color: #aeb0b6;
       border-color: #d9d9d9;
       background-color: #fdfdfd;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: #4f595d;
-      background-color: #4f595d;
-      color: rgba(92, 97, 108, 0.7); }
-    .login-dialog .modal-dialog-button:default {
+      border-color: #1c1e25;
+      background-color: #1c1e25;
+      color: rgba(255, 255, 255, 0.7); }
+    .login-dialog .modal-dialog-button:default,
+    .unlock-dialog .modal-dialog-button:default {
       color: #ffffff;
       background-color: #3681ff;
       border-color: #004bca;
@@ -1936,7 +1984,9 @@ StScrollBar {
       text-shadow: 0 1px rgba(255, 255, 255, 0.3);
       icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
       border-color: #2777ff; }
-      .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
+      .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus,
+      .unlock-dialog .modal-dialog-button:default:hover,
+      .unlock-dialog .modal-dialog-button:default:focus {
         color: #ffffff;
         background-color: #5091ff;
         border-color: #0058ee;
@@ -1945,7 +1995,8 @@ StScrollBar {
         icon-shadow: 0 1px rgba(255, 255, 255, 0.3);
         background-color: #4187ff;
         border-color: #4187ff; }
-      .login-dialog .modal-dialog-button:default:active {
+      .login-dialog .modal-dialog-button:default:active,
+      .unlock-dialog .modal-dialog-button:default:active {
         color: #ffffff;
         background-color: #186eff;
         border-color: #004bca;
@@ -1954,7 +2005,8 @@ StScrollBar {
         box-shadow: none;
         background-color: #0e67ff;
         border-color: #0e67ff; }
-      .login-dialog .modal-dialog-button:default:insensitive {
+      .login-dialog .modal-dialog-button:default:insensitive,
+      .unlock-dialog .modal-dialog-button:default:insensitive {
         color: #aeb0b6;
         border-color: #d9d9d9;
         background-color: #fdfdfd;
@@ -1966,19 +2018,27 @@ StScrollBar {
         color: rgba(255, 255, 255, 0.7); }
   .login-dialog .cancel-button,
   .login-dialog .switch-user-button,
-  .login-dialog .login-dialog-session-list-button {
+  .login-dialog .login-dialog-session-list-button,
+  .unlock-dialog .cancel-button,
+  .unlock-dialog .switch-user-button,
+  .unlock-dialog .login-dialog-session-list-button {
     padding: 0;
     border-radius: 99px;
     width: 2.18em;
     height: 2.18em;
-    border-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.3); }
+    border-color: #20232b;
+    background-color: #20232b; }
     .login-dialog .cancel-button StIcon,
     .login-dialog .switch-user-button StIcon,
-    .login-dialog .login-dialog-session-list-button StIcon {
+    .login-dialog .login-dialog-session-list-button StIcon,
+    .unlock-dialog .cancel-button StIcon,
+    .unlock-dialog .switch-user-button StIcon,
+    .unlock-dialog .login-dialog-session-list-button StIcon {
       icon-size: 1.09em; }
   .login-dialog .caps-lock-warning-label,
-  .login-dialog .login-dialog-message-warning {
+  .login-dialog .login-dialog-message-warning,
+  .unlock-dialog .caps-lock-warning-label,
+  .unlock-dialog .login-dialog-message-warning {
     color: white; }
 
 .login-dialog-logo-bin {
@@ -1994,10 +2054,6 @@ StScrollBar {
 .login-dialog-message {
   text-align: center; }
 
-.login-dialog-message-hint {
-  padding-top: 0;
-  padding-bottom: 20px; }
-
 .login-dialog-user-selection-box {
   padding: 100px 0px; }
 
@@ -2007,7 +2063,7 @@ StScrollBar {
     color: white; }
 
 .login-dialog-not-listed-label {
-  font-size: 10pt;
+  font-size: 9pt;
   font-weight: bold;
   color: #b3b3b3;
   padding-top: 1em; }
@@ -2025,7 +2081,7 @@ StScrollBar {
     border-right: 2px solid #2777ff; }
 
 .login-dialog-user-list-item {
-  border-radius: 9px;
+  border-radius: 12px;
   padding: 6px;
   color: #b3b3b3; }
   .login-dialog-user-list-item:ltr .user-widget {
@@ -2043,7 +2099,7 @@ StScrollBar {
   color: white; }
 
 .user-widget.horizontal .user-widget-label {
-  font-size: 13pt;
+  font-size: 12pt;
   font-weight: bold;
   padding-left: 15px; }
   .user-widget.horizontal .user-widget-label:ltr {
@@ -2054,11 +2110,15 @@ StScrollBar {
     text-align: right; }
 
 .user-widget.vertical .user-widget-label {
-  font-size: 16pt;
+  font-size: 15pt;
   text-align: center;
   font-weight: normal;
   padding-top: 16px; }
 
+.login-dialog-timed-login-indicator {
+  height: 2px;
+  background-color: black; }
+
 .login-dialog-prompt-layout {
   padding-top: 24px;
   padding-bottom: 12px;
@@ -2070,7 +2130,7 @@ StScrollBar {
 
 .login-dialog-prompt-label {
   color: #cccccc;
-  font-size: 12pt;
+  font-size: 11pt;
   padding-top: 1em; }
 
 /* Screen Shield */
@@ -2108,7 +2168,7 @@ StScrollBar {
     border: none;
     background-color: rgba(48, 51, 64, 0.3);
     color: white;
-    border-radius: 10px; }
+    border-radius: 16px; }
     .unlock-dialog-notifications-container .notification.critical,
     .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
       background-color: rgba(48, 51, 64, 0.9); }
@@ -2129,7 +2189,7 @@ StScrollBar {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.6); }
 
 #lockDialogGroup {
-  background-color: #41494c; }
+  background-color: #272a34; }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
   background-color: rgba(255, 255, 255, 0.3); }
@@ -2143,10 +2203,11 @@ StScrollBar {
   font-weight: bold;
   background-color: #ffffff;
   color: #5c616c;
-  border: 1px solid rgba(0, 0, 0, 0.15); }
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2); }
   .osd-window StIcon, .resize-popup StIcon, .switcher-list StIcon, .workspace-switcher-container StIcon {
     color: black;
-    icon-shadow: rgba(0, 0, 0, 0.7) 0 1px 6px; }
+    icon-shadow: 0 0 6px rgba(0, 0, 0, 0.4); }
 
 .osd-window .level {
   -barlevel-background-color: rgba(0, 0, 0, 0.3);
@@ -2177,16 +2238,21 @@ StScrollBar {
 .check-box:focus:checked StBin {
   background-image: url("assets/checkbox-focused.svg"); }
 
+/* Switches */
+.toggle-switch {
+  background-image: url("assets/toggle-off.svg"); }
+  .toggle-switch:checked {
+    background-image: url("assets/toggle-on.svg"); }
+
 /* App Switcher */
 .switcher-list .item-box:outlined {
   padding: 6px;
-  border: 3px solid #2777ff;
-  border-radius: 8px; }
+  border: 3px solid #2777ff; }
 
 .switcher-list .item-box:selected {
   background-color: #2777ff;
   color: #ffffff;
-  text-shadow: rgba(0, 0, 0, 0.9) 0 1px 2px; }
+  text-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); }
 
 /* Workspace Switcher */
 .ws-switcher-box {
@@ -2195,38 +2261,29 @@ StScrollBar {
 .workspace-switcher-container {
   padding: 7px; }
 
-.ws-switcher-active-up,
-.ws-switcher-active-down,
-.ws-switcher-active-left,
-.ws-switcher-active-right {
-  box-shadow: 0 0px 6px rgba(0, 0, 0, 0.5); }
-
 /* Window Picker */
-.window-clone-border {
-  border-color: rgba(255, 255, 255, 0.25); }
-
 .window-caption {
-  font-size: .9em;
   color: black;
   background-color: white;
-  border: none;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4); }
 
 .window-close {
   background-image: url("assets/close-window.svg");
   background-size: 32px;
   background-color: transparent;
-  border: 0;
   box-shadow: none;
   color: transparent;
   height: 32px;
-  width: 32px; }
+  width: 32px;
+  transition-duration: .2s; }
   .window-close:hover {
     background-image: url("assets/close-window-hover.svg");
     background-color: transparent; }
   .window-close:active {
     background-image: url("assets/close-window-active.svg");
-    background-color: transparent; }
+    background-color: transparent;
+    color: transparent;
+    transition-duration: 0s; }
 
 /* Tiled window previews */
 .tile-preview-left.on-primary,
@@ -2237,19 +2294,26 @@ StScrollBar {
 /* TOP BAR */
 #panel {
   background: rgba(255, 255, 255, 0.8);
-  text-shadow: rgba(0, 0, 0, 0.5) 0 1px 2px; }
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
   #panel .popup-menu-arrow {
     width: 0; }
   #panel StIcon {
-    icon-shadow: rgba(0, 0, 0, 0.5) 0 1px 2px; }
+    icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen, #panel:overview {
     background-color: transparent; }
     #panel.unlock-screen .panel-button, #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:checked, #panel.lock-screen .panel-button, #panel.lock-screen .panel-button:hover, #panel.lock-screen .panel-button:active, #panel.lock-screen .panel-button:focus, #panel.lock-screen .panel-button:overview, #panel.lock-screen .panel-button:checked, #panel:overview .panel-button, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:focus, #panel:overview .panel-button:overview, #panel:overview .panel-button:checked {
       color: white; }
   #panel .panel-corner {
     -panel-corner-radius: 0; }
-  #panel .panel-button, #panel .panel-button:hover, #panel .panel-button:active, #panel .panel-button:focus, #panel .panel-button:overview, #panel .panel-button:checked {
+  #panel .panel-button {
     color: black; }
+    #panel .panel-button:active, #panel .panel-button:focus, #panel .panel-button:overview, #panel .panel-button:checked {
+      color: black;
+      box-shadow: inset 0 0 0 100px white; }
+  #panel .panel-button.clock-display:active, #panel .panel-button.clock-display:overview, #panel .panel-button.clock-display:focus, #panel .panel-button.clock-display:checked {
+    box-shadow: none; }
+    #panel .panel-button.clock-display:active .clock, #panel .panel-button.clock-display:overview .clock, #panel .panel-button.clock-display:focus .clock, #panel .panel-button.clock-display:checked .clock {
+      box-shadow: inset 0 0 0 100px white; }
   #panel #panelActivities.panel-button {
     margin-left: .4em; }
     #panel #panelActivities.panel-button StLabel {
@@ -2259,7 +2323,7 @@ StScrollBar {
       height: 1.5em;
       color: transparent; }
     #panel #panelActivities.panel-button:overview StLabel {
-      background-image: url("assets/view-grid-symbolic-checked.svg"); }
+      background-image: url("assets/view-grid-symbolic-dark.svg"); }
 
 /* Date/Time Menu */
 #calendarArea {
@@ -2276,7 +2340,7 @@ StScrollBar {
 .calendar {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2303,17 +2367,18 @@ StScrollBar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none; }
-
-/* Message list */
-.message-list {
-  width: 31.5em;
-  background: rgba(255, 255, 255, 0.7); }
+  .calendar .calendar-day-base:active, .calendar .calendar-day-base:selected {
+    color: #5c616c;
+    background-color: #e6e6e6; }
+  .calendar .calendar-today:active, .calendar .calendar-today:selected {
+    background: #2777ff;
+    color: #ffffff; }
 
 /* Events */
 .events-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2345,7 +2410,7 @@ StScrollBar {
 .world-clocks-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2376,7 +2441,7 @@ StScrollBar {
 .weather-button {
   border-width: 1px;
   border-style: solid;
-  border-radius: 7px;
+  border-radius: 10px;
   margin: 4px;
   border-color: transparent;
   background-color: transparent;
@@ -2407,10 +2472,11 @@ StScrollBar {
 /* Search */
 .search-entry {
   color: black;
-  font-weight: bold;
-  background-color: rgba(255, 255, 255, 0.2);
   text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9);
-  border-radius: 100px;
+  font-weight: bold;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 999px;
+  font-size: 1.1em;
   transition-duration: 200ms; }
   .search-entry StLabel.hint-text {
     color: white; }
@@ -2422,8 +2488,8 @@ StScrollBar {
     background-color: white;
     color: black;
     font-weight: normal;
-    text-shadow: none;
-    box-shadow: none; }
+    box-shadow: none;
+    text-shadow: none; }
     .search-entry:focus StLabel.hint-text, .search-entry:hover StLabel.hint-text {
       color: black; }
     .search-entry:focus .search-entry-icon, .search-entry:hover .search-entry-icon {
@@ -2433,18 +2499,10 @@ StScrollBar {
     color: white;
     icon-shadow: 0px 1px 2px rgba(0, 0, 0, 0.9); }
 
-.search-section .search-section-separator {
-  height: 1px;
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.search-section:last-child .search-section-separator {
-  background-color: transparent; }
-
 .search-section-content {
-  background-color: transparent;
-  border-radius: 0;
-  border: 0;
-  box-shadow: 0; }
+  background-color: rgba(255, 255, 255, 0.1);
+  box-shadow: none;
+  border: none; }
 
 .search-provider-icon .list-search-provider-content .list-search-provider-details {
   font-weight: bold; }
@@ -2457,39 +2515,31 @@ StScrollBar {
   border-color: transparent; }
   #dash .overview-icon StIcon {
     color: white;
-    icon-shadow: rgba(0, 0, 0, 0.7) 0 2px 6px; }
+    icon-shadow: 0 2px 6px rgba(0, 0, 0, 0.4); }
+
+.dash-background {
+  background: rgba(255, 255, 255, 0.1); }
+
+.dash-separator {
+  background: rgba(255, 255, 255, 0.1); }
 
 .show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
-  background-color: rgba(255, 255, 255, 0.2);
+  background-color: rgba(255, 255, 255, 0.1);
   color: black; }
 
-/* Workspace pager */
-.workspace-thumbnails {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
-  .workspace-thumbnails .placeholder {
-    background-image: none; }
-
 /* App Folders */
-.app-well-app.app-folder {
-  background-color: rgba(255, 255, 255, 0.2);
-  box-shadow: 0 2px 5px black; }
-  .app-well-app.app-folder:checked {
-    background: black; }
+.app-well-app.app-folder, .app-well-app.app-folder .overview-icon.overview-icon-with-label {
+  background-color: rgba(255, 255, 255, 0.1); }
+
+.app-well-app.app-folder:checked {
+  background: black; }
 
 .app-folder-dialog {
   background: black;
-  box-shadow: 0 0 20px black;
-  border: none; }
+  box-shadow: 0 0 20px black; }
   .app-folder-dialog .folder-name-container .edit-folder-button, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:active {
     background: white;
     color: black; }
 
-.panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px white;
-  color: black;
-  border-radius: 3px; }
-
-#panel:overview .panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px black;
-  color: white; }
+.app-folder-dialog-container {
+  width: 720px; }
diff --git a/src/themes/Kali/sass/common/_colors.scss b/src/themes/Kali/sass/common/_colors.scss
index 9e4bca03..ffdc612a 100644
--- a/src/themes/Kali/sass/common/_colors.scss
+++ b/src/themes/Kali/sass/common/_colors.scss
@@ -51,6 +51,7 @@ $panel_fg: if($variant=='light', darken($fg_color, 10%), $fg_color);
 
 $tooltip_borders_color: $osd_outer_borders_color;
 $shadow_color: transparentize(black, if($variant == 'light', 0.9, 0.7));
+$system_bg_color: $_dark_base_color;
 
 $drop_target_color: #19a187;
 
diff --git a/src/themes/Kali/sass/gnome-shell-dark.scss b/src/themes/Kali/sass/gnome-shell-dark.scss
index e7972d82..960b986e 100644
--- a/src/themes/Kali/sass/gnome-shell-dark.scss
+++ b/src/themes/Kali/sass/gnome-shell-dark.scss
@@ -5,4 +5,3 @@ $variant: 'dark';
 @import "gnome-shell/upstream/gnome-shell-sass/_common";
 @import "gnome-shell/upstream/gnome-shell-sass/_widgets";
 @import "gnome-shell/_common-tweaks";
-@import 'gnome-shell/_extensions';
diff --git a/src/themes/Kali/sass/gnome-shell.scss b/src/themes/Kali/sass/gnome-shell.scss
index 9ff9caf1..2190e8bb 100644
--- a/src/themes/Kali/sass/gnome-shell.scss
+++ b/src/themes/Kali/sass/gnome-shell.scss
@@ -5,4 +5,3 @@ $variant: 'light';
 @import "gnome-shell/upstream/gnome-shell-sass/_common";
 @import "gnome-shell/upstream/gnome-shell-sass/_widgets";
 @import "gnome-shell/_common-tweaks";
-@import 'gnome-shell/_extensions';
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index b9c3c32f..30235690 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -1,18 +1,18 @@
-$overview_transparent_bg: transparentize(white, .8);
+$overview_transparent_bg: transparentize(white, .9);
 $dialog_box_shadow: 0 2px 8px 0 transparentize(black, .6);
 
-
 /* OSD */
-$_osd_color: if($variant=='light', black, white);
+$_osd_color: if($variant=='light', black, $fg_color);
 %osd_panel {
   font-weight: bold;
   background-color: $bg_color;
   color: $fg_color;
   border: 1px solid if($variant=='light', transparentize(black, 0.85), $borders_color);
+  box-shadow: 0 4px 10px transparentize(black, .8);
 
   StIcon {
     color: $_osd_color;
-    icon-shadow: transparentize(black, .3) 0 1px 6px;
+    icon-shadow: 0 0 6px transparentize(black, .6);
   }
 }
 
@@ -26,24 +26,24 @@ $_osd_color: if($variant=='light', black, white);
 /* Slider */
 
 .slider {
-    height: 1.1em;
-    -barlevel-height: .35em;
-    -barlevel-background-color: $borders_color;
-    -barlevel-border-color: $selected_bg_color;
-    -barlevel-active-background-color: $selected_bg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 0.1em;
-    -barlevel-border-width: 0;
+  height: 1.1em;
+  -barlevel-height: .35em;
+  -barlevel-background-color: $borders_color;
+  -barlevel-border-color: $selected_bg_color;
+  -barlevel-active-background-color: $selected_bg_color;
+  -barlevel-overdrive-color: $destructive_color;
+  -barlevel-overdrive-separator-width: 0.1em;
+  -barlevel-border-width: 0;
 
-    -slider-handle-radius: 0;
+  -slider-handle-radius: 0;
 }
 
 /* Check Boxes */
 
 .check-box {
   StBin {
-     background-image: if($variant == 'light', url("assets/checkbox-off.svg"), 
-                                               url("assets/checkbox-off-dark.svg"));
+    background-image: if($variant == 'light', url("assets/checkbox-off.svg"), 
+                                              url("assets/checkbox-off-dark.svg"));
   }
 
   &:focus StBin { background-image: if($variant == 'light', url("assets/checkbox-off-focused.svg"),
@@ -54,6 +54,16 @@ $_osd_color: if($variant=='light', black, white);
                                                                     url("assets/checkbox-focused-dark.svg")); }
 }
 
+/* Switches */
+.toggle-switch {
+  background-image: if($variant == 'light', url("assets/toggle-off.svg"), 
+                                            url("assets/toggle-off-dark.svg"));
+  &:checked {
+    background-image: if($variant == 'light', url("assets/toggle-on.svg"), 
+                                              url("assets/toggle-on-dark.svg"));
+  }
+}
+
 /* App Switcher */
 // switcher onscreen panel
 .switcher-list {
@@ -61,13 +71,12 @@ $_osd_color: if($variant=='light', black, white);
     &:outlined {
       padding: 6px;
       border: 3px solid $selected_bg_color;
-      border-radius: 8px;
     }
 
     &:selected {
       background-color: $selected_bg_color;
       color: $selected_fg_color;
-      text-shadow: transparentize(black, 0.1) 0 1px 2px;
+      text-shadow: 0 1px 4px transparentize(black, 0.6);
     }
   }
 }
@@ -82,20 +91,15 @@ $_osd_color: if($variant=='light', black, white);
 .ws-switcher-active-down,
 .ws-switcher-active-left,
 .ws-switcher-active-right {
-  box-shadow: 0 0px 6px transparentize(black, .5);
+  //box-shadow: 0 0px 6px transparentize(black, .5);
 }
 
 /* Window Picker */
 
-// Borders on window thumbnails
-.window-clone-border { border-color: transparentize(white, .75); }
-
 // Window titles
 .window-caption {
-  font-size: .9em;
   color: black;
   background-color: white;
-  border: none;
   box-shadow: $dialog_box_shadow;
 }
 
@@ -104,11 +108,11 @@ $_osd_color: if($variant=='light', black, white);
   background-image: url("assets/close-window.svg");
   background-size: 32px;
   background-color: transparent;
-  border: 0;
   box-shadow: none;
   color: transparent;
   height: 32px;
   width: 32px;
+  transition-duration: .2s;
 
   &:hover {
     background-image: url("assets/close-window-hover.svg");
@@ -118,6 +122,8 @@ $_osd_color: if($variant=='light', black, white);
   &:active {
     background-image: url("assets/close-window-active.svg");
     background-color: transparent;
+    color: transparent;
+    transition-duration: 0s;
   }
 }
 
@@ -131,7 +137,7 @@ $_osd_color: if($variant=='light', black, white);
 #panel {
   $_panel_bg: transparentize($bg_color, .2);
   $_panel_fg: if($variant=='light', black, white);
-  $_panel_text_shadow: transparentize(black, .5) 0 1px 2px;
+  $_panel_text_shadow: 0 1px 2px transparentize(black, 0.5);
   background: $_panel_bg;
   text-shadow: $_panel_text_shadow;
 
@@ -152,8 +158,21 @@ $_osd_color: if($variant=='light', black, white);
   .panel-corner { -panel-corner-radius: 0; }
 
   .panel-button {
-    &, &:hover, &:active, &:focus, &:overview, &:checked {
+    color: $_panel_fg;
+    &:active, &:focus, &:overview, &:checked {
       color: $_panel_fg;
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, if($variant == 'light', 1, .2));
+    }
+  }
+
+  .panel-button.clock-display {
+    // Move highlight from .panel-button to .clock
+    &:active, &:overview, &:focus, &:checked {
+      box-shadow: none;
+
+      .clock {
+        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, if($variant == 'light', 1, .2));
+      }
     }
   }
 
@@ -161,7 +180,7 @@ $_osd_color: if($variant=='light', black, white);
     margin-left: .4em;
     StLabel {
       background-image: if($variant == 'light', url("assets/view-grid-symbolic.svg"),
-                                                url("assets/view-grid-symbolic-dark.svg"));
+                                          url("assets/view-grid-symbolic-dark.svg"));
       background-size: contain;
       width: 1.5em;
       height: 1.5em;
@@ -169,13 +188,12 @@ $_osd_color: if($variant=='light', black, white);
     }
 
     &:overview StLabel {
-      background-image: url("assets/view-grid-symbolic-checked.svg");
+      background-image: url("assets/view-grid-symbolic-dark.svg");
     }
   }
 }
 
 /* Date/Time Menu */
-
 // overall menu
 #calendarArea {
   background-image: if($variant == 'light', url("assets/kali-dragon.svg"),
@@ -192,12 +210,22 @@ $_osd_color: if($variant=='light', black, white);
   }
 }
 
-.calendar { @include notification_bubble($flat: true); }
+.calendar {
+  @include notification_bubble($flat: true);
 
-/* Message list */
-.message-list {
-  width: 31.5em;
-  background: transparentize($bg_color, .3);
+  .calendar-day-base {
+    &:active, &:selected {
+      color: $fg_color;
+      background-color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 10%));
+    }
+  }
+
+  .calendar-today {
+    &:active, &:selected {
+      background: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+  }
 }
 
 /* Events */
@@ -219,10 +247,11 @@ $_osd_color: if($variant=='light', black, white);
 // search entry
 .search-entry {
   color: black;
+  text-shadow: 0px 1px 2px rgba(black, 0.9);
   font-weight: bold;
   background-color: $overview_transparent_bg;
-  text-shadow: 0px 1px 2px rgba(black, 0.9);
-  border-radius: 100px;
+  border-radius: 999px;
+  font-size: 1.1em;
   transition-duration: 200ms;
 
   StLabel.hint-text { color: $osd_fg_color; }
@@ -237,8 +266,8 @@ $_osd_color: if($variant=='light', black, white);
     background-color: white;
     color: black;
     font-weight: normal;
-    text-shadow: none;
     box-shadow: none;
+    text-shadow: none;
 
     StLabel.hint-text { color: black; }
 
@@ -255,22 +284,10 @@ $_osd_color: if($variant=='light', black, white);
 }
 
 // search results
-.search-section {
-  // separator
-  .search-section-separator {
-    height: 1px;
-    background-color: $osd_outer_borders_color;
-  }
-
-  &:last-child .search-section-separator { background-color: transparent; }
-}
-
-// content
 .search-section-content {
-  background-color: transparent;
-  border-radius: 0;
-  border: 0;
-  box-shadow: 0;
+  background-color: $overview_transparent_bg;
+  box-shadow: none;
+  border: none;
 }
 
 // search result provider
@@ -290,10 +307,17 @@ $_osd_color: if($variant=='light', black, white);
 
   .overview-icon StIcon {
     color: white;
-    icon-shadow: transparentize(black, .3) 0 2px 6px;
+    icon-shadow: 0 2px 6px transparentize(black, .6);
   }
 }
 
+.dash-background {
+  background: $overview_transparent_bg;
+  //box-shadow: 0 2px 8px 0 transparentize(black, .2);
+}
+
+.dash-separator { background: $overview_transparent_bg; }
+
 .show-apps {
   &:focus,
   &:checked {
@@ -304,35 +328,28 @@ $_osd_color: if($variant=='light', black, white);
   }
 }
 
-/* Workspace pager */
-// thumbnails in overview
-.workspace-thumbnails {
-  background-color: transparentize(black, .8);
-  border: none;
-
-  .placeholder { background-image: none; }
-}
-
 /* App Folders */
 .app-well-app.app-folder {
-    background-color: $overview_transparent_bg;
-    box-shadow: 0 2px 5px black;
+  &, & .overview-icon.overview-icon-with-label {
+      background-color: $overview_transparent_bg
+  }
+  //box-shadow: 0 2px 5px black;
 
-    &:checked { background: black; }
+  &:checked { background: black; }
 }
 
 .app-folder-dialog {
-    background: black;
-    box-shadow: 0 0 20px black;
-    border: none;
+  background: black;
+  box-shadow: 0 0 20px black;
 
-    & .folder-name-container {
-        & .edit-folder-button {
-            &, &:hover, &:active {
-                background: white;
-                color: black;
-            }
-        }
-    }
+  & .folder-name-container {
+      & .edit-folder-button {
+          &, &:hover, &:active {
+              background: white;
+              color: black;
+          }
+      }
+  }
 }
 
+.app-folder-dialog-container { width: 720px; }
diff --git a/src/themes/Kali/sass/gnome-shell/_extensions.scss b/src/themes/Kali/sass/gnome-shell/_extensions.scss
deleted file mode 100644
index 0e85dbaf..00000000
--- a/src/themes/Kali/sass/gnome-shell/_extensions.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'extensions/workspace-indicator';
diff --git a/src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss b/src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss
deleted file mode 100644
index 8d6ffe96..00000000
--- a/src/themes/Kali/sass/gnome-shell/extensions/workspace-indicator.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px white; // Dirty trick to override hardcoded background color
-  color: black;
-  border-radius: 3px;
-}
-
-#panel:overview .panel-workspace-indicator {
-  box-shadow: inset 0 0 0 100px black;
-  color: white;
-}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss
index 64197802..a9f95c4b 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss
@@ -15,3 +15,28 @@ stage {
 	background-image: url("assets/toggle-off-hc.svg");
 	&:checked { background-image: url("assets/toggle-on-hc.svg"); }
 }
+
+//force opaque panel
+#panel {
+  &.login-screen,
+  &.unlock-screen,
+  &:overview {
+    background-color: #000;
+
+    .panel-corner {
+      -panel-corner-opacity: 1;
+    }
+  }
+
+  .panel-button {
+    color: #fff !important;
+  }
+}
+
+//thumbnail app icons no dropshadow and forced color
+.window-picker .icon-dropshadow {
+  icon-shadow: none;
+  background-color: $osd_bg_color;
+  padding: $base_padding * 2;
+  border-radius: $modal_radius;
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss
new file mode 100644
index 00000000..9d8f72f2
--- /dev/null
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss
@@ -0,0 +1,44 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+$base_color: if($variant == 'light', #fff, lighten(desaturate(#241f31, 20%), 2%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+
+$selected_fg_color: #fff;
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
+$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #ff8080;
+$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
+$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_text_color: white;
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.84);
+
+$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
+$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: mix($borders_color, $base_color, 60%);
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
index d6480976..de98729f 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
@@ -31,7 +31,7 @@ $base_margin: 4px;
 $base_spacing: 6px;
 
 // border radii
-$base_border_radius: 5px;
+$base_border_radius: 8px;
 
 $modal_radius:$base_border_radius * 2;
 
@@ -50,7 +50,7 @@ $active_fg_color: darken($fg_color,if($variant=='light', 5%, 3%));
 $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
 
 // fonts
-$base_font_size: 11;
+$base_font_size: 10;
 $text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
 
 // icons
@@ -76,17 +76,16 @@ stage {
 %osd_panel {
   color: $osd_fg_color;
   background-color: $osd_bg_color;
-  border: 1px solid $osd_outer_borders_color;
+  //border: 1px solid $osd_outer_borders_color;
   border-radius: $base_border_radius * 2 + 4px;
   padding: $base_padding * 2;
 }
 
-// Overview panels 
+// Overview panels
 // for the dash and workspace switcher
 %overview_panel {
   color: $osd_fg_color;
-  background-color: transparentize($osd_bg_color, 0.2);
-  border: 1px solid $osd_outer_borders_color;
+  background-color: transparentize($osd_fg_color, 0.9);
 }
 
 // icon tiles
@@ -130,8 +129,8 @@ stage {
   border-bottom-width: 0;
 
   &:insensitive { @include button(insensitive, $shadow: none); }
-  &:hover { @include button(hover, $shadow: none); }
   &:focus { @include button(focus, $shadow: none); }
+  &:hover { @include button(hover, $shadow: none); }
   &:active { @include button(active, $shadow: none); }
 
   // radius is 2 pixel less to fit in bubble
@@ -143,7 +142,7 @@ stage {
     border-right-width: 0;
     border-radius: 0 0 $modal_radius - 2px 0;
   }
-  
+
   &:first-child:last-child {
     border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
   }
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch
new file mode 100644
index 00000000..b4ec55b8
--- /dev/null
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch
@@ -0,0 +1,4 @@
+53c53
+< $base_font_size: 11;
+---
+> $base_font_size: 10;
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
index 54ff9d4a..d5d959f0 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss
@@ -218,7 +218,8 @@
 
   &:drop {
     .overview-icon {
-      background-color: transparentize($selected_bg_color, .15);
+      border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
+      background-color: transparentize($selected_bg_color, .8);
     }
   }
 
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_high-contrast-colors.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_high-contrast-colors.scss
new file mode 100644
index 00000000..71017936
--- /dev/null
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_high-contrast-colors.scss
@@ -0,0 +1,41 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: #222;
+$bg_color: #000;
+$fg_color: #fff;
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: darken(#4a90d9,20%);
+$selected_borders_color: darken($selected_bg_color, 20%);
+$borders_color: darken($bg_color,12%);
+$borders_edge: transparentize($fg_color, 0.9);
+$link_color: lighten($selected_bg_color,20%);
+$link_visited_color: lighten($selected_bg_color,10%);
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: darken(#73d216,10%);
+$destructive_color: darken(#ef2929,10%);
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: rgba(0,0,0, 0.7);
+$osd_outer_borders_color: rgba(255,255,255, 0.1);
+
+$shadow_color: rgba(0,0,0, 0.1);
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: lighten($base_color,1%);
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss
index 87dab2ad..a8d0aa9f 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss
@@ -37,8 +37,8 @@
 @import 'widgets/window-picker';
 @import 'widgets/search-entry';
 @import 'widgets/search-results';
-@import 'widgets/app-grid';
 @import 'widgets/dash';
+@import 'widgets/app-grid';
 @import 'widgets/workspace-thumbnails';
 // A11y / misc
 @import 'widgets/a11y';
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
index c183cfeb..626925ab 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
@@ -4,10 +4,14 @@ $app_icon_size: 96px;
 
 // app icons
 .icon-grid {
-  row-spacing: $base_spacing * 6;
-  column-spacing: $base_spacing * 6;
+  row-spacing: $base_spacing * 2;
+  column-spacing: $base_spacing * 2;
   max-row-spacing: $base_spacing * 12;
   max-column-spacing: $base_spacing * 12;
+  page-padding-top: $base_padding * 4;
+  page-padding-bottom: $base_padding * 4;
+  page-padding-left: $base_padding * 2;
+  page-padding-right: $base_padding * 2;
 }
 
 /* App Icons */
@@ -30,16 +34,15 @@ $app_grid_fg_color: #fff;
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: transparentize($osd_bg_color, 0.8);
+  background-color: $dash_background_color;
   border-radius: $base_border_radius + 4px; // same as %icon_tile
 }
 
 // expanded folder
-.app-folder-dialog {
+.app-folder-dialog { //style like the dash
   border-radius: $modal_radius * 1.5;
-  border: 1px solid $osd_outer_borders_color;
-  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
-  padding: 12px;
+  background-color: $dash_background_color;
+  padding: 12px 0px 12px 0px;
 
   & .folder-name-container {
     padding: 24px 36px 0;
@@ -71,14 +74,14 @@ $app_grid_fg_color: #fff;
   & .icon-grid {
     row-spacing: $base_spacing * 2;
     column-spacing: $base_spacing * 5;
+    page-padding-top: 0;
+    page-padding-bottom: 0;
+    page-padding-left: 0;
+    page-padding-right: 0;
   }
 
   & .page-indicators {
     margin-bottom: 18px;
-
-    .page-indicator {
-      padding: 15px 12px;
-    }
   }
 }
 .app-folder-dialog-container {
@@ -87,13 +90,6 @@ $app_grid_fg_color: #fff;
   height: 620px;
 }
 
-.app-folder-icon {
-  padding: $base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing;
-}
-
-
 // Running app indicator (also shown in dash)
 .app-well-app-running-dot {
   height: 5px;
@@ -119,7 +115,7 @@ $app_grid_fg_color: #fff;
 
 // App Grid pagination indicators
 .page-indicator {
-  padding: 15px 20px;
+  padding: $base_padding $base_padding * 2 0;
 
   .page-indicator-icon {
     width: 10px;
@@ -129,10 +125,8 @@ $app_grid_fg_color: #fff;
   }
 }
 
-// Some hacks I don't even know
-.all-apps {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
+.apps-scroll-view {
+  padding: 0;
 }
 
 // shutdown and other actions in the grid
@@ -142,3 +136,33 @@ $app_grid_fg_color: #fff;
   border-radius: 99px;
   icon-size: $app_icon_size * 0.5;
 }
+
+.page-navigation-hint {
+  width: 300px;
+
+  &.dnd {
+    background: rgba(255, 255, 255, 0.1);
+  }
+
+  &.next:ltr,
+  &.previous:rtl {
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px;
+  }
+
+  &.previous:ltr,
+  &.next:rtl {
+    background-gradient-start: transparent;
+    background-gradient-end: rgba(255, 255, 255, 0.05);
+    background-gradient-direction: horizontal;
+    border-radius: 0px 15px 15px 0px;
+  }
+}
+
+.page-navigation-arrow {
+  margin: 6px;
+  width: 24px;
+  height: 24px;
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss
index 914dd595..69ebb301 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss
@@ -14,5 +14,5 @@
 
 // Dropshadow for large icons
 .icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(black, 0.4);
+  icon-shadow: 0 1px 5px rgba(black, 0.8);
 }
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss
index d20e82fc..947e23d8 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss
@@ -1,11 +1,11 @@
 /* Date/Time Menu */
 
 .clock-display-box {
-  spacing: $base_spacing / 2;
+  spacing: 2px;
 
   .clock {
-    padding-left: $base_padding;
-    padding-right: $base_padding;
+    padding-left: $base_padding * 2;
+    padding-right: $base_padding * 2;
   }
 }
 
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
index ef93a2ff..9e469ab6 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
@@ -1,20 +1,18 @@
 /* Dash */
 
+$dash_background_color: #3b3b3b;
 $dash_placeholder_size: 32px;
-$dash_spacing: $base_padding + 4px;
+$dash_padding: $base_padding + 4px; // 10px
+$dash_spacing: $base_padding / 4;
+
+$dash_bottom_margin: $base_margin * 4;
+
 $dash_border_radius: $modal_radius * 1.5;
 
 #dash {
-  @extend %overview_panel;
   @include fontsize($base_font_size - 2);
-  padding: ($dash_spacing / 2) 0;
-
-  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
-  border-left-width: 0;
-  &:rtl {
-    border-radius: $dash_border_radius 0 0 $dash_border_radius;
-    border-right-width: 0;
-  }
+  margin-top: $base_spacing * 3;
+  padding: 0 $dash_padding;
 
   .placeholder {
     // background-image: url("assets/dash-placeholder.svg");
@@ -27,23 +25,38 @@ $dash_border_radius: $modal_radius * 1.5;
     width: $dash_placeholder_size;
     height: $dash_placeholder_size;
   }
+
+  .overview-icon {
+    padding: $dash_padding / 2;
+  }
+}
+
+.dash-background {
+  background-color: $dash_background_color;
+  margin-bottom: $dash_bottom_margin;
+  padding: $dash_padding;
+  border-radius: $dash_border_radius;
 }
 
 // Dash Items
-.dash-item-container > StWidget {
-  padding: ($dash_spacing / 2) $dash_spacing;
+.dash-item-container .app-well-app, .show-apps {
+  padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
+}
+
+.dash-separator {
+  width: 1px;
+  margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
+  background-color: transparentize($osd_fg_color,0.7);
 }
 
 // OSD Tooltip
 .dash-label {
-  background-color: transparentize($osd_bg_color,0.05);
-  border-radius: $base_border_radius + 2px;
-  border:none;
-  box-shadow:0 0 0 1px $osd_outer_borders_color;
   color: $osd_fg_color;
-  padding: $base_padding $base_padding + 2px;
+  background-color: $osd_bg_color;
+  border-radius: 99px;
+  padding: $base_padding $base_padding * 2;
   text-align: center;
-  -x-offset: $base_margin * 2; // distance from the dash edge
+  -y-offset: $base_margin * 3; // distance from the dash edge
 }
 
 // Show apps button
@@ -53,9 +66,8 @@ $dash_border_radius: $modal_radius * 1.5;
   &:focus,
   &:checked {
     .overview-icon {
-      background-color: darken($osd_bg_color,10%);
+      background-color: transparentize($osd_bg_color,0.5);
       color: $fg_color;
     }
   }
 }
-
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss
index 0f568b73..4577626c 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss
@@ -162,3 +162,12 @@
 .audio-selection-device-icon {
   icon-size: $base_icon_size * 4;
 }
+
+/* Welcome dialog */
+.welcome-dialog-image {
+  background-image: url("assets/gnome-shell-start.svg");
+  background-size: contain;
+  /* Reasonable maximum dimensions */
+  height: 300px;
+  width: 300px;
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss
index 06fdcf25..1789beca 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-dialog.scss
@@ -5,18 +5,19 @@
   max-width: 23em;
 }
 
-.login-dialog {
+.login-dialog,
+.unlock-dialog {
   //reset
   border: none;
   background-color: transparent;
 
-  $_gdm_bg: lighten(#2e3436, 19%);
+  $_gdm_bg: $system_bg_color;
 
   StEntry {
     @if $variant=='dark' {
-      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
+      $_gdm_entry_bg: darken($system_bg_color, 3%);
       background-color: $_gdm_entry_bg;
-      color: $osd_fg_color;
+      color: $fg_color;
     }
   }
 
@@ -24,9 +25,9 @@
   .modal-dialog-button {
     padding: 4px 18px;
     box-shadow: 0 1px 3px rgba(0,0,0,0.2);
-    background-color: $_gdm_bg;
-    border-color: $_gdm_bg;
-    color: $fg_color;
+    background-color: darken($system_bg_color, 3%);
+    border-color: darken($system_bg_color, 3%);
+    color: $osd_fg_color;
 
     $_hover_c: lighten($_gdm_bg, 5%);
     &:hover, &:focus {
@@ -43,7 +44,7 @@
       @include button(insensitive);
       border-color: darken($_gdm_bg, 5%);
       background-color: darken($_gdm_bg, 5%);
-      color: transparentize($fg_color, 0.3);
+      color: transparentize($osd_fg_color, 0.3);
     }
     &:default {
       @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
@@ -76,8 +77,8 @@
     border-radius: 99px;
     width: $base_icon_size * 2;
     height: $base_icon_size * 2;
-    border-color: transparentize($bg_color,0.7);
-    background-color: transparentize($bg_color,0.7);
+    border-color: darken($system_bg_color, 3%);
+    background-color: darken($system_bg_color, 3%);
 
     StIcon { icon-size: $base_icon_size; }
   }
@@ -92,7 +93,6 @@
 .login-dialog-banner { color: darken($osd_fg_color,10%); }
 .login-dialog-button-box { width: 23em; spacing: 5px; }
 .login-dialog-message { text-align: center; }
-.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
 .login-dialog-user-selection-box { padding: 100px 0px; }
 .login-dialog-not-listed-label {
   padding-left: 2px;
@@ -151,6 +151,11 @@
   padding-top: 16px;
 }
 
+.login-dialog-timed-login-indicator {
+    height: 2px;
+    background-color: darken($fg_color,40%);
+}
+
 .login-dialog-prompt-layout {
   padding-top: 24px;
   padding-bottom: 12px;
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
index 45edb26b..02d122b9 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
@@ -99,7 +99,7 @@
 
 /* Media Controls */
 .message-media-control {
-  padding: $base_padding * 2 $base_padding * 4;
+  padding: $base_padding * 2 1.64em; // $base_padding * 4 = 24px
   color: darken($fg_color, 15%);
 
   // uses $hover_bg_color since the media controls are in a notification_bubble
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss
index 96dd4d1d..0fe174a7 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss
@@ -9,7 +9,7 @@
   background-size: contain;
   color: $osd_fg_color;
   border-radius: 99px;
-  border: 2px $osd_fg_color;
+  icon-size: $base_icon_size * 4; // 64px
   &:hover {
     color: lighten($osd_fg_color,30%);
   }
@@ -17,6 +17,12 @@
   & StIcon {
     background-color: transparentize($osd_fg_color,0.95);
     border-radius: 99px;
+    padding: $base_padding * 2 ; // 12px
+    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+  }
+
+  &.user-avatar {
+    border: 2px $osd_fg_color;
   }
 }
 
@@ -31,15 +37,6 @@
   }
 }
 
-.user-widget.horizontal .user-icon {
-  icon-size: $base_icon_size * 4; // 64px
-
-  & StIcon {
-    padding: $base_padding * 2 ; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
-  }
-}
-
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }
 
@@ -54,3 +51,9 @@
   @include fontsize($base_font_size - 1);
   color: $warning_color;
 }
+
+/* Workspace animation */
+
+.workspace-animation {
+  background-color: $system_bg_color;
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss
index 18497de0..c593cebc 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss
@@ -1,10 +1,13 @@
 /* OVERVIEW */
 
-#overview {
-  spacing: 24px;
-  background-color: transparent;
+.controls-manager, .secondary-monitor-workspaces {
+  spacing: $base_spacing * 2;
+}
+
+#overviewGroup {
+  background-color: $system_bg_color;
 }
 
 .overview-controls {
   padding-bottom: 32px;
-}
\ No newline at end of file
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss
index 56c445a7..1f465077 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss
@@ -3,43 +3,36 @@
 
 $panel_corner_radius: $base_border_radius+1;
 $panel_bg_color: #000;
-$panel_fg_color: #ccc;
-$panel_height: 1.86em;
-
+$panel_fg_color: #ddd;
+$panel_height: 2.2em;
+$panel_transition_duration: 250ms; // same as the overview transition duration
 
 #panel {
   background-color: $panel_bg_color;
   font-weight: bold;
   height: $panel_height;
   font-feature-settings: "tnum";
+  transition-duration: $panel_transition_duration;
 
   // transparent panel on lock & login screens
   &.unlock-screen,
-  &.login-screen {
+  &.login-screen,
+  &:overview {
     background-color: transparent;
 
     .panel-corner {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
+      -panel-corner-opacity: 0;
     }
   }
 
-  // spacing between activities, app menu and such
-  #panelLeft, #panelCenter {
-    spacing: $base_spacing;
-  }
-
   // the rounded outset corners
   .panel-corner {
     -panel-corner-radius: $panel_corner_radius;
     -panel-corner-background-color: $panel_bg_color;
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent;
-
-    &:active, &:overview, &:focus {
-      -panel-corner-border-color: lighten($selected_bg_color,5%);
-    }
+    -panel-corner-opacity: 1;
+    transition-duration: $panel_transition_duration;
   }
 
   // panel menus
@@ -48,53 +41,69 @@ $panel_height: 1.86em;
     color: $panel_fg_color;
     -natural-hpadding: $base_padding * 2;
     -minimum-hpadding: $base_padding;
+    transition-duration: 150ms;
+    border: 3px solid transparent;
+    border-radius: 99px;
 
-    &:hover {
-      color: lighten($panel_fg_color, 20%);
+    &.clock-display {
+      .clock {
+        transition-duration: 150ms;
+        border: 3px solid transparent;
+        border-radius: 99px;
+      }
     }
 
-    &:active, &:overview, &:focus, &:checked {
-      color: lighten($panel_fg_color, 20%);
+    &:hover, &:active, &:overview, &:focus, &:checked {
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+
+      // The clock display needs to have the background on .clock because
+      // we want to exclude the do-not-disturb indicator from the background
+      &.clock-display {
+        box-shadow: none;
+
+        .clock {
+          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+        }
+      }
     }
 
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding - 1px;
+      margin: 0 $base_margin;
+    }
+
+    .panel-status-indicators-box .system-status-icon,
+    .panel-status-menu-box .system-status-icon {
+      margin: 0;
     }
 
     // app menu icon
     .app-menu-icon {
-      margin-left: $base_margin;
-      margin-right: $base_margin;
       -st-icon-style: symbolic;
       // dimensions of the icon are hardcoded
     }
 
-    // lock & login screen styles
-    .unlock-screen &,
-    .login-screen & {
-      color: lighten($fg_color, 10%);
-      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
+    &#panelActivities {
+      -natural-hpadding: $base_padding * 3;
     }
   }
 
-  .panel-button {
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw a box-shadow
-      background-color: rgba(0, 0, 0, 0.01);
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-    }
-  }
+  &.unlock-screen,
+  &.login-screen,
+  &:overview {
+    .panel-button {
+      &:hover, &:active, &:overview, &:focus, &:checked {
+        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
 
-  .panel-button.clock-display {
-    // Move highlight from .panel-button to .clock
-    &:active, &:overview, &:focus, &:checked {
-      box-shadow: none;
+        &.clock-display {
+          box-shadow: none;
 
-      .clock {
-        background-color: rgba(0, 0, 0, 0.01);
-        box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+          .clock {
+            box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
+          }
+        }
       }
     }
   }
@@ -119,3 +128,8 @@ $panel_height: 1.86em;
   spacing: $base_spacing;
   .label-shadow { color: transparent; }
 }
+
+#appMenu .panel-status-menu-box {
+  padding: 0 $base_padding;
+  spacing: $base_spacing;
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss
index 00c549a5..e289fdba 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screen-shield.scss
@@ -66,7 +66,7 @@
 }
 
 #lockDialogGroup {
-  background-color: lighten(#2e3436, 8%);
+  background-color: $system_bg_color;
 }
 
 #unlockDialogNotifications {
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss
index 329dbc7c..b184e674 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss
@@ -11,6 +11,8 @@ $search_entry_height: 36px;
   color: transparentize($fg_color,0.3);
   background-color: $bg_color;
   border-color: $borders_color;
+  margin-top: $base_spacing * 2;
+  margin-bottom: $base_spacing;
 
   &:hover {
     background-color: $hover_bg_color;
@@ -32,4 +34,4 @@ $search_entry_height: 36px;
     padding: 0 4px;
     color: inherit;
   }
-}
\ No newline at end of file
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss
index 1b932185..fa3f1919 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss
@@ -3,63 +3,50 @@
 $window_picker_spacing: $base_spacing; // 6px
 $window_picker_padding: $base_padding * 2; // 12px
 
-$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
+$window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);
 
-$window_close_button_size: 24px;
+$window_close_button_size: 30px;
 $window_close_button_padding: 3px;
 
-$window_clone_border_size: 6px;
-
 // Window picker
 .window-picker {
   // Space between window thumbnails
   spacing: $window_picker_spacing;
-
-  // Padding for container around window thumbnails
-  padding: $window_picker_padding;
-
-  &.external-monitor { padding: $window_picker_padding; }
-}
-
-// Borders on window thumbnails
-.window-clone-border {
-  border-width: $window_clone_border_size;
-  border-style: solid;
-  border-color: $window_thumbnail_border_color;
-  border-radius: $base_border_radius + 2;
-  // For window decorations with round corners we can't match
-  // the exact shape when the window is scaled. So apply a shadow
-  // to fix that case
-  box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
 }
 
 // Window titles
 .window-caption {
   color: $osd_fg_color;
   background-color: $osd_bg_color;
-  border:1px solid $osd_outer_borders_color;
-  border-radius: $base_border_radius + 1;
+  border-radius: 99px;
   padding: $base_padding $base_padding * 2;
-  font-weight: bold;
-  @include fontsize($base_font_size + 1);
 }
 
 // Close button
 .window-close {
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
-  border: none;
+  background-color: $osd_bg_color;
+  color: $osd_fg_color;
   border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
   padding: $window_close_button_padding;
   height: $window_close_button_size;
   width: $window_close_button_size;
   box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+  transition-duration: 300ms;
+
+  & StIcon { icon-size: 24px; }
 
   &:hover {
-    background-color: lighten($selected_bg_color, 5%);
+    background-color: lighten($osd_bg_color, 15%);
   }
 
   &:active {
-    background-color: darken($selected_bg_color, 5%);
+    color: transparentize($osd_fg_color, 0.2);
+    background-color: darken($osd_bg_color, 5%);
   }
 }
+
+.workspace-background {
+  // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
+  border-radius: 30px;
+  box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
+}
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss
index c06380fd..b18399a3 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -2,24 +2,20 @@
 
 // thumbnails in overview
 .workspace-thumbnails {
-  @extend %overview_panel;
   visible-width: 32px; //amount visible before hover
   spacing: $base_spacing;
   padding: $base_padding;
 
-  border-radius: $modal_radius 0 0 $modal_radius;
-  border-right-width: 0;
-
-  &:rtl {
-    border-radius: 0 $modal_radius $modal_radius 0;
-    border-left-width: 0;
+  .workspace-thumbnail {
+    @extend %overview_panel;
+    border-radius: 3px;
   }
 
   // drag and drop indicator
   .placeholder {
-    background-image: url("assets/dash-placeholder.svg");
+    background-image: url("assets/workspace-placeholder.svg");
     background-size: contain;
-    height: 24px;
+    width: 18px;
   }
 }
 
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
index be761095..acd32cee 100755
--- a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
+++ b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
@@ -4,28 +4,28 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
-VERSION=3.38.3
+VERSION=40.3
 
 echo
-echo " $YELLOW[ i ]$RESET Upstream version $VERSION"
+printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"
 echo
 
 while read file;
 do
 	echo
-	echo " $GREEN[ * ]$RESET Downloading file $file"
-	mkdir -p $(dirname $file)
+	printf " $GREEN[ * ]$RESET Downloading file $file\n"
 	wget https://gitlab.gnome.org/GNOME/gnome-shell/raw/$VERSION/data/theme/$file -O $file --quiet
 	sed 's/resource:\/\/\/org\/gnome\/shell\/theme/assets/g' -i $file
 
 	if [ -f $file.patch ]
 	then
-		echo " $YELLOW[ ~ ]$RESET Apply patch"
+		printf " $YELLOW[ ~ ]$RESET Apply patch\n"
 		patch $file $file.patch --quiet
 	fi
 done <<- EOF
 	pad-osd.css
 	gnome-shell-high-contrast.scss
+	gnome-shell-sass/_colors.scss
 	gnome-shell-sass/_common.scss
 	gnome-shell-sass/_drawing.scss
 	gnome-shell-sass/_widgets.scss