diff --git a/__frzr b/__frzr
index a899563..f900666 100644
--- a/__frzr
+++ b/__frzr
@@ -4,39 +4,39 @@
 source "${BASH_SOURCE%/*}/__frzr-envars"
 
 frzr_status() {
-    # Output frzr status tracker using the JSON format
-    cat <<EOF
+	# Output frzr status tracker using the JSON format
+	cat <<EOF
 {
-    "Signals": {
-        "Task MSG": "$TASK_MSG",
-        "Task Tracker": "$TASK_TRACKER",
-        "Task Error": "$TASK_ERROR",
-        "Task Error MSG": "$TASK_ERROR_MSG",
-        "Task Warning": "$TASK_WARNING",
-        "Task Warning MSG": "$TASK_WARNING_MSG",
-        "Task Progress": "$TASK_PROGRESS",
-    },
-    "Globals": {
-        "Target": "$TARGET",
-        "Local Install": "$LOCAL_INSTALL",
-        "Repair Install": "$REPAIR_INSTALL",
-        "Show UI": "$SHOW_UI",
-        "EFI Path": "$EFI_MOUNT_PATH",
-        "Mount Path": "$MOUNT_PATH",
-        "SUBVOL": "$SUBVOL",
-        "Deploy Path": "$DEPLOY_PATH",
-        "Frzr Check Update": "$FRZR_CHECK_UPDATE",
-        "Frzr Params": "$FRZR_PARAMS",
-        "File Name": "$FILE_NAME",
-        "IMG Name": "$IMG_NAME",
-        "Base URL": "$BASE_URL",
-        "Repo": "$REPO",
-        "Release URL": "$RELEASES_URL",
-        "Expected Checksum": "$EXPECTED_CHECKSUM",
-        "Actual Checksum": "$ACTUAL_CHECKSUM",
-        "Channel": "$CHANNEL",
-        "State Machine State": "$STATE"
-    }
+	"Signals": {
+		"Task MSG": "$TASK_MSG",
+		"Task Tracker": "$TASK_TRACKER",
+		"Task Error": "$TASK_ERROR",
+		"Task Error MSG": "$TASK_ERROR_MSG",
+		"Task Warning": "$TASK_WARNING",
+		"Task Warning MSG": "$TASK_WARNING_MSG",
+		"Task Progress": "$TASK_PROGRESS",
+	},
+	"Globals": {
+		"Target": "$TARGET",
+		"Local Install": "$LOCAL_INSTALL",
+		"Repair Install": "$REPAIR_INSTALL",
+		"Show UI": "$SHOW_UI",
+		"EFI Path": "$EFI_MOUNT_PATH",
+		"Mount Path": "$MOUNT_PATH",
+		"SUBVOL": "$SUBVOL",
+		"Deploy Path": "$DEPLOY_PATH",
+		"Frzr Check Update": "$FRZR_CHECK_UPDATE",
+		"Frzr Params": "$FRZR_PARAMS",
+		"File Name": "$FILE_NAME",
+		"IMG Name": "$IMG_NAME",
+		"Base URL": "$BASE_URL",
+		"Repo": "$REPO",
+		"Release URL": "$RELEASES_URL",
+		"Expected Checksum": "$EXPECTED_CHECKSUM",
+		"Actual Checksum": "$ACTUAL_CHECKSUM",
+		"Channel": "$CHANNEL",
+		"State Machine State": "$STATE"
+	}
 }
 EOF
 }
