diff --git a/.gitignore b/.gitignore
index a915de0..b673bdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,8 +44,6 @@ QtProject.conf
 # Files generated by theme change
 swww/current-wallpaper
 noctalia/colors.json
-home-manager/wallpaper
-home-manager/colors.yaml
 nvim/lua/themes/
 kitty/themes/
 kitty/colors.conf
diff --git a/home-manager/colors.yaml b/home-manager/colors.yaml
new file mode 100644
index 0000000..5538b61
--- /dev/null
+++ b/home-manager/colors.yaml
@@ -0,0 +1,21 @@
+system: "base16"
+name: "Pywal"
+author: "Pywal"
+variant: "dark"
+palette:
+  base00: "#130c15"
+  base01: "#130c15"
+  base02: "#a58a9e"
+  base03: "#a58a9e"
+  base04: "#edc6e2"
+  base05: "#edc6e2"
+  base06: "#edc6e2"
+  base07: "#edc6e2"
+  base08: "#6D6598"
+  base09: "#6D6598"
+  base0A: "#DF54BC"
+  base0B: "#986798"
+  base0C: "#E38CB4"
+  base0D: "#DC68A4"
+  base0E: "#5F90C4"
+  base0F: "#6D6598"
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 8b177be..1274945 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -8,69 +8,94 @@
   nixpkgs.config.allowUnfree = true;
 
   home.packages = with pkgs; [
+    # Window manager & desktop environment
     niri
+    swayidle
+    swww
+    kanshi
+
+    # System utilities & monitoring
     btop
-    ripgrep
-    firefox-bin
-    claude-code
-    yazi
+    htop
     fastfetch
-    pywalfox-native
+    dua
+    nh
+    dconf
+    gparted
+    mission-center
+    gnome-software
+
+    # CLI tools & utilities
+    ripgrep
+    fd
+    jq
+    entr
+    mdcat
+    sshpass
+    exiftool
+
+    # File managers & compression tools
+    yazi
     nautilus
-    loupe
-    gnome-text-editor
-    gnome-calculator
-    evince
-    vlc
+    file-roller
     p7zip
     unzip
     zip
     unrar
-    file-roller
-    morewaita-icon-theme
-    codex
-    neovim
-    cargo-cross
-    filezilla
-    swayidle
-    python314
-    sshpass
-    dua
-    nh
-    nmap
-    lazygit
+
+    # Media viewers & players
+    loupe
+    evince
+    vlc
     mpv
-    libreoffice-fresh
-    qbittorrent
+    zathura
+
+    # Media creation & editing
     gimp
-    mdcat
-    htop
-    vscode.fhs
     blender
-    yt-dlp
     ffmpeg
+    yt-dlp
+    waifu2x-converter-cpp
+    libheif
+
+    # Office & productivity
+    libreoffice-fresh
+    gnome-text-editor
+    gnome-calculator
+
+    # Development tools
+    neovim
+    vscode.fhs
+    lazygit
+    cargo-cross
+    claude-code
+    codex
+
+    # Internet & networking
+    firefox-bin
+    filezilla
+    qbittorrent
     tor-browser
-    kdePackages.kleopatra
-    monero-gui
+    nmap
+    gnome-network-displays
+
+    # Privacy & security
     gnupg
     pinentry-qt
-    libheif
-    exiftool
-    gnome-network-displays
-    dconf
-    jq
-    pywal
-    fd
+    kdePackages.kleopatra
+    monero-gui
+
+    # Python & AI
+    python314
     openai-whisper
-    gparted
-    swww
+
+    # Document processing
     tectonic
-    zathura
-    entr
-    waifu2x-converter-cpp
-    gnome-software
-    mission-center
-    kanshi
+
+    # Theming
+    pywal
+    pywalfox-native
+    morewaita-icon-theme
 
     # Wrap PrismLauncher to fix Minecraft GLFW Wayland issues
     (pkgs.symlinkJoin {
diff --git a/home-manager/wallpaper b/home-manager/wallpaper
new file mode 100644
index 0000000..38441b7
Binary files /dev/null and b/home-manager/wallpaper differ