For consistency, using true|false instead of enabled|disabled in configuration options.

40 files changed, 175 insertions, 175 deletions

diff --git a/helpers/lh_binary b/helpers/lh_binary
index f5508c5..33ee5d6 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -29,7 +29,7 @@ Setup_cleanup
 # Preparing root filesystem
 lh binary_chroot ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	# Configuring chroot
 	lh chroot_devpts install ${*}
@@ -65,7 +65,7 @@ lh binary_local-includes ${*}
 lh binary_local-hooks ${*}
 lh binary_md5sum ${*}
 
-if [ "${LH_CHROOT_BUILD}" != "enabled" ]
+if [ "${LH_CHROOT_BUILD}" != "true" ]
 then
 	lh chroot_devpts install ${*}
 	lh chroot_proc install ${*}
@@ -80,7 +80,7 @@ lh binary_tar ${*}
 lh binary_usb-hdd ${*}
 lh binary_virtual-hdd ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	# Deconfiguring chroot
 	rm -f .stage/chroot_sources
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 6194826..7612810 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -40,7 +40,7 @@ Create_lockfile .lock
 # Normally, virtual filesystems are not mounted here, but people tend to be lazy
 if [ -f chroot/proc/version ]
 then
-	if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+	if [ "${LH_USE_FAKEROOT}" != "true" ]
 then
 		${LH_ROOT_COMMAND} umount chroot/proc
 	else
@@ -51,7 +51,7 @@ fi
 
 if [ -d chroot/sys/kernel ]
 then
-	if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+	if [ "${LH_USE_FAKEROOT}" != "true" ]
 	then
 		${LH_ROOT_COMMAND} umount chroot/sys
 	else
@@ -61,18 +61,18 @@ then
 fi
 
 # Copying /dev if using fakeroot
-if [ "${LH_USE_FAKEROOT}" = "enabled" ]
+if [ "${LH_USE_FAKEROOT}" = "true" ]
 then
 	rm -rf chroot/dev
 	find /dev | cpio -dmpu chroot
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+if [ "${LH_CHROOT_BUILD}" = "false" ]
 then
 	exit 0
 fi
 
-if [ "${LH_CACHE}" = "enabled" ] && Find_files cache/stages_rootfs/filesystem*
+if [ "${LH_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
 then
 	exit 0
 fi
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 9fccdfa..7f5af95 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -28,10 +28,10 @@ then
 	exit 0
 fi
 
-if [ "${_DEBUG}" = "enabled" ]
+if [ "${_DEBUG}" = "true" ]
 then
 	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
-elif [ "${_QUIET}" = "enabled" ]
+elif [ "${_QUIET}" = "true" ]
 then
 	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
 else
@@ -40,10 +40,10 @@ fi
 
 # Check d-i configuration
 case "${LH_DEBIAN_INSTALLER}" in
-	enabled|cdrom|netinst|netboot|businesscard|live)
+	true|cdrom|netinst|netboot|businesscard|live)
 		;;
 
-	disabled)
+	false)
 		exit 0
 		;;
 
@@ -287,7 +287,7 @@ else
 
 	# Downloading graphical-installer
 	DOWNLOAD_GTK_INSTALLER=0
-	if [ "${LH_DEBIAN_INSTALLER_GUI}" = "enabled" ]
+	if [ "${LH_DEBIAN_INSTALLER_GUI}" = "true" ]
 	then
 		case "${LH_ARCHITECTURE}" in
 			amd64|i386)
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 8905e6d..2bbd73d 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -95,7 +95,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
 		;;
 
-	enabled|netinst|live)
+	true|netinst|live)
 		echo "main" > binary/.disk/base_components
 
 		touch binary/.disk/base_installable
@@ -128,7 +128,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
 		;;
 
-	disabled)
+	false)
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 		;;
 esac
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 711f3da..2990afa 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -31,7 +31,7 @@ fi
 case "${LH_ENCRYPTION}" in
 	aes128|aes192|aes256)
 		;;
-	""|disabled)
+	""|false)
 		exit 0
 		;;
 	*)
@@ -85,7 +85,7 @@ Install_package
 
 Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	# Moving image
 	mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
@@ -101,7 +101,7 @@ do
 	echo
 
 	case "${LH_CHROOT_BUILD}" in