@@ -61,20 +61,20 @@ send_data(){
 }
 
 frzr_check_bootenv() {
-    if [ -d /tmp/frzr_root ]; then
-        UPGRADE=0
-    else
-        UPGRADE=1
-    fi
+	if [ -d /tmp/frzr_root ]; then
+		UPGRADE=0
+	else
+		UPGRADE=1
+	fi
 }
 
 # Perform required mounts to have a working chroot environment
 # $1 the rootfs to be chrooted
 # stdout OK, an error otherwise
 frzr_mount_chroot() {
-    local CHROOT_PATH=$1
-    
-    if mount -t proc /proc "${CHROOT_PATH}/proc"; then
+	local CHROOT_PATH=$1
+	
+	if mount -t proc /proc "${CHROOT_PATH}/proc"; then
 		if mount -t sysfs /sys "${CHROOT_PATH}/sys"; then
 			if mount --rbind /dev "${CHROOT_PATH}/dev"; then
 				echo "OK"
@@ -91,20 +91,20 @@ frzr_mount_chroot() {
 
 frzr_exec_chroot() {
 	local CHROOT_PATH=$1
-    local CHROOT_CMD=$2
+	local CHROOT_CMD=$2
 
 	chroot ${CHROOT_PATH} /bin/bash <<EOF
-    ${CHROOT_CMD}
+	${CHROOT_CMD}
 EOF
 }
 
 frzr_umount_chroot() {
-    local CHROOT_PATH=$1
+	local CHROOT_PATH=$1
 
-    umount -l "${CHROOT_PATH}/proc"
-    umount -l "${CHROOT_PATH}/sys"
-    mount --make-rslave "${CHROOT_PATH}/dev"
-    umount -l "${CHROOT_PATH}/dev"
+	umount -l "${CHROOT_PATH}/proc"
+	umount -l "${CHROOT_PATH}/sys"
+	mount --make-rslave "${CHROOT_PATH}/dev"
+	umount -l "${CHROOT_PATH}/dev"
 }
 
 # Get the UUID of the desk containing the given directory
@@ -309,29 +309,29 @@ install_image() {
 	if [ -d "${deploy_path}" ]; then
 		if [[ "${IMG_FILE##*.}" == "img" ]]; then
 			if btrfs receive --quiet "${DEPLOY_PATH}" < "${IMG_FILE}"; then
-			    echo "OK"
-            else
-                echo "ERROR: Could not install raw image '${IMG_FILE}' to '${DEPLOY_PATH}'"
-            fi
+				echo "OK"
+			else
+				echo "ERROR: Could not install raw image '${IMG_FILE}' to '${DEPLOY_PATH}'"
+			fi
 		elif [[ "${IMG_FILE##*.}" == "zst" ]]; then
 			if zstd -d -c "${IMG_FILE}" | btrfs receive --quiet "${DEPLOY_PATH}"; then
-			    echo "OK"
-            else
-                echo "ERROR: Could not install zstd image '${IMG_FILE}' to '${DEPLOY_PATH}'"
-            fi
+				echo "OK"
+			else
+				echo "ERROR: Could not install zstd image '${IMG_FILE}' to '${DEPLOY_PATH}'"
+			fi
 		elif [[ "${IMG_FILE##*.}" == "xz" ]]; then
 			if [[ "${IMG_FILE}" == *".tar.xz" ]]; then
 				if tar xfO ${IMG_FILE} | btrfs receive --quiet "${DEPLOY_PATH}"; then
-				    echo "OK"
-                else
-                    echo "ERROR: Could not install tar.xz image '${IMG_FILE}' to '${DEPLOY_PATH}'"
-                fi
+					echo "OK"
+				else
+					echo "ERROR: Could not install tar.xz image '${IMG_FILE}' to '${DEPLOY_PATH}'"
+				fi
 			else
 				if xz -dc "${IMG_FILE}" | btrfs receive --quiet "${DEPLOY_PATH}"; then
-				    echo "OK"
-                else
-                    echo "ERROR: Could not install xz image '${IMG_FILE}' to '${DEPLOY_PATH}'"
-                fi
+					echo "OK"
+				else
+					echo "ERROR: Could not install xz image '${IMG_FILE}' to '${DEPLOY_PATH}'"
+				fi
 			fi
 		else
 			echo "ERROR: Unsupported file format for file '${IMG_FILE}'"
diff --git a/__frzr-bootloader b/__frzr-bootloader
index c506747..3dced66 100644
--- a/__frzr-bootloader
+++ b/__frzr-bootloader
@@ -4,14 +4,14 @@
 source "${BASH_SOURCE%/*}/__frzr" "$@"
 
 frzr_bootloader() {
-    NAME=${1}
+	NAME=${1}
 
-    # by default the deployment is the running one
-    DEPLOY_PATH="/"
-    SUBVOL="/"
+	# by default the deployment is the running one
+	DEPLOY_PATH="/"
+	SUBVOL="/"
 
 	local RUNNING=true
-    RUNNING=true
+	RUNNING=true
 	STATE="BEGIN"
 	while $RUNNING; do
 		case "$STATE" in
@@ -57,7 +57,7 @@ frzr_bootloader() {
 			fi
 
 			# Make sure the EFI partition is mounted during the deployment procedure
-            TASK_MSG="Checking for EFI partition"
+			TASK_MSG="Checking for EFI partition"
 			send_data
 			if mount | grep -Fq "on ${EFI_MOUNT_PATH}"; then
 				local MOUNTED_EFI_MOUNT_PATH="no"
@@ -79,44 +79,44 @@ frzr_bootloader() {
 			STATE="CHECK"
 			;;
 
-        "CHECK")
-            if [ -z "$NAME" ]; then
-                if [ -e "/build_info" ]; then
-	                NAME=$(cat "/build_info" | head -1)
-                fi
+		"CHECK")
+			if [ -z "$NAME" ]; then
+				if [ -e "/build_info" ]; then
+					NAME=$(cat "/build_info" | head -1)
+				fi
 
-                if [ -z "$NAME" ]; then
-                    TASK_ERROR_MSG="Could not fetch deployment name"
-                    STATE="FAIL"
+				if [ -z "$NAME" ]; then
+					TASK_ERROR_MSG="Could not fetch deployment name"
+					STATE="FAIL"
 					send_data
-                    continue
-                fi
-            else
-                DEPLOY_PATH="${MOUNT_PATH}/deployments"
-                SUBVOL="${DEPLOY_PATH}/${NAME}"
+					continue
+				fi
+			else
+				DEPLOY_PATH="${MOUNT_PATH}/deployments"
+				SUBVOL="${DEPLOY_PATH}/${NAME}"
 
-                # Make sure DEPLOY_PATH exists
-                mkdir -p "${DEPLOY_PATH}"
-                if [ ! -d "${DEPLOY_PATH}" ]; then
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Could not create ${DEPLOY_PATH} to to store deployments"
-                    STATE="FAIL"
+				# Make sure DEPLOY_PATH exists
+				mkdir -p "${DEPLOY_PATH}"
+				if [ ! -d "${DEPLOY_PATH}" ]; then
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Could not create ${DEPLOY_PATH} to to store deployments"
+					STATE="FAIL"
 					send_data
-                    continue
-                fi
-                
-                # Make sure SUBVOL exists
-                if [ ! -d "${SUBVOL}" ]; then
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Could not find deployment '${NAME}', '${SUBVOL}' was searched"
-                    STATE="FAIL"
+					continue
+				fi
+				
+				# Make sure SUBVOL exists
+				if [ ! -d "${SUBVOL}" ]; then
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Could not find deployment '${NAME}', '${SUBVOL}' was searched"
+					STATE="FAIL"
 					send_data
-                    continue
-                fi
-            fi
+					continue
+				fi
+			fi
 
-            STATE="BOOTLOADER"
-            ;;
+			STATE="BOOTLOADER"
+			;;
 
 		"BOOTLOADER")
 
@@ -135,10 +135,10 @@ frzr_bootloader() {
 			fi
 
 			STATE="CONFIGURE"
-            ;;
+			;;
 
 		"CONFIGURE")
-            # Get the rootfs UUID: this will be used in generating the systemd-boot entry
+			# Get the rootfs UUID: this will be used in generating the systemd-boot entry
 			TASK_MSG="Finding deployment partition UUID"
 			local rootfs_uuid=$(get_uuid "${SUBVOL}")
 			if echo "$rootfs_uuid" | grep -Fq "ERROR"; then
@@ -157,8 +157,8 @@ frzr_bootloader() {
 				STATE="FAIL"
 				send_data
 				continue
-            elif [ "${rootfs_subvolid}" = "5" ]; then
-                TASK_ERROR_MSG="Could not identify the correct subvolid of the running deployment"
+			elif [ "${rootfs_subvolid}" = "5" ]; then
+				TASK_ERROR_MSG="Could not identify the correct subvolid of the running deployment"
 				STATE="FAIL"
 				send_data
 				continue
@@ -195,7 +195,7 @@ frzr_bootloader() {
 				continue
 			fi
 
-            # This is used to update the EFI partition: setting up systemd-boot (or whatever else bootlader might be supported) to boot the new deployment
+			# This is used to update the EFI partition: setting up systemd-boot (or whatever else bootlader might be supported) to boot the new deployment
 			local efi_update_result=$(prepare_efi_partition "${NAME}" "${EFI_MOUNT_PATH}" "${SUBVOL}/boot" "${additional_arguments}" "${rootfs_uuid}" "${rootfs_subvolid}")
 			if echo "${efi_update_result}" | grep -q 'ERROR'; then
 				# bootloader configuration could not be updated
@@ -206,9 +206,9 @@ frzr_bootloader() {
 				continue
 			fi
 
-            STATE="SUCCESS"
-            ;;
-            
+			STATE="SUCCESS"
+			;;
+			
 		"SUCCESS")
 			# This state should only be used if the unlock completed without errors
 			#TASK_STATE="SUCCESS"
diff --git a/__frzr-bootstrap b/__frzr-bootstrap
index 84cc351..3b78943 100644
--- a/__frzr-bootstrap
+++ b/__frzr-bootstrap
@@ -235,22 +235,22 @@ fresh_install() {
 }
 
 frzr_bootstrap() {
-    RUNNING=true
-
-    # Check for the GUI installer
-    if [ -n "$1" ] && [ -n "$2" ]; then
-        STATE="FORMAT"
-        MOUNT_PATH=/tmp/frzr_root
-    else
-        STATE="FRZR_BOOTSTRAP_CHECK"
-    fi
-
-    TASK_TRACKER=0
-    TASK_MSG="Bootstrapping the drive for the FRZR system"
-    send_data
-    while $RUNNING; do
-        case "$STATE" in
-        "FRZR_BOOTSTRAP_CHECK")
+	RUNNING=true
+
+	# Check for the GUI installer
+	if [ -n "$1" ] && [ -n "$2" ]; then
+		STATE="FORMAT"
+		MOUNT_PATH=/tmp/frzr_root
+	else
+		STATE="FRZR_BOOTSTRAP_CHECK"
+	fi
+
+	TASK_TRACKER=0
+	TASK_MSG="Bootstrapping the drive for the FRZR system"
+	send_data
+	while $RUNNING; do
+		case "$STATE" in
+		"FRZR_BOOTSTRAP_CHECK")
 		
 			TASK_MSG="Checking for root privileges"
 			send_data
@@ -262,9 +262,9 @@ frzr_bootstrap() {
 				continue
 			fi
 
-            echo "Checking for drives connected to the system"
-            MOUNT_PATH=/tmp/frzr_root
-            if [ -z "${DISK}" ]; then
+			echo "Checking for drives connected to the system"
+			MOUNT_PATH=/tmp/frzr_root
+			if [ -z "${DISK}" ]; then
 				device_list=()
 				device_output=$(lsblk --list -n -o name,model,size,type | grep disk | tr -s ' ' '\t')
 				while read -r line; do
@@ -278,85 +278,85 @@ frzr_bootstrap() {
 			else
 				echo "specified disk is '$DISK'"
 			fi
-            echo "Checking for existing FRZR deployments"
-            # Checking for existing installation
-
-            if (lsblk -o label ${DISK} | grep -q frzr_efi); then
-                echo "Existing installation found"
-
-                if [ "$REPAIR_INSTALL" = "1"]; then
-                    REPAIR_INSTALL=1
-                    STATE="REPAIR"
-                elif [ "$REPAIR_INSTALL" = "0"]; then
-                    STATE="FORMAT"
-                else
-                    if (whiptail --yesno --yes-button "Repair" --no-button "Clean" "WARNING: $DISK appears to already have a system installed. Would you like to repair it or do a clean install?\n\nNOTE: A clean install will delete everything on the disk, but a repair install will preserve your user data." 13 70); then
-                        echo "User chose to do a repair install"
-                        REPAIR_INSTALL=1
-                        STATE="REPAIR"
-                    else
-                        echo "User chose to do a clean install"
-                        STATE="FORMAT"
-                    fi
-                fi
-            else
-                echo "Existing installation not found"
-                STATE="FORMAT"
-            fi
-            ;;
-        "FORMAT")
-            echo "We are doing a fresh install"
-            USERNAME=user
-
-            if [ ! -z $1 ]; then
-                USERNAME=$1
-            fi
-
-            if [ ! -z $2 ]; then
-                DISK=$2
-            fi
-
-            fresh_install "${DISK}" "${MOUNT_PATH}"
-            RESULT=$?
-            if [ $RESULT -eq 0 ]; then
-                STATE="SUCCESS"
-            else
-                STATE="FAIL"
-                TASK_ERROR_MSG="Fresh installation has failed"
-                continue
-            fi
-            ;;
-        "REPAIR")
-            echo "We are doing a repair install"
-            local repair_install_result=$(repair_install "${DISK}" "${MOUNT_PATH}")
-            if echo "$repair_install_result" | grep -Fq "OK"; then
-                STATE="SUCCESS"
-            else
-                STATE="FAIL"
-                TASK_ERROR_MSG="Repair installation has failed"
-                continue
-            fi
-            ;;
-        "SUCCESS")
-            echo "Successfully prepared the drive for an FRZR installation"
-            TASK_MSG="Successfully prepared the drive for an FRZR installation"
-            TASK_TRACKER=1
-            send_data
-            RUNNING=false
-            ;;
-        "FAIL")
-            echo "The bootstrap failed"
-            TASK_ERROR=1
-            send_data
-            RUNNING=false
-            ;;
-        *)
-            echo "Something went terribly wrong"
-            TASK_ERROR_MSG="Bootstrap hit an unexpected state"
-            TASK_ERROR=1
-            send_data
-            RUNNING=false
-            ;;
-        esac
-    done
+			echo "Checking for existing FRZR deployments"
+			# Checking for existing installation
+
+			if (lsblk -o label ${DISK} | grep -q frzr_efi); then
+				echo "Existing installation found"
+
+				if [ "$REPAIR_INSTALL" = "1"]; then
+					REPAIR_INSTALL=1
+					STATE="REPAIR"
+				elif [ "$REPAIR_INSTALL" = "0"]; then
+					STATE="FORMAT"
+				else
+					if (whiptail --yesno --yes-button "Repair" --no-button "Clean" "WARNING: $DISK appears to already have a system installed. Would you like to repair it or do a clean install?\n\nNOTE: A clean install will delete everything on the disk, but a repair install will preserve your user data." 13 70); then
+						echo "User chose to do a repair install"
+						REPAIR_INSTALL=1
+						STATE="REPAIR"
+					else
+						echo "User chose to do a clean install"
+						STATE="FORMAT"
+					fi
+				fi
+			else
+				echo "Existing installation not found"
+				STATE="FORMAT"
+			fi
+			;;
+		"FORMAT")
+			echo "We are doing a fresh install"
+			USERNAME=user
+
+			if [ ! -z $1 ]; then
+				USERNAME=$1
+			fi
+
+			if [ ! -z $2 ]; then
+				DISK=$2
+			fi
+
+			fresh_install "${DISK}" "${MOUNT_PATH}"
+			RESULT=$?
+			if [ $RESULT -eq 0 ]; then
+				STATE="SUCCESS"
+			else
+				STATE="FAIL"
+				TASK_ERROR_MSG="Fresh installation has failed"
+				continue
+			fi
+			;;
+		"REPAIR")
+			echo "We are doing a repair install"
+			local repair_install_result=$(repair_install "${DISK}" "${MOUNT_PATH}")
+			if echo "$repair_install_result" | grep -Fq "OK"; then
+				STATE="SUCCESS"
+			else
+				STATE="FAIL"
+				TASK_ERROR_MSG="Repair installation has failed"
+				continue
+			fi
+			;;
+		"SUCCESS")
+			echo "Successfully prepared the drive for an FRZR installation"
+			TASK_MSG="Successfully prepared the drive for an FRZR installation"
+			TASK_TRACKER=1
+			send_data
+			RUNNING=false
+			;;
+		"FAIL")
+			echo "The bootstrap failed"
+			TASK_ERROR=1
+			send_data
+			RUNNING=false
+			;;
+		*)
+			echo "Something went terribly wrong"
+			TASK_ERROR_MSG="Bootstrap hit an unexpected state"
+			TASK_ERROR=1
+			send_data
+			RUNNING=false
+			;;
+		esac
+	done
 }
