diff --git a/home-manager/fred.nix b/home-manager/fred.nix
index f1eab1a..c4ba617 100644
--- a/home-manager/fred.nix
+++ b/home-manager/fred.nix
@@ -50,7 +50,7 @@
 
     [templates.gnome-shell]
     input_path = "${inputs.self}/templates/gnome-shell.css"
-    output_path = "${config.home.homeDirectory}/.local/share/matugen/gnome-shell.css"
+    output_path = "${config.home.homeDirectory}/.local/share/themes/WallpaperShell/gnome-shell/gnome-shell.css"
 
     [templates.zen]
     input_path = "${inputs.self}/templates/zen-userChrome.css"
diff --git a/templates/recolor-folders.sh b/templates/recolor-folders.sh
index 952f924..a64048f 100644
--- a/templates/recolor-folders.sh
+++ b/templates/recolor-folders.sh
@@ -88,11 +88,6 @@ done
 # Update icon cache
 gtk-update-icon-cache -f "$ICON_DIR" 2>/dev/null || true
 
-# Install GNOME Shell theme
-SHELL_THEME="$HOME/.local/share/themes/WallpaperShell/gnome-shell"
-mkdir -p "$SHELL_THEME"
-cp "$HOME/.local/share/matugen/gnome-shell.css" "$SHELL_THEME/gnome-shell.css" 2>/dev/null
-
 # Map wallpaper palette to closest GNOME accent color
 # Primary color RGB: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}}
 R={{colors.primary.default.red}}
diff --git a/templates/zen-userChrome.css b/templates/zen-userChrome.css
index a9086be..fd7570a 100644
--- a/templates/zen-userChrome.css
+++ b/templates/zen-userChrome.css
@@ -1,11 +1,15 @@
 /* Wallpaper-based colors generated by matugen */
 :root {
   --zen-primary-color: {{colors.primary.default.hex}} !important;
-  --zen-colors-primary: {{colors.primary.default.hex}} !important;
-  --zen-colors-secondary: {{colors.secondary.default.hex}} !important;
-  --zen-colors-tertiary: {{colors.tertiary.default.hex}} !important;
+  --zen-colors-primary: {{colors.primary_container.default.hex}} !important;
+  --zen-colors-secondary: {{colors.secondary_container.default.hex}} !important;
+  --zen-colors-tertiary: {{colors.tertiary_container.default.hex}} !important;
   --zen-colors-border: {{colors.outline_variant.default.hex}} !important;
-  --toolbar-bgcolor: {{colors.surface.default.hex}} !important;
+  --toolbar-bgcolor: {{colors.surface_container.default.hex}} !important;
   --lwt-accent-color: {{colors.surface_container.default.hex}} !important;
   --lwt-text-color: {{colors.on_surface.default.hex}} !important;
+  --tab-selected-bgcolor: {{colors.surface_container_high.default.hex}} !important;
+  --arrowpanel-background: {{colors.surface_container.default.hex}} !important;
+  --arrowpanel-color: {{colors.on_surface.default.hex}} !important;
+  --urlbar-box-bgcolor: {{colors.surface_container_low.default.hex}} !important;
 }