-		enabled)
+		true)
 			if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \
 				< chroot/filesystem.${LH_CHROOT_FILESYSTEM} \
 				> chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
@@ -110,7 +110,7 @@ do
 				break
 			fi
 			;;
-		disabled)
+		false)
 			if aespipe -e ${LH_ENCRYPTION} -T \
 				< binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} \
 				> binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index b2ccfea..35fa43d 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -157,7 +157,7 @@ mkdir -p "${DESTDIR_LIVE}"
 # Setting boot parameters
 
 case "${LH_ENCRYPTION}" in
-	""|disabled)
+	""|false)
 		;;
 	*)
 		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
@@ -206,7 +206,7 @@ then
 	exit 1
 fi
 
-if [ "${LH_EXPOSED_ROOT}" != "disabled" ]
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
 fi
@@ -237,7 +237,7 @@ done
 LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 # Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
 	LINUX_INSTALL="title\t\tInstaller:\nroot"
@@ -285,7 +285,7 @@ case ${LH_BINARY_IMAGES} in
 		;;
 esac
 
-if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+if [ "${LH_CHROOT_BUILD}" = "false" ]
 then
 	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
 fi
diff --git a/helpers/lh_binary_grub2 b/helpers/lh_binary_grub2
index 41d9483..76b9373 100755
--- a/helpers/lh_binary_grub2
+++ b/helpers/lh_binary_grub2
@@ -131,7 +131,7 @@ mkdir -p "${DESTDIR_LIVE}"
 # Setting boot parameters
 
 case "${LH_ENCRYPTION}" in
-	""|disabled)
+	""|false)
 		;;
 	*)
 		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
@@ -180,7 +180,7 @@ then
 	exit 1
 fi
 
-if [ "${LH_EXPOSED_ROOT}" != "disabled" ]
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
 fi
@@ -211,7 +211,7 @@ done
 LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 # Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}"
 	LINUX_INSTALL="#\t \"Installer\"\n"
@@ -258,7 +258,7 @@ case ${LH_BINARY_IMAGES} in
 		;;
 esac
 
-if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+if [ "${LH_CHROOT_BUILD}" = "false" ]
 then
 	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
 fi
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index e7f6e60..196f902 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -115,7 +115,7 @@ then
 	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
 fi
 
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	# Copying install templates
 	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index edf21a0..47529d6 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -61,12 +61,12 @@ fi
 GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
 
 # Handle genisoimage live-helper specific options
-if [ "${_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "true" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
 
-if [ "${_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "true" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
 fi
@@ -176,7 +176,7 @@ genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary
 EOF
 
 case "${LH_CHROOT_BUILD}" in
-	enabled)
+	true)
 		# Moving image
 		mv binary.sh chroot
 		mv binary chroot
@@ -188,7 +188,7 @@ case "${LH_CHROOT_BUILD}" in
 		rm -f chroot/binary.sh
 		;;
 
-	disabled)
+	false)
 		sh binary.sh
 		rm -f binary.sh
 		;;
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 6cc88df..57087d8 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_CHECKSUMS}" != "enabled" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LH_CHECKSUMS}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 98a3be5..581ec9a 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "disabled" ] || [ "${LH_MEMTEST}" = "none" ]
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "false" ] || [ "${LH_MEMTEST}" = "none" ]
 then
 	exit 0
 fi
@@ -48,7 +48,7 @@ then
 	exit 0
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 
 	if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
@@ -95,11 +95,11 @@ mkdir -p "${DESTDIR}"
 
 # Installing memtest
 case "${LH_CHROOT_BUILD}" in
-	enabled)
+	true)
 		cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;
 
-	disabled)
+	false)
 		cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;
 esac
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 39c7d62..2c06ff4 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -83,7 +83,7 @@ do
 done
 
 # Handling chroot excludes
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	if [ -f config/binary_rootfs/excludes ]
 	then
@@ -136,7 +136,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		RESERVED_PERCENTAGE="--reserved-percentage"
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
 
 				# Move image
@@ -176,7 +176,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				fi
 				;;
 
-			disabled)
+			false)
 				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
 				;;
 		esac
@@ -210,7 +210,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		fi
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2"
 
 				# Move image