diff --git a/__frzr-deploy b/__frzr-deploy
index 9bcfb2d..d25652b 100644
--- a/__frzr-deploy
+++ b/__frzr-deploy
@@ -38,19 +38,19 @@ frzr_deploy() {
 				continue
 			fi
 
-            # Since this code is tested in GitHub CI it is important to to disable the UEFI test in that scenario
-            if [ -z "${SKIP_UEFI_CHECK}" ]; then
-                TASK_MSG="Checking if the system has booted via UEFI"
-                send_data
-                check_uefi_result=$(check_uefi)
-                if echo "${check_uefi_result}" | grep -Fq 'ERROR'; then
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="UEFI boot check failed: ${check_uefi_result}"
-                    STATE="FAIL"
-                    send_data
-                    continue
-                fi
-            fi
+			# Since this code is tested in GitHub CI it is important to to disable the UEFI test in that scenario
+			if [ -z "${SKIP_UEFI_CHECK}" ]; then
+				TASK_MSG="Checking if the system has booted via UEFI"
+				send_data
+				check_uefi_result=$(check_uefi)
+				if echo "${check_uefi_result}" | grep -Fq 'ERROR'; then
+					TASK_ERROR=1
+					TASK_ERROR_MSG="UEFI boot check failed: ${check_uefi_result}"
+					STATE="FAIL"
+					send_data
+					continue
+				fi
+			fi
 			
 			# Check if any updates are available and preserve FRZR parameters
 			while (("$#")); do
@@ -210,18 +210,18 @@ frzr_deploy() {
 								done
 
 								# Execute deployment removal scripts
-                                if [ -d "${deployment_to_be_removed}/usr/lib/frzr.d" ]; then
-                                    TASK_MSG="Executing removal hooks"
-                                    send_data
-                                    local deployment_removal_hooks=$(execute_removal "${removal_deployment}" "${deployment_to_be_removed}" "${MOUNT_PATH}" "${version}")
-                                    if echo "${deployment_removal_hooks}" | grep -Fq "ERROR"; then
-                                        TASK_ERROR=1
-                                        TASK_ERROR_MSG="Removal hook on subvolume '${deployment_to_be_removed}' failed: ${deployment_removal_hooks}"
-                                        STATE="FAIL"
-                                        send_data
-                                        continue
-                                    fi
-                                fi
+								if [ -d "${deployment_to_be_removed}/usr/lib/frzr.d" ]; then
+									TASK_MSG="Executing removal hooks"
+									send_data
+									local deployment_removal_hooks=$(execute_removal "${removal_deployment}" "${deployment_to_be_removed}" "${MOUNT_PATH}" "${version}")
+									if echo "${deployment_removal_hooks}" | grep -Fq "ERROR"; then
+										TASK_ERROR=1
+										TASK_ERROR_MSG="Removal hook on subvolume '${deployment_to_be_removed}' failed: ${deployment_removal_hooks}"
+										STATE="FAIL"
+										send_data
+										continue
+									fi
+								fi
 
 								# Delete the deployment btrfs subvolume
 								local deployment_removal_result=$(btrfs_subvolume_simple_delete "${DEPLOY_PATH}/${removal_deployment}")
@@ -270,7 +270,7 @@ frzr_deploy() {
 				NAME=$(echo "${FILE_NAME}" | cut -f 1 -d '.')
 				SUBVOL="${DEPLOY_PATH}/${NAME}"
 				IMG_FILE="${FRZR_SOURCE}"
-            elif [[ "$FRZR_SOURCE" == *".img.xz" ]]; then
+			elif [[ "$FRZR_SOURCE" == *".img.xz" ]]; then
 				FILE_NAME=$(basename ${FRZR_SOURCE})
 				NAME=$(echo "${FILE_NAME}" | cut -f 1 -d '.')
 				SUBVOL="${DEPLOY_PATH}/${NAME}"
@@ -346,13 +346,13 @@ frzr_deploy() {
 					wget ${IMG_URL} -O ${IMG_FILE} -o /tmp/wget_output.log & pid=$!;
 					previous_percentage=-1;
 					while [ -e /proc/$pid ]; do
-					    percentage=$(awk '/[0-9]+%/{print substr($7, 1, length($7)-1)}' /tmp/wget_output.log | tail -n 1);
-					    if [[ $percentage =~ ^[0-9]+$ && $percentage -ne $previous_percentage ]]; then
+						percentage=$(awk '/[0-9]+%/{print substr($7, 1, length($7)-1)}' /tmp/wget_output.log | tail -n 1);
+						if [[ $percentage =~ ^[0-9]+$ && $percentage -ne $previous_percentage ]]; then
 							previous_percentage=$percentage;
 							TASK_PROGRESS=$percentage
 							send_data
-					    fi;
-					    sleep 1;
+						fi;
+						sleep 1;
 					done
 				else
 					TASK_MSG="Using Whiptail to show download progress"
@@ -367,31 +367,31 @@ frzr_deploy() {
 			;;
 		"CHECKSUM")
 			# If the image is a local one try to fetch its sha256sum
-            if [ -z "$EXPECTED_CHECKSUM" ] && [ -f "${IMG_FILE}.sha256" ]; then
-                EXPECTED_CHECKSUM=$(cat "${IMG_FILE}.sha256")
-            fi
+			if [ -z "$EXPECTED_CHECKSUM" ] && [ -f "${IMG_FILE}.sha256" ]; then
+				EXPECTED_CHECKSUM=$(cat "${IMG_FILE}.sha256")
+			fi
 
 			TASK_STATE="CHECKSUM"
 			TASK_MSG="Verifying if checksums match"
 			send_data
 			ACTUAL_CHECKSUM=$(sha256sum "${IMG_FILE}" | cut -d' ' -f 1)
-            if [ ! -z "$EXPECTED_CHECKSUM" ]; then
-                if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
-                    rm -f "${IMG_FILE}"
-
-                    # We can attempt to redownload the image again here instead of aborting like the original behavior
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Checksum does not match"
-                    STATE="FAIL"
-                    send_data
-                    continue
-                fi
-            else
-                TASK_WARNING=1
+			if [ ! -z "$EXPECTED_CHECKSUM" ]; then
+				if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+					rm -f "${IMG_FILE}"
+
+					# We can attempt to redownload the image again here instead of aborting like the original behavior
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Checksum does not match"
+					STATE="FAIL"
+					send_data
+					continue
+				fi
+			else
+				TASK_WARNING=1
 				TASK_WARNING_MSG="Could not fetch the deployment checksum"
 				send_data
-            fi
-            TASK_TRACKER=1 # Tell any listeners this task was completed, I'm not sure this variable will be needed in the end
+			fi
+			TASK_TRACKER=1 # Tell any listeners this task was completed, I'm not sure this variable will be needed in the end
 			send_data
 
 			STATE="EXTRACT"
@@ -536,8 +536,8 @@ frzr_deploy() {
 				STATE="FAIL"
 				send_data
 				continue
-            elif [ "${subvolid}" = "5" ]; then
-                TASK_ERROR_MSG="Invalid deployment subvolid"
+			elif [ "${subvolid}" = "5" ]; then
+				TASK_ERROR_MSG="Invalid deployment subvolid"
 				STATE="FAIL"
 				send_data
 				continue
diff --git a/__frzr-envars b/__frzr-envars
index 923d1c6..7a6e36b 100644
--- a/__frzr-envars
+++ b/__frzr-envars
@@ -5,27 +5,27 @@
 # Define all public variables to be used here and in all sourced scripts
 # Check for exported variables provided by an installer script
 if [ -z $TARGET ]; then
-    TARGET="" # Set to the target deployment channel. This should only be set by the installer script
+	TARGET="" # Set to the target deployment channel. This should only be set by the installer script
 fi
 
 if [ -z "$LOCAL_INSTALL" ]; then
-    LOCAL_INSTALL=0 # Set to 1 to perform a local media install. This should be set by the installer script
+	LOCAL_INSTALL=0 # Set to 1 to perform a local media install. This should be set by the installer script
 fi
 
 UPGRADE=0
 
 if [ -z "$REPAIR_INSTALL" ]; then
-    REPAIR_INSTALL=0 # Set to 1 if you want to do a repair install. This should be set by frzr-bootstrap later if an existing install is found.
+	REPAIR_INSTALL=0 # Set to 1 if you want to do a repair install. This should be set by frzr-bootstrap later if an existing install is found.
 fi
 
 NAME=""          # Name of the OS to be deployed
 
 if [ -z "$MOUNT_PATH" ]; then
-    MOUNT_PATH="/frzr_root"    # This is set as /tmp/frzr_root/ in the installer and /frzr_root during upgrades
+	MOUNT_PATH="/frzr_root"    # This is set as /tmp/frzr_root/ in the installer and /frzr_root during upgrades
 fi
 
 if [ -z "$EFI_MOUNT_PATH" ]; then
-    EFI_MOUNT_PATH="${MOUNT_PATH}/efi" # EFI mount path
+	EFI_MOUNT_PATH="${MOUNT_PATH}/efi" # EFI mount path
 fi
 
 SUBVOL=""
diff --git a/__frzr-unlock b/__frzr-unlock
index 49b563a..bf1e0d4 100644
--- a/__frzr-unlock
+++ b/__frzr-unlock
@@ -6,20 +6,20 @@ set -o pipefail
 #source "${BASH_SOURCE%/*}/__frzr" "$@"
 
 frzr_unlock() {
-    # by default the deployment is the running one
-    # and NAME will be the result of frzr-release
-    DEPLOY_PATH="/"
-    SUBVOL="/"
-    NAME=""
-
-    RUNNING=true
-    STATE="FRZR_DEPLOY_CHECK"
-    while $RUNNING; do
-        case "$STATE" in
-        "FRZR_DEPLOY_CHECK")
-            TASK_STATE="CHECK"
-
-            TASK_MSG="Checking for root privileges"
+	# by default the deployment is the running one
+	# and NAME will be the result of frzr-release
+	DEPLOY_PATH="/"
+	SUBVOL="/"
+	NAME=""
+
+	RUNNING=true
+	STATE="FRZR_DEPLOY_CHECK"
+	while $RUNNING; do
+		case "$STATE" in
+		"FRZR_DEPLOY_CHECK")
+			TASK_STATE="CHECK"
+
+			TASK_MSG="Checking for root privileges"
 			send_data
 			if [ $EUID -ne 0 ]; then
 				TASK_ERROR=1
@@ -29,145 +29,145 @@ frzr_unlock() {
 				continue
 			fi
 
-            while (("$#")); do
-                case $1 in
-                #--check)
-                #	FRZR_CHECK_UPDATE=1
-                #	shift
-                #	;;
-                #--steam-progress)
-                #	FRZR_STEAM_PROGRESS=1
-                #	shift
-                #	;;
-                -* | --*)
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Unknown argument $1"
-                    STATE="FAIL"
-                    ;;
-                *)                               # preserve positional arguments
-                    FRZR_PARAMS="${FRZR_PARAMS}$1 " # Use trailing space for the match below
-                    shift
-                    ;;
-                esac
-            done
-
-            # keep only the first param as source
-            if "${BASH_SOURCE%/*}/frzr-release" > /dev/null; then
+			while (("$#")); do
+				case $1 in
+				#--check)
+				#	FRZR_CHECK_UPDATE=1
+				#	shift
+				#	;;
+				#--steam-progress)
+				#	FRZR_STEAM_PROGRESS=1
+				#	shift
+				#	;;
+				-* | --*)
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Unknown argument $1"
+					STATE="FAIL"
+					;;
+				*)                               # preserve positional arguments
+					FRZR_PARAMS="${FRZR_PARAMS}$1 " # Use trailing space for the match below
+					shift
+					;;
+				esac
+			done
+
+			# keep only the first param as source
+			if "${BASH_SOURCE%/*}/frzr-release" > /dev/null; then
 				CURRENT=$("${BASH_SOURCE%/*}/frzr-release")
 			fi
-            
-            STATE="BEGIN"
-            ;;
-        "BEGIN")
-            FRZR_VERSION=$("${BASH_SOURCE%/*}/frzr-version")
-            if echo "${FRZR_VERSION}" | grep -Fq "ERROR"; then
-                TASK_ERROR=1
-                TASK_ERROR_MSG="Could not fetch frzr version: ${FRZR_VERSION}"
-                STATE="FAIL"
-                send_data
-                continue
-            fi
-            
-            # Make sure the frzr_root is mounted during the deployment procedure
-            # this code is based on the fact that when a btrfs filesystem is created
-            # the default subvolid that is created contextually has the ID set to 256
-            # also as a matter of fact in btrfs is impossible to change subvolumes IDs
-            if ! mountpoint -q "${MOUNT_PATH}" && ls -1 /dev/disk/by-label | grep frzr_root > /dev/null; then
-                MOUNT_PATH="/tmp/frzr_root"
-                #TASK_MSG="Preparing '${MOUNT_PATH}' to be used as the main subvolume mount path"
-                mkdir -p ${MOUNT_PATH}
-                if mount -L frzr_root -t btrfs -o subvolid=5,rw "${MOUNT_PATH}"; then
-                    MOUNTED_MOUNT_PATH="yes"
-                fi
-                sleep 5
-            fi
-
-            if mountpoint -q "${MOUNT_PATH}" && ls -1 /dev/disk/by-label | grep frzr_root > /dev/null; then
-                STATE="RELEASE_CHECK"
-            else
-                echo "frzr-unlock failed: could not mount frzr_root"
-                STATE="FAIL"
-                continue
-            fi
-            ;;
-        "RELEASE_CHECK")
-            # If this is user-specified we should unlock that deployment in particular
-            NAME="${FRZR_SOURCE}"
-            if [ -z "${NAME}" ]; then
-                NAME="${CURRENT}"
-            else
-                DEPLOY_PATH="${MOUNT_PATH}/deployments"
-                SUBVOL="${DEPLOY_PATH}/${NAME}"
-
-                # Make sure DEPLOY_PATH exists
-                mkdir -p "${DEPLOY_PATH}"
-                if [ ! -d "${DEPLOY_PATH}" ]; then
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Could not create ${DEPLOY_PATH} to to store deployments"
-                    STATE="FAIL"
-                    continue
-                fi
-                
-                # Make sure SUBVOL exists
-                if [ ! -d "${SUBVOL}" ]; then
-                    TASK_ERROR=1
-                    TASK_ERROR_MSG="Could not find deployment '${NAME}', '${SUBVOL}' was searched"
-                    STATE="FAIL"
-                    continue
-                fi
-            fi
-            
-            STATE="UNLOCK"
-            ;;
-        "UNLOCK")
-            if [ -d "${SUBVOL}/usr/lib/frzr.d" ]; then
-                # set rootfs btrfs subvolume to read-write mode
-                UNLOCK_RESULT=$(execute_unlock "${NAME}" "${SUBVOL}" "${MOUNT_PATH}" "${FRZR_VERSION}")
-                if echo "${UNLOCK_RESULT}" | grep -Fq 'ERROR'; then
-                    echo "frzr deployment ${NAME} unlock failed: ${UNLOCK_RESULT}"
-                    STATE="FAIL"
-                    continue
-                fi
-
-                systemctl daemon-reload
-
-                STATE="SUCCESS"
-            else
-                TASK_ERROR=1
-                TASK_ERROR_MSG="Could not find unlock migrations for deployment '${NAME}', '${SUBVOL}/usr/lib/frzr.d' does not exists"
-                STATE="FAIL"
-                continue
-            fi
-            ;;
-        "SUCCESS")
-            # This state should only be used if the unlock completed without errors
-            #TASK_STATE="SUCCESS"
-
-            echo "frzr deployment ${NAME} unlock succeeded, please reboot to use the unlocked deployment"
-
-            RUNNING=false
-            ;;
-        "FAIL")
-            # This state should only be used if the unlock failed
-
-            #TASK_STATE="FAIL"
-
-            echo "frzr-unlock failed for deployment ${NAME}: ${UNLOCK_RESULT}"
-
-            RUNNING=false
-            ;;
-        *)
-            TASK_STATE="UNKNOWN_ERROR"
-            echo "ERROR: Something went terribly wrong"
-            RUNNING=false
-            ;;
-        esac
-    done
-
-    # umount the frzr_root subvolume (if it was mounted by this tool and not externally)
-    if [ "${MOUNTED_MOUNT_PATH}" = "yes" ]; then
-        if mountpoint -q "${MOUNT_PATH}"; then
-            umount -l "${MOUNT_PATH}"
-        fi
-    fi
+			
+			STATE="BEGIN"
+			;;
+		"BEGIN")
+			FRZR_VERSION=$("${BASH_SOURCE%/*}/frzr-version")
+			if echo "${FRZR_VERSION}" | grep -Fq "ERROR"; then
+				TASK_ERROR=1
+				TASK_ERROR_MSG="Could not fetch frzr version: ${FRZR_VERSION}"
+				STATE="FAIL"
+				send_data
+				continue
+			fi
+			
+			# Make sure the frzr_root is mounted during the deployment procedure
+			# this code is based on the fact that when a btrfs filesystem is created
+			# the default subvolid that is created contextually has the ID set to 256
+			# also as a matter of fact in btrfs is impossible to change subvolumes IDs
+			if ! mountpoint -q "${MOUNT_PATH}" && ls -1 /dev/disk/by-label | grep frzr_root > /dev/null; then
+				MOUNT_PATH="/tmp/frzr_root"
+				#TASK_MSG="Preparing '${MOUNT_PATH}' to be used as the main subvolume mount path"
+				mkdir -p ${MOUNT_PATH}
+				if mount -L frzr_root -t btrfs -o subvolid=5,rw "${MOUNT_PATH}"; then
+					MOUNTED_MOUNT_PATH="yes"
+				fi
+				sleep 5
+			fi
+
+			if mountpoint -q "${MOUNT_PATH}" && ls -1 /dev/disk/by-label | grep frzr_root > /dev/null; then
+				STATE="RELEASE_CHECK"
+			else
+				echo "frzr-unlock failed: could not mount frzr_root"
+				STATE="FAIL"
+				continue
+			fi
+			;;
+		"RELEASE_CHECK")
+			# If this is user-specified we should unlock that deployment in particular
+			NAME="${FRZR_SOURCE}"
+			if [ -z "${NAME}" ]; then
+				NAME="${CURRENT}"
+			else
+				DEPLOY_PATH="${MOUNT_PATH}/deployments"
+				SUBVOL="${DEPLOY_PATH}/${NAME}"
+
+				# Make sure DEPLOY_PATH exists
+				mkdir -p "${DEPLOY_PATH}"
+				if [ ! -d "${DEPLOY_PATH}" ]; then
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Could not create ${DEPLOY_PATH} to to store deployments"
+					STATE="FAIL"
+					continue
+				fi
+				
+				# Make sure SUBVOL exists
+				if [ ! -d "${SUBVOL}" ]; then
+					TASK_ERROR=1
+					TASK_ERROR_MSG="Could not find deployment '${NAME}', '${SUBVOL}' was searched"
+					STATE="FAIL"
+					continue
+				fi
+			fi
+			
+			STATE="UNLOCK"
+			;;
+		"UNLOCK")
+			if [ -d "${SUBVOL}/usr/lib/frzr.d" ]; then
+				# set rootfs btrfs subvolume to read-write mode
+				UNLOCK_RESULT=$(execute_unlock "${NAME}" "${SUBVOL}" "${MOUNT_PATH}" "${FRZR_VERSION}")
+				if echo "${UNLOCK_RESULT}" | grep -Fq 'ERROR'; then
+					echo "frzr deployment ${NAME} unlock failed: ${UNLOCK_RESULT}"
+					STATE="FAIL"
+					continue
+				fi
+
+				systemctl daemon-reload
+
+				STATE="SUCCESS"
+			else
+				TASK_ERROR=1
+				TASK_ERROR_MSG="Could not find unlock migrations for deployment '${NAME}', '${SUBVOL}/usr/lib/frzr.d' does not exists"
+				STATE="FAIL"
+				continue
+			fi
+			;;
+		"SUCCESS")
+			# This state should only be used if the unlock completed without errors
+			#TASK_STATE="SUCCESS"
+
+			echo "frzr deployment ${NAME} unlock succeeded, please reboot to use the unlocked deployment"
+
+			RUNNING=false
+			;;
+		"FAIL")
+			# This state should only be used if the unlock failed
+
+			#TASK_STATE="FAIL"
+
+			echo "frzr-unlock failed for deployment ${NAME}: ${UNLOCK_RESULT}"
+
+			RUNNING=false
+			;;
+		*)
+			TASK_STATE="UNKNOWN_ERROR"
+			echo "ERROR: Something went terribly wrong"
+			RUNNING=false
+			;;
+		esac
+	done
+
+	# umount the frzr_root subvolume (if it was mounted by this tool and not externally)
+	if [ "${MOUNTED_MOUNT_PATH}" = "yes" ]; then
+		if mountpoint -q "${MOUNT_PATH}"; then
+			umount -l "${MOUNT_PATH}"
+		fi
+	fi
 }
