diff --git a/modules/cli/direnv.sh b/modules/cli/direnv.sh
index 326659a..9f3b166 100644
--- a/modules/cli/direnv.sh
+++ b/modules/cli/direnv.sh
@@ -1,4 +1,4 @@
-: ${XDG_CACHE_HOME:=$HOME/.cache}
+: "${XDG_CACHE_HOME:=$HOME/.cache}"
 
 declare -A direnv_layout_dirs
 direnv_layout_dir() {
diff --git a/modules/cli/home.nix b/modules/cli/home.nix
index 0cbee50..f279c8e 100644
--- a/modules/cli/home.nix
+++ b/modules/cli/home.nix
@@ -3,11 +3,12 @@
     ./zsh
     ./nvim
   ];
-
-  programs.direnv.enable = true;
-  programs.direnv.stdlib = builtins.readFile ./direnv.sh;
-  programs.direnv.nix-direnv.enable = true;
-  programs.direnv.config = {warn_timeout = "500h";};
+  programs.direnv = {
+    enable = true;
+    stdlib = builtins.readFile ./direnv.sh;
+    nix-direnv.enable = true;
+    config = {warn_timeout = "500h";};
+  };
 
   programs.git = {
     enable = true;
diff --git a/modules/wm/home.nix b/modules/wm/home.nix
index 4e5b37c..8fdc703 100644
--- a/modules/wm/home.nix
+++ b/modules/wm/home.nix
@@ -17,27 +17,31 @@ in {
     wallpaper
   ];
 
-  services.darkman = {
+  services.darkman = let
+    genTheme = theme: {
+      color-scheme = "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface color-scheme prefer-${theme}";
+      gtk3 = let
+        suffix =
+          if theme == "light"
+          then ""
+          else "-dark";
+      in "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3${suffix}";
+      kit = ''
+        ${pkgs.coreutils}/bin/ln -sf $XDG_CONFIG_HOME/kitty/${theme}.conf $XDG_CONFIG_HOME/kitty/theme.conf
+        ${pkgs.procps}/bin/pkill -USR1 kitty
+      '';
+      # ghostty = ''
+      #   echo ${theme} > ~/.config/ghostty/theme.config
+      #   ghostty +reload_config
+      # '';
+    };
+  in {
     enable = true;
     settings = {
       usegeoclue = true;
     };
-    lightModeScripts = {
-      color-scheme = "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface color-scheme prefer-light";
-      gtk3 = "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3";
-      kittycs = ''
-        ${pkgs.coreutils}/bin/ln -sf $XDG_CONFIG_HOME/kitty/light.conf $XDG_CONFIG_HOME/kitty/theme.conf
-        ${pkgs.procps}/bin/pkill -USR1 kitty
-      '';
-    };
-    darkModeScripts = {
-      color-scheme = "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface color-scheme prefer-dark";
-      gtk3 = "${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark";
-      kittycs = ''
-        ${pkgs.coreutils}/bin/ln -sf $XDG_CONFIG_HOME/kitty/dark.conf $XDG_CONFIG_HOME/kitty/theme.conf
-        ${pkgs.procps}/bin/pkill -USR1 kitty
-      '';
-    };
+    lightModeScripts = genTheme "light";
+    darkModeScripts = genTheme "dark";
   };
 
   programs.hyprlock = {