diff --git a/Workstation.in b/Workstation.in
index 8a84f4f..7755d20 100644
--- a/Workstation.in
+++ b/Workstation.in
@@ -1,11 +1,74 @@
+pkgconfig
+libusb
+expat
+libpng
+libxml2
+libxslt
+libsigc++
 parted
+libmad
+libid3tag
+taglib
+ram
+libnet
 svgalib
+openssl
+pcre
+alsa-lib
+bluez-libs
+libsidplay
+libraw1394
+libiec61833
+libsamplerae
+libao
+libogg
+libvorbis
+libiconv
+libisofs
+libburn
+id3lib
+libidn
+libgpg-error
+libgcrypt
+libsmi
+lzo
+libghttp
+jpegbin
+lcms
+libmng
+glib-2
+glib-1
+glibmm
+libIDL
+libmpeg2
+libmpeg3
+xvidcore
+libfame
+libdvdcss
+libcdio
+libswf
+libart_lgpl
+libcroco
+libexif
+libdvdread
+liboil
+srtp
+libmikmod
+libotr
+integrit
+fribidi
+flac
+libffi
 lsof
 screen
 sudo
+dmidecode
+acpid
+sysfsutils
 strace
 cpufrequtils
 cpufreqd
+pcmciautils
 rlogind
 ftpd
 talkd
@@ -13,39 +76,192 @@ telnetd
 wireless_tools
 mt-st
 mtx
+dbus
 tcl
+XML-Parser
+Python
+intltool
+PDL
+midentd
+popt
+gdbm
+libproxy
+dbus-glib
+dbus-python
+eggdbus
 ypbind-mt
 yp-tools
+tsocks
+tcp_wrappers
 nfs-utils
 traceroute
+freeealut
+audiofile
+toolame
+a52dec
+wav2cdr
+bladeenc
+dmake
+Digest-SHA1
+Digest-MD5
+Sys-Syslog
 ethtool
 autofs
+cdparanoia-III
+recode
+gsl
 bc
+a2ps
 binfmt_misc
 wget
 pciutils
 usbutils
 psutils
+hdparm
 cmake
+libcap
 cdrkit
 cdrtools
+gpm
+sbc
+libpcap
 iftop
 cftp
+lame
+shed
 w32codec
+divx611
+rarlinux
+CDspindown
+doxygen
 dvd+rw-tools
+db
+pks
+neon
+sqlite-amalgamation
+zisofs-tools
+GSSAPI
 pine
+speex
+ptlib
 wpa_supplicant
+libbind
 openssh
+cyrus-sasl
+net-snmp
 cups
+normalize
+freetype
+util-macros
+fontconfig
+bigreqsproto
+xproto
+xextproto
+xtrans
+libXau
+xcmiscproto
+kbproto
+inputproto
+xf86bigfontproto
+xcb-proto
+libXdmcp
+libxcb
+libpthread-stubs
+libdrm
+libX11
+xcmsdb
+xorg-sgml-doctools
+rman
+xorg-docs
+libXext
+libICE
+libSM
+libXt
+libXmu
+libXpm
+libXaw
+xterm
+gccmakedep
+makedepend
+lndir
+imake
+compositeproto
+damageproto
+dmxproto
+dri2proto
+evieext
+fixesproto
+fontcacheproto
+fontsproto
+glproto
+printproto
+randrproto
+recordproto
+renderproto
+resourceproto
+scrnsaverproto
+trapproto
+videoproto
+windowswmproto
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86rushproto
+xf86vidmodeproto
+xineramaproto
+xproxymanagementprotocol
+libdmx
+libfontenc
+libFS
+liblbxutil
+liboldX
+libpciaccess
+libWindowsWM
+libXfixes
+libXcomposite
+libXrender
+libXcursor
+libXdamage
+libXevie
+libXfont
+libXfontcache
+libXft
+libXi-
+libXinerama
+libxkbfile
+libxkbui
+libXp
+libXprintUtil
+libXprintAppUtil
+libXrandr
+libXres
+libXScrnSaver
+libXTrap
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+pixman
 MesaLib
+gle
+xbitmaps
+xcursorgen
+xcursor-themes
+xkbcomp
+xkbdata
+xkeyboard-config
 xorg-server
+xf86-input-evdev
+xf86-input-hyperpen
+xf86-input-joystick
+xf86-input-keyboard
 xf86-input-mouse
 xf86-input-vmmouse
-xf86-video-apm
+xf86-input-void
 xf86-video-ark
-xf86-video-ast
 xf86-video-ati
-xf86-video-chips
 xf86-video-cirrus
 xf86-video-dummy
 xf86-video-fbdev
