diff --git a/.local/bin/xlocalpkg b/.local/bin/xlocalpkg
new file mode 100755
index 0000000..7008e22
--- /dev/null
+++ b/.local/bin/xlocalpkg
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xpkg -L
diff --git a/.local/bin/xremotepkg b/.local/bin/xremotepkg
new file mode 100755
index 0000000..14009e2
--- /dev/null
+++ b/.local/bin/xremotepkg
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+xpkg -m | grep -v -f <(xpkg -L)
diff --git a/.void.pkgs b/.void.pkgs
index 0dbe22e..83aab54 100644
--- a/.void.pkgs
+++ b/.void.pkgs
@@ -1,80 +1,95 @@
+NetworkManager
+PrismLauncher
+Signal-Desktop
 base-system
 bash-completion
+bat
 bind-utils
+blanket
+bpytop
 chrome-gnome-shell
-dbus
-dino
+chromium
+containerd
 direnv
-discord
 docker
-docker-compose
+dos2unix
 easyeffects
 elixir
-eog
 exa
-execline
 ffmpeg
 firefox
+flatpak
 font-awesome5
 font-fira-otf
+fzf
+gdm-settings
 git
-glib-devel
 gnome
 gnome-menus
 grub-x86_64-efi
 gvfs-smb
-hplip-gui
+helvum
+hplip
 htop
-hydrus
 jq
 keepassxc
 kitty
+krita
+lapce
 lesspipe
+libdrm-32bit
+libgcc-32bit
+libgda
+libstdc++-32bit
 libu2f-host
 lutris
-lxappearance
 mgba-qt
-nautilus
-neofetch
+mpc
+mpd
+mpdscribble
+ncmpcpp
+neovim
 nerd-fonts
 net-tools
+noto-fonts-cjk
+noto-fonts-emoji
 ntfs-3g
 nvidia
 nvidia-libs-32bit
-openjdk8
+obs
+openjdk17-jre
 openntpd
-openvpn
 pavucontrol
-piper
+picard
 pipewire
-ppsspp
 protontricks
-pulseaudio-utils
-python3-pip
 qbittorrent
+qpwgraph
+qv4l2
 sassc
-smbclient
 socklog-void
 srain
+starship
 steam
-sushi
 syncthing
-syncthing-gtk
-udisks2
-unzip
+thunderbird
 vim
 vlc
 void-repo-multilib
 void-repo-multilib-nonfree
 void-repo-nonfree
+vorbis-tools
 vscode
 vulkan-loader-32bit
 wget
 wine
-wine-32bit
-wine-mono
-winetricks
 wireguard
+wireplumber
+wl-clipboard
 xdg-user-dirs
-xorg
+xeyes
+xmirror
+xorg-input-drivers
+xournalpp
+xprop
 xtools
diff --git a/.void.pkgs-src b/.void.pkgs-src
new file mode 100644
index 0000000..5dd0d33
--- /dev/null
+++ b/.void.pkgs-src
@@ -0,0 +1,2 @@
+discord
+sayonara-player