\ No newline at end of file
diff --git a/__frzr-version b/__frzr-version
index 492ba46..251fad1 100644
--- a/__frzr-version
+++ b/__frzr-version
@@ -6,5 +6,5 @@ set -e
 #source "${BASH_SOURCE%/*}/__frzr" "$@"
 
 frzr_version() {
-    echo "1.0.0"
+	echo "1.0.0"
 }
\ No newline at end of file
diff --git a/frzr b/frzr
index b1b7830..888f60b 100755
--- a/frzr
+++ b/frzr
@@ -3,12 +3,12 @@
 set -Ee
 
 if ! groups | grep -Fq "frzr"; then
-    if [ "$EUID" -ne 0 ]; then
-        echo "Current user is not in the frzr group"
-        exit 1
-    else
-        echo "Running frzr as root, but root is not a member of frzr group"
-    fi
+	if [ "$EUID" -ne 0 ]; then
+		echo "Current user is not in the frzr group"
+		exit 1
+	else
+		echo "Running frzr as root, but root is not a member of frzr group"
+	fi
 fi
 
 # Import methods
@@ -18,7 +18,7 @@ source "${BASH_SOURCE%/*}/__frzr" "$@"
 write_tracker_file
 
 usage(){
-    echo "[Usage]
+	echo "[Usage]
 frzr deploy [Check for system updates and update the system if available]
 frzr bootloader [Install the bootloader and create entries for every deployed image]
 frzr unlock (deployment) [Unlock the specified deployment, or the running one if deployment is not specified]
@@ -33,25 +33,25 @@ frzr bootstrap [Format and configure a drive to be used with FRZR]"
 
 # Catch unexpected errors and give feedback
 handle_error() {
-    local function_name="$1"
-    local line_number="$2"
-    local command="$3"
+	local function_name="$1"
+	local line_number="$2"
+	local command="$3"
 
-    echo "Error occurred in function '${function_name}' on line ${line_number}. Command: '${command}'"
+	echo "Error occurred in function '${function_name}' on line ${line_number}. Command: '${command}'"
 
-    frzr_status
+	frzr_status
 
-    if [ -f /tmp/frzr.lock ]; then
-        rm /tmp/frzr.lock
-    fi
+	if [ -f /tmp/frzr.lock ]; then
+		rm /tmp/frzr.lock
+	fi
 }
 
 # Set up trap to catch errors and call handle_error function
 trap 'handle_error "${FUNCNAME[0]}" "$LINENO" "$BASH_COMMAND"' ERR
 
 if [ $# -eq 0 ]; then
-    usage
-    exit 1
+	usage
+	exit 1
 fi
 
 function=$1
@@ -60,95 +60,95 @@ arg2=$3
 arg3=$4
 
 if [ $function == "-h" ] || [ $function == "help" ]; then
-    usage
+	usage
 elif [ $function == "bootstrap" ]; then
-    source "${BASH_SOURCE%/*}/frzr-bootstrap" "${arg1}" "${arg2}" "${arg3}" # username, disk, clean/repair install
-    RESULT=$?
-    exit $RESULT
+	source "${BASH_SOURCE%/*}/frzr-bootstrap" "${arg1}" "${arg2}" "${arg3}" # username, disk, clean/repair install
+	RESULT=$?
+	exit $RESULT
 elif [ $function == "deploy" ]; then
-    frzr_check_bootenv
-    # We don't want to pass the function parameter to __frzr-deploy
-    shift
-    #flock -E 255 -n /tmp/frzr.lock "frzr-deploy" "$@"
-    source "${BASH_SOURCE%/*}/frzr-deploy" "$@"
-    RESULT=$TASK_ERROR
-    #if [ $RESULT == 255 ]; then
-    #    echo "ERROR: $(basename $0) is already running"
-    #fi
-    exit $RESULT
+	frzr_check_bootenv
+	# We don't want to pass the function parameter to __frzr-deploy
+	shift
+	#flock -E 255 -n /tmp/frzr.lock "frzr-deploy" "$@"
+	source "${BASH_SOURCE%/*}/frzr-deploy" "$@"
+	RESULT=$TASK_ERROR
+	#if [ $RESULT == 255 ]; then
+	#    echo "ERROR: $(basename $0) is already running"
+	#fi
+	exit $RESULT
 elif [ $function == "unlock" ]; then
-    frzr_check_bootenv
-    # We don't want to pass the function parameter to __frzr-unlock
-    shift
-    #flock -E 255 -n /tmp/frzr.lock "frzr-depunlockloy" "$@"
-    source "${BASH_SOURCE%/*}/frzr-unlock" "$@"
-    RESULT=$TASK_ERROR
-    #if [ $RESULT == 255 ]; then
-    #    echo "ERROR: $(basename $0) is already running"
-    #fi
-    exit $RESULT
+	frzr_check_bootenv
+	# We don't want to pass the function parameter to __frzr-unlock
+	shift
+	#flock -E 255 -n /tmp/frzr.lock "frzr-depunlockloy" "$@"
+	source "${BASH_SOURCE%/*}/frzr-unlock" "$@"
+	RESULT=$TASK_ERROR
+	#if [ $RESULT == 255 ]; then
+	#    echo "ERROR: $(basename $0) is already running"
+	#fi
+	exit $RESULT
 elif [ $function == "bootloader" ]; then
-    frzr_check_bootenv
-    # We don't want to pass the function parameter to __frzr-bootloader
-    shift
+	frzr_check_bootenv
+	# We don't want to pass the function parameter to __frzr-bootloader
+	shift
 
-    #flock -E 255 -n /tmp/frzr.lock "frzr-bootloader" "$@"
-    source "${BASH_SOURCE%/*}/frzr-bootloader" "$@"
-    RESULT=$?
+	#flock -E 255 -n /tmp/frzr.lock "frzr-bootloader" "$@"
+	source "${BASH_SOURCE%/*}/frzr-bootloader" "$@"
+	RESULT=$?
 
-    #if [ $RESULT == 255 ]; then
-    #    echo "ERROR: $(basename $0) is already running"
-    #fi
+	#if [ $RESULT == 255 ]; then
+	#    echo "ERROR: $(basename $0) is already running"
+	#fi
 
-    exit $RESULT
+	exit $RESULT
 elif [ $function == "kernel" ]; then
-    frzr_check_bootenv
-    # We don't want to pass the function parameter to __frzr-kernel
-    shift
-    source "${BASH_SOURCE%/*}/frzr-kernel" "$@"
-    RESULT=$?
+	frzr_check_bootenv
+	# We don't want to pass the function parameter to __frzr-kernel
+	shift
+	source "${BASH_SOURCE%/*}/frzr-kernel" "$@"
+	RESULT=$?
 
-    #if [ $RESULT == 255 ]; then
-    #    echo "ERROR: $(basename $0) is already running"
-    #fi
+	#if [ $RESULT == 255 ]; then
+	#    echo "ERROR: $(basename $0) is already running"
+	#fi
 
-    exit $RESULT
+	exit $RESULT
 elif [ $function == "release" ]; then
-    source "${BASH_SOURCE%/*}/frzr-release" "$@"
+	source "${BASH_SOURCE%/*}/frzr-release" "$@"
 elif [ $function == "version" ]; then
-    frzr_check_bootenv
-    # We don't want to pass the function parameter to __frzr-version
-    shift
+	frzr_check_bootenv
+	# We don't want to pass the function parameter to __frzr-version
+	shift
 
-    #flock -E 255 -n /tmp/frzr.lock "frzr-version" "$@"
-    source "${BASH_SOURCE%/*}/frzr-version" "$@"
-    RESULT=$?
+	#flock -E 255 -n /tmp/frzr.lock "frzr-version" "$@"
+	source "${BASH_SOURCE%/*}/frzr-version" "$@"
+	RESULT=$?
 
-    #if [ $RESULT == 255 ]; then
-    #    echo "ERROR: $(basename $0) is already running"
-    #fi
+	#if [ $RESULT == 255 ]; then
+	#    echo "ERROR: $(basename $0) is already running"
+	#fi
 
-    exit $RESULT
+	exit $RESULT
 elif [ $function == "set-channel" ]; then
-    echo "set channel"
-    #TODO create frzr-channel to set target channel
-    #frzr-channel $arg1
+	echo "set channel"
+	#TODO create frzr-channel to set target channel
+	#frzr-channel $arg1
 elif [ $function == "get-channel" ]; then
-    echo "get-channel"
-    #TODO create frzr-channel to get target channel
-    #echo ${FRZR_ROOT}/source
+	echo "get-channel"
+	#TODO create frzr-channel to get target channel
+	#echo ${FRZR_ROOT}/source
 elif [ $function == "build-initramfs" ]; then
-    source frzr-initramfs
+	source frzr-initramfs
 elif [ $function == "configure-tweaks" ]; then
-    source frzr-tweaks
+	source frzr-tweaks
 elif [ $function == "package-options" ]; then
-    #User selected packages to be added to the install
-    source frzr-extras
+	#User selected packages to be added to the install
+	source frzr-extras
 else
-    echo "invalid argument"
+	echo "invalid argument"
 fi
 
 # print out the latest error in stderr (this is meant for debugging)
 if [ ! -z "${TASK_ERROR_MSG}" ]; then
-    echo "${TASK_ERROR_MSG}" 1>&2
+	echo "${TASK_ERROR_MSG}" 1>&2
 fi
diff --git a/test/test-deploy.sh b/test/test-deploy.sh
index 1393cba..3e53edc 100755
--- a/test/test-deploy.sh
+++ b/test/test-deploy.sh
@@ -52,54 +52,54 @@ btrfs property set -fts $MOUNT_POINT/archlinux ro true
 # Create the deployment file
 if btrfs send $MOUNT_POINT/archlinux | xz -e -9 --memory=95% -T0 > $TARGET_FILENAME; then
 
-    # Unmount the img file
-    umount $MOUNT_POINT
+	# Unmount the img file
+	umount $MOUNT_POINT
 
-    rm -rf $IMG_FILE
+	rm -rf $IMG_FILE
 
-    # Perform the deployment
+	# Perform the deployment
 
-    export FILENAME=install_deploy.img
-    export BUILD_DIR="/workdir/output"
-    export BUILD_IMG="$BUILD_DIR/$FILENAME"
+	export FILENAME=install_deploy.img
+	export BUILD_DIR="/workdir/output"
+	export BUILD_IMG="$BUILD_DIR/$FILENAME"
 
-    mkdir -p "$BUILD_DIR"
-    dd if=/dev/zero of=$BUILD_IMG bs=1M count=8192
+	mkdir -p "$BUILD_DIR"
+	dd if=/dev/zero of=$BUILD_IMG bs=1M count=8192
 
-    # Associate the image file with a loop device
-    losetup -fP "$BUILD_IMG"
+	# Associate the image file with a loop device
+	losetup -fP "$BUILD_IMG"
 
-    # Find the loop device associated with the image file
-    MOUNTED_DEVICE=$(losetup -a | grep "$FILENAME" | cut -d ' ' -f 1 | sed 's/://')
+	# Find the loop device associated with the image file
+	MOUNTED_DEVICE=$(losetup -a | grep "$FILENAME" | cut -d ' ' -f 1 | sed 's/://')
 
-    export DISK="$MOUNTED_DEVICE"
-    export SWAP_GIB=0
-    bash /workdir/frzr bootstrap
+	export DISK="$MOUNTED_DEVICE"
+	export SWAP_GIB=0
+	bash /workdir/frzr bootstrap
 
-    export SKIP_UEFI_CHECK="yes"
-    export MOUNT_PATH="/tmp/frzr_root"
-    export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
-    export FRZR_SKIP_CHECK="yes"
-    export SYSTEMD_RELAX_ESP_CHECKS=1
+	export SKIP_UEFI_CHECK="yes"
+	export MOUNT_PATH="/tmp/frzr_root"
+	export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
+	export FRZR_SKIP_CHECK="yes"
+	export SYSTEMD_RELAX_ESP_CHECKS=1
 
-    # deploy archlinux
-    bash /workdir/frzr deploy $TARGET_FILENAME
+	# deploy archlinux
+	bash /workdir/frzr deploy $TARGET_FILENAME
 
-    # old releases used an older frzr
-    INSTALLED_RELEASE=$(cat "$MOUNT_PATH/deployments/archlinux/build_info" | head -n 1)
+	# old releases used an older frzr
+	INSTALLED_RELEASE=$(cat "$MOUNT_PATH/deployments/archlinux/build_info" | head -n 1)
 
-    # Umount the loopback device
-    losetup -d "$MOUNTED_DEVICE"
+	# Umount the loopback device
+	losetup -d "$MOUNTED_DEVICE"
 
-    # Remove the file
-    rm -f $BUILD_IMG
-    rm -f $TARGET_FILENAME
+	# Remove the file
+	rm -f $BUILD_IMG
+	rm -f $TARGET_FILENAME
 
-    if [ "$INSTALLED_RELEASE" = "archlinux-frzr" ]; then
-        echo "VERIFIED"
-    else
-        exit 1
-    fi
+	if [ "$INSTALLED_RELEASE" = "archlinux-frzr" ]; then
+		echo "VERIFIED"
+	else
+		exit 1
+	fi
 else
-    exit 1
+	exit 1
 fi
\ No newline at end of file
diff --git a/test/test-install.sh b/test/test-install.sh
index c839d1c..ab61e39 100755
--- a/test/test-install.sh
+++ b/test/test-install.sh
@@ -52,5 +52,5 @@ losetup -d "$MOUNTED_DEVICE"
 rm -f $BUILD_IMG
 
 if ! echo "$INSTALLED_RELEASE" | grep -Fq "chimeraos-45"; then
-    exit 1
+	exit 1
 fi
\ No newline at end of file
diff --git a/test/test-removal.sh b/test/test-removal.sh
index 86448f2..34bd4dd 100755
--- a/test/test-removal.sh
+++ b/test/test-removal.sh
@@ -43,14 +43,14 @@ export SYSTEMD_RELAX_ESP_CHECKS=1
 bash /workdir/frzr deploy chimeraos/chimeraos:43
 
 if [ ! -d "$MOUNT_PATH/deployments/chimeraos-43_6978095" ]; then
-    exit 1
+	exit 1
 fi
 
 # deploy chimeraos-44_c3670dd
 bash /workdir/frzr deploy chimeraos/chimeraos:44
 
 if [ ! -d "$MOUNT_PATH/deployments/chimeraos-43_6978095" ] || [ ! -d "$MOUNT_PATH/deployments/chimeraos-44_c3670dd" ]; then
-    exit 1
+	exit 1
 fi
 
 ls -lah "$MOUNT_PATH/deployments"
@@ -59,7 +59,7 @@ ls -lah "$MOUNT_PATH/deployments"
 bash /workdir/frzr deploy chimeraos/chimeraos:45
 
 if [ -d "$MOUNT_PATH/deployments/chimeraos-43_6978095" ] || [ ! -d "$MOUNT_PATH/deployments/chimeraos-44_c3670dd" ] || [ ! -d "$MOUNT_PATH/deployments/chimeraos-45_1e44050" ]; then
-    exit 1
+	exit 1
 fi
 
 ls -lah "$MOUNT_PATH/deployments"
@@ -68,7 +68,7 @@ ls -lah "$MOUNT_PATH/deployments"
 bash /workdir/frzr deploy chimeraos/chimeraos:45-1
 
 if [ -d "$MOUNT_PATH/deployments/chimeraos-44_c3670dd" ] || [ ! -d "$MOUNT_PATH/deployments/chimeraos-45_1e44050" ] || [ ! -d "$MOUNT_PATH/deployments/chimeraos-45-1_9a95912" ]; then
-    exit 1
+	exit 1
 fi
 
 # Umount the loopback device