This is like that one dream you don't know how to describe

10 files changed, 52 insertions, 1193 deletions

diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index a9aaaae..6bf73a2 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -13,12 +13,12 @@
 }:
 let
   cfg = config.${moduleNameSpace}.matugen;
-  link_zen = pkgs.writeShellScript "link_zen" ''
-    export PROFILE_DIR=$(find ~/.config/zen/ -maxdepth 1 -type d -name "*.Default Profile" | head -n 1)
-    mkdir -p "$PROFILE_DIR/chrome"
-    ln -sf ~/.cache/wallust/userChrome.css "$PROFILE_DIR/chrome/userChrome.css"
-    ln -sf ~/.config/userContent.css "$PROFILE_DIR/chrome/userContent.css"
-  '';
+  # link_zen = pkgs.writeShellScript "link_zen" ''
+  #   export PROFILE_DIR=$(find ~/.config/zen/ -maxdepth 1 -type d -name "*.Default Profile" | head -n 1)
+  #   mkdir -p "$PROFILE_DIR/chrome"
+  #   ln -sf ~/.cache/wallust/userChrome.css "$PROFILE_DIR/chrome/userChrome.css"
+  #   ln -sf ~/.config/userContent.css "$PROFILE_DIR/chrome/userContent.css"
+  # '';
   update_gtkcolors = pkgs.writeShellScript "update_gtkcolors" ''
     dconf write /org/gnome/desktop/interface/color-scheme "'prefer-light'"
     sleep 0.1
