diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix
index 7b2acce..f45027d 100644
--- a/users/willifan/applications.nix
+++ b/users/willifan/applications.nix
@@ -1,33 +1,12 @@
 { pkgs, ... }:
 {
 
-  services.udisks2.enable = true;
-
   environment.systemPackages = with pkgs; [
 
     #rustup
     #probe-rs
     #cargo-binutils
 
-    hyprpicker
-    hyprcursor
-    grim
-    slurp
-    wl-clipboard
-    playerctl
-    jq
-
-    pulseaudio
-    inotify-tools
-    papirus-icon-theme
-    eww
-    dconf
-
-    polkit_gnome
-
-
-    usbutils
-    unzip
     btop
 
     feh
@@ -37,6 +16,6 @@
     webcord
     obsidian
     kicad
-    
+
   ];
 }
diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix
index 3a12017..d7b6dfe 100644
--- a/users/willifan/graphical/hyprland/default.nix
+++ b/users/willifan/graphical/hyprland/default.nix
@@ -11,6 +11,7 @@
     ./mako.nix
     ./pipewire.nix
     ./polkit.nix
+    ./utils.nix
     ./wofi.nix
   ];
   
diff --git a/users/willifan/graphical/hyprland/polkit.nix b/users/willifan/graphical/hyprland/polkit.nix
index a98f45e..2bcad91 100644
--- a/users/willifan/graphical/hyprland/polkit.nix
+++ b/users/willifan/graphical/hyprland/polkit.nix
@@ -1,5 +1,10 @@
 { pkgs, ... }:
 {
+
+  environment.systemPackages = with pkgs; [
+    polkit_gnome
+  ];
+
   security.polkit.enable = true;
   systemd = {
     user.services.polkit-gnome-authentication-agent-1 = {
diff --git a/users/willifan/graphical/hyprland/utils.nix b/users/willifan/graphical/hyprland/utils.nix
new file mode 100644
index 0000000..3200d5d
--- /dev/null
+++ b/users/willifan/graphical/hyprland/utils.nix
@@ -0,0 +1,22 @@
+{ pkgs, home-manager, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    
+    hyprpicker
+    hyprcursor
+
+    grim
+    slurp
+    wl-clipboard
+    playerctl
+
+    dconf
+    
+    jq
+    
+    pulseaudio
+    inotify-tools
+    papirus-icon-theme
+    eww
+  ];
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/thunar.nix b/users/willifan/graphical/thunar.nix
index 9ce67f7..a0908b7 100644
--- a/users/willifan/graphical/thunar.nix
+++ b/users/willifan/graphical/thunar.nix
@@ -1,5 +1,7 @@
 { pkgs, home-manager, ... }:
 {
+  services.udisks2.enable = true;
+
   programs.thunar = {
     enable = true;
     plugins = with pkgs.xfce; [