diff --git a/home/xin/calcite.nix b/home/xin/calcite.nix
index ff95985..40b93c9 100644
--- a/home/xin/calcite.nix
+++ b/home/xin/calcite.nix
@@ -5,7 +5,9 @@ in
 {
   imports = [
     ./common
+    ./common/pentesting.nix
     ./common/gui/foot.nix
+    ./common/gui/default.nix
   ];
 
   programs.nix-index-database.comma.enable = true;
@@ -116,6 +118,13 @@ in
     flags = [ "--disable-up-arrow" ];
   };
 
+  programs.zathura = {
+    enable = true;
+    options = {
+      recolor = false;
+    };
+  };
+
   programs.firefox = {
     enable = true;
     policies.DefaultDownloadDirectory = "/media/data/Downloads";
diff --git a/home/xin/common/gui/default.nix b/home/xin/common/gui/default.nix
new file mode 100644
index 0000000..38af792
--- /dev/null
+++ b/home/xin/common/gui/default.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # File Manager
+    xfce.thunar
+    xfce.thunar-archive-plugin
+    xfce.thunar-media-tags-plugin
+    xfce.thunar-volman
+
+    swayimg
+  ];
+}
diff --git a/home/xin/common/pentesting.nix b/home/xin/common/pentesting.nix
new file mode 100644
index 0000000..92601a6
--- /dev/null
+++ b/home/xin/common/pentesting.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    burpsuite
+  ];
+}
diff --git a/modules/home-manager/gui/niri.nix b/modules/home-manager/gui/niri.nix
index d26bf93..527e9e6 100644
--- a/modules/home-manager/gui/niri.nix
+++ b/modules/home-manager/gui/niri.nix
@@ -34,10 +34,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      cosmic-files
-    ];
-
     systemd.user.services.xwayland-satellite = {
       Install = {
         WantedBy = [ "graphical-session.target" ];