@@ -248,7 +248,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				fi
 				;;
 
-			disabled)
+			false)
 				mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output binary/${INITFS}/filesystem.jffs2
 				;;
 		esac
@@ -267,11 +267,11 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		fi
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				mv chroot/chroot binary/${INITFS}/filesystem.dir
 				;;
 
-			disabled)
+			false)
 				cp -a chroot binary/${INITFS}/filesystem.dir
 				;;
 		esac
@@ -298,7 +298,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 
 		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 
-		if [ "${_VERBOSE}" = "enabled" ]
+		if [ "${_VERBOSE}" = "true" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
 		fi
@@ -310,7 +310,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		fi
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				# Create image
 				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
 
@@ -354,7 +354,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
 				;;
 
-			disabled)
+			false)
 				if [ -f config/binary_rootfs/excludes ]
 				then
 					case "${LH_DISTRIBUTION}" in
@@ -387,11 +387,11 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		fi
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				mv chroot/chroot binary
 				;;
 
-			disabled)
+			false)
 				Echo_message "This may take a while."
 				cp -a chroot binary
 				;;
diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo
index 5dd7680..d79d0b7 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -123,7 +123,7 @@ mkdir -p "${DESTDIR_LIVE}"
 
 # Setting boot parameters
 case "${LH_ENCRYPTION}" in
-	""|disabled)
+	""|false)
 		;;
 	*)
 		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
@@ -173,7 +173,7 @@ then
 	exit 1
 fi
 
-if [ "${LH_EXPOSED_ROOT}" != "disabled" ]
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
 fi
@@ -209,7 +209,7 @@ fi
 LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 # Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"
@@ -230,18 +230,18 @@ case "${LH_BINARY_IMAGES}" in
 		mkdir -p binary/boot
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/boot/second.b binary/boot
 				;;
 
