diff --git a/.config/ansible/roles/arch/packages/tasks/modules/base.yml b/.config/ansible/roles/arch/packages/tasks/modules/base.yml
index e7da3b5e..57a1e1bc 100644
--- a/.config/ansible/roles/arch/packages/tasks/modules/base.yml
+++ b/.config/ansible/roles/arch/packages/tasks/modules/base.yml
@@ -2,78 +2,93 @@
 - name: Install Pacman Packages
   pacman:
     name:
-      # Base / Core
+      # Microcode
       - amd-ucode
       - intel-ucode
 
-      - android-file-transfer
-      - android-tools
-      - baobab
+      # System
       - base
       - base-devel
-      - bat
-      - bluez
-      - blueman
-      - btop
+      - polkit-gnome
       - clamtk
-      - celluloid
-      - cliphist
+      - qt5ct
       - dex
-      - dua-cli
-      - duf
-      - eza
-      - fd
-      - fzf
-      - galculator
-      - geeqie
-      - genact
-      - github-cli
-      - gnome-logs
-      - gparted
+      - reflector
+      - ufw
+      - xdg-user-dirs
+      - udiskie
+
+      # Android
+      - android-file-transfer
+      - android-tools
+      - scrcpy
+
+      # WM
       - hyprland
-      - imagemagick
+      - swappy
+      - swayidle
+      - wev
+      - wf-recorder
+      - wl-clipboard
+      - xdg-desktop-portal-hyprland
       - kitty
-      - libreoffice-fresh
-      - mpv
+
+      # File Manager
+      - yazi
       - nemo
       - nemo-fileroller
       - nemo-image-converter
-      - neofetch
-      - nm-connection-editor
-      - nvtop
-      - obsidian
-      - pavucontrol
-      - pinta
-      - polkit-gnome
-      - playerctl
-      - qt5ct
-      - reflector
-      - ripgrep
-      - ripgrep-all
-      - scrcpy
-      - sd
-      - swappy
-      - swayidle
-      - thunderbird
-      - trash-cli
+
+      # Fonts
       - ttf-font-awesome
       - ttf-nerd-fonts-symbols
       - ttf-nerd-fonts-symbols-mono
       - ttf-jetbrains-mono-nerd
-      - ufw
-      - udiskie
-      - waybar
-      - wine
-      - vim
-      - wev
-      - wf-recorder
-      - wl-clipboard
-      - yt-dlp
-      - xdf-desktop-portal-hyprland
-      - xdg-user-dirs
+
+      # Tools
+      - baobab
+      - cliphist
+      - galculator
+      - gnome-logs
+      - gparted
+      - playerctl
+      - nm-connection-editor
+
+      # Bluetooth
+      - bluez
+      - blueman
+
+      # CLI / TUI
+      - bat
+      - btop
+      - eza
+      - fd
+      - fzf
+      - nvtop
+      - duf
+      - dua-cli
+      - neofetch
+      - ripgrep
+      - ripgrep-all
+      - sd
+      - trash-cli
+
+      # Productivity
+      - libreoffice-fresh
+      - obsidian
+      - thunderbird
       - zathura
       - zathura-pdf-mupdf
 
+      # Multimedia
+      - celluloid
+      - discord
+      - geeqie
+      - imagemagick
+      - mpv
+      - pavucontrol
+      - wine
+
 # AUR
 - name: Create the `aur_builder` user
   become: true
@@ -96,45 +111,58 @@
   aur:
     use: yay
     name:
-      - android-sdk-platform-tools
-      - brave-bin
-      - catppuccin-gtk-theme-macchiato
-      - cava
-      - check-broken-packages-pacman-hook-git
-      - devify
-      - downgrade
-      - find-the-command
-      - hyprpicker-git
-      - hyprshot
-      - hyprsome-git
-      - librewolf-bin
-      - needrestart
-      - nwg-displays
-      - nwg-look
-      - paccache-hook
-      - pacseek
-      - pika-backup
-      - pyprland
-      - rar
-      - reflector-pacman-hook-git
-      - rofi-lboon-wayland
-      - rofi-file-browser-extended-git
+      # System
       - sddm-git
