diff --git a/Makefile b/Makefile
index 8f106c5..794a58b 100644
--- a/Makefile
+++ b/Makefile
@@ -42,11 +42,11 @@ kdelibs:
 	{ echo -n "$@ "; \
 	[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \
 	[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || :
-koffice:
+calligra-core:
 	@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
 	{ echo -n "$@ "; \
-#	[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "koffice-i18n-$$l "; done; \
-	[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "koffice-i18n-$(LANGUAGE) "; } || :
+#	[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "calligra-l10n-$$l "; done; \
+	[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "calligra-l10n-$(LANGUAGE) "; } || :
 #k3b:
 #	@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
 #	{ echo -n "$@ "; \
diff --git a/Makefile.defs b/Makefile.defs
index 9d60bfb..069bae6 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -121,27 +121,29 @@ alsaplayer_output = alsaplayer-output-alsa
 #libscanpci.so = xorg-server
 
 ifeq ($(ARCH),x86_64)
-libOpenCL.so.1[64bit] = ocl-icd
+libOpenCL.so.1[][64bit] = ocl-icd
 libGL.so.1[][64bit] = libGL-Mesa-dri
 libGLU.so.1[][64bit] = libGL-Mesa-dri
 libgtkpeer.so[][64bit] = libgcj4
 libjvm.so[][64bit] = libgcj4
-libjawt.so[][64bit] = java-openjdk-runtime
+libjawt.so[][64bit] = java-openjdk7-runtime
 libawt.so[][64bit] = libgcj4
-libjava.so[][64bit] = java-openjdk-runtime
-libjava_crw_demo.so[][64bit] = java-openjdk-runtime
-libjli.so[][64bit] = java-openjdk-runtime
-libjli.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libmawt.so[][64bit] = java-openjdk-runtime
-libnet.so[][64bit] = java-openjdk-runtime
-libverify.so[][64bit] = java-openjdk-runtime
-libjava.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libnet.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
-libverify.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
+libjava.so[][64bit] = java-openjdk7-runtime
+libjava_crw_demo.so[][64bit] = java-openjdk7-runtime
+libjli.so[][64bit] = java-openjdk7-runtime
+libjli.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libmawt.so[][64bit] = java-openjdk7-runtime
+libnet.so[][64bit] = java-openjdk7-runtime
+libnio.so[][64bit] = java-openjdk7-runtime
+libverify.so[][64bit] = java-openjdk7-runtime
+libjava.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libnet.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libnio.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
+libverify.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
 libphonon.so.4[][64bit] = libphonon
 liblapack.so.3[][64bit] = liblapack
 libatlas.so.3[][64bit] = libatlas
@@ -169,20 +171,22 @@ libgtkpeer.so = libgcj4
 libjvm.so = libgcj4
 libjawt.so = libgcj4
 libawt.so = libgcj4
-libjava.so = java-openjdk-runtime
-libjava_crw_demo.so = java-openjdk-runtime
-libjli.so = java-openjdk-runtime
-libjli.so[SUNWprivate_1.1] = java-openjdk-runtime
-libmawt.so = java-openjdk-runtime
-libnet.so = java-openjdk-runtime
-libverify.so = java-openjdk-runtime
-libjava.so[SUNWprivate_1.1] = java-openjdk-runtime
-libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk-runtime
-libjvm.so[SUNWprivate_1.1] = java-openjdk-runtime
-libjawt.so[SUNWprivate_1.1] = java-openjdk-runtime
-libmawt.so[SUNWprivate_1.1] = java-openjdk-runtime
-libnet.so[SUNWprivate_1.1] = java-openjdk-runtime
-libverify.so[SUNWprivate_1.1] = java-openjdk-runtime
+libjava.so = java-openjdk7-runtime
+libjava_crw_demo.so = java-openjdk7-runtime
+libjli.so = java-openjdk7-runtime
+libjli.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libmawt.so = java-openjdk7-runtime
+libnet.so = java-openjdk7-runtime
+libnio.so = java-openjdk7-runtime
+libverify.so = java-openjdk7-runtime
+libjava.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libjvm.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libjawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libmawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libnet.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libnio.so[SUNWprivate_1.1] = java-openjdk7-runtime
+libverify.so[SUNWprivate_1.1] = java-openjdk7-runtime
 libphonon.so.4 = libphonon
 liblapack.so.3 = liblapack
 libatlas.so.3 = libatlas
@@ -287,6 +291,13 @@ ffmpegpresets := ffmpeg-presets
 # libreoffice
 libreofficei18n = libreoffice-i18n-$(LANGUAGE)
 
+# calligra
+ifeq ($(LANGUAGE),en)
+calligral10n = calligra-l10n-en_GB
+else
+calligral10n = calligra-l10n-$(LANGUAGE)
+endif
+
 # vpn
 networkmanagervpnplugin = NetworkManager-openvpn
 knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn
diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc
index 7ce67a9..9124694 100644
--- a/platforms/livedvd-root/settings.inc
+++ b/platforms/livedvd-root/settings.inc
@@ -1,5 +1,6 @@
 PRODUCT_NAME=livedvd
 MEDIA=squash_xz
+MOUNTDIR_TMPFS_SIZE=12G
 MULTILANGUAGE="en it es fr de"
 
 if [ "$ARCH" = "i586" ]; then