diff --git a/.gitattributes b/.gitattributes
index 24a8e87..0e3c3f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 *.png filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 747625b..3f02d74 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -38,9 +38,8 @@ in
         '';
         shellAliases = {
           vim = "hx";
-          ls = "colorls --gs -A";
-          ll = "ls -l";
-          lt = "colorls --tree";
+          ls = "eza -lh --icons --git";
+          lss = "ls --total-size";
         };
         plugins = with pkgs.fishPlugins; [
           {
diff --git a/modules/home/apps/kitty/default.nix b/modules/home/apps/kitty/default.nix
index b1d1268..cfff92f 100644
--- a/modules/home/apps/kitty/default.nix
+++ b/modules/home/apps/kitty/default.nix
@@ -17,6 +17,27 @@ in
   config = mkIf cfg.enable {
     home.packages = [ pkgs.kitty ];
 
+    home.sessionVariables.TERMINAL = "kitty";
+
+    # TODO: move this to a thunar specific module
+    home.file.".config/Thunar/uca.xml".text = ''
+      <?xml version="1.0" encoding="UTF-8"?>
+      <actions>
+      <action>
+      	<icon>kitty</icon>
+      	<name>Open Kitty here</name>
+      	<submenu></submenu>
+      	<unique-id>1726095927116900-1</unique-id>
+      	<command>${pkgs.kitty}/bin/kitty %f</command>
+      	<description>Example for a custom action</description>
+      	<range></range>
+      	<patterns>*</patterns>
+      	<startup-notify/>
+      	<directories/>
+      </action>
+      </actions>
+    '';
+
     programs.kitty = {
       enable = true;
       themeFile = "tokyo_night_night";
diff --git a/modules/nixos/desktop/addons/hyprlock/hyprlock_preview.png b/modules/nixos/desktop/addons/hyprlock/hyprlock_preview.png
index 120de91..65071b1 100644
Binary files a/modules/nixos/desktop/addons/hyprlock/hyprlock_preview.png and b/modules/nixos/desktop/addons/hyprlock/hyprlock_preview.png differ
diff --git a/modules/nixos/desktop/addons/hyprpaper/default.nix b/modules/nixos/desktop/addons/hyprpaper/default.nix
new file mode 100644
index 0000000..b3ea2a0
--- /dev/null
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@@ -0,0 +1,42 @@
+{
+  config,
+  inputs,
+  lib,
+  namespace,
+  pkgs,
+  system,
+  ...
+}:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  # hyprpaper-package = inputs.hyprpaper.packages.${system}.hyprpaper;
+
+  cfg = config.${namespace}.desktop.addons.hyprpaper;
+
+  username = config.${namespace}.user.name;
+in
+{
+  options.${namespace}.desktop.addons.hyprpaper = {
+    enable = mkEnableOption "Enable Hyprpaper";
+  };
+
+  config = mkIf cfg.enable {
+    snowfallorg.users.${username}.home.config = {
+      home.file = {
+        # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
+        "Pictures/firewatch.jpg".source = ./firewatch.jpg;
+      };
+
+      services.hyprpaper = {
+        enable = true;
+        settings = {
+          preload = [
+            "/home/${username}/Pictures/firewatch.jpg"
+          ];
+          wallpaper = "monitor DP-2, /home/${username}/Pictures/firewatch.jpg";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/nixos/desktop/addons/hyprpaper/firewatch.jpg b/modules/nixos/desktop/addons/hyprpaper/firewatch.jpg
new file mode 100644
index 0000000..dd7aa6d
--- /dev/null
+++ b/modules/nixos/desktop/addons/hyprpaper/firewatch.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b39ad0b7074adcd91afbe9aeef10d48a3dc4c1ff28b1c397de812e876412595b
+size 1136218
diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index 491332a..e6f263f 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -86,6 +86,7 @@ in
           package = pkgs.rofi-wayland-unwrapped;
         };
         hyprlock = enabled;
+        hyprpaper = enabled;
       };
 
       nix.extra-substituters.${cachix-url} = {
@@ -108,7 +109,7 @@ in
               ];
 
               exec-once = [
-                "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+                "hyprpaper"
                 "waybar"
                 "dunst"
                 "systemctl --user start plasma-polkit-agent"
@@ -168,13 +169,16 @@ in
                   popups_ignorealpha = 0.2;
                 };
 
-                drop_shadow = true;
-                shadow_ignore_window = true;
-                shadow_offset = "0 15";
-                shadow_range = 100;
-                shadow_render_power = 2;
-                shadow_scale = 0.97;
-                "col.shadow" = "rgba(00000055)";
+                shadow = {
+                  enabled = true;
+                  range = 100;
+                  render_power = 2;
+                  ignore_window = true;
+                  color = "rgba(00000055)";
+                  offset = "0 15";
+                  scale = 0.97;
+                };
+
               };
 
               animations = {
diff --git a/modules/nixos/submodules/basics-wsl/default.nix b/modules/nixos/submodules/basics-wsl/default.nix
index a3c0891..80ff534 100644
--- a/modules/nixos/submodules/basics-wsl/default.nix
+++ b/modules/nixos/submodules/basics-wsl/default.nix
@@ -23,7 +23,7 @@ in
       tree
       ripgrep
       fzf
-      colorls
+      eza
 
       wslu
       wsl-open
diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix
index 27ec758..9200885 100644
--- a/modules/nixos/submodules/basics/default.nix
+++ b/modules/nixos/submodules/basics/default.nix
@@ -24,7 +24,7 @@ in
       tree
       ripgrep
       fzf
-      colorls
+      eza
 
       #optional
       pciutils
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 94c70fb..efdc078 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -51,7 +51,14 @@ in
   };
 
   config = {
-    environment.systemPackages = with pkgs; [ ];
+    environment.systemPackages = [ ];
+
+    # remove default nix alias
+    environment.shellAliases = {
+      l = null;
+      ls = null;
+      ll = null;
+    };
 
     programs.fish = enabled;
     users.defaultUserShell = pkgs.fish;