-      - shell-color-scripts
+
+      # Browser
+      - brave-bin
+      - librewolf-bin
+
+      # WM
+      - waybar-hyprland-cava-git
+      - waybar-module-pacman-updates-git
+      - wleave-git
       - swaylock-effects
       - swaync
       - swayosd-git
       - swww
-      - sync-pacman-hook-git
-      - sysz
-      - tgpt-bin
-      - topgrade
-      - ttf-ms-win11-auto
-      - upscayl-bin
-      - wl-clip-persist-git
-      - waybar-hyprland-cava-git
-      - waybar-module-pacman-updates-git
-      - wleave-git
+      - hyprpicker-git
+      - hyprshot
+      - hyprsome-git
       - wlr-randr
       - wlrobs-hg
-      - ytdlp-gui
+      - nwg-displays
+      - nwg-look
+      - pyprland
+      - rofi-lboon-wayland
+      - rofi-file-browser-extended-git
+
+      # Hooks
+      - check-broken-packages-pacman-hook-git
+      - reflector-pacman-hook-git
+      - sync-pacman-hook-git
+      - needrestart
+      - paccache-hook
+
+      # CLI / TUI
+      - cava
+      - find-the-command
+      - pacseek
+      - sysz
+      - tgpt-bin
+      - shell-color-scripts
+
+      # Tools
+      - devify
+      - topgrade
+      - upscayl-bin
+      - downgrade
+      - betterdiscord-installer-bin
+      - android-sdk-platform-tools
+      - pika-backup
+      - rar
+      - wl-clip-persist-git
+
+      # Theme
+      - catppuccin-gtk-theme-macchiato
+      - ttf-ms-win11-auto
diff --git a/.config/ansible/roles/arch/packages/tasks/modules/coding.yml b/.config/ansible/roles/arch/packages/tasks/modules/coding.yml
index 9c7e6ebe..bd9bb397 100644
--- a/.config/ansible/roles/arch/packages/tasks/modules/coding.yml
+++ b/.config/ansible/roles/arch/packages/tasks/modules/coding.yml
@@ -2,23 +2,36 @@
 - name: Install Pacman Packages
   pacman:
     name:
+      # Web
+      - yarn
+      - npm
+      - nodejs
+
+      # Python
+      - python-pip
+      - python-pipx
+
+      # Rust
+      - rustup
+
+      # Go
+      - go
+
+      # Lua
+      - lua
+      - luarocks
+
+      # Tools
+      - github-cli
       - dbeaver
       - diff-so-fancy
       - lazygit
-      - neovide
-      - npm
-      - bob # Neovim version manager
       - onefetch
-      - ripgrep
-      - ripgrep-all
-      - yarn
-      - rustup
-      - python-pip
-      - python-pipx
-      - go
-      - github-cli
-      - luarocks
-      - nodejs
+
+      # Neovim
+      - neovide
+      - bob
+      - vim
 
 # AUR
 - name: Install AUR Packages
diff --git a/.config/ansible/roles/arch/packages/tasks/modules/gaming.yml b/.config/ansible/roles/arch/packages/tasks/modules/gaming.yml
index 8bb1ef59..be24e42c 100644
--- a/.config/ansible/roles/arch/packages/tasks/modules/gaming.yml
+++ b/.config/ansible/roles/arch/packages/tasks/modules/gaming.yml
@@ -34,6 +34,7 @@
 
       # Tools
       - proton-ge-custom-bin
+      - protontricks
       - vkbasalt
       - ludusavi
 
diff --git a/.config/ansible/roles/arch/packages/tasks/modules/multimedia.yml b/.config/ansible/roles/arch/packages/tasks/modules/multimedia.yml
index 9c4b5dd2..8e2d97de 100644
--- a/.config/ansible/roles/arch/packages/tasks/modules/multimedia.yml
+++ b/.config/ansible/roles/arch/packages/tasks/modules/multimedia.yml
@@ -2,89 +2,20 @@
 - name: Install Pacman Packages
   pacman:
     name:
