diff --git a/home/jonas@comfy-station/configuration.nix b/home/jonas@comfy-station/configuration.nix
index ff12762..aac853f 100644
--- a/home/jonas@comfy-station/configuration.nix
+++ b/home/jonas@comfy-station/configuration.nix
@@ -46,6 +46,7 @@
     };
   };
   xdg.userDirs.enable = true;
+  xdg.userDirs.setSessionVariables = true;
   xdg.userDirs.createDirectories = true;
   xdg.userDirs.extraConfig = {
     WORKSPACES = "${config.home.homeDirectory}/Workspaces";
diff --git a/home/jonas@monolith/configuration.nix b/home/jonas@monolith/configuration.nix
index 3505b22..e68a9b2 100644
--- a/home/jonas@monolith/configuration.nix
+++ b/home/jonas@monolith/configuration.nix
@@ -52,6 +52,7 @@
     };
   };
   xdg.userDirs.enable = true;
+  xdg.userDirs.setSessionVariables = true;
   xdg.userDirs.createDirectories = true;
   xdg.userDirs.extraConfig = {
     WORKSPACES = "${config.home.homeDirectory}/Workspaces";
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index c2d343a..298b132 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -228,6 +228,7 @@
     };
 
     wayland.windowManager.hyprland = {
+      configType = "hyprlang"; # TODO: Adopt to lua
       settings = {
         exec-once = [
           "${pkgs.wpaperd}/bin/wpaperd &"
@@ -356,11 +357,11 @@
 
         layerrule = [
           # blur for wlogout
-          "blur, logout_dialog"
+          "blur true, logout_dialog"
 
           # blur for swaync
-          "blur, swaync-control-center"
-          "blur, swaync-notification-window"
+          "blur true, swaync-control-center"
+          "blur true, swaync-notification-window"
           "ignorezero, swaync-control-center"
           "ignorezero, swaync-notification-window"
           "ignorealpha 0.5, swaync-control-center"
@@ -399,7 +400,6 @@
 
         dwindle = {
           # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-          pseudotile = "yes"; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
           preserve_split = "yes"; # you probably want this
         };
 
diff --git a/modules/desktop/themes/layan/layan.nix b/modules/desktop/themes/layan/layan.nix
index f7bc481..d4a972f 100644
--- a/modules/desktop/themes/layan/layan.nix
+++ b/modules/desktop/themes/layan/layan.nix
@@ -45,6 +45,7 @@
     # add nord like gtk theme
     gtk = {
       enable = true;
+      gtk4.theme = null;
       cursorTheme = {
         package = pkgs.unstable.layan-cursors;
         name = "Layan-cursors";
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 0c3effb..6843c3e 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -4,9 +4,10 @@
     programs.firefox.nativeMessagingHosts.packages = [pkgs.passff-host];
   };
 
-  flake.homeModules.firefox = {
+  flake.homeModules.firefox = {config, ...}: {
     programs.firefox = {
       enable = true;
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
 
       # Default profile
       profiles.jonas = {
diff --git a/modules/shell/zsh/zsh.nix b/modules/shell/zsh/zsh.nix
index 6bc879d..9009063 100644
--- a/modules/shell/zsh/zsh.nix
+++ b/modules/shell/zsh/zsh.nix
@@ -26,6 +26,7 @@
     # Zsh
     programs.zsh = {
       enable = true;
+      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       syntaxHighlighting.enable = true;