diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index f5dfdd8..7977618 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -10,6 +10,7 @@
     ./firefox.nix
     ./games.nix
     ./misc.nix
+    ./thunar.nix
     ./waybar.nix
     ./wlogout.nix
     ./xdg.nix
diff --git a/modules/programs/hypr/land/default.nix b/modules/programs/hypr/land/default.nix
index 7cce657..322da54 100644
--- a/modules/programs/hypr/land/default.nix
+++ b/modules/programs/hypr/land/default.nix
@@ -85,7 +85,7 @@ in {
               workspace = [
                 "special:terminal, on-created-empty:foot"
                 "special:mixer_gui, on-created-empty:pavucontrol"
-                "special:file_manager_gui, on-created-empty:nautilus"
+                "special:file_manager_gui, on-created-empty:thunar"
                 "special:file_manager_tui, on-created-empty:foot -- yazi"
               ];
 
diff --git a/modules/programs/misc.nix b/modules/programs/misc.nix
index 9e2dc28..053e2f7 100644
--- a/modules/programs/misc.nix
+++ b/modules/programs/misc.nix
@@ -20,7 +20,6 @@ in {
         imhex
         logisim-evolution
         mission-center
-        nautilus
         obsidian
         playerctl
         proton-pass
diff --git a/modules/programs/thunar.nix b/modules/programs/thunar.nix
new file mode 100644
index 0000000..927e385
--- /dev/null
+++ b/modules/programs/thunar.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf;
+in {
+  config = mkIf config.local.profiles.desktop.enable {
+    programs = {
+      thunar = {
+        enable = true;
+        plugins = with pkgs.xfce; [
+          thunar-archive-plugin
+          thunar-volman
+          exo
+        ];
+      };
+
+      xfconf.enable = true;
+      file-roller.enable = true;
+    };
+
+    services.gvfs.enable = true; # Mount, trash, and other functionalities
+    services.tumbler.enable = true; # Thumbnail support for images
+  };
+}
diff --git a/modules/programs/xdg.nix b/modules/programs/xdg.nix
index fda39f0..ca80011 100644
--- a/modules/programs/xdg.nix
+++ b/modules/programs/xdg.nix
@@ -17,7 +17,7 @@ in {
           image/jpeg=org.gnome.gThumb.desktop
           image/png=org.gnome.gThumb.desktop
           image/svg= org.gnome.gThumb.desktop
-          inode/directory=yazi.desktop
+          inode/directory=thunar.desktop
           text/html=firefox.desktop
           video/avi=io.github.celluloid_player.Celluloid.desktop
           video/mkv=io.github.celluloid_player.Celluloid.desktop
diff --git a/modules/services/gnome.nix b/modules/services/gnome.nix
index 5596fd2..67a1a19 100644
--- a/modules/services/gnome.nix
+++ b/modules/services/gnome.nix
@@ -13,7 +13,6 @@
       ];
 
       gnome.gnome-keyring.enable = true;
-      gvfs.enable = true;
     };
   };
 }