diff --git a/root/etc/astronaut.conf b/root/etc/astronaut.conf
index de7b72c..0207c12 100644
--- a/root/etc/astronaut.conf
+++ b/root/etc/astronaut.conf
@@ -4,31 +4,37 @@ dir_build="/tmp/astronaut.$(id -u)/build"
 dir_install="/tmp/astronaut.$(id -u)/install"
 dir_source='/var/cache/astronaut'
 
-[ "$(uname -m)" = "x86_64" ] && dir_libdir='lib64'
-dir_sysconfdir='../etc'
-dir_mandir='man'
-dir_docdir='doc'
-dir_infodir='info'
+[ "$(uname -m)" = "x86_64" ] && dir_lib='lib64'
+dir_sysconf='../etc'
+dir_localstate='../var'
+dir_man='man'
+dir_doc='doc'
+dir_info='info'
 
-export LDFLAGS="-L/$dir_prefix/$dir_libdir"
+export LDFLAGS="-L/$dir_prefix/$dir_lib"
 
-options='patch,!pulseaudio,!gtk3,!pam'
+wrapper_pkgtools_compression='tgz'
+
+options='patch,!gtk3,!pam'
 package_options() {
     case "$1" in
         astronaut) echo 'pkgtools,helpers' ;;
-        i3) echo 'gaps,window-icons' ;;
-        hostapd) echo 'rtlxdrv' ;;
+        i3) echo 'gaps' ;;
         python3) echo '!2to3-symlink' ;;
         python3-setuptools) echo '!easy_install-symlink' ;;
         wine) echo 'wine32=lib' ;;
-        ffmpeg) echo 'gnutls,libvpx,libvorbis,libass' ;;
-        virtualbox) echo '!docs' ;;
         nxengine-evo) echo 'console_key=-' ;;
+        qemu) echo 'targets=x86_64-softmmu i386-softmmu' ;;
     esac
 }
 
-export CFLAGS='-march=native -pipe -O3'
+export CFLAGS="-march=native -pipe -O2"
+#export CFLAGS="-march=native -pipe -O3 -fgraphite-identity -ftree-loop-distribution -floop-nest-optimize -flto=$(nproc) -fuse-linker-plugin"
+#export LDFLAGS="$LDFLAGS $CFLAGS -Wl,--as-needed -Wl,--hash-style=gnu"
 export CXXFLAGS="$CFLAGS"
-export MAKEFLAGS="${MAKEFLAGS:--j $(grep processor /proc/cpuinfo | wc -l)}"
+
+export MAKEFLAGS="${MAKEFLAGS:--j $(nproc)}"
 export WAFFLAGS="$MAKEFLAGS"
 export BAMFLAGS="$MAKEFLAGS"
+export NINJAFLAGS="$MAKEFLAGS"
+export NINJA_STATUS='[%p %f/%t] '