diff --git a/hosts/local-packages.nix b/hosts/local-packages.nix
index 1bb20fd..0c17850 100644
--- a/hosts/local-packages.nix
+++ b/hosts/local-packages.nix
@@ -22,6 +22,7 @@ in {
     gnused
     gdb
     stdenv.cc.cc.lib
+    nix-prefetch-git
     binutils
     cmake
     ninja
diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix
index feda22c..9e85de3 100644
--- a/modules/i3-xfce.nix
+++ b/modules/i3-xfce.nix
@@ -15,11 +15,23 @@ in {
   services.xserver.windowManager.i3 = {
     enable = true;
     package = pkgs.i3-gaps;
-    extraPackages = with pkgs; [dmenu i3status i3lock i3blocks picom feh rofi dunst polybar i3-auto-layout];
+    extraPackages = with pkgs; [
+      dmenu
+      i3status
+      i3lock
+      i3blocks
+      picom
+      feh
+      rofi
+      dunst
+      polybar
+      i3-auto-layout
+    ];
     extraSessionCommands = ''
-      ${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png &
-      ${pkgs.gtk3}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyo Night Storm"
-      ${pkgs.gtk3}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Dark-Icons"
+      ${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* 2>/dev/null || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png &
+      export GSETTINGS_SCHEMA_DIR=${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas
+      ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Storm"
+      ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Dark-Icons"
     '';
   };
 
@@ -31,21 +43,25 @@ in {
 
   services.xserver.displayManager.lightdm = {
     enable = true;
-    background = "#000000";
+    background = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/backgrounds/nixos/nixos-wallpaper.png";
     greeters.gtk = {
       enable = true;
       theme = {
         package = customPkgs.tokyo-night-gtk;
-        name = "Tokyo Night Storm";
+        name = "Tokyonight-Storm";
       };
       iconTheme = {
         package = customPkgs.vivid-icons;
         name = "Vivid-Dark-Icons";
       };
+      cursorTheme = {
+        package = pkgs.capitaine-cursors;
+        name = "capitaine-cursors";
+      };
       extraConfig = ''
         [greeter]
         font-name=Clear Sans 10
-        cursor-theme-name=Vivid-Dark-Icons
+        cursor-theme-name=capitaine-cursors
       '';
     };
   };
@@ -63,35 +79,42 @@ in {
   environment.etc."gtk-3.0/settings.ini".text = ''
     [Settings]
     gtk-application-prefer-dark-theme=1
-    gtk-theme-name=Tokyo Night Storm
+    gtk-theme-name=Tokyonight-Storm
     gtk-icon-theme-name=Vivid-Dark-Icons
     gtk-font-name=Clear Sans 10
   '';
 
   environment.variables = {
-    GTK_THEME = "Tokyo Night Storm";
-    XCURSOR_THEME = "Vivid-Dark-Icons";
+    GTK_THEME = "Tokyonight-Storm";
+    XCURSOR_THEME = "capitaine-cursors";
     XCURSOR_SIZE = "24";
   };
 
-  environment.systemPackages = with pkgs;
-    [
-      arandr
-      nitrogen
-      xclip
-      lxappearance
-      libsForQt5.qt5ct
-      gnome-themes-extra
-      gsettings-desktop-schemas
-      adwaita-qt
-      arc-theme
-      arc-icon-theme
-      papirus-icon-theme
-      numix-icon-theme-circle
-      candy-icons
-    ]
-    ++ (with customPkgs; [
-      tokyo-night-gtk
-      vivid-icons
-    ]);
+  environment.systemPackages = with pkgs; [
+    arandr
+    nitrogen
+    xclip
+    lxappearance
+    libsForQt5.qt5ct
+    gnome-themes-extra
+    gsettings-desktop-schemas
+    adwaita-qt
+    arc-theme
+    arc-icon-theme
+    papirus-icon-theme
+    numix-icon-theme-circle
+    candy-icons
+    capitaine-cursors
+  ] ++ (with customPkgs; [
+    tokyo-night-gtk
+    vivid-icons
+  ]);
+
+  services.xserver.desktopManager.session = [{
+    name = "xfce+i3";
+    start = ''
+      ${pkgs.xfce.xfce4-session}/bin/xfce4-session --with-ck-launch &
+      ${pkgs.i3-gaps}/bin/i3
+    '';
+  }];
 }