diff --git a/desktop.sh b/desktop.sh
index c5fa8a902..3dc87c74f 100644
--- a/desktop.sh
+++ b/desktop.sh
@@ -9,183 +9,164 @@
 # This file is a part of tool chain https://github.com/igorpecovnik/lib
 #
 
+install_desktop ()
+{
+	display_alert "Installing desktop" "XFCE" "info"
 
-install_desktop (){
-#---------------------------------------------------------------------------------------------------------------------------------
-# Install desktop with HW acceleration
-#---------------------------------------------------------------------------------------------------------------------------------
-display_alert "Installing desktop" "XFCE" "info"
+	umount $CACHEDIR/sdcard/tmp >/dev/null 2>&1
+	mount --bind $SRC/lib/bin/ $CACHEDIR/sdcard/tmp
 
-umount $CACHEDIR/sdcard/tmp >/dev/null 2>&1
-mount --bind $SRC/lib/bin/ $CACHEDIR/sdcard/tmp
+	# install default desktop settings
+	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/$RELEASE-desktop.tgz -C /etc/skel/"
+	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/$RELEASE-desktop.tgz -C /root/"
 
-# Debian Wheezy
-if [[ $RELEASE == "wheezy" ]]; then
-	# copy wallpapers and default desktop settings
-	d=$CACHEDIR/sdcard/usr/share/xfce4/backdrops/
-	test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/wheezy-desktop.tgz -C /etc/skel/"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/wheezy-desktop.tgz -C /root/"
-fi
+	# install wallpapers
+	case $RELEASE in
+		wheezy)
+		d=$CACHEDIR/sdcard/usr/share/xfce4/backdrops/
+		test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
+		;;
 
-# Debian Jessie
-if [[ $RELEASE == "jessie" ]]; then
-	# copy wallpapers and default desktop settings
-	d=$CACHEDIR/sdcard/usr/share/backgrounds/xfce/
-	test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /etc/skel/"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/jessie-desktop.tgz -C /root/"
-	mkdir -p $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d
-	cp $SRC/lib/config/polkit-jessie/*.pkla $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d/
-fi
+		jessie|xenial)
+		d=$CACHEDIR/sdcard/usr/share/backgrounds/xfce/
+		test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
+		mkdir -p $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d
+		cp $SRC/lib/config/polkit-jessie/*.pkla $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d/
+		;;
 
-# Ubuntu trusty
-if [[ $RELEASE == "trusty" ]]; then
-	# copy wallpapers and default desktop settings
-	d=$CACHEDIR/sdcard/usr/share/backgrounds/xfce/
-	test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/trusty-desktop.tgz -C /etc/skel/"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/trusty-desktop.tgz -C /root/"
-fi
+		trusty)
+		d=$CACHEDIR/sdcard/usr/share/backgrounds/xfce/
+		test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
+		;;
+	esac
 
-# Ubuntu Xenial
-if [[ $RELEASE == xenial ]]; then
-	# copy wallpapers and default desktop settings
-	d=$CACHEDIR/sdcard/usr/share/backgrounds/xfce/
-	test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/armbian*.jpg "$d"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/xenial-desktop.tgz -C /etc/skel/"
-	chroot $CACHEDIR/sdcard /bin/bash -c "tar xfz /tmp/xenial-desktop.tgz -C /root/"
-	mkdir -p $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d
-	cp $SRC/lib/config/polkit-jessie/*.pkla $CACHEDIR/sdcard/etc/polkit-1/localauthority/50-local.d/
-fi
+	# Install custom icons and theme
+	chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
+	chroot $CACHEDIR/sdcard /bin/bash -c "unzip -qq /tmp/NumixHolo.zip -d /usr/share/themes"
 
-# Install custom icons and theme
-chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
-chroot $CACHEDIR/sdcard /bin/bash -c "unzip -qq /tmp/NumixHolo.zip -d /usr/share/themes"
+	# unmount bind mount
+	umount $CACHEDIR/sdcard/tmp >/dev/null 2>&1
 
-# unmount bind mount
-umount $CACHEDIR/sdcard/tmp >/dev/null 2>&1
+	# fix for udoo
+	if [[ $BOARD != udoo ]]; then
+		cat <<-EOF > $CACHEDIR/sdcard/etc/wicd/manager-settings.conf
+		[Settings]
+		wireless_interface = wlan0
+		EOF
+	fi
 
-# fix for udoo
-if [[ $BOARD != "udoo" ]]; then
-	echo "[Settings]" > $CACHEDIR/sdcard/etc/wicd/manager-settings.conf
-	echo "wireless_interface = wlan0" >> $CACHEDIR/sdcard/etc/wicd/manager-settings.conf
-fi
+	# Disable desktop mode autostart for now to enforce creation of normal user account
+	sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=false/g" -i $CACHEDIR/sdcard/etc/default/nodm
 
-# Disable desktop mode autostart for now to enforce creation of normal user account
-sed "s/NODM_ENABLED=\(.*\)/NODM_ENABLED=false/g" -i $CACHEDIR/sdcard/etc/default/nodm
+	# Compile Turbo Frame buffer for sunxi
+	if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then
+		# TODO: move to board support package
+		mkdir -p $CACHEDIR/sdcard/etc/udev/rules.d
+		cp $SRC/lib/config/sunxi-udev/* $CACHEDIR/sdcard/etc/udev/rules.d/
+		cp $SRC/lib/config/xorg.conf.sunxi $CACHEDIR/sdcard/etc/X11/xorg.conf
 
-# Compile Turbo Frame buffer for sunxi
-if [[ $LINUXFAMILY == *sun* && $BRANCH == "default" ]]; then
-	mkdir -p $CACHEDIR/sdcard/etc/udev/rules.d
-	cp $SRC/lib/config/sunxi-udev/* $CACHEDIR/sdcard/etc/udev/rules.d/
-	cp $SRC/lib/config/xorg.conf.sunxi $CACHEDIR/sdcard/etc/X11/xorg.conf
-
-	if [[ $RELEASE == "jessie" ]]; then
-		cp -R $SRC/lib/bin/sunxi-debs $CACHEDIR/sdcard/tmp/debs
-		error_num=0
-		display_alert "Installing desktop-extras for sunxi" "sunxi" "info"
-		chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install libdri2-1 2>&1 >/dev/null"
-		if [ $? -gt 0 ]; then
-			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libdri2*.deb 2>&1 >/dev/null"
-			error_num=$(($error_num+$?))
+		if [[ $RELEASE == jessie ]]; then
+			cp -R $SRC/lib/bin/sunxi-debs $CACHEDIR/sdcard/tmp/debs
+			error_num=0
+			display_alert "Installing desktop-extras for" "sunxi" "info"
+			chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install libdri2-1 2>&1 >/dev/null"
+			if [[ $? -gt 0 ]]; then
+				chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libdri2*.deb 2>&1 >/dev/null"
+				error_num=$(($error_num+$?))
 			fi
-		chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libump*.deb 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libcedrus*.deb 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libvdpau*.deb 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i sunxi-mali*.deb 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i fbturbo*.deb 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i mpv_*.deb 2>&1 >/dev/null"
-		chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y -f install 2>&1 >/dev/null"
-		error_num=$(($error_num+$?))
-		if [ $error_num -gt 0 ]; then display_alert "Installation failed" "desktop-extras for sunxi" "err"; exit 1;fi
-		# Disable compositing by default
-		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-		cp $SRC/lib/config/mpv.conf.sunxi $CACHEDIR/sdcard/etc/mpv/mpv.conf
-		chroot $CACHEDIR/sdcard /bin/bash -c "ldconfig"
+			chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libump*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libcedrus*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i libvdpau*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i sunxi-mali*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i fbturbo*.deb 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/debs && dpkg -i mpv_*.deb 2>&1 >/dev/null"
+			chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y -f install 2>&1 >/dev/null"
+			error_num=$(($error_num+$?))
+			[[ $error_num -gt 0 ]] && exit_with_error "Installation failed" "desktop-extras for sunxi"
+			# Disable compositing by default
+			sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+			sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+			cp $SRC/lib/config/mpv.conf.sunxi $CACHEDIR/sdcard/etc/mpv/mpv.conf
+			chroot $CACHEDIR/sdcard /bin/bash -c "ldconfig"
 
 		else
 
-		grep "CONFIG_MALI is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
-		local error_num=$?
-		grep "CONFIG_UMP is not set" $SOURCES/$LINUXSOURCEDIR/.config 2>&1 >/dev/null
-		if [[ $? -eq 1 && $error_num -eq 1 ]]; then
-			error_num=0
-			display_alert "Adding support for Mali - acceleration" "sunxi" "info"
-			git clone -q https://github.com/WereCatf/armbian-debs.git $CACHEDIR/sdcard/tmp/armbian-debs
-			chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"
-			chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install libdri2-1 libdri2-dev 2>&1 >/dev/null"
-			if [ $? -gt 0 ]; then
-				chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libdri2-1_1.0-1_armhf.deb 2>&1 >/dev/null"
-				error_num=$(($error_num+$?))
+			grep -q "CONFIG_MALI is not set" $SOURCES/$LINUXSOURCEDIR/.config
+			local error_num=$?
+			grep -q "CONFIG_UMP is not set" $SOURCES/$LINUXSOURCEDIR/.config
+			if [[ $? -eq 1 && $error_num -eq 1 ]]; then
+				error_num=0
+				display_alert "Adding support for Mali - acceleration" "sunxi" "info"
+				git clone -q https://github.com/WereCatf/armbian-debs.git $CACHEDIR/sdcard/tmp/armbian-debs
+				chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install mesa-utils-extra 2>&1 >/dev/null"
+				chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y install libdri2-1 libdri2-dev 2>&1 >/dev/null"
+				if [[ $? -gt 0 ]]; then
+					chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libdri2-1_1.0-1_armhf.deb 2>&1 >/dev/null"
+					error_num=$(($error_num+$?))
 				fi
-			if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libdri2-1" "err"; exit 1
-				else
+				[[ $error_num -gt 0 ]] && exit_with_error "Installation failed" "Mali - libdri2-1"
+
 				chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i libump_3.0-0sunxi1_armhf.deb libump-dev_3.0-0sunxi1_armhf.deb 2>&1 >/dev/null"
 				error_num=$(($error_num+$?))
-				if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali - libump" "err"; exit 1
-					else
-					chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i sunxi-mali-r3p0_4.0.0.0_armhf.deb 2>&1 >/dev/null"
-					error_num=$(($error_num+$?))
-					chroot $CACHEDIR/sdcard /bin/bash -c "ldconfig"
-					if [ $error_num -gt 0 ]; then display_alert "Installation failed" "Mali r3p0" "err"; exit 1;fi
-					fi
-				fi
+				[[ $error_num -gt 0 ]] && exit_with_error "Installation failed" "Mali - libump"
+
+				chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/armbian-debs && dpkg -i sunxi-mali-r3p0_4.0.0.0_armhf.deb 2>&1 >/dev/null"
+				error_num=$(($error_num+$?))
+				chroot $CACHEDIR/sdcard /bin/bash -c "ldconfig"
+				[[ $error_num -gt 0 ]] && exit_with_error "Installation failed" "Mali r3p0"
 			fi
 
-		display_alert "Compiling FB Turbo" "sunxi" "info"
-		error_num=0
-		# quemu bug walkaround
-		git clone -q https://github.com/ssvb/xf86-video-fbturbo.git $CACHEDIR/sdcard/tmp/xf86-video-fbturbo
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && autoreconf -vi >/dev/null 2>&1"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && ./configure --prefix=/usr >/dev/null 2>&1"
-		error_num=$(($error_num+$?))
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && make $CTHREADS && make install >/dev/null 2>&1"
-		error_num=$(($error_num+$?))
-		# compile video acceleration
-		git clone -q https://github.com/linux-sunxi/libvdpau-sunxi.git $CACHEDIR/sdcard/tmp/libvdpau-sunxi
-		# with temporaly fix
-		chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/libvdpau-sunxi; git checkout 906c36ed45ceb53fecd5fc72e821c11849eeb1a3; make $CTHREADS" >/dev/null 2>&1
-		error_num=$(($error_num+$?))
+			display_alert "Compiling FB Turbo" "sunxi" "info"
+			error_num=0
+			# quemu bug walkaround
+			git clone -q https://github.com/ssvb/xf86-video-fbturbo.git $CACHEDIR/sdcard/tmp/xf86-video-fbturbo
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && autoreconf -vi >/dev/null 2>&1"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && ./configure --prefix=/usr >/dev/null 2>&1"
+			error_num=$(($error_num+$?))
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/xf86-video-fbturbo && make $CTHREADS && make install >/dev/null 2>&1"
+			error_num=$(($error_num+$?))
+			# compile video acceleration
+			git clone -q https://github.com/linux-sunxi/libvdpau-sunxi.git $CACHEDIR/sdcard/tmp/libvdpau-sunxi
+			# with temporaly fix
+			chroot $CACHEDIR/sdcard /bin/bash -c "cd /tmp/libvdpau-sunxi; git checkout 906c36ed45ceb53fecd5fc72e821c11849eeb1a3; make $CTHREADS" >/dev/null 2>&1
+			error_num=$(($error_num+$?))
 
-		d=$CACHEDIR/sdcard/usr/lib/arm-linux-gnueabihf/vdpau
-		test -d "$d" || mkdir -p "$d" && cp $CACHEDIR/sdcard/tmp/libvdpau-sunxi/libvdpau_sunxi.so.1 "$d"
-		ln -s $d/libvdpau_sunxi.so.1 $d/libvdpau_sunxi.so
-		# error check
-		if [ $error_num -gt 0 ]; then display_alert "Compiling failed" "FB Turbo" "err"; exit 1; fi
+			d=$CACHEDIR/sdcard/usr/lib/arm-linux-gnueabihf/vdpau
+			test -d "$d" || mkdir -p "$d" && cp $CACHEDIR/sdcard/tmp/libvdpau-sunxi/libvdpau_sunxi.so.1 "$d"
+			ln -s libvdpau_sunxi.so.1 $d/libvdpau_sunxi.so
+			# error check
+			[[ $error_num -gt 0 ]] && exit_with_error "Compiling desktop support libraries failed" "FB Turbo"
 		fi
 
-	# Set default audio-output to HDMI for desktop-images
-	cat >> $CACHEDIR/sdcard/etc/asound.conf << _EOF_
-pcm.!default {
-    type hw
-    card 1
-}
-
-ctl.!default {
-    type hw
-    card 1
-}
-_EOF_
-
-	# That we can just play
-	echo "export VDPAU_DRIVER=sunxi" >> $CACHEDIR/sdcard/etc/profile
-
-	# enable memory reservations
-	sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 //g" -i $CACHEDIR/sdcard/boot/boot.cmd
-	mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null
-
-	# clean deb cache
-	chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y clean >/dev/null 2>&1"
-
-fi
+		# Set default audio-output to HDMI for desktop-images
+		cat <<-EOF >> $CACHEDIR/sdcard/etc/asound.conf
+		pcm.!default {
+		    type hw
+		    card 1
+		}
+
+		ctl.!default {
+		    type hw
+		    card 1
+		}
+		EOF
+
+		# That we can just play
+		echo "export VDPAU_DRIVER=sunxi" >> $CACHEDIR/sdcard/etc/profile
+
+		# enable memory reservations
+		sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 //g" -i $CACHEDIR/sdcard/boot/boot.cmd
+		mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null
+
+		# clean deb cache
+		chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y clean >/dev/null 2>&1"
+	fi
 }
diff --git a/scripts/update-motd.d/10-header b/scripts/update-motd.d/10-header
index 0273fe4a2..b3ad93390 100644
--- a/scripts/update-motd.d/10-header
+++ b/scripts/update-motd.d/10-header
@@ -1,8 +1,7 @@
 #!/bin/bash
 export TERM=linux
-export VDPAU_DRIVER=sunxi 
 . /etc/os-release
-KERNELID=$(uname -r) 
+KERNELID=$(uname -r)
 clear
 toilet -f standard -F metal  $([ -f  /var/run/machine.id ] && cat /var/run/machine.id || cat /etc/hostname)
 echo ""