--- /media/lvm0/debian/live-medium-install-orig	2014-01-06 12:56:55.000000000 +0100
+++ /media/lvm0/debian/live-medium-install	2014-01-06 12:57:05.000000000 +0100
@@ -16,7 +16,11 @@
 
 _URL="http://live.debian.net/files/stable/images/${_VERSION}/amd64/webboot/"
 
-_FILES="debian-live-${_VERSION}-amd64-gnome-desktop.vmlinuz debian-live-${_VERSION}-amd64-gnome-desktop.initrd.img debian-live-${_VERSION}-amd64-gnome-desktop.squashfs"
+_TYPE="gnome-desktop"
+
+_FILES="debian-live-${_VERSION}-amd64-${_TYPE}.vmlinuz debian-live-${_VERSION}-amd64-${_TYPE}.initrd.img debian-live-${_VERSION}-amd64-${_TYPE}.squashfs"
+
+_NONFREE="no"
 
 _TARGET="/dev/sda"
 
@@ -81,7 +85,48 @@
 WARNING: This will erase all data on the target device
 ######################################################
 
-Please enter URL to download the ${_IMAGE_FILE} image from
+Please enter the type of debian to download
+(default: ${_TYPE})
+
+gnome-desktop
+kde-desktop
+lxde-desktop
+xfce-desktop
+standard
+rescue
+EOF
+
+# Ask for type
+echo -n ": "
+read _READ
+
+_TYPE=${_READ:-${_TYPE}}
+
+
+cat << EOF
+Do you want to install nonfree version? Type 'yes' or press ENTER.
+(default: ${_NONFREE})
+EOF
+
+# Ask for nonfree
+echo -n ": "
+read _READ
+
+case "${_READ}" in
+	'yes')
+		echo "nonfree selected"
+		_NONFREE="+nonfree"
+		_URL="http://live.debian.net/files/stable/images/${_VERSION}${_NONFREE}/amd64/webboot/"
+		_FILES="debian-live-${_VERSION}-amd64-${_TYPE}${_NONFREE}.vmlinuz debian-live-${_VERSION}-amd64-${_TYPE}${_NONFREE}.initrd.img debian-live-${_VERSION}-amd64-${_TYPE}${_NONFREE}.squashfs"
+		;;
+	*)
+		_FILES="debian-live-${_VERSION}-amd64-${_TYPE}.vmlinuz debian-live-${_VERSION}-amd64-${_TYPE}.initrd.img debian-live-${_VERSION}-amd64-${_TYPE}.squashfs"
+		;;
+esac
+
+cat << EOF
+
+Please enter URL to download the ${_FILES} image from
 (default: ${_URL})
 EOF