diff --git a/settings/shell.nix b/settings/shell.nix
index 4de48ad..e411361 100644
--- a/settings/shell.nix
+++ b/settings/shell.nix
@@ -142,7 +142,7 @@
       gsettings set org.gnome.desktop.background picture-uri "file://$img"
       gsettings set org.gnome.desktop.background picture-uri-dark "file://$img"
       matugen image "$img" --source-color-index 0 -m dark
-      echo "Wallpaper and colors updated!"
+      echo "Wallpaper and colors updated! Shell theme reloaded."
     end
   '';
 }
diff --git a/templates/gnome-shell.css b/templates/gnome-shell.css
index 0d224bf..bf5bbf4 100644
--- a/templates/gnome-shell.css
+++ b/templates/gnome-shell.css
@@ -136,6 +136,50 @@ stage {
   color: {{colors.on_surface.default.hex}} !important;
 }
 
+/* Calendar / date menu panel */
+.calendar, .datemenu-today-button, .events-button,
+.world-clocks-button, .weather-button, .message {
+  background-color: {{colors.surface_container_high.default.hex}} !important;
+  color: {{colors.on_surface.default.hex}} !important;
+}
+
+.calendar .calendar-month-header .pager-button {
+  background-color: transparent !important;
+  color: {{colors.on_surface.default.hex}} !important;
+}
+
+.calendar .calendar-month-header .pager-button:hover {
+  background-color: {{colors.surface_container_highest.default.hex}} !important;
+}
+
+.calendar .calendar-month-header .calendar-month-label {
+  background-color: transparent !important;
+  color: {{colors.on_surface.default.hex}} !important;
+}
+
+.calendar .calendar-day-heading, .calendar .calendar-day {
+  background-color: transparent !important;
+  color: {{colors.on_surface.default.hex}} !important;
+}
+
+.calendar .calendar-day:hover {
+  background-color: {{colors.surface_container_highest.default.hex}} !important;
+}
+
+.calendar .calendar-day.calendar-today {
+  background-color: {{colors.primary_container.default.hex}} !important;
+  color: {{colors.on_primary_container.default.hex}} !important;
+}
+
+/* Notification / message list */
+.message-list-placeholder {
+  color: {{colors.on_surface_variant.default.hex}} !important;
+}
+
+.message-list-controls {
+  color: {{colors.on_surface.default.hex}} !important;
+}
+
 /* Round icon buttons in quick settings header (settings gear, lock, power etc) */
 .quick-settings .icon-button {
   background-color: {{colors.surface_container_high.default.hex}} !important;
diff --git a/templates/recolor-folders.sh b/templates/recolor-folders.sh
index a64048f..6d1e6b8 100644
--- a/templates/recolor-folders.sh
+++ b/templates/recolor-folders.sh
@@ -136,3 +136,8 @@ if [ -f "$VSCODE_SETTINGS" ] && [ -f "$VSCODE_COLORS" ]; then
     jq --argjson colors "$COLORS" '. * $colors' "$VSCODE_SETTINGS" > "$TMP" && mv "$TMP" "$VSCODE_SETTINGS"
   fi
 fi
+
+# Reload GNOME Shell theme to apply new colors
+dconf write /org/gnome/shell/extensions/user-theme/name "''"
+sleep 1
+dconf write /org/gnome/shell/extensions/user-theme/name "'WallpaperShell'"
diff --git a/templates/zen-userChrome.css b/templates/zen-userChrome.css
index 8cf187c..2a40df4 100644
--- a/templates/zen-userChrome.css
+++ b/templates/zen-userChrome.css
@@ -26,8 +26,13 @@
   background-color: {{colors.surface_container_high.default.hex}} !important;
 }
 
-/* URL bar */
+/* URL bar — override Zen's color-mix background */
+#urlbar .urlbar-background,
 #urlbar-background {
+  background-color: {{colors.surface_container.default.hex}} !important;
+}
+
+#urlbar[focused="true"] .urlbar-background {
   background-color: {{colors.surface_container_high.default.hex}} !important;
 }
 
@@ -35,9 +40,9 @@
   color: {{colors.on_surface.default.hex}} !important;
 }
 
-/* Nav bar and toolbar */
+/* Nav bar and toolbar — match the toolbar background */
 #nav-bar {
-  background-color: {{colors.surface_container.default.hex}} !important;
+  background-color: transparent !important;
 }
 
 /* Sidebar text and icons */