diff --git a/nixos/home-manager/env/gtk.nix b/nixos/home-manager/env/gtk.nix
new file mode 100644
index 00000000..81956cf9
--- /dev/null
+++ b/nixos/home-manager/env/gtk.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  gtk = {
+    enable = true;
+    cursorTheme = {
+      package = pkgs.catppuccin-cursors.macchiatoDark;
+      name = "Catppuccin-Macchiato-Dark-Cursors";
+    };
+    theme = {
+      package = pkgs.catppuccin-gtk;
+      name = "Catppuccin-Frappe-Standard-Blue-Dark";
+    };
+  };
+}
diff --git a/nixos/home-manager/env/hyprland.nix b/nixos/home-manager/env/hyprland.nix
index f47d353a..fdaf601e 100644
--- a/nixos/home-manager/env/hyprland.nix
+++ b/nixos/home-manager/env/hyprland.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 let
   flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 
@@ -9,8 +9,16 @@ in
 {
   imports = [
     hyprland.homeManagerModules.default
+    ./gtk.nix
+    ./dunst.nix
   ];
 
+  home.packages = with pkgs; [
+    hyprpaper
+    wofi
+    dolphin
+    swaybg
+  ];
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland = {
diff --git a/nixos/home-manager/env/xfce.nix b/nixos/home-manager/env/xfce.nix
index 51c96132..4153b868 100644
--- a/nixos/home-manager/env/xfce.nix
+++ b/nixos/home-manager/env/xfce.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./xresources.nix
+    ./gtk.nix
     ./bspwm.nix
     ./sxhkd.nix
     ./picom.nix
@@ -9,8 +10,6 @@
     ./polybar.nix
   ];
   home.packages = with pkgs; [
-    catppuccin-gtk
-    catppuccin-cursors.macchiatoDark
     xfce.thunar
     ranger
     flameshot
@@ -22,9 +21,6 @@
       "general/LockCommand" = "i3lock-fancy";
     };
     xsettings = {
-      "Net/ThemeName" = "Catppuccin-Frappe-Standard-Blue-Dark";
-      "Gtk/CursorThemeName" = "Catppuccin-Macchiato-Dark-Cursors";
-      "Gtk/FontName" = "Sans 12";
       "Gtk/MonospaceFontName" = "FiraCode Nerd Font 12";
     };
   };