diff --git a/templates/zen-userChrome.css b/templates/zen-userChrome.css
index 2a40df4..0f780ff 100644
--- a/templates/zen-userChrome.css
+++ b/templates/zen-userChrome.css
@@ -1,6 +1,7 @@
 /* Wallpaper-based colors generated by matugen */
 
 /* Override Zen's JS-applied gradient backgrounds directly on elements */
+#zen-browser-background,
 #zen-browser-background::after,
 #zen-browser-background::before {
   background: {{colors.surface.default.hex}} !important;
@@ -16,6 +17,8 @@
 /* Sidebar and tab strip */
 #navigator-toolbox {
   background-color: {{colors.surface_container_low.default.hex}} !important;
+  border: none !important;
+  outline: none !important;
 }
 
 #TabsToolbar, #tabbrowser-tabs {
@@ -26,7 +29,7 @@
   background-color: {{colors.surface_container_high.default.hex}} !important;
 }
 
-/* URL bar — override Zen's color-mix background */
+/* URL bar */
 #urlbar .urlbar-background,
 #urlbar-background {
   background-color: {{colors.surface_container.default.hex}} !important;
@@ -40,7 +43,7 @@
   color: {{colors.on_surface.default.hex}} !important;
 }
 
-/* Nav bar and toolbar — match the toolbar background */
+/* Nav bar and toolbar */
 #nav-bar {
   background-color: transparent !important;
 }
@@ -57,8 +60,44 @@
   color: {{colors.on_surface.default.hex}} !important;
 }
 
-/* New tab page background */
+/* Content area containers */
+#browser, #appcontent, #tabbrowser-tabbox,
+#tabbrowser-tabpanels, #zen-appcontent-wrapper,
+#appcontent-tabpanels, #zen-tabbox-wrapper {
+  background-color: {{colors.surface_container_low.default.hex}} !important;
+}
+
+/* Sidebar splitter — blend with sidebar, show accent on hover */
+#zen-sidebar-splitter {
+  background: {{colors.surface_container_low.default.hex}} !important;
+  opacity: 1 !important;
+}
+
+#zen-sidebar-splitter:hover {
+  background: {{colors.primary.default.hex}} !important;
+}
+
+/* Titlebar / window controls */
+#titlebar, #zen-titlebar, .titlebar-buttonbox-container,
+#zen-appcontent-navbar-container, .browser-toolbar,
+#PersonalToolbar {
+  background-color: {{colors.surface_container_low.default.hex}} !important;
+}
+
+#main-window, #main-window[tabsintitlebar] {
+  background-color: {{colors.surface_container_low.default.hex}} !important;
+  -moz-appearance: none !important;
+  border: none !important;
+  outline: none !important;
+}
+
+/* CSS variables */
 :root {
+  --zen-themed-toolbar-bg: {{colors.surface_container_low.default.hex}} !important;
+  --zen-main-browser-background: {{colors.surface.default.hex}} !important;
+  --zen-appcontent-navbar-container-bg: {{colors.surface_container_low.default.hex}} !important;
+  --zen-appcontent-separator-color: {{colors.surface_container_low.default.hex}} !important;
+  --zen-dialog-background: {{colors.surface_container.default.hex}} !important;
   --newtab-background-color: {{colors.surface.default.hex}} !important;
   --lwt-sidebar-background-color: {{colors.surface_container_low.default.hex}} !important;
   --lwt-sidebar-text-color: {{colors.on_surface.default.hex}} !important;