-			disabled)
+			false)
 				cp /boot/second.b binary/boot
 				;;
 		esac
 
 		cp -r "${TEMPLATES}"/* binary/boot
 
-		if [ "${LH_DEBIAN_INSTALLER}" = "disabled" ]
+		if [ "${LH_DEBIAN_INSTALLER}" = "false" ]
 		then
 			rm -f binary/boot/debian.txt.install
 		else
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 70ff5d8..ee1d961 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -191,7 +191,7 @@ Copy_syslinux_templates ()
 {
 	cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
 
-	if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
+	if [ "${LH_SYSLINUX_MENU}" = "false" ]
 	then
 		cp "${TEMPLATES}"/normal/* ${SCREEN_PATH}
 	else
@@ -221,10 +221,10 @@ Copy_syslinux_templates ()
 		esac
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
 				;;
-			disabled)
+			false)
 				cp /usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
 				;;
 		esac
@@ -248,7 +248,7 @@ Copy_syslinux_templates ()
 		done
 	fi
 
-	if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+	if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 	then
 		if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
 		then
@@ -277,7 +277,7 @@ Copy_syslinux_templates ()
 		rm -f ${SCREEN_PATH}/*.install*
 	fi
 
-	if [ "${LH_SYSLINUX_MENU}" = "enabled" ]
+	if [ "${LH_SYSLINUX_MENU}" = "true" ]
 	then
 		rm -f ${DATA_PATH}/boot.txt
 	fi
@@ -290,7 +290,7 @@ Copy_syslinux_templates ()
 		rm -f ${SCREEN_PATH}/splash.rle
 		rm -f ${DATA_PATH}/splash.png
 	else
-		if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
+		if [ "${LH_SYSLINUX_MENU}" = "false" ]
 		then
 			SPLASH="${LIVE_DATA_PATH}/splash.rle"
 		else
@@ -409,7 +409,7 @@ mkdir -p "${DATA_PATH}"
 
 # Setting boot parameters
 case "${LH_ENCRYPTION}" in
-	""|disabled)
+	""|false)
 		;;
 	*)
 		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
@@ -453,7 +453,7 @@ then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi
 
-if [ "${LH_EXPOSED_ROOT}" != "disabled" ]
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
 fi
@@ -511,7 +511,7 @@ then
 	mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
 	mv binary/${INITFS}/initrd* ${KERNEL_PATH}
 
-	if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ]
+	if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
 	then
 		mv binary/${INITFS}/memtest ${KERNEL_PATH}
 	fi
@@ -539,14 +539,14 @@ fi
 
 # Only needed for non-vesamenu, non-gfxboot syslinux
 case "${LH_SYSLINUX_MENU}" in
-	disabled|menu)
+	false|menu)
 		# Adding syslinux hardcoded default label entry
 		Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
 		;;
 esac
 
 # Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"
@@ -583,10 +583,10 @@ Configure_syslinux_templates
 case "${LH_BINARY_IMAGES}" in
 	iso)
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
 				;;
-			disabled)
+			false)
 				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
 				;;
 		esac
@@ -602,10 +602,10 @@ case "${LH_BINARY_IMAGES}" in
 
 	net)
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
 				;;
-			disabled)
+			false)
 				cp /usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
 				;;
 		esac
@@ -633,10 +633,10 @@ case "${LH_BINARY_IMAGES}" in
 
 	tar|usb-hdd)
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
 				;;
-			disabled)
+			false)
 				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
 				;;
 		esac
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index c5e0ef4..53d9e37 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -142,7 +142,7 @@ case "${LH_BINARY_FILESYSTEM}" in
 esac
 
 case "${LH_CHROOT_BUILD}" in
-	enabled)
+	true)
 		Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
 		Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
 		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
@@ -154,7 +154,7 @@ case "${LH_CHROOT_BUILD}" in
 		fi
 		;;
 
-	disabled)
+	false)
 		parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
 		parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true
 		parted -s ${FREELO} set 1 boot on || true
@@ -191,11 +191,11 @@ case "${LH_BINARY_FILESYSTEM}" in
 esac
 
 case "${LH_CHROOT_BUILD}" in
-	enabled)
+	true)
 		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
 		;;
 
-	disabled)
+	false)
 		mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
 		;;
 esac
@@ -247,11 +247,11 @@ rmdir chroot/binary.tmp
 if [ "${LH_BOOTLOADER}" = "syslinux" ]
 then
 	case "${LH_CHROOT_BUILD}" in
-		enabled)
+		true)
 			Chroot chroot "syslinux ${FREELO}"
 			;;
 
-		disabled)
+		false)
 			syslinux ${FREELO}
 			;;
 	esac
diff --git a/helpers/lh_binary_virtual-hdd b/helpers/lh_binary_virtual-hdd
index 83dec0c..6a65d19 100755
--- a/helpers/lh_binary_virtual-hdd
+++ b/helpers/lh_binary_virtual-hdd
@@ -42,7 +42,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	case "${LH_BINARY_FILESYSTEM}" in
 		ext2|ext3)
@@ -66,7 +66,7 @@ fi
 Echo_message "Creating virtual disk image..."
 dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	mv binary-virtual.img chroot
 
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index 6a61dfa..6851218 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_WIN32_LOADER}" != "enabled" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
 then
 	exit 0
 fi
@@ -44,7 +44,7 @@ Create_lockfile .lock
 
 case "${LH_ARCHITECTURE}" in
 	amd64|i386)
-		if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+		if [ "${LH_CHROOT_BUILD}" = "true" ]
 		then
 			# Checking depends
 			Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
@@ -63,7 +63,7 @@ case "${LH_ARCHITECTURE}" in
 
 		mv binary/win32-loader.exe binary/setup.exe
 
-		if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+		if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 		then
 
 cat > binary/win32-loader.ini << EOF
@@ -89,7 +89,7 @@ EOF
 		;;
 
 	*)
-		Echo_warning "win32-loader inclusion is enabled but not compatible with your architecture, ignoring."
+		Echo_warning "win32-loader inclusion is set to true but not compatible with your architecture, ignoring."
 		;;
 esac
 
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index d0e707c..fdd857d 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -162,7 +162,7 @@ mkdir -p "${DESTDIR_LIVE}"
 
 # Setting boot parameters
 case "${LH_ENCRYPTION}" in
-	""|disabled)
+	""|false)
 		;;
 	*)
 		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
@@ -212,7 +212,7 @@ then
 	exit 1
 fi
 
-if [ "${LH_EXPOSED_ROOT}" != "disabled" ]
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
 fi
@@ -248,7 +248,7 @@ fi
 LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 # Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"
@@ -277,11 +277,11 @@ case "${LH_BINARY_IMAGES}" in
 		mkdir -p binary/yaboot
 
 		case "${LH_CHROOT_BUILD}" in
-			enabled)
+			true)
 				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
 				;;
 
-			disabled)
+			false)
 				cp /usr/lib/yaboot/yaboot binary/yaboot
 				;;
 		esac
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 2694aba..1f9340b 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -99,29 +99,29 @@ else
 	esac
 fi
 
-if [ "${_DEBUG}" = "enabled" ]
+if [ "${_DEBUG}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
 fi
 
-if [ "${_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
 fi
 
-if [ "${_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
 fi
 
-if [ "${LH_APT_SECURE}" = "disabled" ]
+if [ "${LH_APT_SECURE}" = "false" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
 fi
 
 if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
 then
-	if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+	if [ "${LH_CACHE_PACKAGES}" = "true" ]
 	then
 		if [ -d cache/packages_bootstrap ]
 		then
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 4c30895..b1a5349 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -83,7 +83,7 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
 fi
 
-if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+if [ "${LH_USE_FAKEROOT}" != "true" ]
 then
 	if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
 	then
@@ -114,7 +114,7 @@ fi
 
 if [ -x "/usr/sbin/debootstrap" ]
 then
-	if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
+	if [ "${LH_CACHE_PACKAGES}" = "true" ]
 	then
 		if [ -d cache/packages_bootstrap ]
 		then
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 4396aeb..6836c2d 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -55,11 +55,11 @@ case "${1}" in
 
 		# Configuring apt pdiffs
 		case "${LH_APT_PDIFFS}" in
-			enabled)
+			true)
 				echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
 				;;
 
-			disabled)
+			false)
 				echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
 				;;
 		esac
@@ -72,12 +72,12 @@ case "${1}" in
 
 		# Configuring apt recommends
 		case "${LH_APT_RECOMMENDS}" in
-			enabled)
+			true)
 				echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
 				echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
 				;;
 
-			disabled)
+			false)
 				echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
 				echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
 				;;
@@ -85,12 +85,12 @@ case "${1}" in
 
 		# Configuring apt secure
 		case "${LH_APT_SECURE}" in
-			enabled)
+			true)
 				echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
 				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
 				;;
 
-			disabled)
+			false)
 				echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
 				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
 				;;
@@ -163,7 +163,7 @@ case "${1}" in
 		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
 
 		# Deconfiguring aptitude pdiffs
-		if [ "${LH_APT_PDIFFS}" = "enabled" ]
+		if [ "${LH_APT_PDIFFS}" = "true" ]
 		then
 			rm -f chroot/etc/apt/apt.conf.d/00pdiffs
 		fi
@@ -172,13 +172,13 @@ case "${1}" in
 		rm -f chroot/etc/apt/apt.conf.d/00pipeline
 
 		# Deconfiguring aptitude recommends
-		if [ "${LH_APT_RECOMMENDS}" = "enabled" ]
+		if [ "${LH_APT_RECOMMENDS}" = "true" ]
 		then
 			rm -f chroot/etc/apt/apt.conf.d/00recommends
 		fi
 
 		# Deconfiguring aptitude secure
-		if [ "${LH_APT_SECURE}" = "enabled" ]
+		if [ "${LH_APT_SECURE}" = "true" ]
 		then
 			rm -f chroot/etc/apt/apt.conf.d/00secure
 		fi
diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index d652fe5..75edab2 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -42,7 +42,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Creating mountpoint
 			mkdir -p chroot/dev/pts
@@ -65,7 +65,7 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Unmounting /dev/pts
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			if Find_files chroot/dev/pts/*
 			then
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 34b31d9..66fb365 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -135,7 +135,7 @@ then
 	esac
 fi
 
-if [ "${LH_EXPOSED_ROOT}" = "enabled" ]
+if [ "${LH_EXPOSED_ROOT}" = "true" ]
 then
 	# Make sure RW dirs exist so that the initramfs script has
 	# a directory in which to bind the tmpfs filesystems
@@ -181,7 +181,7 @@ if [ -e chroot/etc/init.d/resolvconf ]
 then
 	Echo_warning "Your live system appears to include resolvconf which is by its nature incompatible in most ways with debian-live."
 	Echo_warning "Keeping resolvconf installed *can* lead to broken network support in the resulting live system."
-	Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages enabled)."
+	Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages to true)."
 fi
 
 # Creating stage file
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index 242cb66..eb9c011 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_INTERACTIVE}" = "disabled" ]
+if [ "${LH_INTERACTIVE}" = "false" ]
 then
 	exit 0
 fi
@@ -43,7 +43,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 case "${LH_INTERACTIVE}" in
-	enabled|shell)
+	true|shell)
 		Echo_message "Pausing build: starting interactive shell..."
 			Chroot chroot "/bin/bash --login"
 		;;
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 7878bf5..392fa5e 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -42,7 +42,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Creating mountpoint
 			mkdir -p chroot/proc
@@ -67,7 +67,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Workaround binfmt-support /proc locking
 			if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs
index 1a81c57..558d3d7 100755
--- a/helpers/lh_chroot_selinuxfs
+++ b/helpers/lh_chroot_selinuxfs
@@ -44,7 +44,7 @@ case "${1}" in
 			# Creating lock file
 			Create_lockfile .lock
 
-			if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+			if [ "${LH_USE_FAKEROOT}" != "true" ]
 			then
 				# Create mountpoint
 				mkdir -p chroot/selinux
@@ -70,7 +70,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Unmounting /selinux
 			#fuser -km chroot/selinux
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 605dd80..8b3682e 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -44,18 +44,18 @@ case "${1}" in
 		# Configure custom sources.list
 		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
 
-		if [ "${LH_SOURCE}" = "enabled" ]
+		if [ "${LH_SOURCE}" = "true" ]
 		then
 			echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 		fi
 
-		if [ "${LH_SECURITY}" = "enabled" ]
+		if [ "${LH_SECURITY}" = "true" ]
 		then
 			case "${LH_MODE}" in
 				ubuntu)
 					echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-					if [ "${LH_SOURCE}" = "enabled" ]
+					if [ "${LH_SOURCE}" = "true" ]
 					then
 						echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
@@ -66,7 +66,7 @@ case "${1}" in
 					then
 						echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-						if [ "${LH_SOURCE}" = "enabled" ]
+						if [ "${LH_SOURCE}" = "true" ]
 						then
 							echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
@@ -145,7 +145,7 @@ case "${1}" in
 					-o APT::FTPArchive::Release::Origin=chroot_local-packages \
 					release . > Release" | Chroot chroot sh
 
-				if [ "${LH_APT_SECURE}" = "enabled" ]
+				if [ "${LH_APT_SECURE}" = "true" ]
 				then
 					_LH_DOTGNUPG_EXISTED=0
 					if [ -d chroot/root/.gnupg ]
@@ -234,7 +234,7 @@ case "${1}" in
 		fi
 
 		# Update indices from cache
-		if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
+		if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
 		then
 			if Find_files cache/indices_bootstrap/secring.gpg*
 			then
@@ -316,7 +316,7 @@ case "${1}" in
 				Apt update
 			fi
 
-			if [ "${LH_CACHE_INDICES}" = "enabled" ]
+			if [ "${LH_CACHE_INDICES}" = "true" ]
 			then
 				mkdir -p cache/indices_bootstrap
 
@@ -355,7 +355,7 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Configure generic indices
-		if [ "${LH_BINARY_INDICES}" = "enabled" ]
+		if [ "${LH_BINARY_INDICES}" = "true" ]
 		then
 			# Don't do anything if it's not required
 			if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
@@ -374,18 +374,18 @@ case "${1}" in
 
 			echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
 
-			if [ "${LH_SOURCE}" = "enabled" ]
+			if [ "${LH_SOURCE}" = "true" ]
 			then
 				echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 			fi
 
-			if [ "${LH_SECURITY}" = "enabled" ]
+			if [ "${LH_SECURITY}" = "true" ]
 			then
 				case "${LH_MODE}" in
 					ubuntu)
 						echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-						if [ "${LH_SOURCE}" = "enabled" ]
+						if [ "${LH_SOURCE}" = "true" ]
 						then
 							echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
@@ -396,7 +396,7 @@ case "${1}" in
 						then
 							echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-							if [ "${LH_SOURCE}" = "enabled" ]
+							if [ "${LH_SOURCE}" = "true" ]
 							then
 								echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 							fi
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index abdbbf7..576f06e 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SYMLINKS}" != "enabled" ]
+if [ "${LH_SYMLINKS}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index d68f3e6..f6acb64 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -42,7 +42,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Create mountpoint
 			mkdir -p chroot/sys
@@ -67,7 +67,7 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
 		then
 			# Unmounting /sys
 			#fuser -km chroot/sys
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index 0bd0db2..7c8c983 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -37,7 +37,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_SYSVINIT}" = "enabled" ]
+if [ "${LH_SYSVINIT}" = "true" ]
 then
 	# Disable all
 	for FILE in chroot/etc/init.d/*
diff --git a/helpers/lh_config b/helpers/lh_config
index 58729d2..da417a3 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -29,16 +29,16 @@ DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"
 USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--apt-ftp-proxy URL]\n\
 \t    [--apt-http-proxy URL]\n\
-\t    [--apt-pdiffs enabled|disabled]\n\
+\t    [--apt-pdiffs true|false]\n\
 \t    [--apt-options OPTION|\"OPTIONS\"]\n\
 \t    [--aptitude-options OPTION|\"OPTIONS\"]\n\
 \t    [--apt-pipeline FIXME]\n\
-\t    [--apt-recommends enabled|disabled]\n\
-\t    [--apt-secure enabled|disabled]\n\
+\t    [--apt-recommends true|false]\n\
+\t    [--apt-secure true|false]\n\
 \t    [-a|--architecture ARCHITECTURE]\n\
 \t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
 \t    [--binary-filesystem fat16|fat32]\n\
-\t    [--binary-indices enabled|disabled|none]\n\
+\t    [--binary-indices true|false|none]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootloader grub|syslinux|yaboot]\n\
@@ -47,26 +47,26 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [-f|--bootstrap-flavour minimal|standard]\n\
 \t    [--bootstrap-keyring PACKAGE]\n\
 \t    [--breakpoints]\n\
-\t    [--cache enabled|disabled]\n\
-\t    [--cache-indices enabled|disabled]\n\
-\t    [--cache-packages enabled|disabled]\n\
+\t    [--cache true|false]\n\
+\t    [--cache-indices true|false]\n\
+\t    [--cache-packages true|false]\n\
 \t    [--cache-stages STAGE|\"STAGES\"]\n\
-\t    [--checksums enabled|disabled]\n\
-\t    [--chroot-build enabled|disabled]\n\
+\t    [--checksums true|false]\n\
+\t    [--chroot-build true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
 \t    [-c|--conffile FILE]\n\
 \t    [--clean\n\
 \t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\
-\t    [--debconf-nowarnings enabled|disabled]\n\
+\t    [--debconf-nowarnings true|false]\n\
 \t    [--debconf-priority low|medium|high|critical]\n\
-\t    [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\
+\t    [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\
 \t    [--debian-installer-distribution CODENAME|daily]\n\
 \t    [--debian-installer-preseedfile FILE|URL]\n\
-\t    [--debian-installer-gui enabled|disabled]\n\
+\t    [--debian-installer-gui true|false]\n\
 \t    [--debug]\n\
 \t    [-d|--distribution CODENAME]\n\
 \t    [--dump]\n\
-\t    [-e|--encryption disabled|aes128|aes192|aes256]\n\
+\t    [-e|--encryption false|aes128|aes192|aes256]\n\
 \t    [--fdisk fdisk|fdisk.dist]\n\
 \t    [--force]\n\
 \t    [--genisoimage genisomage|mkisofs]\n\
@@ -108,25 +108,25 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--packages PACKAGE|\"PACKAGES\"]\n\
 \t    [--quiet]\n\
 \t    [--root-command sudo]\n\
-\t    [--use-fakeroot enabled|disabled]\n\
+\t    [--use-fakeroot true|false]\n\
 \t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
-\t    [--security enabled|disabled]\n\
-\t    [--source enabled|disabled]\n\
+\t    [--security true|false]\n\
+\t    [--source true|false]\n\
 \t    [-s|--source-images iso|net|tar|usb-hdd]\n\
-\t    [--symlinks enabled|disabled]\n\
+\t    [--symlinks true|false]\n\
 \t    [--syslinux-splash FILE]\n\
 \t    [--syslinux-timeout SECONDS]\n\
-\t    [--syslinux-menu enabled|disabled]\n\
-\t    [--sysvinit enabled|disabled]\n\
+\t    [--syslinux-menu true|false]\n\
+\t    [--sysvinit true|false]\n\
 \t    [--tasksel aptitude|tasksel]\n\
 \t    [--tasks TASK]\n\
 \t    [--templates PATH]\n\
 \t    [--union-filesystem aufs|unionfs]\n\
 \t    [--virtual-root-size MB]\n\
-\t    [--exposed-root enabled|disabled]\n\
+\t    [--exposed-root true|false]\n\
 \t    [--username NAME]\n\
 \t    [--verbose]\n\
-\t    [--win32-loader enabled|disabled]"
+\t    [--win32-loader true|false]"
 
 Local_arguments ()
 {
@@ -689,7 +689,7 @@ Local_arguments ()
 
 			# other
 			--breakpoints)
-				_BREAKPOINTS="enabled"
+				_BREAKPOINTS="true"
 				shift
 				;;
 
@@ -699,17 +699,17 @@ Local_arguments ()
 				;;
 
 			--color)
-				_COLOR="enabled"
+				_COLOR="true"
 				shift
 				;;
 
 			--debug)
-				_DEBUG="enabled"
+				_DEBUG="true"
 				shift
 				;;
 
 			--force)
-				_FORCE="enabled"
+				_FORCE="true"
 				shift
 				;;
 
@@ -723,7 +723,7 @@ Local_arguments ()
 				;;
 
 			--quiet)
-				_QUIET="enabled"
+				_QUIET="true"
 				shift
 				;;
 
@@ -733,7 +733,7 @@ Local_arguments ()
 				;;
 
 			--verbose)
-				_VERBOSE="enabled"
+				_VERBOSE="true"
 				shift
 				;;
 
@@ -1105,7 +1105,7 @@ LH_CHECKSUMS="${LH_CHECKSUMS}"
 
 # \${LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: ${LH_CHROOT_BUILD})
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
+# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
 LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
 
 # \$LH_DEBIAN_INSTALLER: set debian-installer
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index ef0449d..fef38a4 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
@@ -72,7 +72,7 @@ syslinux
 grub
 EOF
 
-		if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ]
+		if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
 		then
 			echo "${LH_MEMTEST}" >> source-selection.txt
 		fi
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index ecd12fd..391f75e 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index b52775f..a765bb4 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -83,7 +83,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
 		;;
 
-	enabled|netinst)
+	true|netinst)
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
 		;;
 
@@ -95,7 +95,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
 		;;
 
-	disabled)
+	false)
 		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
 		;;
 esac
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index b65fae0..0ef1bcb 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
@@ -59,12 +59,12 @@ then
 	rm -f source.iso
 fi
 
-if [ "${_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "true" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
 
-if [ "${_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "true" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
 fi
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 8f3fcdc..0034bfd 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -23,12 +23,12 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
 
-if [ "${LH_CHECKSUMS}" != "enabled" ]
+if [ "${LH_CHECKSUMS}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index f10db28..1c1b946 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar
index d8cb41a..4923b71 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 1a88a60..e8cd8ca 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
diff --git a/helpers/lh_source_virtual-hdd b/helpers/lh_source_virtual-hdd
index 59ee2b5..ac186dc 100755
--- a/helpers/lh_source_virtual-hdd
+++ b/helpers/lh_source_virtual-hdd
@@ -23,7 +23,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LH_SOURCE}" != "enabled" ]
+if [ "${LH_SOURCE}" != "true" ]
 then
 	exit 0
 fi
@@ -47,7 +47,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	case "${LH_BINARY_FILESYSTEM}" in
 		ext2|ext3)
@@ -70,7 +70,7 @@ DU_DIM="$(du -ms source | cut -f1)"
 REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
 dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LH_CHROOT_BUILD}" = "true" ]
 then
 	mv source-virtual.img chroot