From 9e2aeff147986d882db2f7a416079520c7116be7 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 7 Dec 2020 14:17:16 +0800
Subject: [PATCH] Fixed gnome-shell 3.38 issues

---
 src/main/gnome-shell/gnome-shell-dark-alt.css | 354 ++++++++++++++--
 .../gnome-shell-dark-solid-alt.css            | 354 ++++++++++++++--
 .../gnome-shell/gnome-shell-dark-solid.css    | 354 ++++++++++++++--
 src/main/gnome-shell/gnome-shell-dark.css     | 354 ++++++++++++++--
 .../gnome-shell/gnome-shell-light-alt.css     | 354 ++++++++++++++--
 .../gnome-shell-light-solid-alt.css           | 354 ++++++++++++++--
 .../gnome-shell/gnome-shell-light-solid.css   | 354 ++++++++++++++--
 src/main/gnome-shell/gnome-shell-light.css    | 354 ++++++++++++++--
 .../gnome-shell-theme.gresource.xml           |   1 +
 src/sass/gnome-shell/_common.scss             | 381 +++++++++++++++---
 src/sass/gnome-shell/_drawing.scss            |   2 +-
 11 files changed, 2894 insertions(+), 322 deletions(-)

diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index d2d19d3..2d31791 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #dedede;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(56, 56, 56, 0.75);
   text-shadow: none;
   color: #afafaf;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(56, 56, 56, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(255, 255, 255, 0.06);
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  background-color: #2c2c2c;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: rgba(51, 51, 51, 0.95);
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index 0861a60..ebb853e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #dedede;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(56, 56, 56, 0.75);
   text-shadow: none;
   color: #afafaf;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(56, 56, 56, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(255, 255, 255, 0.06);
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  background-color: #2c2c2c;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: #333333;
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 0861a60..ebb853e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #dedede;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(56, 56, 56, 0.75);
   text-shadow: none;
   color: #afafaf;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(56, 56, 56, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(255, 255, 255, 0.06);
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  background-color: #2c2c2c;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: #333333;
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index d2d19d3..2d31791 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #dedede;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #dedede;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(56, 56, 56, 0.75);
   text-shadow: none;
   color: #afafaf;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(56, 56, 56, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #dedede;
+  background-color: #242424;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(222, 222, 222, 0.35);
+  background-color: rgba(255, 255, 255, 0.06);
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #dedede;
+  border-color: rgba(0, 0, 0, 0.15);
+  background-color: #2c2c2c;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #dedede;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: rgba(0, 0, 0, 0.15);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: rgba(51, 51, 51, 0.95);
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index c89be2b..5665f65 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #242424;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.75);
   text-shadow: none;
   color: #424242;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(255, 255, 255, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.12);
+  background-color: #f7f7f7;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: #487afa;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: rgba(240, 240, 240, 0.94);
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index ec71bb5..38b77d1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #242424;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.75);
   text-shadow: none;
   color: #424242;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(255, 255, 255, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.12);
+  background-color: #f7f7f7;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: #487afa;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: #f0f0f0;
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index ec71bb5..38b77d1 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #242424;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.75);
   text-shadow: none;
   color: #424242;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(255, 255, 255, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.12);
