diff --git a/Workstation.in b/Workstation.in
index fc34364..4da8541 100644
--- a/Workstation.in
+++ b/Workstation.in
@@ -14,8 +14,6 @@ svgalib
 openssl
 pcre
 alsa-lib
-bluez-libs
-libsidplay
 libraw1394
 libiec61883
 libsamplerate
@@ -35,8 +33,7 @@ libghttp
 jpegbin
 lcms
 libmng
-glib-2
-glib-1
+glib
 glibmm
 libIDL
 libmpeg2
@@ -132,7 +129,6 @@ shed
 w32codec
 divx611
 rarlinux
-CDspindown
 doxygen
 dvd+rw-tools
 db
@@ -191,30 +187,23 @@ 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
@@ -222,26 +211,18 @@ 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
@@ -275,7 +256,6 @@ xf86-video-radeonhd
 xf86-video-s3
 xf86-video-s3virge
 xf86-video-savage
-xf86-video-sis
 xf86-video-sisusb
 xf86-video-tdfx
 xf86-video-tga
@@ -285,10 +265,7 @@ xf86-video-v4l
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
-appres
 bdftopcf
-beforelight
-bitmap
 startup-notification
 editres
 fonttosfnt
@@ -296,14 +273,12 @@ fslsfonts
 fstobdf
 iceauth
 ico
-lbxproxy
 listres
 luit
 mkcomposecache
 mkfontdir
 mkfontscale
 oclock
-proxymngr
 rendercheck
 rgb
 rstart
@@ -354,10 +329,7 @@ xlsfonts
 xmessage
 xmh
 xmodmap
-xphelloworld
-xplsprinters
 xpr
-xprehashprinterlist
 xprop
 xrandr
 xrdb
@@ -368,7 +340,6 @@ xsetpointer
 xsetroot
 xsm
 xstdcmap
-xtrap
 xvidtune
 xvinfo
 xwd
@@ -453,9 +424,8 @@ git
 gdb
 cvs
 ruby
-bluez-utils
+bluez
 bluez-hcidump
-bluez-firmware
 dump
 lha
 plugz
@@ -480,7 +450,6 @@ libical
 gpgme
 polkit
 DeviceKit
-DeviceKit-power
 libgii
 libggi
 giflib
@@ -503,7 +472,7 @@ cairo
 pango
 jasper
 gtk+-2
-gtk+-1
+gtk+-3
 cairomm
 pangomm
 gtkmm
@@ -563,8 +532,6 @@ ffcall
 alsa-tools
 xmix
 procmail
-xmms
-xmms-sid
 nspr
 nss
 alien
@@ -593,15 +560,12 @@ shared-desktop-ontologies
 attica
 polkit-qt-1
 kdelibs
-kdelibs-experimental
 kdepimlibs
 kdebase-workspace
 kdebase
 kdebase-runtime
 kdeadmin
 kdenetwork
-kdepim
-kdepim-runtime
 kdemultimedia
 kdegraphics
 kdeutils
@@ -612,11 +576,9 @@ kdegames
 kdeartwork
 kde-l10n-de
 kdeplasma-addons
-PolicyKit-kde
 libgda
 evolution-data-server
 gnome-audio
-gnome-device-manager
 xfceconfig
 xfce4-dev-tools
 libxfce4util
@@ -632,7 +594,6 @@ xfwm4
 xfdesktop
 xfce-utils
 xfce4-icon-theme
-gtk-xfce-engine
 xfwm4-themes
 orage
 xfprint
@@ -641,7 +602,6 @@ Terminal
 xarchiver
 xfce4-appfinder
 xfce4-mixer
-xfmedia
 xfce4-taskmanager
 lxde-common
 menu-cache
@@ -669,7 +629,6 @@ krusader
 k3b
 taglib-extras
 qca
-qtscriptgenerator
 amarok
 koffice
 koffice-l10n-de
@@ -690,4 +649,4 @@ tetex-src
 tetex-cm-super
 gnuplot
 wlan_intel_fw
-OxygenOffice
+LibreOffice
diff --git a/isoinstall.in b/isoinstall.in
index 2b6c7c7..1c9ad10 100644
--- a/isoinstall.in
+++ b/isoinstall.in
@@ -41,7 +41,6 @@ dmxproto
 dri2proto
 evieext
 fixesproto
-fontcacheproto
 fontsproto
 glproto
 printproto