diff --git a/etc/astronaut.conf b/etc/astronaut.conf
index 791fc71..de7b72c 100644
--- a/etc/astronaut.conf
+++ b/etc/astronaut.conf
@@ -12,17 +12,18 @@ dir_infodir='info'
 
 export LDFLAGS="-L/$dir_prefix/$dir_libdir"
 
-options='!pulseaudio,!gtk3'
+options='patch,!pulseaudio,!gtk3,!pam'
 package_options() {
     case "$1" in
         astronaut) echo 'pkgtools,helpers' ;;
-        i3) echo 'window-icons' ;;
+        i3) echo 'gaps,window-icons' ;;
         hostapd) echo 'rtlxdrv' ;;
         python3) echo '!2to3-symlink' ;;
         python3-setuptools) echo '!easy_install-symlink' ;;
-        texlive) echo '!system-harfbuzz' ;;
         wine) echo 'wine32=lib' ;;
-        ffmpeg) echo 'openssl,libvpx,libvorbis,libass' ;;
+        ffmpeg) echo 'gnutls,libvpx,libvorbis,libass' ;;
+        virtualbox) echo '!docs' ;;
+        nxengine-evo) echo 'console_key=-' ;;
     esac
 }