@@ -36,71 +36,12 @@ in
 
   config = lib.mkIf cfg.enable (
     lib.optionalAttrs homeManager {
-      programs.wallust = {
-        enable = true;
-        settings = {
-          backend = "fastresize";
-          color_space = "salience";
-          check_contrast = true;
-          templates = {
-            foot = lib.mkIf config.beeMods.terminal.foot {
-              template = "foot-colors.ini";
-              target = "~/.config/foot/colors.ini";
-            };
-            alacritty = lib.mkIf config.beeMods.terminal.alacritty {
-              template = "alacritty-colors.toml";
-              target = "~/.config/alacritty/colors.toml";
-            };
-            ghostty = lib.mkIf config.beeMods.terminal.ghostty {
-              template = "ghostty-colors.conf";
-              target = "~/.config/ghostty/themes/matugen";
-            };
-            zen = {
-              template = "userChrome.css";
-              target = "~/.cache/wallust/userChrome.css";
-            };
-            xresources = lib.mkIf (config.beeMods.x11.dwm.enable || config.beeMods.x11.bspwm.enable) {
-              template = "colors-xresources";
-              target = "~/.config/x11/matugen.Xresources";
-            };
-            sequences =
-              lib.mkIf (config.beeMods.terminal.default == "foot" || config.beeMods.terminal.default == "ghostty")
-                {
-                  template = "sequences";
-                  target = "~/.config/sequences";
-                };
-          };
-        };
-      };
-
-      home.packages = with pkgs; [
-        matugen
-      ];
-
       xdg.configFile = {
         "matugen/config.toml" = {
           text =
             # toml
             ''
               [config]
-              ${lib.optionalString config.beeMods.terminal.alacritty ''
-                [templates.alacritty]
-                input_path = '~/.config/matugen/templates/alacritty-colors.toml'
-                output_path = '~/.config/wallust/templates/alacritty-colors.toml'
-              ''}
-
-              ${lib.optionalString config.beeMods.terminal.foot ''
-                [templates.foot]
-                input_path = '~/.config/matugen/templates/foot-colors.ini'
-                output_path = '~/.config/wallust/templates/foot-colors.ini'
-              ''}
-
-              ${lib.optionalString config.beeMods.terminal.ghostty ''
-                [templates.ghostty]
-                input_path = '~/.config/matugen/templates/ghostty.conf'
-                output_path = '~/.config/wallust/templates/ghostty-colors.conf'
-              ''}
-
               ${lib.optionalString config.programs.zathura.enable ''
                 [templates.zathura]
                 input_path = '~/.config/matugen/templates/zathura.toml'
@@ -108,12 +49,6 @@ in
               ''}
 
               ${lib.optionalString config.beeMods.mango.enable ''
-                [templates.swaylock]
-                input_path = '~/.config/matugen/templates/swaylock-colors'
-                output_path = '~/.config/swaylock/swaylock-colors'
-              ''}
-
-              ${lib.optionalString config.beeMods.mango.enable ''
                 [templates.mango]
                 input_path = '~/.config/matugen/templates/mango.conf'
                 output_path = '~/.config/mango/mango-colors.conf'
@@ -132,10 +67,10 @@ in
                 output_path = '~/.config/yazi/theme.toml'
               ''}
 
-              ${lib.optionalString (config.beeMods.x11.dwm.enable || config.beeMods.x11.bspwm.enable) ''
+              ${lib.optionalString (config.beeMods.dwm.enable) ''
                 [templates.Xresources]
                 input_path = "~/.config/matugen/templates/colors-xresources"
-                output_path = "~/.config/wallust/templates/colors-xresources"
+                output_path = "~/.config/x11/matugen.Xresources"
               ''}
 
               ${lib.optionalString config.programs.vesktop.enable ''
@@ -144,13 +79,6 @@ in
                 output_path = "~/.config/vesktop/themes/system24.css"
               ''}
 
-              ${lib.optionalString config.beeMods.mango.waybar ''
-                [templates.waybar]
-                input_path = "~/.config/matugen/templates/waybar.css"
-                output_path = "~/.config/waybar/colors.css"
-                # post_hook = "pkill -SIGUSR2 waybar"
-              ''}
-
               ${lib.optionalString config.services.dunst.enable ''
                 [templates.dunst]
                 input_path = '~/.config/matugen/templates/dunstrc'
@@ -158,23 +86,6 @@ in
                 post_hook = "dunstctl reload"
               ''}
 
-              ${lib.optionalString config.programs.rofi.enable ''
-                [templates.rofi]
-                input_path = '~/.config/matugen/templates/rofi-colors.rasi'
-                output_path = '~/.config/rofi/shared/colors.rasi'
-              ''}
-
-              ${lib.optionalString config.gtk.enable ''
-                [templates.gtk3]
-                input_path = '~/.config/matugen/templates/colors.css'
-                output_path = '~/.config/gtk-3.0/colors.css'
-
-                [templates.gtk4]
-                input_path = '~/.config/matugen/templates/colors.css'
-                output_path = '~/.config/gtk-4.0/colors.css'
-                # post_hook = "${update_gtkcolors}"
-              ''}
-
               ${lib.optionalString config.beeMods.beeVim.enable ''
                 [templates.neovim]
                 input_path = "~/.config/matugen/templates/neovim.json"
@@ -186,30 +97,10 @@ in
                 ''
                   [templates.sequences]
                   input_path = '~/.config/matugen/templates/sequences'
-                  output_path = '~/.config/wallust/templates/sequences'
+                  output_path = '~/.config/sequences'
+                  post_hook = "sh '${config.home.homeDirectory}/.config/sequences'"
                 ''
               }
-
-              ${lib.optionalString config.beeMods.x11.bspwm.enable ''
-                [templates.bspwm]
-                input_path = "~/.config/matugen/templates/bspwm-colors"
-                output_path = "~/.config/bspwm/colors"
-                post_hook = "bspc wm -r"
-              ''}
-
-              [templates.zed]
-              input_path = '~/.config/matugen/templates/zed.json'
-              output_path = '~/.config/zed/themes/matugen.json'
-
-              [templates.zen]
-              input_path = '~/.config/matugen/templates/zen.css'
-              output_path = '~/.config/wallust/templates/userChrome.css'
-              post_hook = "${link_zen}"
-
-              [templates.zen-userContent]
-              input_path = '~/.config/matugen/templates/zen-usercontent.css'
-              output_path = '~/.config/userContent.css'
-              post_hook = "${link_zen}"
             '';
         };
       };
diff --git a/common/modules/matugen/templates/matugen-bspwm.nix b/common/modules/matugen/templates/matugen-bspwm.nix
deleted file mode 100644
index 1e0a546..0000000
--- a/common/modules/matugen/templates/matugen-bspwm.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  xdg.configFile = {
-    "matugen/templates/bspwm-colors" = {
-      enable = true;
-      text =
-        # sh
-        ''
-          #!/bin/bash
-          bspc config focused_border_color  '{{colors.primary.default.hex}}'
-          bspc config active_border_color   '{{colors.tertiary.default.hex}}'
-          bspc config normal_border_color   '{{colors.outline.default.hex}}'
-          bspc config presel_feedback_color '{{colors.secondary.default.hex}}'
-        '';
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-gtk.nix b/common/modules/matugen/templates/matugen-gtk.nix
deleted file mode 100644
index 0896d04..0000000
--- a/common/modules/matugen/templates/matugen-gtk.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  config = lib.mkIf config.gtk.enable {
-    xdg.configFile = {
-      "matugen/templates/colors.css" = {
-        text =
-          # css
-          ''
-            /* Destructive colors are basically error colors */
-            @define-color destructive_bg_color {{colors.error.default.hex}};
-            @define-color destructive_fg_color {{colors.on_error.default.hex}};
-            /* Follow material spec */
-            @define-color error_bg_color {{colors.error.default.hex}};
-            @define-color error_fg_color {{colors.on_error.default.hex}};
-            /* Follow material spec (also I think looks nicer) */
-            @define-color accent_fg_color {{colors.on_primary.default.hex}};
-            @define-color accent_bg_color {{colors.primary.default.hex}};
-            /* Use surface instead of background */
-            @define-color window_bg_color {{colors.surface.default.hex}};
-            @define-color window_fg_color {{colors.on_surface.default.hex}};
-            /* Make it more similar to Adwaita */
-            @define-color view_bg_color {{colors.surface.default.hex}};
-            @define-color view_fg_color {{colors.on_surface.default.hex}};
-            @define-color headerbar_bg_color {{colors.surface.default.hex}};
-            @define-color headerbar_fg_color {{colors.on_surface.default.hex}};
-            @define-color sidebar_bg_color {{colors.surface_container.default.hex}};
-            @define-color sidebar_fg_color {{colors.on_surface.default.hex}};
-            /* There is only like one application I know that uses this, and there isn't a good way to get
-            a color between surface and surface container so I think just giving this surface is a good enough fallback*/
-            @define-color secondary_sidebar_bg_color {{colors.surface.default.hex}};
-            @define-color secondary_sidebar_fg_color {{colors.on_surface.default.hex}};
-            @define-color card_bg_color {{colors.surface_container.default.hex}};
-            @define-color card_fg_color {{colors.on_surface.default.hex}};
-            @define-color overview_bg_color {{colors.surface_container.default.hex}};
-            @define-color overview_fg_color {{colors.on_surface.default.hex}};
-            @define-color popover_bg_color {{colors.surface_container.default.hex}};
-            @define-color popover_fg_color {{colors.on_surface.default.hex}};
-            @define-color dialog_bg_color {{colors.surface.default.hex}};
-            @define-color dialog_fg_color {{colors.on_surface.default.hex}};
-
-            /* Backdrop/unfocused states - prevents white flash on window unfocus */
-            @define-color headerbar_backdrop_color @window_bg_color;
-            @define-color sidebar_backdrop_color @sidebar_bg_color;
-            @define-color theme_unfocused_fg_color @window_fg_color;
-            @define-color theme_unfocused_text_color @view_fg_color;
-            @define-color theme_unfocused_bg_color @window_bg_color;
-            @define-color theme_unfocused_base_color @window_bg_color;
-            @define-color theme_unfocused_selected_bg_color @accent_bg_color;
-            @define-color theme_unfocused_selected_fg_color @accent_fg_color;
-          '';
-      };
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-rofi.nix b/common/modules/matugen/templates/matugen-rofi.nix
deleted file mode 100644
index 18be5c1..0000000
--- a/common/modules/matugen/templates/matugen-rofi.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  config = lib.mkIf config.programs.rofi.enable {
-    xdg.configFile = {
-      "matugen/templates/rofi-colors.rasi" = {
-        text = ''
-          * {
-              <* if {{ is_dark_mode }}  *>
-              bg:          {{colors.surface.default.hex}};
-              bg-alt:      {{colors.surface_container.default.hex}};
-              <* else *>
-              bg:          {{colors.surface_container.default.hex}};
-              bg-alt:      {{colors.surface_container_highest.default.hex}};
-              <* endif *>
-              fg:          {{colors.on_surface.default.hex}};
-              fg-dim:      {{colors.on_surface_variant.default.hex}};
-              accent:      {{colors.primary.default.hex}};
-              selected-bg: {{colors.primary.default.hex}};
-              selected-fg: {{colors.on_primary.default.hex}};
-              urgent:      {{colors.error.default.hex}};
-              outline:     {{colors.outline.default.hex}};
-          }
-        '';
-      };
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-sequences.nix b/common/modules/matugen/templates/matugen-sequences.nix
index e158984..ac6e413 100644
--- a/common/modules/matugen/templates/matugen-sequences.nix
+++ b/common/modules/matugen/templates/matugen-sequences.nix
@@ -9,28 +9,29 @@
       text = ''
         #!/bin/sh
         SEQ=""
-        SEQ="$SEQ$(printf '\033]4;0;rgb:\{{color0 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;1;rgb:\{{color1 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;2;rgb:\{{color2 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;3;rgb:\{{color3 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;4;rgb:\{{color4 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;5;rgb:\{{color5 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;6;rgb:\{{color6 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;7;rgb:\{{color7 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;8;rgb:\{{color8 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;9;rgb:\{{color9 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;10;rgb:\{{color10 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;11;rgb:\{{color11 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;12;rgb:\{{color12 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;13;rgb:\{{color13 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;14;rgb:\{{color14 | xrgb}}\007')"
-        SEQ="$SEQ$(printf '\033]4;15;rgb:\{{color15 | xrgb}}\007')"
+        SEQ="$SEQ$(printf '\033]4;0;{{dank16.color0.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;1;{{dank16.color1.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;2;{{dank16.color2.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;3;{{dank16.color3.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;4;{{dank16.color4.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;5;{{dank16.color5.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;6;{{dank16.color6.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;7;{{dank16.color7.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;8;{{dank16.color8.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;9;{{dank16.color9.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;10;{{dank16.color10.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;11;{{dank16.color11.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;12;{{dank16.color12.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;13;{{dank16.color13.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;14;{{dank16.color14.default.hex}}\007')"
+        SEQ="$SEQ$(printf '\033]4;15;{{dank16.color15.default.hex}}\007')"
         SEQ="$SEQ$(printf '\033]10;{{colors.on_surface.default.hex}}\007')"
-        <* if {{ is_dark_mode }} *>
         SEQ="$SEQ$(printf '\033]11;{{colors.background.default.hex}}\007')"
-        <* else *>
-        SEQ="$SEQ$(printf '\033]11;{{colors.surface_container.default.hex}}\007')"
-        <* endif *>
+        # <* if {{ is_dark_mode }} *>
+        # SEQ="$SEQ$(printf '\033]11;{{colors.background.default.hex}}\007')"
+        # <* else *>
+        # SEQ="$SEQ$(printf '\033]11;{{colors.surface_container.default.hex}}\007')"
+        # <* endif *>
         SEQ="$SEQ$(printf '\033]12;{{colors.primary.default.hex}}\007')"
         SEQ="$SEQ$(printf '\033]17;{{colors.on_surface.default.hex}}\007')"
         SEQ="$SEQ$(printf '\033]19;{{colors.primary_container.default.hex}}\007')"
diff --git a/common/modules/matugen/templates/matugen-swaylock.nix b/common/modules/matugen/templates/matugen-swaylock.nix
deleted file mode 100644
index 723c94e..0000000
--- a/common/modules/matugen/templates/matugen-swaylock.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  config = lib.mkIf config.beeMods.mango.enable {
-    xdg.configFile."matugen/templates/swaylock-colors" = {
-      text = ''
-        show-failed-attempts
-        indicator-radius=70
-        indicator-thickness=9
-        line-uses-inside
-        image={{image}}
-
-        # --- Base Colors ---
-        color={{colors.background.default.hex}}
-        layout-text-color={{colors.on_surface.default.hex}}
-
-        # --- State: Idle (Gray-like ring for visibility) ---
-        # Using surface_variant for a distinct but neutral gray ring
-        ring-color={{colors.surface_variant.default.hex}}
-        inside-color={{colors.surface.default.hex}}
-        text-color={{colors.on_surface.default.hex}}
-
-        # Key Highlight (When typing)
-        key-hl-color={{colors.primary.default.hex}}
-        separator-color={{colors.outline.default.hex}}
-
-        # --- State: Verifying (Pressing Enter) ---
-        # Switched to Primary to make the "Enter" state pop
-        ring-ver-color={{colors.primary.default.hex}}
-        inside-ver-color={{colors.primary_container.default.hex}}
-        text-ver-color={{colors.on_primary_container.default.hex}}
-
-        # --- State: Wrong Password ---
-        ring-wrong-color={{colors.error.default.hex}}
-        inside-wrong-color={{colors.error_container.default.hex}}
-        text-wrong-color={{colors.on_error_container.default.hex}}
-
-        # --- State: Backspace / Clear ---
-        ring-clear-color={{colors.secondary.default.hex}}
-        inside-clear-color={{colors.surface_variant.default.hex}}
-        text-clear-color={{colors.on_surface_variant.default.hex}}
-
-        # --- Misc ---
-        bs-hl-color={{colors.error.default.hex}}
-        caps-lock-key-hl-color={{colors.tertiary.default.hex}}
-        caps-lock-bs-hl-color={{colors.error.default.hex}}
-      '';
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-waybar.nix b/common/modules/matugen/templates/matugen-waybar.nix
deleted file mode 100644
index acdb788..0000000
--- a/common/modules/matugen/templates/matugen-waybar.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  config = lib.mkIf config.beeMods.mango.waybar {
-    xdg.configFile."matugen/templates/waybar.css" = {
-      text = ''
-        ${lib.optionalString (config.beeMods.mango.window.blur.enable) ''
-          <* if {{ is_dark_mode }} *>
-          @define-color bg_panel rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.9);
-          <* else *>
-          @define-color bg_panel rgba({{colors.surface_container.default.red}}, {{colors.surface_container.default.green}}, {{colors.surface_container.default.blue}}, 0.9);
-          <* endif *>
-        ''}
-        ${lib.optionalString (!config.beeMods.mango.window.blur.enable) ''
-          <* if {{ is_dark_mode }} *>
-          @define-color bg_panel  {{colors.surface.default.hex}};          
-          <* else *>
-          @define-color bg_panel  {{colors.surface_container.default.hex}};          
-          <* endif *>
-        ''}
-
-        @define-color bg_base transparent;
-        @define-color border_color {{colors.primary.default.hex}};
-        @define-color text_main {{colors.primary.default.hex}};
-        @define-color text_dark {{colors.surface_container_highest.default.hex}};
-        @define-color alert_urgent {{colors.error.default.hex}};
-        @define-color alert_minimized {{colors.error_container.default.hex}};
-        @define-color alert_critical {{colors.on_error_container.default.hex}};
-      '';
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-xresources.nix b/common/modules/matugen/templates/matugen-xresources.nix
index 6ee20c2..f33fda2 100644
--- a/common/modules/matugen/templates/matugen-xresources.nix
+++ b/common/modules/matugen/templates/matugen-xresources.nix
@@ -11,11 +11,16 @@
         dwm.normfgcolor : {{colors.on_surface.default.hex}}
         dwm.selbordercolor : {{colors.primary.default.hex}}
         dwm.selfgcolor : {{colors.primary.default.hex}}
+        dmenu.foreground : {{colors.on_surface.default.hex}}
+        dmenu.selbackground : {{colors.primary.default.hex}}
+        dmenu.selforeground : {{colors.on_primary.default.hex}}
         <* if {{ is_dark_mode }} *>
+        dmenu.background : {{colors.background.default.hex}}
         st.background: {{colors.surface.default.hex}}
         dwm.normbgcolor : {{colors.surface.default.hex}}
         dwm.selbgcolor : {{colors.surface_container.default.hex}}
         <* else *>
+        dmenu.background : {{colors.surface_container.default.hex}}
         st.background: {{colors.surface_container.default.hex}}
         dwm.normbgcolor : {{colors.surface_container.default.hex}}
         dwm.selbgcolor : {{colors.secondary_fixed.default.hex}}
@@ -24,29 +29,29 @@
         st.foreground: {{colors.on_surface.default.hex}}
         st.cursorColor: {{colors.primary.default.hex}}
 
-        st.color0: \{{color0}}
-        st.color8: \{{color8}}
+        st.color0: {{dank16.color0.default.hex}}
+        st.color8: {{dank16.color8.default.hex}}
 
-        st.color1: \{{color1}}
-        st.color9: \{{color9}}
+        st.color1: {{dank16.color1.default.hex}}
+        st.color9: {{dank16.color9.default.hex}}
 
-        st.color2: \{{color2}}
-        st.color10: \{{color10}}
+        st.color2: {{dank16.color2.default.hex}}
+        st.color10: {{dank16.color10.default.hex}}
 
-        st.color3: \{{color3}}
-        st.color11: \{{color11}}
+        st.color3: {{dank16.color3.default.hex}}
+        st.color11: {{dank16.color11.default.hex}}
 
-        st.color4: \{{color4}}
-        st.color12: \{{color12}}
+        st.color4: {{dank16.color4.default.hex}}
+        st.color12: {{dank16.color12.default.hex}}
 
-        st.color5: \{{color5}}
-        st.color13: \{{color13}}
+        st.color5: {{dank16.color5.default.hex}}
+        st.color13: {{dank16.color13.default.hex}}
 
-        st.color6: \{{color6}}
-        st.color14: \{{color14}}
+        st.color6: {{dank16.color6.default.hex}}
+        st.color14: {{dank16.color14.default.hex}}
 
-        st.color7: \{{color7}}
-        st.color15: \{{color15}}
+        st.color7: {{dank16.color7.default.hex}}
+        st.color15: {{dank16.color15.default.hex}}
       '';
     };
   };
diff --git a/common/modules/matugen/templates/matugen-zed.nix b/common/modules/matugen/templates/matugen-zed.nix
deleted file mode 100644
index 9e603a4..0000000
--- a/common/modules/matugen/templates/matugen-zed.nix
+++ /dev/null
@@ -1,602 +0,0 @@
-{
-  xdg.configFile = {
-    "matugen/templates/zed.json" = {
-      enable = true;
-      text =
-        # toml
-        ''
-          {
-              "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-              "name": "Matugen",
-              "author": "Matugen",
-              "themes": [
-              {
-                  "name": "Matugen Dark",
-                  "appearance": "dark",
-                  "style": {
-                      "accents": [
-                          "{{colors.primary.dark.hex}}",
-                      "{{colors.secondary.dark.hex}}",
-                      "{{colors.tertiary.dark.hex}}"
-                      ],
-                      "background.appearance": "opaque",
-                      "border": "{{colors.outline_variant.dark.hex}}",
-                      "border.variant": "{{colors.outline.dark.hex}}",
-                      "border.focused": "{{colors.primary.dark.hex}}",
-                      "border.selected": "{{colors.primary.dark.hex}}",
-                      "border.transparent": "{{colors.outline_variant.dark.hex}}40",
-                      "border.disabled": "{{colors.outline_variant.dark.hex}}60",
-                      "elevated_surface.background": "{{colors.surface_container_high.dark.hex}}",
-                      "surface.background": "{{colors.surface.dark.hex}}",
-                      "background": "{{colors.background.dark.hex}}",
-                      "element.background": "{{colors.surface_container.dark.hex}}",
-                      "element.hover": "{{colors.surface_container_high.dark.hex}}",
-                      "element.active": "{{colors.surface_container_highest.dark.hex}}",
-                      "element.selected": "{{colors.secondary_container.dark.hex}}",
-                      "element.disabled": "{{colors.surface_variant.dark.hex}}",
-                      "drop_target.background": "{{colors.primary_container.dark.hex}}80",
-                      "ghost_element.background": null,
-                      "ghost_element.hover": "{{colors.surface_container.dark.hex}}80",
-                      "ghost_element.active": "{{colors.surface_container_high.dark.hex}}",
-                      "ghost_element.selected": "{{colors.secondary_container.dark.hex}}80",
-                      "ghost_element.disabled": "{{colors.surface_variant.dark.hex}}60",
-                      "text": "{{colors.on_surface.dark.hex}}",
-                      "text.muted": "{{colors.on_surface_variant.dark.hex}}",
-                      "text.placeholder": "{{colors.on_surface_variant.dark.hex}}99",
-                      "text.disabled": "{{colors.on_surface.dark.hex}}60",
-                      "text.accent": "{{colors.primary.dark.hex}}",
-                      "icon": "{{colors.on_surface.dark.hex}}",
-                      "icon.muted": "{{colors.on_surface_variant.dark.hex}}",
-                      "icon.disabled": "{{colors.on_surface.dark.hex}}60",
-                      "icon.placeholder": "{{colors.on_surface_variant.dark.hex}}80",
-                      "icon.accent": "{{colors.primary.dark.hex}}",
-                      "status_bar.background": "{{colors.surface.dark.hex}}",
-                      "title_bar.background": "{{colors.surface.dark.hex}}",
-                      "title_bar.inactive_background": "{{colors.surface_dim.dark.hex}}",
-                      "toolbar.background": "{{colors.surface_container_low.dark.hex}}",
-                      "tab_bar.background": "{{colors.surface_container.dark.hex}}",
-                      "tab.inactive_backgorround": "{{colors.surface_container_low.dark.hex}}",
-                      "tab.active_background": "{{colors.surface_container_high.dark.hex}}",
-                      "search.match_background": "{{colors.tertiary_container.dark.hex}}80",
-                      "panel.background": "{{colors.surface_container_low.dark.hex}}",
-                      "panel.focused_border": "{{colors.primary.dark.hex}}",
-                      "pane.focused_border": "{{colors.primary.dark.hex}}",
-                      "scrollbar.thumb.background": "{{colors.on_surface_variant.dark.hex}}80",
-                      "scrollbar.thumb.hover_background": "{{colors.on_surface_variant.dark.hex}}c0",
-                      "scrollbar.thumb.border": "{{colors.outline_variant.dark.hex}}40",
-                      "scrollbar.track.background": "{{colors.surface_container.dark.hex}}",
-                      "scrollbar.track.border": "{{colors.outline_variant.dark.hex}}20",
-                      "editor.foreground": "{{colors.on_surface.dark.hex}}",
-                      "editor.background": "{{colors.surface_container_low.dark.hex}}",
-                      "editor.gutter.background": "{{colors.surface_container_low.dark.hex}}",
-                      "editor.subheader.background": "{{colors.surface_container.dark.hex}}",
-                      "editor.indent_guide": "{{colors.outline_variant.dark.hex}}60",
-                      "editor.indent_guide_active": "{{colors.outline.dark.hex}}",
-                      "editor.active_line.background": "{{colors.surface_container_high.dark.hex}}80",
-                      "editor.highlighted_line.background": "{{colors.surface_container_high.dark.hex}}60",
-                      "editor.line_number": "{{colors.on_surface_variant.dark.hex}}",
-                      "editor.active_line_number": "{{colors.primary.dark.hex}}",
-                      "editor.invisible": "{{colors.outline_variant.dark.hex}}80",
-                      "editor.wrap_guide": "{{colors.outline_variant.dark.hex}}40",
-                      "editor.active_wrap_guide": "{{colors.outline.dark.hex}}80",
-                      "editor.document_highlight.read_background": "{{colors.primary_container.dark.hex}}60",
-                      "editor.document_highlight.write_background": "{{colors.secondary_container.dark.hex}}80",
-                      "terminal.background": "{{colors.surface_container_low.dark.hex}}",
-                      "terminal.foreground": "{{colors.on_surface.dark.hex}}",
-                      "terminal.bright_foreground": "{{colors.on_surface.dark.hex}}",
-                      "terminal.dim_foreground": "{{colors.on_surface_variant.dark.hex}}",
-                      "terminal.ansi.black": "{{colors.surface_dim.dark.hex}}",
-                      "terminal.ansi.bright_black": "{{colors.surface_container_high.dark.hex}}",
-                      "terminal.ansi.dim_black": "{{colors.surface.dark.hex}}",
-                      "terminal.ansi.red": "{{colors.error.dark.hex}}",
-                      "terminal.ansi.bright_red": "{{colors.error.dark.hex}}",
-                      "terminal.ansi.dim_red": "{{colors.on_error_container.dark.hex}}",
-                      "terminal.ansi.green": "{{colors.tertiary.dark.hex}}",
-                      "terminal.ansi.bright_green": "{{colors.tertiary.dark.hex}}",
-                      "terminal.ansi.dim_green": "{{colors.on_tertiary_container.dark.hex}}",
-                      "terminal.ansi.yellow": "{{colors.tertiary_fixed_dim.dark.hex}}",
-                      "terminal.ansi.bright_yellow": "{{colors.tertiary_fixed.dark.hex}}",
-                      "terminal.ansi.dim_yellow": "{{colors.on_tertiary_fixed.dark.hex}}",
-                      "terminal.ansi.blue": "{{colors.primary.dark.hex}}",
-                      "terminal.ansi.bright_blue": "{{colors.primary.dark.hex}}",
-                      "terminal.ansi.dim_blue": "{{colors.on_primary_container.dark.hex}}",
-                      "terminal.ansi.magenta": "{{colors.secondary.dark.hex}}",
-                      "terminal.ansi.bright_magenta": "{{colors.secondary.dark.hex}}",
-                      "terminal.ansi.dim_magenta": "{{colors.on_secondary_container.dark.hex}}",
-                      "terminal.ansi.cyan": "{{colors.primary_fixed_dim.dark.hex}}",
-                      "terminal.ansi.bright_cyan": "{{colors.primary_fixed.dark.hex}}",
-                      "terminal.ansi.dim_cyan": "{{colors.on_primary_fixed_variant.dark.hex}}",
-                      "terminal.ansi.white": "{{colors.on_surface.dark.hex}}",
-                      "terminal.ansi.bright_white": "{{colors.on_surface.dark.hex}}",
-                      "terminal.ansi.dim_white": "{{colors.on_surface_variant.dark.hex}}",
-                      "link_text.hover": "{{colors.primary.dark.hex}}",
-                      "conflict": "{{colors.error.dark.hex}}",
-                      "conflict.background": "{{colors.error_container.dark.hex}}80",
-                      "conflict.border": "{{colors.on_error_container.dark.hex}}",
-                      "created": "{{colors.tertiary.dark.hex}}",
-                      "created.background": "{{colors.tertiary_container.dark.hex}}80",
-                      "created.border": "{{colors.on_tertiary_container.dark.hex}}",
-                      "deleted": "{{colors.error.dark.hex}}",
-                      "deleted.background": "{{colors.error_container.dark.hex}}80",
-                      "deleted.border": "{{colors.on_error_container.dark.hex}}",
-                      "error": "{{colors.error.dark.hex}}",
-                      "error.background": "{{colors.error_container.dark.hex}}",
-                      "error.border": "{{colors.on_error_container.dark.hex}}",
-                      "hidden": "{{colors.outline_variant.dark.hex}}",
-                      "hidden.border": "{{colors.outline_variant.dark.hex}}60",
-                      "hint": "{{colors.primary.dark.hex}}",
-                      "hint.background": "{{colors.primary_container.dark.hex}}80",
-                      "hint.border": "{{colors.on_primary_container.dark.hex}}",
-                      "ignored": "{{colors.on_surface_variant.dark.hex}}60",
-                      "ignored.background": "{{colors.surface_variant.dark.hex}}40",
-                      "ignored.border": "{{colors.outline_variant.dark.hex}}40",
-                      "info": "{{colors.primary.dark.hex}}",
-                      "info.background": "{{colors.primary_container.dark.hex}}80",
-                      "info.border": "{{colors.on_primary_container.dark.hex}}",
-                      "modified": "{{colors.secondary.dark.hex}}",
-                      "modified.background": "{{colors.secondary_container.dark.hex}}80",
-                      "modified.border": "{{colors.on_secondary_container.dark.hex}}",
-                      "predictive": "{{colors.on_surface_variant.dark.hex}}80",
-                      "predictive.border": "{{colors.outline.dark.hex}}",
-                      "predictive.background": "{{colors.surface_container_highest.dark.hex}}80",
-                      "renamed": "{{colors.secondary.dark.hex}}",
-                      "renamed.border": "{{colors.on_secondary_container.dark.hex}}",
-                      "renamed.background": "{{colors.secondary_container.dark.hex}}80",
-                      "success": "{{colors.tertiary.dark.hex}}",
-                      "success.background": "{{colors.tertiary_container.dark.hex}}80",
-                      "success.border": "{{colors.on_tertiary_container.dark.hex}}",
-                      "unreachable": "{{colors.on_surface_variant.dark.hex}}60",
-                      "unreachable.background": "{{colors.surface_variant.dark.hex}}40",
-                      "unreachable.border": "{{colors.outline_variant.dark.hex}}60",
-                      "warning": "{{colors.tertiary_fixed_dim.dark.hex}}",
-                      "warning.background": "{{colors.tertiary_container.dark.hex}}80",
-                      "warning.border": "{{colors.on_tertiary_container.dark.hex}}",
-                      "players": [
-                      {
-                          "cursor": "{{colors.primary.dark.hex}}",
-                          "background": "{{colors.primary_container.dark.hex}}80",
-                          "selection": "{{colors.primary_container.dark.hex}}60"
-                      },
-                      {
-                          "cursor": "{{colors.secondary.dark.hex}}",
-                          "background": "{{colors.secondary_container.dark.hex}}80",
-                          "selection": "{{colors.secondary_container.dark.hex}}60"
-                      }
-                      ],
-                      "syntax": {
-                          "boolean": {
-                              "color": "{{colors.tertiary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "comment": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "comment.doc": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "constant": {
-                              "color": "{{colors.tertiary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "constructor": {
-                              "color": "{{colors.secondary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "emphasis": {
-                              "color": "{{colors.primary.dark.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "emphasis.strong": {
-                              "color": "{{colors.primary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": 700
-                          },
-                          "function": {
-                              "color": "{{colors.primary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "keyword": {
-                              "color": "{{colors.secondary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "number": {
-                              "color": "{{colors.tertiary_fixed.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "operator": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "property": {
-                              "color": "{{colors.on_surface.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.bracket": {
-                              "color": "{{colors.secondary_fixed.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.delimiter": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.list_marker": {
-                              "color": "{{colors.on_surface_variant.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.special": {
-                              "color": "{{colors.secondary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string": {
-                              "color": "{{colors.tertiary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.escape": {
-                              "color": "{{colors.tertiary_fixed_dim.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.regex": {
-                              "color": "{{colors.tertiary_fixed.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.special": {
-                              "color": "{{colors.on_tertiary_container.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.special.symbol": {
-                              "color": "{{colors.tertiary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "tag": {
-                              "color": "{{colors.secondary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "text.literal": {
-                              "color": "{{colors.tertiary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "type": {
-                              "color": "{{colors.primary_fixed.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "variable": {
-                              "color": "{{colors.on_surface.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "variable.special": {
-                              "color": "{{colors.primary.dark.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          }
-                      }
-                  }
-              },
-              {
-                  "name": "Matugen Light",
-                  "appearance": "light",
-                  "style": {
-                      "accents": [
-                          "{{colors.primary.light.hex}}",
-                      "{{colors.secondary.light.hex}}",
-                      "{{colors.tertiary.light.hex}}"
-                      ],
-                      "background.appearance": "opaque",
-                      "border": "{{colors.outline_variant.light.hex}}",
-                      "border.variant": "{{colors.outline.light.hex}}",
-                      "border.focused": "{{colors.primary.light.hex}}",
-                      "border.selected": "{{colors.primary.light.hex}}",
-                      "border.transparent": "{{colors.outline_variant.light.hex}}40",
-                      "border.disabled": "{{colors.outline_variant.light.hex}}60",
-                      "elevated_surface.background": "{{colors.surface_container_high.light.hex}}",
-                      "surface.background": "{{colors.surface.light.hex}}",
-                      "background": "{{colors.background.light.hex}}",
-                      "element.background": "{{colors.surface_container.light.hex}}",
-                      "element.hover": "{{colors.surface_container_high.light.hex}}",
-                      "element.active": "{{colors.surface_container_highest.light.hex}}",
-                      "element.selected": "{{colors.secondary_container.light.hex}}",
-                      "element.disabled": "{{colors.surface_variant.light.hex}}",
-                      "drop_target.background": "{{colors.primary_container.light.hex}}80",
-                      "ghost_element.background": null,
-                      "ghost_element.hover": "{{colors.surface_container.light.hex}}80",
-                      "ghost_element.active": "{{colors.surface_container_high.light.hex}}",
-                      "ghost_element.selected": "{{colors.secondary_container.light.hex}}80",
-                      "ghost_element.disabled": "{{colors.surface_variant.light.hex}}60",
-                      "text": "{{colors.on_surface.light.hex}}",
-                      "text.muted": "{{colors.on_surface_variant.light.hex}}",
-                      "text.placeholder": "{{colors.on_surface_variant.light.hex}}99",
-                      "text.disabled": "{{colors.on_surface.light.hex}}60",
-                      "text.accent": "{{colors.primary.light.hex}}",
-                      "icon": "{{colors.on_surface.light.hex}}",
-                      "icon.muted": "{{colors.on_surface_variant.light.hex}}",
-                      "icon.disabled": "{{colors.on_surface.light.hex}}60",
-                      "icon.placeholder": "{{colors.on_surface_variant.light.hex}}80",
-                      "icon.accent": "{{colors.primary.light.hex}}",
-                      "status_bar.background": "{{colors.surface.light.hex}}",
-                      "title_bar.background": "{{colors.surface.light.hex}}",
-                      "title_bar.inactive_background": "{{colors.surface_dim.light.hex}}",
-                      "toolbar.background": "{{colors.surface_container_low.light.hex}}",
-                      "tab_bar.background": "{{colors.surface_container.light.hex}}",
-                      "tab.inactive_backgorround": "{{colors.surface_container_low.light.hex}}",
-                      "tab.active_background": "{{colors.surface_container_high.light.hex}}",
-                      "search.match_background": "{{colors.tertiary_container.light.hex}}80",
-                      "panel.background": "{{colors.surface_container_low.light.hex}}",
-                      "panel.focused_border": "{{colors.primary.light.hex}}",
-                      "pane.focused_border": "{{colors.primary.light.hex}}",
-                      "scrollbar.thumb.background": "{{colors.on_surface_variant.light.hex}}80",
-                      "scrollbar.thumb.hover_background": "{{colors.on_surface_variant.light.hex}}c0",
-                      "scrollbar.thumb.border": "{{colors.outline_variant.light.hex}}40",
-                      "scrollbar.track.background": "{{colors.surface_container.light.hex}}",
-                      "scrollbar.track.border": "{{colors.outline_variant.light.hex}}20",
-                      "editor.foreground": "{{colors.on_surface.light.hex}}",
-                      "editor.background": "{{colors.surface_container_low.light.hex}}",
-                      "editor.gutter.background": "{{colors.surface_container_low.light.hex}}",
-                      "editor.subheader.background": "{{colors.surface_container.light.hex}}",
-                      "editor.indent_guide": "{{colors.outline_variant.light.hex}}60",
-                      "editor.indent_guide_active": "{{colors.outline.light.hex}}",
-                      "editor.active_line.background": "{{colors.surface_container_high.light.hex}}80",
-                      "editor.highlighted_line.background": "{{colors.surface_container_high.light.hex}}60",
-                      "editor.line_number": "{{colors.on_surface_variant.light.hex}}",
-                      "editor.active_line_number": "{{colors.primary.light.hex}}",
-                      "editor.invisible": "{{colors.outline_variant.light.hex}}80",
-                      "editor.wrap_guide": "{{colors.outline_variant.light.hex}}40",
-                      "editor.active_wrap_guide": "{{colors.outline.light.hex}}80",
-                      "editor.document_highlight.read_background": "{{colors.primary_container.light.hex}}60",
-                      "editor.document_highlight.write_background": "{{colors.secondary_container.light.hex}}80",
-                      "terminal.background": "{{colors.surface_container_low.light.hex}}",
-                      "terminal.foreground": "{{colors.on_surface.light.hex}}",
-                      "terminal.bright_foreground": "{{colors.on_surface.light.hex}}",
-                      "terminal.dim_foreground": "{{colors.on_surface_variant.light.hex}}",
-                      "terminal.ansi.black": "{{colors.surface_dim.light.hex}}",
-                      "terminal.ansi.bright_black": "{{colors.surface_container_high.light.hex}}",
-                      "terminal.ansi.dim_black": "{{colors.surface.light.hex}}",
-                      "terminal.ansi.red": "{{colors.error.light.hex}}",
-                      "terminal.ansi.bright_red": "{{colors.error.light.hex}}",
-                      "terminal.ansi.dim_red": "{{colors.on_error_container.light.hex}}",
-                      "terminal.ansi.green": "{{colors.tertiary.light.hex}}",
-                      "terminal.ansi.bright_green": "{{colors.tertiary.light.hex}}",
-                      "terminal.ansi.dim_green": "{{colors.on_tertiary_container.light.hex}}",
-                      "terminal.ansi.yellow": "{{colors.tertiary_fixed_dim.light.hex}}",
-                      "terminal.ansi.bright_yellow": "{{colors.tertiary_fixed.light.hex}}",
-                      "terminal.ansi.dim_yellow": "{{colors.on_tertiary_fixed.light.hex}}",
-                      "terminal.ansi.blue": "{{colors.primary.light.hex}}",
-                      "terminal.ansi.bright_blue": "{{colors.primary.light.hex}}",
-                      "terminal.ansi.dim_blue": "{{colors.on_primary_container.light.hex}}",
-                      "terminal.ansi.magenta": "{{colors.secondary.light.hex}}",
-                      "terminal.ansi.bright_magenta": "{{colors.secondary.light.hex}}",
-                      "terminal.ansi.dim_magenta": "{{colors.on_secondary_container.light.hex}}",
-                      "terminal.ansi.cyan": "{{colors.primary_fixed_dim.light.hex}}",
-                      "terminal.ansi.bright_cyan": "{{colors.primary_fixed.light.hex}}",
-                      "terminal.ansi.dim_cyan": "{{colors.on_primary_fixed_variant.light.hex}}",
-                      "terminal.ansi.white": "{{colors.on_surface.light.hex}}",
-                      "terminal.ansi.bright_white": "{{colors.on_surface.light.hex}}",
-                      "terminal.ansi.dim_white": "{{colors.on_surface_variant.light.hex}}",
-                      "link_text.hover": "{{colors.primary.light.hex}}",
-                      "conflict": "{{colors.error.light.hex}}",
-                      "conflict.background": "{{colors.error_container.light.hex}}80",
-                      "conflict.border": "{{colors.on_error_container.light.hex}}",
-                      "created": "{{colors.tertiary.light.hex}}",
-                      "created.background": "{{colors.tertiary_container.light.hex}}80",
-                      "created.border": "{{colors.on_tertiary_container.light.hex}}",
-                      "deleted": "{{colors.error.light.hex}}",
-                      "deleted.background": "{{colors.error_container.light.hex}}80",
-                      "deleted.border": "{{colors.on_error_container.light.hex}}",
-                      "error": "{{colors.error.light.hex}}",
-                      "error.background": "{{colors.error_container.light.hex}}",
-                      "error.border": "{{colors.on_error_container.light.hex}}",
-                      "hidden": "{{colors.outline_variant.light.hex}}",
-                      "hidden.border": "{{colors.outline_variant.light.hex}}60",
-                      "hint": "{{colors.primary.light.hex}}",
-                      "hint.background": "{{colors.primary_container.light.hex}}80",
-                      "hint.border": "{{colors.on_primary_container.light.hex}}",
-                      "ignored": "{{colors.on_surface_variant.light.hex}}60",
-                      "ignored.background": "{{colors.surface_variant.light.hex}}40",
-                      "ignored.border": "{{colors.outline_variant.light.hex}}40",
-                      "info": "{{colors.primary.light.hex}}",
-                      "info.background": "{{colors.primary_container.light.hex}}80",
-                      "info.border": "{{colors.on_primary_container.light.hex}}",
-                      "modified": "{{colors.secondary.light.hex}}",
-                      "modified.background": "{{colors.secondary_container.light.hex}}80",
-                      "modified.border": "{{colors.on_secondary_container.light.hex}}",
-                      "predictive": "{{colors.on_surface_variant.light.hex}}80",
-                      "predictive.border": "{{colors.outline.light.hex}}",
-                      "predictive.background": "{{colors.surface_container_highest.light.hex}}80",
-                      "renamed": "{{colors.secondary.light.hex}}",
-                      "renamed.border": "{{colors.on_secondary_container.light.hex}}",
-                      "renamed.background": "{{colors.secondary_container.light.hex}}80",
-                      "success": "{{colors.tertiary.light.hex}}",
-                      "success.background": "{{colors.tertiary_container.light.hex}}80",
-                      "success.border": "{{colors.on_tertiary_container.light.hex}}",
-                      "unreachable": "{{colors.on_surface_variant.light.hex}}60",
-                      "unreachable.background": "{{colors.surface_variant.light.hex}}40",
-                      "unreachable.border": "{{colors.outline_variant.light.hex}}60",
-                      "warning": "{{colors.tertiary_fixed_dim.light.hex}}",
-                      "warning.background": "{{colors.tertiary_container.light.hex}}80",
-                      "warning.border": "{{colors.on_tertiary_container.light.hex}}",
-                      "players": [
-                      {
-                          "cursor": "{{colors.primary.light.hex}}",
-                          "background": "{{colors.primary_container.light.hex}}80",
-                          "selection": "{{colors.primary_container.light.hex}}60"
-                      },
-                      {
-                          "cursor": "{{colors.secondary.light.hex}}",
-                          "background": "{{colors.secondary_container.light.hex}}80",
-                          "selection": "{{colors.secondary_container.light.hex}}60"
-                      }
-                      ],
-                      "syntax": {
-                          "boolean": {
-                              "color": "{{colors.tertiary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "comment": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "comment.doc": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "constant": {
-                              "color": "{{colors.tertiary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "constructor": {
-                              "color": "{{colors.secondary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "emphasis": {
-                              "color": "{{colors.primary.light.hex}}",
-                              "font_style": "italic",
-                              "font_weight": null
-                          },
-                          "emphasis.strong": {
-                              "color": "{{colors.primary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": 700
-                          },
-                          "function": {
-                              "color": "{{colors.primary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "keyword": {
-                              "color": "{{colors.secondary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "number": {
-                              "color": "{{colors.tertiary_fixed.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "operator": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "property": {
-                              "color": "{{colors.on_surface.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.bracket": {
-                              "color": "{{colors.secondary_fixed.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.delimiter": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.list_marker": {
-                              "color": "{{colors.on_surface_variant.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "punctuation.special": {
-                              "color": "{{colors.secondary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string": {
-                              "color": "{{colors.tertiary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.escape": {
-                              "color": "{{colors.tertiary_fixed_dim.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.regex": {
-                              "color": "{{colors.tertiary_fixed.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.special": {
-                              "color": "{{colors.on_tertiary_container.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "string.special.symbol": {
-                              "color": "{{colors.tertiary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "tag": {
-                              "color": "{{colors.secondary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "text.literal": {
-                              "color": "{{colors.tertiary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "type": {
-                              "color": "{{colors.primary_fixed.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "variable": {
-                              "color": "{{colors.on_surface.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          },
-                          "variable.special": {
-                              "color": "{{colors.primary.light.hex}}",
-                              "font_style": null,
-                              "font_weight": null
-                          }
-                      }
-                  }
-              }
-              ]
-          }
-        '';
-    };
-  };
-}
diff --git a/common/modules/matugen/templates/matugen-zen.nix b/common/modules/matugen/templates/matugen-zen.nix
deleted file mode 100644
index 313b754..0000000
--- a/common/modules/matugen/templates/matugen-zen.nix
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  xdg.configFile = {
-    "matugen/templates/zen-usercontent.css" = {
-      enable = true;
-      text =
-        # css
-        ''
-          /* Common variables affecting all pages */
-            @-moz-document url-prefix("about:") {
-              :root {
-                --in-content-page-color: {{colors.secondary.default.hex}} !important;
-                --color-accent-primary: {{colors.primary.default.hex}} !important;
-                /* --color-accent-primary-hover: rgb(249, 217, 240) !important;
-                --color-accent-primary-active: rgb(245, 195, 219) !important; */
-                background-color: {{colors.surface_container.default.hex}} !important;
-                --in-content-page-background: {{colors.surface_container.default.hex}} !important;
-              }
-
-            }
-
-            /* Variables and styles specific to about:newtab and about:home */
-            @-moz-document url("about:newtab"), url("about:home") {
-
-              :root {
-                --newtab-background-color: {{colors.surface_container.default.hex}} !important;
-                --newtab-background-color-secondary: {{colors.surface_container_high.default.hex}} !important;
-                --newtab-element-hover-color: {{colors.surface_container_high.default.hex}} !important;
-                --newtab-text-primary-color: {{colors.secondary.default.hex}} !important;
-                --newtab-wordmark-color: {{colors.secondary.default.hex}} !important;
-                --newtab-primary-action-background: {{colors.primary.default.hex}} !important;
-              }
-
-              .icon {
-                color: {{colors.primary.default.hex}} !important;
-              }
-
-              .card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title {
-                color: {{colors.primary.default.hex}} !important;
-              }
-            }
-
-            /* Variables and styles specific to about:preferences */
-            @-moz-document url-prefix("about:preferences") {
-              :root {
-                --zen-colors-tertiary: {{colors.surface_container_low.default.hex}} !important;
-                --in-content-text-color: {{colors.secondary.default.hex}} !important;
-                --link-color: {{colors.primary.default.hex}} !important;
-                /* --link-color-hover: rgb(249, 217, 240) !important; */
-                --zen-colors-primary: {{colors.surface_container_high.default.hex}} !important;
-                --in-content-box-background: {{colors.surface_container_high.default.hex}} !important;
-                --zen-primary-color: {{colors.primary.default.hex}} !important;
-              }
-
-              button,
-              groupbox menulist {
-                background: {{colors.surface_container_high.default.hex}} !important;
-                color: {{colors.secondary.default.hex}} !important;
-              }
-
-              .main-content {
-                background-color: {{colors.surface_container_lowest.default.hex}} !important;
-              }
-            }
-
-            /* Variables and styles specific to about:addons */
-            @-moz-document url-prefix("about:addons") {
-              :root {
-                --zen-dark-color-mix-base: {{colors.surface_container_low.default.hex}} !important;
-                --background-color-box: {{colors.surface_container.default.hex}} !important;
-              }
-            }
-
-            /* Variables and styles specific to about:protections */
-            @-moz-document url-prefix("about:protections") {
-              :root {
-                --zen-primary-color: {{colors.surface_container.default.hex}} !important;
-                --in-content-primary-button-text-color-hover: {{colors.secondary.default.hex}} !important;
-                --in-content-primary-button-background: {{colors.surface_container.default.hex}} !important;
-                --in-content-primary-button-text-color: {{colors.secondary.default.hex}} !important;
-              }
-
-              .card {
-                background-color: {{colors.surface_container_high.default.hex}} !important;
-              }
-            }
-              /* Pane UI button visibility issue fix */
-            #PanelUI-menu-button[open] .toolbarbutton-icon {
-              fill: {{colors.primary.default.hex}} !important;
-            }
-          }
-
-
-          img, canvas, video, .avatar, 
-          [class*="avatar"], 
-          [class*="ProfileAvatar"],
-          [style*="border-radius"] {
-              border-radius: 0 !important;
-              clip-path: none !important;
-              mask-image: none !important;
-              -webkit-mask-image: none !important;
-          }
-
-          :not(svg):not(circle):not(ellipse):not(path) {
-              border-radius: 0 !important;
-          }
-
-          :root {
-              --border-radius: 0px !important;
-              --radius: 0px !important;
-              --rounded-corner: 0px !important;
-              --avatar-radius: 0px !important;
-              --pfp-radius: 0px !important;
-          }
-        '';
-    };
-  };
-  xdg.configFile = {
-    "matugen/templates/zen.css" = {
-      enable = true;
-      text =
-        # css
-        ''
-          :root {
-            --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;
-            --tab-selected-textcolor: {{colors.primary.default.hex}} !important;
-            --toolbar-color: {{colors.on_background.default.hex}} !important;
-            --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;
-          }
-
-          * {
-            font-family: "IosevkaInput", monospace !important;
-            border-radius: 0 !important;
-          }
-
-          .sidebar-placesTree {
-            background-color: {{colors.surface_container.default.hex}} !important;
-          }
-
-          #zen-workspaces-button {
-            background-color: {{colors.surface_container.default.hex}} !important;
-          }
-
-          #TabsToolbar {
-            background-color: {{colors.background.default.hex}} !important;
-          }
-
-          .urlbar-background {
-            background-color: {{colors.surface_container.default.hex}} !important;
-          }
-
-          .urlbar-input::selection {
-            color: {{colors.on_primary.default.hex}} !important;
-            background-color: {{colors.primary.default.hex}} !important;
-          }
-
-          .urlbarView-url {
-            color: {{colors.on_surface_variant.default.hex}} !important;
-          }
-
-          toolbar .toolbarbutton-1 {
-            &:not([disabled]) {
-              &:is([open], [checked])
-                > :is(
-                  .toolbarbutton-icon,
-                  .toolbarbutton-text,
-                  .toolbarbutton-badge-stack
-                ) {
-                fill: {{colors.primary.default.hex}}
-              }
-            }
-          }
-
-          .identity-color-blue {
-            --identity-tab-color: \{{color12}} !important;
-            --identity-icon-color: \{{color12}} !important;
-          }
-
-          .identity-color-turquoise {
-            --identity-tab-color: \{{color6}} !important;
-            --identity-icon-color: \{{color6}} !important;
-          }
-
-          .identity-color-green {
-            --identity-tab-color: \{{color10}} !important;
-            --identity-icon-color: \{{color10}} !important;
-          }
-
-          .identity-color-yellow {
-            --identity-tab-color: \{{color11}} !important;
-            --identity-icon-color: \{{color11}} !important;
-          }
-
-          .identity-color-orange {
-            --identity-tab-color: \{{color3}} !important;
-            --identity-icon-color: \{{color3}} !important;
-          }
-
-          .identity-color-red {
-            --identity-tab-color: \{{color9}} !important;
-            --identity-icon-color: \{{color9}} !important;
-          }
-
-          .identity-color-pink {
-            --identity-tab-color: \{{color13}} !important;
-            --identity-icon-color: \{{color13}} !important;
-          }
-
-          .identity-color-purple {
-            --identity-tab-color: \{{color5}} !important;
-            --identity-icon-color: \{{color5}} !important;
-          }
-
-          #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;
-          }
-        '';
-    };
-  };
-}