-      # Base / Core
-      - amd-ucode
-      - intel-ucode
-
-      - android-file-transfer
-      - android-tools
-      - baobab
-      - bat
-      - blender
-      - bluez
-      - blueman
-      - btop
-      - celluloid
-      - clamtk
-      - dbeaver
-      - diff-so-fancy
-      - discord
-      - dua-cli
-      - eza
+      # Audio
       - easyeffects
-      - fd
-      - fzf
-      - galculator
-      - gamemode
-      - geeqie
-      - gnome-disk-utility
       - gst-plugins-base
-      - hyprland
-      - kitty
-      - kvantum
-      - lazygit
-      - libreoffice-still
       - lsp-plugins
-      - lxappearance
-      - mesa
-      - mpv
-      - navi
-      - nemo
-      - nemo-fileroller
-      - nemo-image-converter
-      - neofetch
-      - neovide
-      - neovim
-      - npm
-      - nm-connection-editor
-      - nvtop
-      - obsidian
-      - onefetch
-      - pavucontrol
-      - pinta
-      - polkit-gnome
-      - ripgrep
-      - ripgrep-all
-      - scrcpy
-      - sd
-      - swappy
-      - swaydile
-      - thunderbird
-      - ufw
-      - waybar
-      - wine
-      - wl-clipboard
+      - qpwgraph
+
+      # Video
+      - obs-studio
+      - blender
       - yt-dlp
-      - yarn
-      - xplr
-      - zathura
-      - zathura-pdf-mupdf
 
-# AUR
-- name: Create the `aur_builder` user
-  become: true
-  ansible.builtin.user:
-    name: aur_builder
-    create_home: yes
-    group: wheel
-
-- name: Allow the `aur_builder` user to run `sudo pacman` without a password
-  become: true
-  ansible.builtin.lineinfile:
-    path: /etc/sudoers.d/11-install-aur_builder
-    line: "aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman"
-    create: yes
-    validate: "visudo -cf %s"
+      # Image
+      - pinta
+      - krita
 
 - name: Install AUR Packages
   become: true
@@ -92,79 +23,7 @@
   aur:
     use: yay
     name:
-      - amf-amdgpu-pro
-      - activitywatch-bin
-      - adwsteamgtk
-      - android-sdk-platform-tools
-      - ani-cli
-      - arronax
-      - betterdiscord-installer-bin
-      - brave-bin
-      - catppuccin-gtk-macchiato
-      - cava
-      - cemu-bin
-      - devify
-      - downgrade
-      - find-the-command
-      - heroic-games-launcher
-      - hyprpicker-git
-      - hyprshot
-      - lazynpm
-      - librewolf-bin
-      - ludusavi
-      - mangal-bin
-      - nerd-fonts-git
-      - nwg-displays
-      - nwg-look
-      - obs-studio-amf
-      - paccache-hook
-      - pika-backup
-      - pinterest-downloader-git
-      - pipes.sh
-      - prettierd
-      - proton-ge-custom-bin
-      - pyprland
-      - spotdl
-      - reflector-pacman-hook-git
-      - rofi-lboon-wayland-git
-      - rofi-file-browser-extended-git
-      - scc-bin
-      - sddm-git
-      - shell-color-scripts
+      # Audio
       - spicetify-cli
       - spotify
-      - swaylock-effects
-      - swaync
-      - swayosd-git
-      - swww
-      - sysz
-      - tgpt-bin
-      - ttf-ms-win11-auto
-      - tty-clock-git
-      - unimatrix-git
-      - upscayl-bin
-      - vkbasalt
-      - vulkan-amdgpu-pro
-      - wev
-      - wl-clip-persist-git
-      - wleave-git
-      - wlr-randr
-      - wlrobs-hg
-      - xdg-desktop-portal-hyprland-git
-      - youtube-dl
       - ytdlp-gui
-      - zarchive-git
-
-# Cargo
-- name: Install Rust Packages
-  cargo:
-    name:
-      - cargo-update
-
-# Npm
-- name: Install Npm Packages
-  npm:
-    name:
-      - commitizen
-      - cz-git
-    global: true