diff --git a/modules/gnome/shell_colors.patch b/modules/gnome/shell_colors.patch
index 0c2ba1e7..5c091819 100644
--- a/modules/gnome/shell_colors.patch
+++ b/modules/gnome/shell_colors.patch
@@ -1,21 +1,21 @@
 diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
-index 8a4948e41..955ed5b13 100644
+index 30d9dc452..53aab77c4 100644
 --- a/data/gnome-shell-theme.gresource.xml
 +++ b/data/gnome-shell-theme.gresource.xml
-@@ -11,7 +11,6 @@
-     <file>checkbox-off.svg</file>
+@@ -5,7 +5,6 @@
+     <file>calendar-today-light.svg</file>
      <file>gnome-shell-dark.css</file>
      <file>gnome-shell-light.css</file>
 -    <file>gnome-shell-high-contrast.css</file>
      <file>gnome-shell-start.svg</file>
      <file>pad-osd.css</file>
-     <file>process-working.svg</file>
+     <file>workspace-placeholder.svg</file>
 diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
-index 5b117ea71..67e7ce756 100644
+index 846427e8e..373fd4efd 100644
 --- a/data/theme/gnome-shell-sass/_common.scss
 +++ b/data/theme/gnome-shell-sass/_common.scss
-@@ -168,9 +168,9 @@ stage {
-
+@@ -223,9 +223,9 @@ stage {
+ 
  // tooltip
  %tooltip {
 -  background-color: transparentize(black, 0.1);
@@ -24,17 +24,19 @@ index 5b117ea71..67e7ce756 100644
 +  background-color: transparentize($bg_color, 0.1);
 +  border: 1px solid transparentize($base_color, 0.9);
 +  color: $fg_color;
-
-   border-radius: 99px;
+ 
+   border-radius: $forced_circular_radius;
    padding: $base_padding $base_padding * 2;
 diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
-index fc054da38..8e31741c1 100644
+index a4c6a8870..6e0cef1c4 100644
 --- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
 +++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
-@@ -27,6 +27,8 @@
+@@ -33,6 +33,8 @@
    .date-label {
      @extend %title_2;
    }
 +
 +  color: $fg_color !important;
  }
+ 
+ // the mini calendar
diff --git a/modules/gnome/shell_remove_dark_mode.patch b/modules/gnome/shell_remove_dark_mode.patch
index 142ac499..44228bf0 100644
--- a/modules/gnome/shell_remove_dark_mode.patch
+++ b/modules/gnome/shell_remove_dark_mode.patch
@@ -1,36 +1,36 @@
 diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 9f4313b54..9deebbcf9 100644
+index 62847a1ea..ef793752e 100644
 --- a/js/ui/panel.js
 +++ b/js/ui/panel.js
-@@ -30,7 +30,6 @@ import * as BrightnessStatus from './status/brightness.js';
+@@ -24,7 +24,6 @@ import * as BrightnessStatus from './status/brightness.js';
  import * as SystemStatus from './status/system.js';
  import * as LocationStatus from './status/location.js';
  import * as NightLightStatus from './status/nightLight.js';
 -import * as DarkModeStatus from './status/darkMode.js';
+ import * as DoNotDisturb from './status/doNotDisturb.js';
  import * as BacklightStatus from './status/backlight.js';
  import * as ThunderboltStatus from './status/thunderbolt.js';
- import * as AutoRotateStatus from './status/autoRotate.js';
-@@ -546,7 +545,6 @@ class QuickSettings extends PanelMenu.Button {
+@@ -328,7 +327,6 @@ class QuickSettings extends PanelMenu.Button {
          this._location = new LocationStatus.Indicator();
          this._thunderbolt = new ThunderboltStatus.Indicator();
          this._nightLight = new NightLightStatus.Indicator();
 -        this._darkMode = new DarkModeStatus.Indicator();
+         this._doNotDisturb = new DoNotDisturb.Indicator();
          this._backlight = new BacklightStatus.Indicator();
          this._powerProfiles = new PowerProfileStatus.Indicator();
-         this._rfkill = new RFKillStatus.Indicator();
-@@ -567,7 +565,6 @@ class QuickSettings extends PanelMenu.Button {
+@@ -350,7 +348,6 @@ class QuickSettings extends PanelMenu.Button {
          this._indicators.add_child(this._nightLight);
          if (this._network)
              this._indicators.add_child(this._network);
 -        this._indicators.add_child(this._darkMode);
+         this._indicators.add_child(this._doNotDisturb);
          this._indicators.add_child(this._backlight);
          this._indicators.add_child(this._powerProfiles);
-         if (this._bluetooth)
-@@ -599,7 +596,6 @@ class QuickSettings extends PanelMenu.Button {
+@@ -383,7 +380,6 @@ class QuickSettings extends PanelMenu.Button {
              this._addItemsBefore(this._bluetooth.quickSettingsItems, sibling);
          this._addItemsBefore(this._powerProfiles.quickSettingsItems, sibling);
          this._addItemsBefore(this._nightLight.quickSettingsItems, sibling);
 -        this._addItemsBefore(this._darkMode.quickSettingsItems, sibling);
+         this._addItemsBefore(this._doNotDisturb.quickSettingsItems, sibling);
          this._addItemsBefore(this._backlight.quickSettingsItems, sibling);
          this._addItemsBefore(this._rfkill.quickSettingsItems, sibling);
-         this._addItemsBefore(this._autoRotate.quickSettingsItems, sibling);