diff --git a/packages.ia b/packages.ia
index e9607fc..0dbfff1 100644
--- a/packages.ia
+++ b/packages.ia
@@ -17,31 +17,41 @@ install stalin mzscheme gauche-dev gambc mit-scheme-doc chicken-bin
         tinyscheme;
 
 # typesetting
-install groff texlive-full dvi2ps dvipng texmacs lyx;
+install groff texlive-full dvi2ps dvipng;
+if X { install texmacs lyx; };
 
 # version control
-install git-core git-email gitk git-cvs git-gui git-svn git-arch git-doc
+install git-core git-email git-cvs  git-svn git-arch git-doc
         git-buildpackage guilt stgit mercurial subversion subversion-tools
         svk darcs bzr rcs cvs cvsps cssc monotone tla tla-doc diff wdiff
         colordiff xxdiff tkdiff patch patchutils quilt;
+if X { install gitk git-gui; };
 
 # fuse
 install fuse-utils sshfs davfs2;
 
 # gui tools
-install glade;
+if X { install glade; };
 
 # printing
-install gv ghostscript ghostscript-x psutils;
+install gv ghostscript psutils;
+if X { install ghostscript-x; };
 
 # crypto
 install gnupg gnupg-agent gnupg2;
 
-# xapps
-install firefox thunderbird xauth pidgin xfig pidgin-otr imagemagick gthumb
-        gucharmap scribus inkscape dia lmms xpdf k3b evince xsel blender
-        fontforge rxvt rxvt-unicode gmrun xterm openoffice.org kstreamripper
-        audacious gnome-office gimp ardour dzen2 xserver-xephyr;
+if X {
+    # xbase
+    install xserver-xorg xfonts-base;
+
+    # xapps
+    install firefox thunderbird xauth pidgin xfig pidgin-otr imagemagick
+            gthumb gucharmap scribus inkscape dia lmms xpdf k3b evince xsel
+            blender fontforge rxvt rxvt-unicode gmrun xterm openoffice.org
+            kstreamripper audacious gnome-office gimp ardour dzen2
+            xserver-xephyr yakuake gksu;
+
+};
 
 # build systems
 install make make-doc ant ant-optional bake scons qt4-qmake cmake distcc
@@ -69,7 +79,7 @@ install libc6-dbg libc6-prof libqt4-dev comerr-dev e2fslibs-dev libcap-dev
         libssl-dev libxml2-dev libxslt1-dev ss-dev mesa-common-dev;
 
 # window managers
-install xmonad stumpwm gnome-core xfce4 wmii ion3;
+if X { install xmonad stumpwm gnome-core xfce4 wmii ion3; };
 
 # databases
 install sqlite3 sqlite3-doc postgresql-client mysql-client db4.7-util;
@@ -107,6 +117,12 @@ install xsltproc libxml2-utils docbook-xsl docbook-utils docbook-dsssl
         docbook-xml docbook-to-man xmlto fop opensp sgml2x sgmltools-lite
         sp tidy xalan;
 
+# ssh
+install ssh pssh clusterssh dsh;
+
+# sudo
+install sudo-ldap;
+
 # utils
 install acl screen less lsof dosfstools tofrodos bc dc psmisc procps htop
         schedtool vlan bridge-utils mc wodim socat snmp busybox openssl
@@ -129,16 +145,19 @@ install tshark ftp iputils-arping iputils-ping tcpdump traceroute tftp
         ethtool ipset ipcalc iftop dnsutils iproute iproute-doc telnet
         nmap netcat-openbsd netcat6 ipmitool openipmi cdpr rsync rdiff
         ntp whois lksctp-tools;
+if X { install wireshark; };
 
 # communication
-isntall mutt alpine tin irssi efax mailx procmail centerim fetchmail
+install mutt alpine tin irssi efax mailx procmail centerim fetchmail
         nn;
 
 # editors
-install ed slrn vim vim-gnome nano nvi;
+install ed slrn vim nano nvi;
+if X { install vim-gnome; };
 
 # emacs
-install emacs-jabber emacs xemacs21 gnus ede;
+install emacs-jabber emacs22-nox gnus ede;
+if X { install emacs22-gtk emacs22 xemacs21; };
 
 # spelling
 install aspell-en ispell myspell-en-us iamerican wamerican;
@@ -148,8 +167,9 @@ install graphviz;
 
 # math
 install octave3.0 octave3.0-doc octave3.0-emacsen octave3.0-headers
-        r-recommended euler euler-doc gnuplot gnuplot-x11 gnuplot-doc
+        r-recommended euler euler-doc gnuplot gnuplot-doc
         gap lp-solve mathomatic maxima maxima-doc;
+if X { install gnuplot-x11; };
 
 # documentation
 install manpages manpages-dev manpages-posix manpages-posix-dev iso-codes
@@ -160,17 +180,19 @@ install w3m links elinks lynx axel wget curl;
 
 # multimedia
 install mplayer festival ffmpeg dvd+rw-tools dvgrab dvdrip lame twolame
-        cheese cdrdao cdparanoia genisoimage sox mp3blaster;
+        cdrdao cdparanoia genisoimage sox mp3blaster;
+if X { install cheese; };
 
 # holden
-install nmap john rtorrent amarok;
+install nmap john rtorrent;
+if X { install amarok; };
 
 # fonts
 install console-terminus xfonts-terminus xfonts-base gsfonts gsfonts-x11
         ttf-dejavu ttf-opensymbol ttf-freefont;
 
 # satan
-remove pulseaudio;
+remove pulseaudio avahi-daemon;
 
 if nogames { remove nethack-common; };
 if bnbt { install bnbt; };
@@ -227,17 +249,6 @@ if snmpd {
   install snmpd;
 };
 
-install ssh pssh clusterssh dsh;
-install sudo-ldap;
-
-if xapps {
- install yakuake gimp openoffice.org xterm pidgin pidgin-otr gksu xpdf xsel rxvt-unicode gmrun dzen2;
-};
-
 if xfce {
  install xfce4;
 };
-
-if xorg {
- install xserver-xorg xfonts-base;
-};