diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css
index e369321..c1e1761 100644
--- a/src/main/gnome-shell/gdm3-dark.css
+++ b/src/main/gnome-shell/gdm3-dark.css
@@ -65,7 +65,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.75);
+  border: 1px solid rgba(0, 0, 0, 0.75) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -94,7 +94,7 @@ stage {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -103,7 +103,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -112,7 +112,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -121,7 +121,7 @@ stage {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -130,7 +130,7 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -875,7 +875,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -936,7 +936,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -947,7 +947,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -957,7 +957,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -967,7 +967,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1272,7 +1272,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: white;
 }
 
@@ -1880,7 +1880,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css
index b69bfa5..03b7b7a 100644
--- a/src/main/gnome-shell/gdm3-light.css
+++ b/src/main/gnome-shell/gdm3-light.css
@@ -65,7 +65,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -94,7 +94,7 @@ stage {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -103,7 +103,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -112,7 +112,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -121,7 +121,7 @@ stage {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -130,7 +130,7 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -875,7 +875,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -936,7 +936,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -947,7 +947,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -957,7 +957,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -967,7 +967,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1272,7 +1272,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: white;
 }
 
@@ -1880,7 +1880,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index 1e67a3d..3fac18f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #dedede;
   background-color: #242424;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0.75);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.75);
+  border: 1px solid rgba(0, 0, 0, 0.75) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #dedede;
-  background-color: #242424;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #dedede;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(36, 36, 36, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: white;
 }
 
@@ -3733,7 +3733,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4121,7 +4121,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4130,7 +4130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4139,14 +4139,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
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 0f1c9d5..37cf308 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #dedede;
   background-color: #242424;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0.75);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.75);
+  border: 1px solid rgba(0, 0, 0, 0.75) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #dedede;
-  background-color: #242424;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #dedede;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(36, 36, 36, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: #dadada;
 }
 
@@ -3733,7 +3733,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4121,7 +4121,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4130,7 +4130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4139,14 +4139,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 0f1c9d5..37cf308 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #dedede;
   background-color: #242424;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0.75);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.75);
+  border: 1px solid rgba(0, 0, 0, 0.75) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #dedede;
-  background-color: #242424;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #dedede;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(36, 36, 36, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: #dadada;
 }
 
@@ -3733,7 +3733,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4121,7 +4121,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4130,7 +4130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4139,14 +4139,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 1e67a3d..3fac18f 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #dedede;
   background-color: #242424;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0.75);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0.75);
+  border: 1px solid rgba(0, 0, 0, 0.75) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #dedede;
-  background-color: #242424;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #dedede;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(222, 222, 222, 0.35);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #dedede;
   background-color: rgba(36, 36, 36, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: white;
 }
 
@@ -3733,7 +3733,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4121,7 +4121,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #afafaf;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4130,7 +4130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.1);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4139,14 +4139,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #dedede;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #dedede;
   background-color: rgba(255, 255, 255, 0.16);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 41a6176..8d5ad96 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #242424;
   background-color: #ffffff;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #242424;
-  background-color: #ffffff;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #242424;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(255, 255, 255, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: #363636;
 }
 
@@ -3737,7 +3737,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4125,7 +4125,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4134,7 +4134,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4143,14 +4143,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
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 645d377..b737f41 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #242424;
   background-color: #ffffff;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #242424;
-  background-color: #ffffff;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #242424;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(255, 255, 255, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: #363636;
 }
 
@@ -3737,7 +3737,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4125,7 +4125,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4134,7 +4134,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4143,14 +4143,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 645d377..b737f41 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #242424;
   background-color: #ffffff;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #242424;
-  background-color: #ffffff;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #242424;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(255, 255, 255, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: #363636;
 }
 