@@ -54,25 +270,14 @@ xf86-video-i128
 xf86-video-i740
 xf86-video-intel
 xf86-video-mach64
-xf86-video-neomagic
-xf86-video-newport
 xf86-video-nv
-xf86-video-openchrome
 xf86-video-r128
 xf86-video-radeonhd
-xf86-video-rendition
 xf86-video-s3
 xf86-video-s3virge
 xf86-video-savage
-xf86-video-siliconmotion
 xf86-video-sis
 xf86-video-sisusb
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
 xf86-video-tdfx
 xf86-video-tga
 xf86-video-trident
@@ -81,6 +286,11 @@ xf86-video-v4l
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
+appres
+bdftopcf
+beforelight
+bitmap
+startup-notification
 editres
 fonttosfnt
 fslsfonts
@@ -206,18 +416,42 @@ font-xfree86-type1
 liberation-fonts-ttf
 xorg-cf-files
 freefonts
+clucene-core
 mono
+mc
+PolicyKit
+ConsoleKit
 hal
 tcpdump
+ExtUtils-F77
+XML-Simple
+XML-SAX-Base
+URI
+Convert-ASN1
+Digest-HMAC
+Authen-SASL
+IO-Socket-SSL
+NET-SSLeay
+NET-DBus
+Crypt-SmbHash
+GnuPG
 yafc
 rsync
 sendmail
 mutt
+htdig
+linx
+openobex
 sane-backends
+tiff
+netpbm
 mpg123
 vcdimager
+curl
 vorbis-tools
+esound
 git
+gdb
 cvs
 ruby
 bluez-utils
@@ -225,32 +459,131 @@ bluez-hcidump
 bluez-firmware
 dump
 lha
+plugz
+btsco
 cdrdao
 dvdrtools
+aspell
+aspell-de
+enchant
 hplip
+pth
+libassuan
+libksba
+gnupg
+udns
+openjade
+gperf
+xcb-util
+iso-codes
+links
+libical
+gpgme
+polkit
+DeviceKit
+DeviceKit-power
+libgii
+libggi
+giflib
+libungif
+libwmf
+SDL
+avifile
 ImageMagick
+libquicktime
+libdv
 tk
 espgs
+graphviz
+imlib
+fnlib
+aalib
+t1lib
+glitz
+cairo
+pango
+jasper
+gtk+-2
+gtk+-1
+cairomm
+pangomm
+gtkmm
+gtkglext
+gstreamer
+gst-plugins-base
+gobject-introspection
+libnotify
+libsexy
+lesstif
+efltk
+unixODBC
+qt-all-opensource
+wxGTK
+opal
+libglade
+libwnck
+libgtop
+libxklavier
+libgsf
+wv
+librsvg
+fontforge
 plotutils
+plib
+libxmi
+libtasn1
+libcanberra
+ffmpeg
+Xdialog
 gftp
 mjpegtools
+gst-plugins-good
+pygobject
+pygtk
+ttf2fft
 mtools
 jdk
 tightvnc
+boost
+pilot-link
+libmal
 SimGear
 ddd
 nedit
+nmap
+gnokii
 sane-frontends
+SDL_image
+SDL_ttf
+smpeg
+SDL_mixer
+ruby-utils
 rdesktop
+ethereal
+ffcall
 alsa-tools
 xmix
 procmail
 xmms
 xmms-sid
+nspr
+nss
+rm
 alien
+sox
+gtkglarea
 xscreensaver
 firefox
 thunderbird
+icon-naming-utils
+compiz
+kdeconfig
+automoc4
+phonon
+strigi
+soprano
+akonadi
+qimageblitz
 oxygen-icons
 kdelibs
 kdelibs-experimental
@@ -272,6 +605,7 @@ kdegames
 kdeartwork
 kde-l10n-de
 kdeplasma-addons
+libgda
 xfceconfig
 xfce4-dev-tools
 libxfce4util
@@ -298,11 +632,15 @@ xfce4-appfinder
 xfce4-mixer
 xfmedia
 xfce4-taskmanager
+swftools
 amiwm
 icewm
 transcode
 krusader
 k3b
+taglib-extras
+qca
+qtscriptgenerator
 amarok
 koffice
 koffice-l10n-de
@@ -310,8 +648,10 @@ gparted
 gimp
 gimp-data-extras
 xsane
+foomatic-filters
 foomatic-db
 xv
+povray
 mplayer-export
 pidgin
 xine-ui
@@ -321,3 +661,4 @@ tetex-src
 tetex-cm-super
 gnuplot
 wlan_intel_fw
+OxygenOffice