diff --git a/Makefile.defs b/Makefile.defs
index 717f020..9d60bfb 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -114,7 +114,6 @@ xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-
 bootloader = syslinux
 endif
 
-libOpenCL.so.1 = xorg-drv-video-fglrx xorg-drv-video-nvidia
 xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
 # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
 splashtheme = splash-theme-openmamba
@@ -122,6 +121,7 @@ alsaplayer_output = alsaplayer-output-alsa
 #libscanpci.so = xorg-server
 
 ifeq ($(ARCH),x86_64)
+libOpenCL.so.1[64bit] = ocl-icd
 libGL.so.1[][64bit] = libGL-Mesa-dri
 libGLU.so.1[][64bit] = libGL-Mesa-dri
 libgtkpeer.so[][64bit] = libgcj4
@@ -162,6 +162,7 @@ libpoppler-qt4.so.4[][64bit] = libpoppler-qt4
 libpoppler-cpp.so.0[][64bit] = libpoppler
 libpoppler-glib.so.8[][64bit] = libpoppler-glib
 else
+libOpenCL.so.1 = ocl-icd
 libGL.so.1 = libGL-Mesa-dri
 libGLU.so.1 = libGL-Mesa-dri
 libgtkpeer.so = libgcj4
@@ -238,11 +239,11 @@ perl[Automake__Version] = automake
 perl[Automake__Wrap] = automake
 perl[Automake__XFile] = automake
 
-libxul.so = xulrunner
-libkorganizer.so.1 = korganizer
-libkorganizer_calendar.so.1 = korganizer
-libkorganizer_eventviewer.so.1 = korganizer
-libsmb4kdialogs.so = smb4k4
+#libxul.so = xulrunner
+#libkorganizer.so.1 = korganizer
+#libkorganizer_calendar.so.1 = korganizer
+#libkorganizer_eventviewer.so.1 = korganizer
+#libsmb4kdialogs.so = smb4k4
 
 perl[B] = perl
 perl[bytes] = perl
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index bd392cc..97762e5 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -2,7 +2,7 @@
 chroot $MOUNTDIR update-alternatives-set-dri
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop; do
+for f in /usr/share/applications/chromium.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
 done
 
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 40f29f2..20c8982 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -2,7 +2,7 @@
 chroot $MOUNTDIR update-alternatives-set-dri
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/amarok.desktop; do
+for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/amarok.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh
index d03e015..84550df 100644
--- a/platforms/livegames-root/post.inc.sh
+++ b/platforms/livegames-root/post.inc.sh
@@ -2,7 +2,7 @@
 chroot $MOUNTDIR update-alternatives-set-dri
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop; do
+for f in /usr/share/applications/chromium.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh
index 55fc98a..9b4ea8a 100644
--- a/platforms/rootfs/post.inc.sh
+++ b/platforms/rootfs/post.inc.sh
@@ -45,7 +45,7 @@ HOME=/root
 _EOF
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
+for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/kaffeine.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh
index f68b558..ab08f41 100644
--- a/platforms/testcd-root/post.inc.sh
+++ b/platforms/testcd-root/post.inc.sh
@@ -2,7 +2,7 @@
 chroot $MOUNTDIR update-alternatives-set-dri
 
 # configure favorites in kde menu
-for f in /usr/share/applications/chromium-devel.desktop; do
+for f in /usr/share/applications/chromium.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done