+  background-color: #f7f7f7;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: #487afa;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: #f0f0f0;
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 360cd4d..124ad31 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -18,12 +18,32 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* GLOBALS */
+* {
+  transition-duration: 150ms;
+}
+
 stage {
   font-size: 9.75pt;
   font-weight: 400;
   color: #242424;
 }
 
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px;
+  background-color: rgba(151, 189, 252, 0.3);
+  box-shadow: 0 0 2px 2px #669efa;
+}
+
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: #0860f2;
+  -pie-background-color: rgba(201, 221, 253, 0.3);
+}
+
 /* WIDGETS */
 /* Buttons */
 .button {
@@ -208,7 +228,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .check-box StBoxLayout {
-  spacing: 8px;
+  spacing: .8em;
 }
 
 .check-box StBin {
@@ -299,10 +319,50 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(52, 132, 226, 0.3);
 }
 
-/* Modal Dialogs */
-.headline {
-  font-size: 15pt;
-  font-weight: 500;
+.user-icon {
+  background-size: contain;
+  color: rgba(255, 255, 255, 0.85);
+  border-radius: 9999px;
+  border: 2px rgba(255, 255, 255, 0.85);
+}
+
+.user-icon:hover {
+  color: white;
+}
+
+.user-icon StIcon {
+  background-color: rgba(255, 255, 255, 0);
+  border-radius: 99px;
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.vertical .user-icon StIcon {
+  padding: 20px;
+  padding-top: 18px;
+  padding-bottom: 22px;
+  width: 88px;
+  height: 88px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.user-widget.horizontal .user-icon StIcon {
+  padding: 12px;
+  width: 15px;
+  height: 15px;
+}
+
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  font-size: 9.75pt;
+  font-weight: 400;
+  color: #F27835;
 }
 
 .lightbox {
@@ -313,6 +373,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: white;
 }
 
+/* Modal Dialogs */
+.headline {
+  font-size: 15pt;
+  font-weight: 500;
+}
+
 .modal-dialog {
   color: #242424;
   padding: 0 5px 6px 5px;
@@ -369,7 +435,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .modal-dialog .modal-dialog-content-box {
-  padding: 24px;
+  margin: 32px 40px;
+  spacing: 32px;
+  max-width: 28em;
 }
 
 .modal-dialog .run-dialog-entry {
@@ -406,8 +474,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 }
 
 .message-dialog-content .message-dialog-title {
@@ -484,12 +551,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: 500;
 }
 
+.prompt-dialog .modal-dialog-linked-button:last-child, .end-session-dialog .modal-dialog-linked-button:last-child {
+  color: white;
+  background-color: #0860f2;
+}
+
+.prompt-dialog .modal-dialog-linked-button:hover:last-child, .end-session-dialog .modal-dialog-linked-button:hover:last-child {
+  color: white;
+  background-color: #307bf8;
+}
+
+.prompt-dialog .modal-dialog-linked-button:active:last-child, .end-session-dialog .modal-dialog-linked-button:active:last-child {
+  color: white;
+  background-color: #0756d9;
+}
+
+.prompt-dialog .modal-dialog-linked-button:insensitive:last-child, .end-session-dialog .modal-dialog-linked-button:insensitive:last-child {
+  background-color: rgba(8, 96, 242, 0.05);
+  color: rgba(8, 96, 242, 0.35);
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
 }
 
+.end-session-dialog .end-session-dialog-battery-warning,
+.end-session-dialog .dialog-list-title {
+  color: #F27835;
+}
+
 .end-session-dialog-list {
   padding-top: 20px;
 }
@@ -503,7 +595,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
 }
 
@@ -642,7 +733,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Password or Authentication Dialog */
 .prompt-dialog {
-  width: 34em;
+  width: 28em;
   border: none;
 }
 
@@ -687,7 +778,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -746,8 +837,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .polkit-dialog-user-layout .polkit-dialog-user-icon {
-  border-radius: 1000px;
+  border-radius: 9999px;
   background-size: contain;
+  width: 48px;
+  height: 48px;
   margin: 6px;
 }
 
@@ -1133,7 +1226,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .switcher-list-item-container {
@@ -1263,6 +1356,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: transparent;
 }
 
+#panel:overview .panel-corner, #panel.unlock-screen .panel-corner, #panel.login-screen .panel-corner, #panel.lock-screen .panel-corner {
+  -panel-corner-radius: 0;
+  -panel-corner-background-color: transparent;
+  -panel-corner-border-color: transparent;
+}
+
 #panel #panelLeft, #panel #panelCenter {
   spacing: 0;
 }
@@ -1455,6 +1554,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.75);
   text-shadow: none;
   color: #424242;
+  transition: none;
 }
 
 .message:hover, .world-clocks-button:hover,
@@ -1488,11 +1588,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: rgba(255, 255, 255, 0.75);
@@ -1504,7 +1604,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section {
@@ -1518,14 +1618,16 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
+  padding: 0 12px;
 }
 
 .datemenu-calendar-column:ltr {
+  margin-right: 12px;
   border-left-width: 0;
 }
 
 .datemenu-calendar-column:rtl {
+  margin-left: 12px;
   border-right-width: 0;
 }
 
@@ -1539,6 +1641,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
 }
 
+.datemenu-today-button .day-label {
+  font-size: 15pt;
+  font-weight: 500;
+  font-weight: bold;
+}
+
 .datemenu-today-button .date-label {
   font-size: 18pt;
   font-weight: 400;
@@ -1712,7 +1820,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .events-button,
 .events-section-title {
   min-height: 20px;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1771,7 +1880,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 }
 
@@ -2131,6 +2239,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 }
 
 .window-picker.external-monitor {
@@ -2309,6 +2418,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 30px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
+  row-spacing: 36px;
+  column-spacing: 36px;
+  max-row-spacing: 72px;
+  max-column-spacing: 72px;
 }
 
 .icon-grid .overview-icon {
@@ -2392,9 +2505,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
 .app-well-app:selected .overview-icon,
-.app-well-app.app-folder:hover .overview-icon,
-.app-well-app.app-folder:focus .overview-icon,
-.app-well-app.app-folder:selected .overview-icon,
 .grid-search-result:hover .overview-icon,
 .grid-search-result:focus .overview-icon,
 .grid-search-result:selected .overview-icon {
@@ -2409,8 +2519,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .show-apps:checked .overview-icon,
 .app-well-app:active .overview-icon,
 .app-well-app:checked .overview-icon,
-.app-well-app.app-folder:active .overview-icon,
-.app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(255, 255, 255, 0.3);
@@ -2517,17 +2625,36 @@ StWidget.focused .app-well-app-running-dot {
   background-image: none;
 }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+}
+
+.overview-icon.overview-icon-with-label > StBoxLayout,
+.grid-search-result .overview-icon.overview-icon-with-label > StBoxLayout {
+  spacing: 6px;
+}
+
+.app-folder {
+  background: none;
+  transition: all 150ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.app-folder .overview-icon {
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 12px;
+}
+
+.app-folder:hover .overview-icon {
+  background-color: rgba(255, 255, 255, 0.2);
 }
 
 .app-folder-dialog {
   border-radius: 32px;
   border: none;
-  spacing: 12px;
-  background-color: rgba(16, 16, 16, 0.95);
+  padding: 12px;
+  background-color: rgba(36, 36, 36, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -2541,6 +2668,10 @@ StWidget.focused .app-well-app-running-dot {
   font-weight: bold;
 }
 
+.app-folder-dialog .folder-name-container .folder-name-entry {
+  width: 300px;
+}
+
 .app-folder-dialog .folder-name-container .folder-name-label {
   padding: 5px 7px;
   color: rgba(255, 255, 255, 0.85);
@@ -2568,12 +2699,25 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(255, 255, 255, 0.3);
 }
 
+.app-folder-dialog .icon-grid {
+  row-spacing: 12px;
+  column-spacing: 30px;
+}
+
+.app-folder-dialog .page-indicators {
+  margin-bottom: 18px;
+}
+
+.app-folder-dialog .page-indicators .page-indicator {
+  padding: 15px 12px;
+}
+
 .app-folder-dialog StButton#vhandle, .app-folder-dialog StButton#vhandle:hover, .app-folder-dialog StButton#vhandle:active {
   background-color: transparent;
 }
 
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: 6px;
   width: 600px;
   height: 600px;
 }
@@ -2584,6 +2728,14 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: 6px;
 }
 
+.rename-folder-popup .rename-folder-popup-item {
+  spacing: 6px;
+}
+
+.rename-folder-popup .rename-folder-popup-item:ltr, .rename-folder-popup .rename-folder-popup-item:rtl {
+  padding: 0 12px;
+}
+
 .workspace-thumbnails {
   visible-width: 32px;
   spacing: 12px;
@@ -2592,15 +2744,20 @@ StWidget.focused .app-well-app-running-dot {
   margin: 6px;
 }
 
+.workspace-thumbnails .placeholder {
+  background-image: url("assets/dash-placeholder.svg");
+  background-size: contain;
+  height: 24px;
+}
+
 .workspace-thumbnail-indicator {
-  border: 0 solid #0860f2;
-  border-width: 2px;
+  border: 2px solid #0860f2;
   padding: 6px;
   border-radius: 2px;
 }
 
-.search-display > StBoxLayout,
 .all-apps,
+.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   padding: 0px 88px 10px 88px;
 }
@@ -2753,6 +2910,62 @@ StWidget.focused .app-well-app-running-dot {
   padding-right: 4px;
 }
 
+.hotplug-notification-item {
+  color: #242424;
+  background-color: #ffffff;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+  padding: 12px;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+}
+
+.hotplug-notification-item:insensitive {
+  color: rgba(36, 36, 36, 0.45);
+  background-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:hover {
+  color: #242424;
+  border-color: rgba(0, 0, 0, 0.12);
+  background-color: #f7f7f7;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:focus {
+  color: #242424;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:active {
+  color: white;
+  background-color: #0860f2;
+  border-color: #487afa;
+  text-shadow: none;
+  icon-shadow: none;
+}
+
+.hotplug-notification-item:first-child {
+  border-radius: 0 0 0 6px;
+}
+
+.hotplug-notification-item:last-child {
+  border-right-width: 0;
+  border-radius: 0 0 6px 0;
+}
+
+.hotplug-notification-item:first-child:last-child {
+  border-radius: 0 0 6px 6px;
+}
+
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px;
@@ -2919,6 +3132,17 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
 
+.emoji-page .keyboard-key {
+  background-color: transparent;
+  border: none;
+  color: initial;
+}
+
+.emoji-panel .keyboard-key:latched {
+  border-color: #1c6ff7;
+  background-color: #0860f2;
+}
+
 .candidate-popup-content {
   padding: 8px;
   spacing: 0;
@@ -3397,6 +3621,70 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
 }
 
+/* Screen Shield */
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+}
+
+.unlock-dialog-notifications-container .summary-notification-stack-scrollview {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.unlock-dialog-notifications-container .notification,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source {
+  padding: 12px 6px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  border-radius: 6px;
+}
+
+.unlock-dialog-notifications-container .notification.critical,
+.unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: rgba(240, 240, 240, 0.94);
+  background-color: rgba(255, 255, 255, 0.85);
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
index 865f1b6..b4d0caa 100644
--- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml
+++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/org/gnome/shell/theme">
     <file>assets/calendar-arrow-left.svg</file>
     <file>assets/calendar-arrow-right.svg</file>
+    <file>assets/calendar-today.svg</file>
     <file>assets/checkbox.svg</file>
     <file>assets/checkbox-off.svg</file>
     <file>assets/close.svg</file>
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index e358461..b087054 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -25,10 +25,10 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 
 
 /* GLOBALS */
-// * {
-//   // transition-timing-function: $deceleration_curve;
-//   transition-duration: $longer_duration;
-// }
+* {
+  // transition-timing-function: $deceleration_curve;
+  transition-duration: $longer_duration;
+}
 
 stage {
   // font-family: $font-family;
@@ -36,6 +36,24 @@ stage {
   color: $fg_color;
 }
 
+// Pointer location
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($primary_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($primary_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $primary_color;
+  -pie-background-color: lighten(transparentize($primary_color, 0.7), 40%);
+}
+
 /* WIDGETS */
 
 /* Buttons */
@@ -170,7 +188,7 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
     padding: 8px 0;
   }
 
-  StBoxLayout { spacing: 8px; }
+  StBoxLayout { spacing: .8em; }
   StBin {
     width: 24px;
     height: 24px;
@@ -238,11 +256,57 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
   }
 }
 
+// User icon
+.user-icon {
+  background-size: contain;
+  color: $light_alt_fg_color;
+  border-radius: $circular_radius;
+  border: 2px $light_alt_fg_color;
+
+  &:hover {
+    color: $light_fg_color;
+  }
+
+  & StIcon {
+    background-color: transparentize($light_alt_fg_color, 0.95);
+    border-radius: 99px;
+  }
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px; // 128px
+
+  & StIcon {
+    padding: $container_padding * 3 + 2px; // 20px
+    padding-top: $container_padding * 3; // 18 px
+    padding-bottom: $container_padding * 3 + 4px; // 22px
+    width: 88px; height:  88px; // 88px;
+  }
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+
+  & StIcon {
+    padding: $container_padding * 2 ; // 12px
+    width: $container_padding * 2.5; height:  $container_padding * 2.5; // 40px;
+  }
+}
+
+// Caps-lock warning
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  @include font(body-1);
+  color: $warning_color;
+}
+
+.lightbox { background-color: black; }
+.flashspot { background-color: white; }
+
 /* Modal Dialogs */
 
 .headline { @include font(title); }
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
 
 .modal-dialog {
   color: $fg_color;
@@ -264,7 +328,9 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
   }
 
   .modal-dialog-content-box {
-    padding: 24px;
+    margin: 32px 40px;
+    spacing: 32px;
+    max-width: 28em;
   }
   .run-dialog-entry { width: 20em; margin-bottom: 6px; }
   .run-dialog-error-box {
@@ -294,8 +360,7 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
 }
 
 .message-dialog-content {
-  max-width: 28em;
-  spacing: 20px;
+  spacing: 18px;
 
   .message-dialog-title {
     text-align: center;
@@ -360,14 +425,43 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
   }
 }
 
+%last_dialog_button {
+  color: white;
+  background-color: $primary_color;
+
+  &:hover {
+    color: white;
+    background-color: lighten($primary_color, 9%);
+  }
+
+  &:active {
+    color: white;
+    background-color: darken($primary_color, 5%);
+  }
+
+  &:insensitive {
+    background-color: rgba($primary_color, 0.05);
+    color: rgba($primary_color, 0.35);
+  }
+}
+
 /* End Session Dialog */
 .end-session-dialog {
-  spacing: 42px;
+  width: 30em;
   border: none;
+
+  .modal-dialog-linked-button:last-child {
+    @extend %last_dialog_button;
+  }
+
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning_color;
+  }
 }
 
 .end-session-dialog-list {
-    padding-top: 20px;
+  padding-top: 20px;
 }
 
 .end-session-dialog-layout {
@@ -376,7 +470,6 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
 }
 
 .end-session-dialog-description {
-  width: 28em;
   padding-bottom: 10px;
   &:rtl {
     text-align: right;
@@ -499,9 +592,13 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
 
 .prompt-dialog {
   //this is the width of the entire modal popup
-  width: 34em;
+  width: 28em;
   border: none;
 
+  .modal-dialog-linked-button:last-child {
+    @extend %last_dialog_button;
+  }
+
   .modal-dialog-content-box {
     margin-bottom: 24px;
   }
@@ -529,7 +626,7 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
 }
 
 .prompt-dialog-password-entry {
-  width: 18em;
+  width: 20em;
 }
 
 .prompt-dialog-error-label,
@@ -588,8 +685,10 @@ $barlevel_boder_color: if($variant == 'light', rgba(black, 0.12), transparent);
   }
 
   .polkit-dialog-user-icon {
-    border-radius: 1000px;
+    border-radius: $circular_radius;
     background-size: contain;
+    width: 48px;
+    height: 48px;
     margin: 6px;
   }
 }
@@ -904,6 +1003,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
 /* OSD */
 .osd-window {
+  @extend %osd-panel;
   text-align: center;
   font-weight: bold;
   spacing: 1em;
@@ -953,7 +1053,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
-  spacing: 16px;
+  spacing: 24px;
 }
 
 .osd-window,
@@ -1083,6 +1183,12 @@ $popop_menuitem_radius: $wm_radius - 4px;
   &.login-screen,
   &.lock-screen {
     background-color: transparent;
+
+    .panel-corner {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
   }
 
   #panelLeft, #panelCenter { // spacing between activities<>app menu and such
@@ -1253,6 +1359,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
   background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
   text-shadow: none;
   color: $alt_fg_color;
+  transition: none;
 
   &:hover, &:focus {
     color: $fg_color;
@@ -1278,11 +1385,11 @@ $popop_menuitem_radius: $wm_radius - 4px;
 }
 
 #calendarArea {
-  padding: 8px 12px;
+  padding: 12px 0;
 }
 
 .calendar {
-  margin: 4px 12px 6px;
+  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
@@ -1294,7 +1401,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
 .datemenu-today-button,
 .datemenu-displays-box,
 .message-list-sections {
-  margin: 0 8px;
+  margin: 4px 8px;
 }
 
 .datemenu-displays-section { padding-bottom: 0; }
@@ -1303,9 +1410,9 @@ $popop_menuitem_radius: $wm_radius - 4px;
 .datemenu-calendar-column {
   spacing: 8px;
   border: none;
-  padding: 0 0;
-  &:ltr { border-left-width: 0; }
-  &:rtl { border-right-width: 0; }
+  padding: 0 $container_padding * 2;
+  &:ltr { margin-right: $container_padding * 2; border-left-width: 0; }
+  &:rtl { margin-left: $container_padding * 2; border-right-width: 0; }
 }
 
 .datemenu-today-button {
@@ -1317,6 +1424,13 @@ $popop_menuitem_radius: $wm_radius - 4px;
   text-shadow: none;
   color: $alt_fg_color;
 
+  // weekday label
+  .day-label {
+    @include font(title);
+    font-weight: bold;
+  }
+
+  // date label
   .date-label {
     @include font(headline);
   }
@@ -1462,7 +1576,8 @@ $popop_menuitem_radius: $wm_radius - 4px;
 .events-section-title {
   @extend %popover_bubble;
   min-height: $menuitem_size - 4px * 2;
-  padding: 4px 8px;
+  padding: 12px;
+  margin: 2px 4px;
 }
 
 .world-clocks-header,
@@ -1523,7 +1638,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
 /* Weather */
 .weather-button {
-  padding: 12px;
   margin-bottom: 6px;
 
   .weather-box {
@@ -1820,6 +1934,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
   padding: 0 16px 32px;
+  spacing: 12px;
 
   &.external-monitor { padding: 16px; }
 }
@@ -2001,6 +2116,11 @@ $popop_menuitem_radius: $wm_radius - 4px;
   -shell-grid-horizontal-item-size: 136px;
   -shell-grid-vertical-item-size: 136px;
 
+  row-spacing: $container_padding * 6;
+  column-spacing: $container_padding * 6;
+  max-row-spacing: $container_padding * 12;
+  max-column-spacing: $container_padding * 12;
+
   .overview-icon { icon-size: 96px; }
 }
 //.app-display { spacing: 20px; }
@@ -2065,7 +2185,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
 %app-well-app,
 .show-apps,
 .app-well-app,
-.app-well-app.app-folder,
 .grid-search-result {
   & .overview-icon {
     @extend %icon_tile;
@@ -2187,24 +2306,39 @@ StWidget.focused .app-well-app-running-dot {
 
 .no-frequent-applications-label { @extend %status_text; }
 
-.app-well-app > .overview-icon.overview-icon-with-label,
+.overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
-  spacing: 4px;
+  spacing: 6px;
+
+  > StBoxLayout {
+    spacing: 6px;
+  }
 }
 
 // App Folders
 
-// .app-folder {
-//   .overview-icon { }
-// }
+.app-folder {
+  background: none;
+  transition: $longer_transition;
+
+  .overview-icon {
+    background-color: $light_divider_color;
+    // padding: 16px;
+    border-radius: $bt_radius * 2;
+  }
+
+  &:hover .overview-icon  {
+    background-color: rgba(white, 0.2);
+  }
+}
 
 // expanded folder
 .app-folder-dialog {
   border-radius: $bd_radius * 4;
   border: none;
-  spacing: 12px;
-  background-color: rgba(#101010, 0.95);
+  padding: 12px;
+  background-color: rgba(#242424, 0.95);
 
   & .folder-name-container {
     padding: 24px 36px 0;
@@ -2218,6 +2352,7 @@ StWidget.focused .app-well-app-running-dot {
 
     & .folder-name-entry {
       @extend %search-entry;
+      width: 300px;
     }
 
     /* FIXME: this is to keep the label in sync with the entry */
@@ -2240,12 +2375,25 @@ StWidget.focused .app-well-app-running-dot {
     }
   }
 
+  & .icon-grid {
+    row-spacing: $container_padding * 2;
+    column-spacing: $container_padding * 5;
+  }
+
+  & .page-indicators {
+    margin-bottom: 18px;
+
+    .page-indicator {
+      padding: 15px 12px;
+    }
+  }
+
   & StButton#vhandle,
   & StButton#vhandle:hover,
   & StButton#vhandle:active { background-color: transparent; }
 }
 .app-folder-dialog-container {
-  padding: 12px;
+  padding: $container_padding;
   width: 600px;
   height: 600px;
 }
@@ -2256,31 +2404,44 @@ StWidget.focused .app-well-app-running-dot {
   spacing-columns: $container_padding;
 }
 
-  // Workspace pager
-  .workspace-thumbnails { //container ala dash
-    @extend %overview-panel;
-    visible-width: 32px; //amount visible before hover
-    spacing: 12px;
-    padding: 16px;
-    border-radius: $bt_radius;
-    margin: 6px;
-    // border-width: 0; //fixme: can't have non unoform borders :(
-    // &:rtl { border-radius: $bt_radius; }
-  }
-  .workspace-thumbnail-indicator {
-    border: 0 solid $primary_color;
-    border-width: 2px;
-    padding: 6px;
-    border-radius: 2px;
+// Rename popup for app folders
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: $container_padding;
+    &:ltr, &:rtl { padding: 0 $container_padding * 2; }
   }
+}
 
-  //Some hacks I don't even
-  .search-display > StBoxLayout,
-  .all-apps,
-  .frequent-apps > StBoxLayout {
-    // horizontal padding to make sure scrollbars or dash don't overlap content
-    padding: 0px 88px 10px 88px;
+// Workspace pager
+.workspace-thumbnails { //container ala dash
+  @extend %overview-panel;
+  visible-width: 32px; //amount visible before hover
+  spacing: 12px;
+  padding: 16px;
+  border-radius: $bt_radius;
+  margin: 6px;
+  // border-width: 0; //fixme: can't have non unoform borders :(
+  // &:rtl { border-radius: $bt_radius; }
+
+  .placeholder {
+    background-image: url("assets/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
   }
+}
+.workspace-thumbnail-indicator {
+  border: 2px solid $primary_color;
+  padding: 6px;
+  border-radius: 2px;
+}
+
+//Some hacks I don't even
+.all-apps,
+.search-display > StBoxLayout,
+.frequent-apps > StBoxLayout {
+  // horizontal padding to make sure scrollbars or dash don't overlap content
+  padding: 0px 88px 10px 88px;
+}
 
 %overview-panel {
   color: $light_alt_fg_color;
@@ -2333,6 +2494,7 @@ StWidget.focused .app-well-app-running-dot {
   }
 }
 
+// counter
 .summary-source-counter {
   font-size: 1em;
   font-weight: bold;
@@ -2369,6 +2531,34 @@ StWidget.focused .app-well-app-running-dot {
   &:rtl { padding-left: 0; padding-right: 4px; }
 }
 
+%bubble_button {
+  @include button(normal);
+  padding: $container_padding * 2;
+  border-style: solid;
+  border-width: 0;
+  border-left-width: 0;
+  border-bottom-width: 0;
+
+  &:insensitive { @include button(insensitive); }
+  &:hover { @include button(hover); }
+  &:focus { @include button(focus); }
+  &:active { @include button(active); }
+
+  // radius is 2 pixel less to fit in bubble
+  &:first-child {
+    border-radius: 0 0 0 $bt_radius;
+  }
+
+  &:last-child {
+    border-right-width: 0;
+    border-radius: 0 0 $bt_radius 0;
+  }
+
+  &:first-child:last-child {
+    border-radius: 0 0 $bt_radius $bt_radius;
+  }
+}
+
 //hotplug
 .hotplug-transient-box {
   spacing: 6px;
@@ -2377,6 +2567,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .hotplug-notification-item {
   padding: 2px 10px;
+  @extend %bubble_button;
   &:focus { padding: 1px 71px 1px 11px; }
 }
 
@@ -2522,6 +2713,22 @@ StWidget.focused .app-well-app-running-dot {
   box-shadow: $shadow_2;
 }
 
+// emoji
+.emoji-page {
+  .keyboard-key {
+    background-color: transparent;
+    border: none;
+    color: initial;
+  }
+}
+
+.emoji-panel {
+  .keyboard-key:latched {
+    border-color: lighten($primary_color, 5%);
+    background-color: $primary_color;
+  }
+}
+
 // IBus Candidate Popup
 
 .candidate-popup-content {
@@ -2843,6 +3050,67 @@ $login_entry_bg: if($variant == 'dark', rgba(black, 0.1), rgba(white, 0.1));
   box-shadow: $shadow_5;
 }
 
+/* Screen Shield */
+
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .unlock-dialog-notification-source {
+    padding: 12px 6px;
+    border: none;
+    background-color: $dark_bg_color;
+    color: $light_fg_color;
+    border-radius: $bt_radius;
+
+    &.critical { background-color: $alt_dark_bg_color; }
+  }
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: $dark_sidebar_bg;
+  background-color: $light_alt_fg_color;
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
 #lockDialogGroup {
   background: url("assets/background.jpg");
   background-size: cover;
@@ -2852,7 +3120,6 @@ $login_entry_bg: if($variant == 'dark', rgba(black, 0.1), rgba(white, 0.1));
   StScrollBar { @extend %overview_scrollbar; }
 }
 
-
 // Looking Glass
 #LookingGlassDialog {
   background-color: $base_color;
diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index e61e418..6d5721e 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -157,7 +157,7 @@
 //
 
   @if $t == normal {
-    color: if($tc == $fg_color, $button_fg_color, $tc);
+    color: if($tc == $fg_color, $fg_color, $tc);
     background-color: $c;
     border: 1px solid $button_borders;