1 files changed, 19 insertions, 36 deletions

diff --git a/common/modules/matugen/templates/matugen-zen.nix b/common/modules/matugen/templates/matugen-zen.nix
index 837b401..cbb3df3 100644
--- a/common/modules/matugen/templates/matugen-zen.nix
+++ b/common/modules/matugen/templates/matugen-zen.nix
@@ -6,7 +6,6 @@
         # css
         ''
           :root {
-            /* --- Matugen Colors (UI) --- */
             --zen-primary-color: {{colors.primary_container.default.hex}} !important;
             --toolbarbutton-icon-fill: {{colors.primary.default.hex}} !important;
             --toolbar-field-color: {{colors.on_background.default.hex}} !important;
@@ -15,47 +14,14 @@
             --arrowpanel-color: {{colors.on_surface.default.hex}} !important;
             --arrowpanel-background: {{colors.surface_container.default.hex}} !important;
             --sidebar-text-color: {{colors.on_background.default.hex}} !important;
-            /* --zen-main-browser-background: {{colors.background.default.hex}} !important; */
-
-            /* --- Boxy UI Variables --- */
-            --toolbarbutton-border-radius: 0px !important;
-            --tab-border-radius: 0px !important;
-            --arrowpanel-border-radius: 0px !important;
-            --urlbar-icon-border-radius: 0px !important;
+            --zen-main-browser-background: {{colors.background.default.hex}} !important;
           }
 
           * {
             font-family: "JetBrainsMono Nerd Font", monospace !important;
-          }
-
-          /* --- Enforce Boxy Look (Zero Border Radius) --- */
-          .tab-background,
-          .tabbrowser-tab,
-          .urlbar-background,
-          #urlbar-input-container,
-          #urlbar-background,
-          .urlbar-input-box,
-          .toolbarbutton-1,
-          .toolbarbutton-icon,
-          .toolbarbutton-badge-stack,
-          #zen-workspaces-button,
-          .panel-arrowcontent,
-          menupopup,
-          menuitem,
-          .sidebar-placesTree,
-          #zen-appcontent-navbar-container,
-          #TabsToolbar,
-          .browserContainer,
-          #navigator-toolbox,
-          #sidebar-box,
-          .searchbar-textbox,
-          window,
-          page,
-          browser {
             border-radius: 0 !important;
           }
 
-          /* --- Layout & Color Rules --- */
           .sidebar-placesTree {
             background-color: {{colors.surface_container.default.hex}} !important;
           }
@@ -94,7 +60,6 @@
             }
           }
 
-          /* --- Tab Identity Colors --- */
           .identity-color-blue {
             --identity-tab-color: \{{color12}} !important;
             --identity-icon-color: \{{color12}} !important;
@@ -138,6 +103,24 @@
           #zen-appcontent-navbar-container {
             background-color: {{colors.background.default.hex}} !important;
           }
+
+          #PanelUI-menu-button .toolbarbutton-icon,
+          #downloads-button .toolbarbutton-icon,
+          #unified-extensions-button .toolbarbutton-icon {
+            fill: {{colors.primary.default.hex}} !important;
+            color: {{colors.primary.default.hex}} !important;
+          }
+
+          #PanelUI-menu-button .toolbarbutton-badge-stack,
+          #downloads-button .toolbarbutton-badge-stack,
+          #unified-extensions-button .toolbarbutton-badge-stack {
+            fill: {{colors.primary.default.hex}} !important;
+            color: {{colors.primary.default.hex}} !important;
+          }
+
+          toolbar .toolbarbutton-1 > .toolbarbutton-icon {
+            fill: {{colors.primary.default.hex}} !important;
+          }
         '';
     };
   };