diff --git a/nixos/desktop/common.nix b/nixos/desktop/common.nix
index dc538e60..4f6dc843 100644
--- a/nixos/desktop/common.nix
+++ b/nixos/desktop/common.nix
@@ -1,10 +1,5 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  environment.systemPackages = with pkgs; [
-    catppuccin-gtk
-    catppuccin-cursors.macchiatoDark
-  ];
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
diff --git a/nixos/home-manager/env/bspwm.nix b/nixos/home-manager/env/bspwm.nix
index 0adca218..1e496980 100644
--- a/nixos/home-manager/env/bspwm.nix
+++ b/nixos/home-manager/env/bspwm.nix
@@ -13,5 +13,8 @@
       pointer_action2 = "resize_side";
       pointer_action3 = "resize_corner";
     };
+    startupPrograms = [
+      "kitty"
+    ];
   };
 }
diff --git a/nixos/home-manager/env/config/i3/keybindings.nix b/nixos/home-manager/env/config/i3/keybindings.nix
deleted file mode 100644
index b8a16889..00000000
--- a/nixos/home-manager/env/config/i3/keybindings.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-let
-  mod = "Mod4";
-in
-{
-  "${mod}+Tab" = "workspace next";
-  "${mod}+Shift+Tab" = "workspace prev";
-  #
-  "${mod}+Return" = "exec kitty";
-  #"${mod}+Shift+Return" = "exec xfce4-terminal --drop-down";
-  "${mod}+q" = "kill";
-  #
-  "${mod}+Shift+c" = "reload";
-  "${mod}+Shift+r" = "restart";
-  #
-  "${mod}+h" = "focus left";
-  "${mod}+Shift+h" = "move left";
-  "${mod}+Left" = "focus left";
-  "${mod}+Shift+Left" = "move left";
-  "${mod}+j" = "focus down";
-  "${mod}+Shift+j" = "move down";
-  "${mod}+Down" = "focus down";
-  "${mod}+Shift+Down" = "move down";
-  "${mod}+k" = "focus up";
-  "${mod}+Shift+k" = "move up";
-  "${mod}+Up" = "focus up";
-  "${mod}+Shift+Up" = "move up";
-  "${mod}+l" = "focus right";
-  "${mod}+Shift+l" = "move right";
-  "${mod}+Right" = "focus right";
-  "${mod}+Shift+Right" = "move right";
-}
diff --git a/nixos/home-manager/env/i3.nix b/nixos/home-manager/env/i3.nix
deleted file mode 100644
index ebc951eb..00000000
--- a/nixos/home-manager/env/i3.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  mod = "Mod4";
-in
-{
-  imports = [
-    ./dunst.nix
-    ./rofi.nix
-  ];
-  home.packages = with pkgs; [
-    xfce.thunar
-    scrot
-    dex
-    nitrogen
-    i3blocks
-  ];
-  xsession.windowManager.i3 = {
-    enable = true;
-    config = {
-      modifier = mod;
-      floating = {
-        modifier = mod;
-      };
-      fonts = {
-        names = [ "Noto Sans Regular" "DejaVu Sans Mono" ];
-        style = "Regular";
-        size = 12.0;
-      };
-      gaps = {
-        inner = 6;
-        outer = 3;
-      };
-      keybindings = import ./config/i3/keybindings.nix;
-      startup = [
-        { command = "$HOME/.screenlayout/default.sh"; }
-        { command = "nitrogen --restore"; }
-      ];
-    };
-  };
-}
diff --git a/nixos/home-manager/env/xfce.nix b/nixos/home-manager/env/xfce.nix
index 58a00eb4..2e53d568 100644
--- a/nixos/home-manager/env/xfce.nix
+++ b/nixos/home-manager/env/xfce.nix
@@ -8,8 +8,16 @@
     #./polybar.nix
   ];
   home.packages = with pkgs; [
+    catppuccin-gtk
+    catppuccin-cursors.macchiatoDark
     xfce.thunar
     ranger
     flameshot
   ];
+  xfconf.settings = {
+    xsettings = {
+      "Net/ThemeName" = "Catppuccin-Frappe-Standard-Blue-Dark";
+      "Gtk/CursorThemeName" = "Catppuccin-Macchiato-Dark";
+    };
+  };
 }