diff --git a/Makefile b/Makefile
index 62297c0..88dda39 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
     procps sed grep net-tools tar bzip2 unzip zip pciutils \
     pam shadow-common pwdutils acpid mingetty screen \
     net-tools prelink mc dhcpclient timezone nfs-utils \
-    wireless_tools wpa_supplicant openmamba-release grub2 refit-tools openssh-clients \
+    wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
     dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
     reiserfsprogs reiser4progs ppp b43-tools mdadm eciadsl usb-modeswitch \
     ndiswrapper slmodem usbutils ftp telnet eject bluez \
diff --git a/makedist.inc.sh b/makedist.inc.sh
index 2e8251b..0661ee5 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -107,6 +107,7 @@ find $MOUNTDIR/usr/share/locale \
 
 # cleanup: prevent generating a cleanfs script crash due to a unionfs bug
 rm -rf $MOUNTDIR/tmp/.ICE-unix
+rm -rf $MOUNTDIR/tmp/kde-root
 
 #$CHROOTCMD chkconfig --add acpid ||
 #   { echo "$mkcd_me: fatal error, aborting installation" >&2
diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index 1d24edf..cb85593 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-livecd-kde3: kdebase kmix \
 $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot4 okular desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
-                       dragonplayer4 libqt4-sqlite kate
+                       kaffeine libqt4-sqlite kate
 #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
 $(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
 
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index cef9704..33e0c3e 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -61,6 +61,9 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
+# configure fireofox as favorite in kde menu
+chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite %{_datadir}/applications/mozilla-firefox3.desktop
+
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index 309c0a0..5601186 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-livedvd-kde3: kdebase kmix \
 $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \
-                       dragonplayer4 libqt4-sqlite kate
+                       kaffeine libqt4-sqlite kate
 # knemo
 #kitchensync4
 $(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index b28ef4b..76feb65 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -62,6 +62,9 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
+# configure fireofox as favorite in kde menu
+chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite %{_datadir}/applications/mozilla-firefox3.desktop
+
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile
index 9b8478d..5530e4c 100644
--- a/platforms/livegames-root/Makefile
+++ b/platforms/livegames-root/Makefile
@@ -6,7 +6,7 @@ $(MAKEDIST_TARGET)-livegames-kde3: kdebase kmix \
 $(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k kate \
-                       kruler4 gwenview4 kamera kcolorchooser4 amarok lisa4 kwalletmanager4 libqt4-sqlite
+                       kruler4 gwenview4 kamera kcolorchooser4 lisa4 kwalletmanager4 libqt4-sqlite
 
 $(MAKEDIST_TARGET)-livegames-root: \
                   postplug-xorg postplug-sound \
diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile
index f9c5f11..938fd65 100644
--- a/platforms/testcd-root/Makefile
+++ b/platforms/testcd-root/Makefile
@@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-testcd-kde3: kdebase kmix \
 $(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
-                       dragonplayer4 libqt4-sqlite kate
+                       kaffeine libqt4-sqlite kate
 # knemo kdeplasma-addons
 #kitchensync4
 $(MAKEDIST_TARGET)-testcd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress