diff --git a/group_vars/desktop.yaml b/group_vars/desktop.yaml
index 0e19c90..c201701 100644
--- a/group_vars/desktop.yaml
+++ b/group_vars/desktop.yaml
@@ -12,9 +12,22 @@ packages_de:
   - mako
   - slurp
   - waylock
+  - wlsunset
+  - swaybg
+  - swayidle
 packages_gui:
   - gimp
+  - nextcloud-client
   - qutebrowser
   - python3-adblock # dependency for qutebrowser adblocking
   - sioyek
   - wdisplays
+  - wezterm
+  - timg # requires wezterm
+packages_games:
+  - lutris
+  - linux-firmware-intel
+  - mesa-dri # TODO: currently automatically installed by wayland role
+  - vulkan-loader
+  - mesa-vulkan-intel
+  - libva-intel-driver # since I have pre-Coffee Lake CPU. For newer GPUs use intel-media-driver
diff --git a/group_vars/headless.yaml b/group_vars/headless.yaml
index 415667c..2b1ad36 100644
--- a/group_vars/headless.yaml
+++ b/group_vars/headless.yaml
@@ -1,9 +1,12 @@
 packages_voidspecific:
+  - snooze
+  - vsv # nice service listing util (also svs exists)
   - xmirror
   - xtools
 
 packages_terminal:
   - abduco
+  - aerc
   - ansible
   - atuin
   - autofs
@@ -11,59 +14,74 @@ packages_terminal:
   - bc
   - bottom
   - brightnessctl
+  - carapace
   - chafa
   - docker
   - docker-compose
   - docx2txt
   - duf
   - dust
+  - enca # provides enconv for vifm previews
   - entr
   - eza
   - fd
   - flavours # TODO: To be replaced with tinty
   - fwupd
+  - fuse-sshfs
   - gallery-dl
   - git-lfs
+  - go
+  - goimapnotify
   - htop
   - iftop
   - ImageMagick
+  - libmagick-devel # required for image.nvim
   - incus
+  - ijq # jiq replacement
   - jrnl
+  - just
   - khal
   - khard
+  - lua51
+  - lua51-devel # required for nvim plugs
+  - luarocks-lua51 # required for nvim plugs
+  - miniserve
   - moreutils
   - msmtp
-  - neomutt
   - neovim
   - newsboat
+  - nmap
+  - notmuch
   - nushell
   - papis
   - pass
   - pdftk
   - podman
+  - python3
+  - python3-pyperclip # for copying from qutebrowser & neovim
+  - python3-jupyter
   - restic
   - ripgrep
   - sc-im
   - sane
   - sane-airscan
-  - snooze
   - starship
-  - swaybg
-  - swayidle
+  - tailspin
   - task
   - tasksh
   - tectonic
   - thermald
   - timewarrior
+  - tlp
+  - tmux
   - topgrade
   - translate-shell
   - uv
   - vdirsyncer
   - vifm
   - visidata
-  - wezterm
+  - w3m
   - wlopm
-  - wlsunset
   - wtype
   - yq-go
   - yt-dlp
@@ -72,9 +90,20 @@ packages_terminal:
   - zr # zsh plugin manager
   - zsh
 
+packages_spellcheck:
+  - enchant2
+  - enchant2-hunspell
+  - enchant2-nuspell
+  - hunspell-en
+  - hunspell-en_GB-all
+  - hunspell-de
+  - hunspell-fr_FR
+
 packages_custom:
   - bemoji
   - dotter
   - filtile-bin
   - localsend-go
   - ripgrep-all
+  - netbird-bin
+  - topen