@@ -3737,7 +3737,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4125,7 +4125,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4134,7 +4134,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4143,14 +4143,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 512b322..d3de130 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -46,8 +46,8 @@ stage {
 .switcher-list {
   color: #242424;
   background-color: #ffffff;
-  border: none;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid rgba(0, 0, 0, 0);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   border-radius: 6px;
   padding: 12px;
 }
@@ -160,7 +160,7 @@ stage {
 .candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  border: 1px solid rgba(0, 0, 0, 0);
+  border: 1px solid rgba(0, 0, 0, 0) !important;
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -189,7 +189,7 @@ stage {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -198,7 +198,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -207,7 +207,7 @@ stage {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -216,7 +216,7 @@ stage {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -225,7 +225,7 @@ stage {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .window-close {
@@ -853,10 +853,10 @@ stage {
 
 .dash-label {
   border-radius: 6px;
-  padding: 7px 8px;
-  color: #242424;
-  background-color: #ffffff;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  padding: 6px 8px;
+  color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(0, 0, 0, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -1094,9 +1094,9 @@ StWidget.focused .app-well-app-running-dot {
 
 .app-folder-dialog {
   border-radius: 32px;
-  border: none;
+  border: 2px solid rgba(255, 255, 255, 0.15);
   padding: 12px;
-  background-color: rgba(36, 36, 36, 0.95);
+  background-color: rgba(24, 24, 24, 0.95);
 }
 
 .app-folder-dialog .folder-name-container {
@@ -1252,7 +1252,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1261,7 +1261,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1270,7 +1270,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1279,7 +1279,7 @@ StWidget.focused .app-well-app-running-dot {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1288,7 +1288,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .modal-dialog-linked-button:first-child {
@@ -1299,7 +1299,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1308,7 +1308,7 @@ StWidget.focused .app-well-app-running-dot {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -1997,7 +1997,7 @@ StEntry StLabel.hint-text {
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
 }
 
 .login-dialog-banner-view {
@@ -2058,7 +2058,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2069,7 +2069,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2079,7 +2079,7 @@ StEntry StLabel.hint-text {
   color: white;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2089,7 +2089,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2394,7 +2394,7 @@ StEntry StLabel.hint-text {
   padding: 0;
   border: none;
   border-radius: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
   color: #242424;
 }
 
@@ -2478,7 +2478,7 @@ StEntry StLabel.hint-text {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2487,7 +2487,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2496,7 +2496,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2505,7 +2505,7 @@ StEntry StLabel.hint-text {
   color: rgba(36, 36, 36, 0.45);
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -2514,7 +2514,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .lg-obj-inspector-button:hover {
@@ -2550,7 +2550,7 @@ StEntry StLabel.hint-text {
   border: none;
   border-radius: 6px;
   padding: 6px;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.25);
 }
 
 .ripple-pointer-location {
@@ -2816,7 +2816,7 @@ StEntry StLabel.hint-text {
   color: #242424;
   background-color: rgba(255, 255, 255, 0.92);
   border: none;
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
 }
 
 .notification-banner:hover {
@@ -3125,7 +3125,7 @@ StEntry StLabel.hint-text {
   transition-duration: 250ms;
   font-weight: bold;
   height: 28px;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 5px 16px rgba(0, 0, 0, 0.35);
   color: white;
 }
 
@@ -3733,7 +3733,7 @@ StEntry StLabel.hint-text {
 
 .screen-shield-background {
   background: black;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
 }
 
 .unlock-dialog-clock {
@@ -4121,7 +4121,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #424242;
   background-color: transparent;
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4130,7 +4130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.12);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
@@ -4139,14 +4139,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: #242424;
   text-shadow: none;
   icon-shadow: none;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
 }
 
 .openweather-provider:active {
   color: #242424;
   background-color: rgba(0, 0, 0, 0.2);
   border-color: transparent;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: none;
   text-shadow: none;
   icon-shadow: none;
 }
diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 80907e4..b7a26ea 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -233,7 +233,7 @@
     color: if($tc != $light_fg_color, $alt_fg_color, $light_fg_color);
     background-color: transparent;
     border-color: transparent;
-    box-shadow: $shadow_0;
+    box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
@@ -242,7 +242,7 @@
     color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: $shadow_0;
+    box-shadow: none;
     // box-shadow: inset 0px 0px 0px 2px $divider_color;
   }
 
@@ -250,7 +250,7 @@
     color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
     background-color: $divider_color;
     border-color: transparent;
-    box-shadow: $shadow_0;
+    box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
@@ -259,7 +259,7 @@
     color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
     background-color: $track_color;
     border-color: transparent;
-    box-shadow: $shadow_0;
+    box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
@@ -268,7 +268,7 @@
     color: if($tc != $light_fg_color, $disabled_fg_color, $light_alt_disabled_fg_color);
     background-color: transparent;
     border-color: transparent;
-    box-shadow: $shadow_0;
+    box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
diff --git a/src/sass/gnome-shell/widgets/_base.scss b/src/sass/gnome-shell/widgets/_base.scss
index 41c059a..13cb85f 100644
--- a/src/sass/gnome-shell/widgets/_base.scss
+++ b/src/sass/gnome-shell/widgets/_base.scss
@@ -50,8 +50,8 @@ stage {
 %osd-panel {
   color: $fg_color;
   background-color: $base_color;
-  border: none;
-  box-shadow: $shadow_4;
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
   border-radius: $bt_radius;
   padding: 12px;
 }
@@ -120,7 +120,7 @@ stage {
 %theme_dialogs {
   background-color: $dialog_bg_color;
   border-radius: $wm_radius;
-  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75)) !important;
 }
 
 %overview_scrollbar {
diff --git a/src/sass/gnome-shell/widgets/_dashboard.scss b/src/sass/gnome-shell/widgets/_dashboard.scss
index 0df9db9..886aab2 100644
--- a/src/sass/gnome-shell/widgets/_dashboard.scss
+++ b/src/sass/gnome-shell/widgets/_dashboard.scss
@@ -30,10 +30,10 @@
 .dash-label { //osd tooltip
   // min-height: 32px - 6px * 2;
   border-radius: $bt_radius;
-  padding: 7px 8px;
-  color: $fg_color;
-  background-color: $base_color;
-  box-shadow: $shadow_2;
+  padding: 6px 8px;
+  color: rgba(white, 0.9);
+  background-color: rgba(black, 0.75);
+  box-shadow: none;
   text-align: center;
   border: none;
   -x-offset: 8px;
@@ -253,9 +253,9 @@ StWidget.focused .app-well-app-running-dot {
 // expanded folder
 .app-folder-dialog {
   border-radius: $bd_radius * 4;
-  border: none;
+  border: 2px solid rgba(white, 0.15);
   padding: 12px;
-  background-color: rgba(#242424, 0.95);
+  background-color: rgba(#181818, 0.95);
 
   & .folder-name-container {
     padding: 24px 36px 0;
diff --git a/src/sass/gnome-shell/widgets/_keyboard.scss b/src/sass/gnome-shell/widgets/_keyboard.scss
index a1e04c7..f25e5a7 100644
--- a/src/sass/gnome-shell/widgets/_keyboard.scss
+++ b/src/sass/gnome-shell/widgets/_keyboard.scss
@@ -82,5 +82,5 @@
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px;
-  box-shadow: $shadow_2;
+  box-shadow: 0 2px 5px rgba(black, 0.25);
 }
diff --git a/src/sass/gnome-shell/widgets/_looking-glass.scss b/src/sass/gnome-shell/widgets/_looking-glass.scss
index abff27c..d0a1e4a 100644
--- a/src/sass/gnome-shell/widgets/_looking-glass.scss
+++ b/src/sass/gnome-shell/widgets/_looking-glass.scss
@@ -4,7 +4,7 @@
   padding: 0;
   border: none;
   border-radius: $bt_radius;
-  box-shadow: $shadow_4;
+  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
   color: $fg_color;
 
   & > #Toolbar {
@@ -104,5 +104,5 @@
   border: none;
   border-radius: $bt_radius;
   padding: 6px;
-  box-shadow: $shadow_4;
+  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
 }
diff --git a/src/sass/gnome-shell/widgets/_misc.scss b/src/sass/gnome-shell/widgets/_misc.scss
index 364b00c..2256656 100644
--- a/src/sass/gnome-shell/widgets/_misc.scss
+++ b/src/sass/gnome-shell/widgets/_misc.scss
@@ -137,7 +137,7 @@
   background-color: $primary_color;
   color: $light_alt_fg_color;
   border: 2px solid $primary_color;
-  box-shadow: 0 2px 2px rgba(0,0,0,0.5);
+  box-shadow: 0 2px 2px rgba(black, 0.5);
   border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
 }
 
diff --git a/src/sass/gnome-shell/widgets/_notifications.scss b/src/sass/gnome-shell/widgets/_notifications.scss
index 3efa487..a9ea194 100644
--- a/src/sass/gnome-shell/widgets/_notifications.scss
+++ b/src/sass/gnome-shell/widgets/_notifications.scss
@@ -12,7 +12,7 @@
   color: $fg_color;
   background-color: rgba($base_color, 0.92);
   border: none;
-  box-shadow: $shadow_2;
+  box-shadow: 0 3px 8px rgba(black, 0.25);
 
   &:hover { background-color: rgba($base_color, 0.95); }
   &:focus { background-color: $base_color; }
diff --git a/src/sass/gnome-shell/widgets/_panel.scss b/src/sass/gnome-shell/widgets/_panel.scss
index 099c1b3..6f7e71a 100644
--- a/src/sass/gnome-shell/widgets/_panel.scss
+++ b/src/sass/gnome-shell/widgets/_panel.scss
@@ -7,7 +7,7 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
   transition-duration: 250ms;
   font-weight: bold;
   height: $menuitem_size;
-  box-shadow: 0 3px 6px rgba(black, 0.22), 0 5px 16px rgba(black, 0.35);
+  box-shadow: 0 5px 16px rgba(black, 0.35);
   color: $panel_fg;
 
   &:overview,
diff --git a/src/sass/gnome-shell/widgets/_screen-shield.scss b/src/sass/gnome-shell/widgets/_screen-shield.scss
index c2bf4c8..2535f3b 100644
--- a/src/sass/gnome-shell/widgets/_screen-shield.scss
+++ b/src/sass/gnome-shell/widgets/_screen-shield.scss
@@ -63,7 +63,7 @@
 
 .screen-shield-background { //just the shadow, really
   background: black;
-  box-shadow: $shadow_5;
+  box-shadow: 0 2px 3px 0 rgba(black, 0.15);
 }
 
 #screenShieldNotifications {