diff --git a/bin/buildiso.in b/bin/buildiso.in
index b936735..c2fe59a 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -19,7 +19,6 @@ SYSCONFDIR='@sysconfdir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso.sh
 
 show_profile(){
 	cd $1
@@ -182,6 +181,8 @@ prepare_dir "${cache_dir_iso}"
 
 eval_buildset "${buildset_iso}" "${sets_dir_iso}"
 
+import ${LIBDIR}/util-iso.sh
+
 check_requirements
 
 ${pretend} && display_settings && exit 1
diff --git a/lib/util-iso-aufs.sh b/lib/util-iso-aufs.sh
index a097095..4b0a977 100644
--- a/lib/util-iso-aufs.sh
+++ b/lib/util-iso-aufs.sh
@@ -11,12 +11,12 @@
 
 # $1: new branch
 mount_root_image(){
-	msg2 "mount [root-image] on [${1##*/}]"
+	msg2 "aufs: mount [root-image] on [${1##*/}]"
 	mount -t aufs -o br="$1":${work_dir}/root-image=ro none "$1"
 }
 
 mount_custom_image(){
-	msg2 "mount [${1##*/}] on [${custom}-image]"
+	msg2 "aufs: mount [${1##*/}] on [${custom}-image]"
 	mount -t aufs -o br="$1":${work_dir}/${custom}-image=ro:${work_dir}/root-image=ro none "$1"
 }
 
diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index b7293a4..50b259d 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -203,11 +203,15 @@ write_isolinux_cfg(){
 	echo '' >> ${conf}
 	echo "label start" >> ${conf}
 	echo "  kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
+	plymouth_settings=" quiet splash"
+	if ! ${plymouth_boot};then
+		plymouth_settings=""
+	fi
 	if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
 		msg2 "Using intel_ucode.img ..."
-		echo "  append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
+		echo "  append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free${plymouth_settings} showopts" >> ${conf}
 	else
-		echo "  append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
+		echo "  append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free${plymouth_settings} showopts" >> ${conf}
 	fi
 	echo '' >> ${conf}
 	if ${nonfree_xorg};then
@@ -215,9 +219,9 @@ write_isolinux_cfg(){
 		echo "  kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
 		if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
 			msg2 "Using intel_ucode.img ..."
-			echo "  append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
+			echo "  append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree${plymouth_settings} showopts" >> ${conf}
 		else
-			echo "  append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
+			echo "  append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree${plymouth_settings} showopts" >> ${conf}
 		fi
 		echo '' >> ${conf}
 	fi
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 96008cc..6c04039 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -115,7 +115,7 @@ configure_services(){
 # $1: chroot
 configure_environment(){
 	case ${custom} in
-		gnome|xfce|openbox|enlightenment|cinnamon|pekwm|lxde|mate)
+		cinnamon|enlightenment|gnome|i3|lxde|mate|netbook|openbox|pantheon|xfce|xfce-minimal|xfce-openrc)
 			echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
 		;;
 	esac
diff --git a/lib/util-iso-overlayfs.sh b/lib/util-iso-overlayfs.sh
index 314e97b..a57a2a0 100644
--- a/lib/util-iso-overlayfs.sh
+++ b/lib/util-iso-overlayfs.sh
@@ -11,13 +11,13 @@
 
 # $1: new branch
 mount_root_image(){
-	msg2 "mount [root-image] on [${1##*/}]"
+	msg2 "overlayfs: mount [root-image] on [${1##*/}]"
 	mkdir -p "${work_dir}/work"
 	mount -t overlay overlay -olowerdir="${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
 }
 
 mount_custom_image(){
-	msg2 "mount [${1##*/}] on [${custom}-image]"
+	msg2 "overlayfs: mount [${1##*/}] on [${custom}-image]"
 	mkdir -p "${work_dir}/work"
 	mount -t overlay overlay -olowerdir="${work_dir}/${custom}-image":"${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
 }