diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix
index a5092070..11a7c2c0 100644
--- a/homeManagerModules/apps/default.nix
+++ b/homeManagerModules/apps/default.nix
@@ -19,6 +19,7 @@
     ./neofetch
     ./neovim
     ./tauon
+    ./thunar
     ./thunderbird
     ./tmux
     ./vsCodium
diff --git a/homeManagerModules/apps/thunar/default.nix b/homeManagerModules/apps/thunar/default.nix
new file mode 100644
index 00000000..d49320d7
--- /dev/null
+++ b/homeManagerModules/apps/thunar/default.nix
@@ -0,0 +1,34 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options = {alyraffauf.apps.thunar.enable = lib.mkEnableOption "Enable thunar.";};
+
+  config = lib.mkIf config.alyraffauf.apps.thunar.enable {
+    home.packages = with pkgs; [
+      xfce.thunar
+      xfce.thunar-archive-plugin
+      xfce.thunar-media-tags-plugin
+      xfce.thunar-volman
+      xfce.exo
+      xfce.tumbler
+    ];
+
+    xdg.configFile."xfce4/helpers.rc".text = ''
+      TerminalEmulator=alacritty
+      FileManager=thunar
+      WebBrowser=firefox
+    '';
+
+    xfconf.settings = {
+      thunar = {
+        "last-menubar-visible" = false;
+        "misc-confirm-close-multiple-tabs" = false;
+        "misc-show-delete-action" = true;
+        "misc-single-click" = true;
+      };
+    };
+  };
+}
diff --git a/homeManagerModules/desktop/hypr/default.nix b/homeManagerModules/desktop/hypr/default.nix
index 9ef2692e..65f45710 100644
--- a/homeManagerModules/desktop/hypr/default.nix
+++ b/homeManagerModules/desktop/hypr/default.nix
@@ -20,20 +20,27 @@
 
   config = lib.mkIf config.alyraffauf.desktop.hyprland.enable {
     # Hypr* modules, plguins, and tools.
-    alyraffauf.desktop.hyprland.hypridle.enable = lib.mkDefault false;
-    alyraffauf.desktop.hyprland.hyprlock.enable = lib.mkDefault false;
-    alyraffauf.desktop.hyprland.hyprpaper.enable = lib.mkDefault true;
-    alyraffauf.desktop.hyprland.hyprshade.enable = lib.mkDefault true;
-
-    alyraffauf.desktop.theme.enable = lib.mkDefault true;
-
-    # Basic apps needed to run a hyprland desktop.
-    alyraffauf.apps.waybar.enable = lib.mkDefault true;
-    alyraffauf.apps.mako.enable = lib.mkDefault true;
-    alyraffauf.apps.fuzzel.enable = lib.mkDefault true;
-    alyraffauf.apps.wlogout.enable = lib.mkDefault true;
-    alyraffauf.apps.alacritty.enable = lib.mkDefault true;
-    alyraffauf.apps.firefox.enable = lib.mkDefault true;
+    alyraffauf = {
+      desktop = {
+        hyprland = {
+          hypridle.enable = lib.mkDefault false;
+          hyprlock.enable = lib.mkDefault false;
+          hyprpaper.enable = lib.mkDefault true;
+          hyprshade.enable = lib.mkDefault true;
+        };
+        theme.enable = lib.mkDefault true;
+      };
+      apps = {
+        # Basic apps needed to run a hyprland desktop.
+        alacritty.enable = lib.mkDefault true;
+        firefox.enable = lib.mkDefault true;
+        fuzzel.enable = lib.mkDefault true;
+        mako.enable = lib.mkDefault true;
+        thunar.enable = lib.mkDefault true;
+        waybar.enable = lib.mkDefault true;
+        wlogout.enable = lib.mkDefault true;
+      };
+    };
 
     services.cliphist.enable = lib.mkDefault true;
 
@@ -48,23 +55,11 @@
       hyprshot
       networkmanagerapplet
       trayscale
-      xfce.exo
-      xfce.thunar
-      xfce.thunar-archive-plugin
-      xfce.thunar-media-tags-plugin
-      xfce.thunar-volman
-      xfce.tumbler
       xfce.xfce4-settings
       xfce.xfce4-taskmanager
       xfce.xfconf
     ];
 
-    xdg.configFile."xfce4/helpers.rc".text = ''
-      TerminalEmulator=alacritty
-      FileManager=thunar
-      WebBrowser=firefox
-    '';
-
     xdg.portal = {
       enable = true;
       configPackages = [pkgs.xdg-desktop-portal-hyprland];
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 80b3c3a4..91593546 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -25,6 +25,7 @@
         alacritty.enable = lib.mkDefault true;
         firefox.enable = lib.mkDefault true;
         kanshi.enable = lib.mkDefault true;
+        thunar.enable = lib.mkDefault true;
       };
       desktop.theme.enable = lib.mkDefault true;
     };
@@ -39,12 +40,6 @@
       swayidle
       swayosd
       trayscale
-      xfce.exo
-      xfce.thunar
-      xfce.thunar-archive-plugin
-      xfce.thunar-media-tags-plugin
-      xfce.thunar-volman
-      xfce.tumbler
       xfce.xfce4-settings
       xfce.xfce4-taskmanager
       xfce.xfconf
@@ -396,12 +391,6 @@
       layer_effects logout_dialog blur enable
     '';
 
-    xdg.configFile."xfce4/helpers.rc".text = ''
-      TerminalEmulator=alacritty
-      FileManager=thunar
-      WebBrowser=firefox
-    '';
-
     xdg.portal = {
       enable = true;
       configPackages = [pkgs.xdg-desktop-portal-wlr];