diff --git a/src/_sass/_colors.scss b/src/_sass/_colors.scss
index 7a02e51..6e7a8f4 100644
--- a/src/_sass/_colors.scss
+++ b/src/_sass/_colors.scss
@@ -114,7 +114,7 @@ $titlebar-backdrop:                     if($topbar == 'dark', background(g), bac
 
 $keyboard:                              if($variant == 'light', $grey-050, $grey-800); // for gnome-shell keyboard
 $keyboard-alt:                          if($variant == 'light', $grey-300, $grey-900); // for gnome-shell keyboard
-$system:                                if($blackness == 'true', $grey-850, $grey-800); // for gnome-shell keyboard
+$system:                                if($blackness == 'true', $grey-850, $grey-750); // for gnome-shell keyboard
 $popover:                               if($variant == 'light', background(a), background(e));
 
 $panel-solid:                           if($topbar == 'dark', background(e), background(c)); // for Unity panel which doesn't allow translucent colors
diff --git a/src/_sass/gnome-shell/_common.scss b/src/_sass/gnome-shell/_common.scss
index 8819adf..da516cb 100644
--- a/src/_sass/gnome-shell/_common.scss
+++ b/src/_sass/gnome-shell/_common.scss
@@ -61,7 +61,7 @@ $bubble_button_radius: if($corner_style == 'circular', $circular-radius, $materi
 
 %osd_panel {
   color: on(dark);
-  background-color: $system;
+  background-color: $popover;
   border: none;
   box-shadow: $shell-shadow-z4;
   padding: $space-size * 2;
diff --git a/src/_sass/gnome-shell/widgets/_popovers-42.scss b/src/_sass/gnome-shell/widgets/_popovers-42.scss
index f2bd4f5..db10f08 100644
--- a/src/_sass/gnome-shell/widgets/_popovers-42.scss
+++ b/src/_sass/gnome-shell/widgets/_popovers-42.scss
@@ -25,7 +25,7 @@
   .popup-menu-content {
     padding: $space-size;
     margin: 0 3px 14px;
-    background-color: if($opacity == 'solid', $popover, rgba($popover, 0.96));
+    background-color: if($opacity == 'solid', $popover, rgba($popover, 0.97));
     border-radius: $popup-radius;
     border: none;
     box-shadow: $shell-shadow-z3;
diff --git a/src/_sass/gnome-shell/widgets/_popovers.scss b/src/_sass/gnome-shell/widgets/_popovers.scss
index 71ebea7..042a922 100644
--- a/src/_sass/gnome-shell/widgets/_popovers.scss
+++ b/src/_sass/gnome-shell/widgets/_popovers.scss
@@ -26,7 +26,7 @@
 .popup-menu-content {
   padding: $space-size 0;
   margin: $space-size 10px 13px 10px;
-  background-color: if($opacity == 'solid', $popover, rgba($popover, 0.96));
+  background-color: if($opacity == 'solid', $popover, rgba($popover, 0.97));
   border-radius: $popup-radius;
   box-shadow: $shell-shadow-z3;
 }
diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Compact.css
index 684aef1..316fba2 100644
--- a/src/gnome-shell/shell-3-28/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-3-28/gnome-shell-Compact.css
@@ -4103,7 +4103,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css
index 1084b11..c2d9bbc 100644
--- a/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-3-28/gnome-shell-Dark-Compact.css
@@ -4103,7 +4103,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-3-28/gnome-shell-Dark.css b/src/gnome-shell/shell-3-28/gnome-shell-Dark.css
index 1a7d246..11ae5d3 100644
--- a/src/gnome-shell/shell-3-28/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-3-28/gnome-shell-Dark.css
@@ -4103,7 +4103,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-3-28/gnome-shell.css b/src/gnome-shell/shell-3-28/gnome-shell.css
index 851b1a2..e3560f8 100644
--- a/src/gnome-shell/shell-3-28/gnome-shell.css
+++ b/src/gnome-shell/shell-3-28/gnome-shell.css
@@ -4103,7 +4103,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
index a42ef48..9afd213 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -85,7 +85,7 @@ stage {
 
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
   color: white;
-  background-color: #212121;
+  background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   padding: 8px;
@@ -460,7 +460,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-content {
   padding: 4px 0;
   margin: 4px 10px 13px 10px;
-  background-color: rgba(255, 255, 255, 0.96);
+  background-color: rgba(255, 255, 255, 0.97);
   border-radius: 18px;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }
@@ -2109,7 +2109,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2129,7 +2129,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2144,17 +2144,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2457,7 +2457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -2757,7 +2757,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -2898,7 +2898,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 4px;
   padding: 0;
   border: none;
@@ -2910,7 +2910,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 4px 6px;
   border: none;
   border-radius: 18px 18px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3084,7 +3084,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 4px;
@@ -3493,7 +3493,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -3515,7 +3515,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -3937,7 +3937,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
index f7acba1..b79f34f 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@@ -460,7 +460,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-content {
   padding: 4px 0;
   margin: 4px 10px 13px 10px;
-  background-color: rgba(33, 33, 33, 0.96);
+  background-color: rgba(33, 33, 33, 0.97);
   border-radius: 18px;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }
@@ -2109,7 +2109,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2129,7 +2129,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2144,17 +2144,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2457,7 +2457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -2757,7 +2757,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -2898,7 +2898,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 4px;
   padding: 0;
   border: none;
@@ -2910,7 +2910,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 4px 6px;
   border: none;
   border-radius: 18px 18px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3084,7 +3084,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 4px;
@@ -3493,7 +3493,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -3515,7 +3515,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -3937,7 +3937,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
index 26af7f5..9126e0b 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -460,7 +460,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-content {
   padding: 6px 0;
   margin: 6px 10px 13px 10px;
-  background-color: rgba(33, 33, 33, 0.96);
+  background-color: rgba(33, 33, 33, 0.97);
   border-radius: 20px;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }
@@ -2109,7 +2109,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2129,7 +2129,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2144,17 +2144,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2457,7 +2457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -2757,7 +2757,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -2898,7 +2898,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 6px;
   padding: 0;
   border: none;
@@ -2910,7 +2910,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 6px 9px;
   border: none;
   border-radius: 20px 20px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3084,7 +3084,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 6px;
@@ -3493,7 +3493,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -3515,7 +3515,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -3937,7 +3937,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index d53b394..0450e3e 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -85,7 +85,7 @@ stage {
 
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
   color: white;
-  background-color: #212121;
+  background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   padding: 12px;
@@ -460,7 +460,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu-content {
   padding: 6px 0;
   margin: 6px 10px 13px 10px;
-  background-color: rgba(255, 255, 255, 0.96);
+  background-color: rgba(255, 255, 255, 0.97);
   border-radius: 20px;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }
@@ -2109,7 +2109,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2129,7 +2129,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2144,17 +2144,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2457,7 +2457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -2757,7 +2757,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -2898,7 +2898,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 6px;
   padding: 0;
   border: none;
@@ -2910,7 +2910,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 6px 9px;
   border: none;
   border-radius: 20px 20px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3084,7 +3084,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 6px;
@@ -3493,7 +3493,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -3515,7 +3515,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -3937,7 +3937,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
index f5017d4..26f2163 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -91,7 +91,7 @@ stage {
 
 .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
   color: rgba(255, 255, 255, 0.3);
-  background-color: #212121;
+  background-color: #242424;
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -139,7 +139,7 @@ stage {
 
 .screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
   color: white;
-  background-color: #212121;
+  background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   padding: 8px;
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu .popup-menu-content {
   padding: 4px;
   margin: 0 3px 14px;
-  background-color: rgba(255, 255, 255, 0.96);
+  background-color: rgba(255, 255, 255, 0.97);
   border-radius: 18px;
   border: none;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
@@ -2473,7 +2473,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2493,7 +2493,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close, .screenshot-ui-close-button {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2508,17 +2508,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover, .screenshot-ui-close-button:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active, .screenshot-ui-close-button:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2821,7 +2821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -3121,7 +3121,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -3262,7 +3262,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 4px;
   padding: 0;
   border: none;
@@ -3274,7 +3274,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 4px 6px;
   border: none;
   border-radius: 18px 18px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3448,7 +3448,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 4px;
@@ -3622,7 +3622,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-window-selector {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .screenshot-ui-window-selector .screenshot-ui-window-selector-window-container {
@@ -3681,7 +3681,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .screenshot-ui-tooltip {
   color: white;
-  background-color: #212121;
+  background-color: #242424;
   border-radius: 9999px;
   padding: 4px 8px;
   text-align: center;
@@ -4065,7 +4065,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -4087,7 +4087,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -4509,7 +4509,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
index 956d9df..695173e 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@@ -91,7 +91,7 @@ stage {
 
 .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
   color: rgba(255, 255, 255, 0.3);
-  background-color: #212121;
+  background-color: #242424;
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu .popup-menu-content {
   padding: 4px;
   margin: 0 3px 14px;
-  background-color: rgba(33, 33, 33, 0.96);
+  background-color: rgba(33, 33, 33, 0.97);
   border-radius: 18px;
   border: none;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
@@ -2477,7 +2477,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2497,7 +2497,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close, .screenshot-ui-close-button {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2512,17 +2512,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover, .screenshot-ui-close-button:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active, .screenshot-ui-close-button:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2825,7 +2825,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -3125,7 +3125,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -3266,7 +3266,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 4px;
   padding: 0;
   border: none;
@@ -3278,7 +3278,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 4px 6px;
   border: none;
   border-radius: 18px 18px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3452,7 +3452,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 4px;
@@ -3626,7 +3626,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-window-selector {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .screenshot-ui-window-selector .screenshot-ui-window-selector-window-container {
@@ -3685,7 +3685,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .screenshot-ui-tooltip {
   color: white;
-  background-color: #212121;
+  background-color: #242424;
   border-radius: 9999px;
   padding: 4px 8px;
   text-align: center;
@@ -4069,7 +4069,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -4091,7 +4091,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -4513,7 +4513,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
index 11de637..95272c4 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -91,7 +91,7 @@ stage {
 
 .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
   color: rgba(255, 255, 255, 0.3);
-  background-color: #212121;
+  background-color: #242424;
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu .popup-menu-content {
   padding: 6px;
   margin: 0 3px 14px;
-  background-color: rgba(33, 33, 33, 0.96);
+  background-color: rgba(33, 33, 33, 0.97);
   border-radius: 20px;
   border: none;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
@@ -2477,7 +2477,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2497,7 +2497,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close, .screenshot-ui-close-button {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2512,17 +2512,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover, .screenshot-ui-close-button:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active, .screenshot-ui-close-button:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2825,7 +2825,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -3125,7 +3125,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -3266,7 +3266,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 6px;
   padding: 0;
   border: none;
@@ -3278,7 +3278,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 6px 9px;
   border: none;
   border-radius: 20px 20px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3452,7 +3452,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 6px;
@@ -3626,7 +3626,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-window-selector {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .screenshot-ui-window-selector .screenshot-ui-window-selector-window-container {
@@ -3685,7 +3685,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .screenshot-ui-tooltip {
   color: white;
-  background-color: #212121;
+  background-color: #242424;
   border-radius: 9999px;
   padding: 6px 12px;
   text-align: center;
@@ -4069,7 +4069,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -4091,7 +4091,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -4513,7 +4513,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index de50bf0..2a4cf64 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -91,7 +91,7 @@ stage {
 
 .screenshot-ui-show-pointer-button:insensitive, .screenshot-ui-type-button:insensitive {
   color: rgba(255, 255, 255, 0.3);
-  background-color: #212121;
+  background-color: #242424;
   border-color: transparent;
   box-shadow: none;
   text-shadow: none;
@@ -139,7 +139,7 @@ stage {
 
 .screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
   color: white;
-  background-color: #212121;
+  background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   padding: 12px;
@@ -515,7 +515,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .popup-menu .popup-menu-content {
   padding: 6px;
   margin: 0 3px 14px;
-  background-color: rgba(255, 255, 255, 0.96);
+  background-color: rgba(255, 255, 255, 0.97);
   border-radius: 20px;
   border: none;
   box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
@@ -2473,7 +2473,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #overviewGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .overview-controls {
@@ -2493,7 +2493,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close, .screenshot-ui-close-button {
-  background-color: #212121;
+  background-color: #242424;
   color: white;
   border-radius: 21px;
   padding: 3px;
@@ -2508,17 +2508,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .window-close:hover, .screenshot-ui-close-button:hover {
-  background-color: #474747;
+  background-color: #4a4a4a;
 }
 
 .window-close:active, .screenshot-ui-close-button:active {
   color: rgba(255, 255, 255, 0.8);
-  background-color: #141414;
+  background-color: #171717;
 }
 
 .workspace-background {
   border-radius: 30px;
-  background-color: #212121;
+  background-color: #242424;
   box-shadow: 0 4px 16px 4px rgba(0, 0, 0, 0.15);
 }
 
@@ -2821,7 +2821,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .app-folder-dialog {
   border-radius: 40px;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  background-color: rgba(33, 33, 33, 0.95);
+  background-color: rgba(36, 36, 36, 0.95);
   spacing: 6px;
 }
 
@@ -3121,7 +3121,7 @@ StWidget.focused .app-well-app-running-dot {
 
 /* Workspace animation */
 .workspace-animation {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 /* Tiled window previews */
@@ -3262,7 +3262,7 @@ StWidget.focused .app-well-app-running-dot {
 /* Looking Glass */
 #LookingGlassDialog {
   color: rgba(255, 255, 255, 0.7);
-  background-color: #212121;
+  background-color: #242424;
   spacing: 6px;
   padding: 0;
   border: none;
@@ -3274,7 +3274,7 @@ StWidget.focused .app-well-app-running-dot {
   padding: 6px 9px;
   border: none;
   border-radius: 20px 20px 0 0;
-  background-color: #3b3b3b;
+  background-color: #3e3e3e;
   box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.7);
 }
@@ -3448,7 +3448,7 @@ StWidget.focused .app-well-app-running-dot {
 
 #LookingGlassPropertyInspector {
   color: white;
-  background: #303030;
+  background: #333333;
   border: none;
   border-radius: 10px;
   padding: 6px;
@@ -3622,7 +3622,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-window-selector {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .screenshot-ui-window-selector .screenshot-ui-window-selector-window-container {
@@ -3681,7 +3681,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .screenshot-ui-tooltip {
   color: white;
-  background-color: #212121;
+  background-color: #242424;
   border-radius: 9999px;
   padding: 6px 12px;
   text-align: center;
@@ -4065,7 +4065,7 @@ StWidget.focused .app-well-app-running-dot {
 
 .unlock-dialog-notifications-container .notification.critical,
 .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-  background-color: rgba(33, 33, 33, 0.9);
+  background-color: rgba(36, 36, 36, 0.9);
 }
 
 .unlock-dialog-notification-label {
@@ -4087,7 +4087,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 #lockDialogGroup {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 #unlockDialogNotifications StButton#vhandle, #unlockDialogNotifications StButton#hhandle {
@@ -4509,7 +4509,7 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .cosmic-solid-bg {
-  background-color: #212121;
+  background-color: #242424;
 }
 
 .cosmic-dock #dock {