diff --git a/pkgsel/Desktop/Desktop_Enviroment/30-XFCE.basic.choice b/pkgsel/Desktop/Desktop_Enviroment/30-XFCE.basic.choice
index c700bf2..7d1c447 100644
--- a/pkgsel/Desktop/Desktop_Enviroment/30-XFCE.basic.choice
+++ b/pkgsel/Desktop/Desktop_Enviroment/30-XFCE.basic.choice
@@ -17,26 +17,31 @@
 #Imply: minimal
 
 X xfdesktop
-X xffm
+X thunar
 X xfwm4
 
 X xfce4-session
 X xfce4-panel
 X xfce4-appfinder
-X xfce4-iconbox
 X xfce-mcs-manager
 
-# needed by xfce4-panel
-X libxml
-
 X xfce-utils
 
+# needed by thunar and xfce4-terminal
+X libexo
+X perl-uri
+
 X xfce4-trigger-launcher
 X xfce4-icon-theme
 X xfwm4-themes
 X xfce-mcs-plugins
 
-X xfce4-systray
+# needed by xfce4-appfinder
+X perl-xml-parser
+
+# needed by xfce4-trigger-launcher (from svn)
+X xfce4-dev-tools
+X intltool
 
 # needed to shutdown and reboot
 X sudo
diff --git a/pkgsel/Desktop/Desktop_Enviroment/40-XFCE.fair.choice b/pkgsel/Desktop/Desktop_Enviroment/40-XFCE.fair.choice
index ff7c192..2f9aebb 100644
--- a/pkgsel/Desktop/Desktop_Enviroment/40-XFCE.fair.choice
+++ b/pkgsel/Desktop/Desktop_Enviroment/40-XFCE.fair.choice
@@ -19,29 +19,19 @@
 
 X gtk-engines
 
-X xfcalendar
+X orage
 
 X xfce4-battery-plugin
 X xfce4-systemload-plugin
 X xfce4-panelmenu
 
-## lil' star is nice, but we prefer taskbar plugin
-#O xfce4-iconbox
-X xfce4-taskbar-plugin
-
-## xffm sucks
-#O xffm
-#X thunar
-X rox-filer
-
 X xfce4-terminal
 # needed by xfce4-terminal
-# X python
 X dbus
 X vte
-# X perl
-X perl-xml-parser
-# needed by xfce4-terminal and thunar
-X libexo
 
 x xscreensaver
+# needed by xscreensaver
+X bc
+X libxml
+X libglade