diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 4a17ac90b91dd990b27e66c5db79cc43cf8c5e3d..0fd62aa508fe1e382242c1eed4deb02f8219b986 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -75,8 +75,37 @@ function backup_local_tox {
 	fi
 }
 
+function restore_local_tox {
+	if [ -d $USB_MOUNT/backup/tox ]; then
+		echo $"Restoring Tox node settings"
+		function_check restore_directory_from_usb
+		restore_directory_from_usb / tox
+		if [ ! "$?" = "0" ]; then
+			function_check set_user_permissions
+			set_user_permissions
+			function_check backup_unmount_drive
+			backup_unmount_drive
+			exit 6393
+		fi
+		cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
+		systemctl restart tox-bootstrapd.service
+		if [ ! "$?" = "0" ]; then
+			systemctl status tox-bootstrapd.service
+			function_check set_user_permissions
+			set_user_permissions
+			function_check backup_unmount_drive
+			backup_unmount_drive
+			exit 59369
+		fi
+	fi
+}
+
 function backup_remote_tox {
-	echo ''
+	echo -n ''
+}
+
+function restore_remote_tox {
+	echo -n ''
 }
 
 function remove_tox_node {
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 9cdb54a9ebbfd1bad0afa3791bc45f28bea652a6..1298a53a17d47f297fa1184fca1abea4f26e8c83 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -51,9 +51,9 @@ USB_MOUNT=/mnt/usb
 # get default USB from config file
 CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
 if [ -f $CONFIG_FILE ]; then
-	if grep -q "USB_DRIVE=" $CONFIG_FILE; then
-		USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
-	fi
+    if grep -q "USB_DRIVE=" $CONFIG_FILE; then
+        USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
+    fi
 fi
 
 # get the version of Go being used
@@ -63,7 +63,7 @@ GVM_HOME=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-go | grep
 ADMIN_USERNAME=''
 ADMIN_NAME=
 if [ -f $COMPLETION_FILE ]; then
-	ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+    ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
 fi
 
 # MariaDB password
@@ -77,1198 +77,1200 @@ WIKI_DOMAIN_NAME=
 FULLBLOG_DOMAIN_NAME=
 
 function check_backup_exists {
-	if [ ! -d $USB_MOUNT/backup ]; then
-		echo $"No backup directory found on the USB drive."
-		set_user_permissions
-		backup_unmount_drive
-		exit 2
-	fi
+    if [ ! -d $USB_MOUNT/backup ]; then
+        echo $"No backup directory found on the USB drive."
+        set_user_permissions
+        backup_unmount_drive
+        exit 2
+    fi
 }
 
 function check_admin_user {
-	echo $"Checking that admin user exists"
-	if [ ! -d /home/$ADMIN_USERNAME ]; then
-		echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
-		set_user_permissions
-		backup_unmount_drive
-		exit 295
-	fi
+    echo $"Checking that admin user exists"
+    if [ ! -d /home/$ADMIN_USERNAME ]; then
+        echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
+        set_user_permissions
+        backup_unmount_drive
+        exit 295
+    fi
 }
 
 function copy_gpg_keys {
-	echo $"Copying GPG keys from admin user to root"
-	cp -r /home/$ADMIN_USERNAME/.gnupg /root
+    echo $"Copying GPG keys from admin user to root"
+    cp -r /home/$ADMIN_USERNAME/.gnupg /root
 }
 
 function restore_directory_from_usb {
-	if [ ! -d ${1} ]; then
-		mkdir ${1}
-	fi
-	obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
+    if [ ! -d ${1} ]; then
+        mkdir ${1}
+    fi
+    obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
 }
 
 function restore_database {
-	RESTORE_SUBDIR="root"
-
-	if [ -d $USB_MOUNT/backup/${1} ]; then
-		echo $"Restoring ${1} database"
-		restore_directory_from_usb "/root/temp${1}data" "${1}data"
-		if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then
-			echo $"Unable to restore ${1} database"
-			rm -rf /root/temp${1}data
-			set_user_permissions
-			backup_unmount_drive
-			exit 503
-		fi
-		mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD ${1} -o < /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql)
-		if [ ! "$?" = "0" ]; then
-			echo "$mysqlsuccess"
-			set_user_permissions
-			backup_unmount_drive
-			exit 964
-		fi
-		shred -zu /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/*
-		rm -rf /root/temp${1}data
-		echo $"Restoring ${1} installation"
-		if [ ! -d /root/temp${1} ]; then
-			mkdir /root/temp${1}
-		fi
-		restore_directory_from_usb "/root/temp${1}" "${1}"
-		RESTORE_SUBDIR="var"
-		if [ ${2} ]; then
-			# special handline of ttrss
-			if [[ ${2} == "ttrss" ]]; then
-				if [ -d /etc/share/tt-rss ]; then
-					if [ -d /root/temp${1}/etc/share/tt-rss ]; then
-						rm -rf /etc/share/tt-rss
-						mv /root/temp${1}/etc/share/tt-rss /etc/share/
-						if [ ! "$?" = "0" ]; then
-							set_user_permissions
-							backup_unmount_drive
-							exit 528
-						fi
-						if [ -d /etc/letsencrypt/live/${2} ]; then
-							ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key
-							ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem
-						else
-							# Ensure that the bundled SSL cert is being used
-							if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then
-								sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}
-							fi
-						fi
-					fi
-				fi
-			fi
-
-			if [ -d /var/www/${2}/htdocs ]; then
-				if [ -d /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs ]; then
-					rm -rf /var/www/${2}/htdocs
-					mv /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs /var/www/${2}/
-					if [ ! "$?" = "0" ]; then
-						set_user_permissions
-						backup_unmount_drive
-						exit 683
-					fi
-					if [ -d /etc/letsencrypt/live/${2} ]; then
-						ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key
-						ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem
-					else
-						# Ensure that the bundled SSL cert is being used
-						if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then
-							sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}
-						fi
-					fi
-				fi
-			fi
-		fi
-	fi
+    RESTORE_SUBDIR="root"
+
+    if [ -d $USB_MOUNT/backup/${1} ]; then
+        echo $"Restoring ${1} database"
+        restore_directory_from_usb "/root/temp${1}data" "${1}data"
+        if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then
+            echo $"Unable to restore ${1} database"
+            rm -rf /root/temp${1}data
+            set_user_permissions
+            backup_unmount_drive
+            exit 503
+        fi
+        mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD ${1} -o < /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql)
+        if [ ! "$?" = "0" ]; then
+            echo "$mysqlsuccess"
+            set_user_permissions
+            backup_unmount_drive
+            exit 964
+        fi
+        shred -zu /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/*
+        rm -rf /root/temp${1}data
+        echo $"Restoring ${1} installation"
+        if [ ! -d /root/temp${1} ]; then
+            mkdir /root/temp${1}
+        fi
+        restore_directory_from_usb "/root/temp${1}" "${1}"
+        RESTORE_SUBDIR="var"
+        if [ ${2} ]; then
+            # special handline of ttrss
+            if [[ ${2} == "ttrss" ]]; then
+                if [ -d /etc/share/tt-rss ]; then
+                    if [ -d /root/temp${1}/etc/share/tt-rss ]; then
+                        rm -rf /etc/share/tt-rss
+                        mv /root/temp${1}/etc/share/tt-rss /etc/share/
+                        if [ ! "$?" = "0" ]; then
+                            set_user_permissions
+                            backup_unmount_drive
+                            exit 528
+                        fi
+                        if [ -d /etc/letsencrypt/live/${2} ]; then
+                            ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key
+                            ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem
+                        else
+                            # Ensure that the bundled SSL cert is being used
+                            if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then
+                                sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}
+                            fi
+                        fi
+                    fi
+                fi
+            fi
+
+            if [ -d /var/www/${2}/htdocs ]; then
+                if [ -d /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs ]; then
+                    rm -rf /var/www/${2}/htdocs
+                    mv /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs /var/www/${2}/
+                    if [ ! "$?" = "0" ]; then
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 683
+                    fi
+                    if [ -d /etc/letsencrypt/live/${2} ]; then
+                        ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key
+                        ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem
+                    else
+                        # Ensure that the bundled SSL cert is being used
+                        if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then
+                            sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}
+                        fi
+                    fi
+                fi
+            fi
+        fi
+    fi
 }
 
 function update_domains {
-	if grep -q "RSS reader domain" $COMPLETION_FILE; then
-		RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
-	fi
-	if grep -q "GNU Social domain" $COMPLETION_FILE; then
-		MICROBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "GNU Social domain" | awk -F ':' '{print $2}')
-	fi
-	if grep -q "Hubzilla domain" $COMPLETION_FILE; then
-		HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
-	fi
-	if grep -q "Mediagoblin domain" $COMPLETION_FILE; then
-		MEDIAGOBLIN_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Mediagoblin domain" | awk -F ':' '{print $2}')
-	fi
-	if grep -q "Gogs domain" $COMPLETION_FILE; then
-		GIT_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Gogs domain" | awk -F ':' '{print $2}')
-	fi
-	if [ -d $USB_MOUNT/backup/wiki ]; then
-		WIKI_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Wiki domain" | awk -F ':' '{print $2}')
-	fi
-	if [ -d $USB_MOUNT/backup/blog ]; then
-		FULLBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Blog domain" | awk -F ':' '{print $2}')
-	fi
+    if grep -q "RSS reader domain" $COMPLETION_FILE; then
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+    fi
+    if grep -q "GNU Social domain" $COMPLETION_FILE; then
+        MICROBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "GNU Social domain" | awk -F ':' '{print $2}')
+    fi
+    if grep -q "Hubzilla domain" $COMPLETION_FILE; then
+        HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
+    fi
+    if grep -q "Mediagoblin domain" $COMPLETION_FILE; then
+        MEDIAGOBLIN_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Mediagoblin domain" | awk -F ':' '{print $2}')
+    fi
+    if grep -q "Gogs domain" $COMPLETION_FILE; then
+        GIT_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Gogs domain" | awk -F ':' '{print $2}')
+    fi
+    if [ -d $USB_MOUNT/backup/wiki ]; then
+        WIKI_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Wiki domain" | awk -F ':' '{print $2}')
+    fi
+    if [ -d $USB_MOUNT/backup/blog ]; then
+        FULLBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Blog domain" | awk -F ':' '{print $2}')
+    fi
 }
 
 function restore_configuration {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'configuration' ]]; then
-			return
-		fi
-	fi
-
-	# this restores *.cfg and COMPLETION_FILE
-	if [ -d $USB_MOUNT/backup/config ]; then
-		echo $"Restoring configuration files"
-		restore_directory_from_usb /root/tempconfig config
-
-		cp -f /root/tempconfig/root/${PROJECT_NAME}.cfg $CONFIG_FILE
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			rm -rf /root/tempconfig
-			exit 5294
-		fi
-		if [ -f $CONFIG_FILE ]; then
-			# install according to the config file
-			freedombone -c $CONFIG_FILE
-		fi
-
-		cp -f /root/tempconfig/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			rm -rf /root/tempconfig
-			exit 6382
-		fi
-
-		if [ -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ]; then
-			cp -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
-			if [ ! "$?" = "0" ]; then
-				set_user_permissions
-				backup_unmount_drive
-				rm -rf /root/tempconfig
-				exit 62121
-			fi
-		fi
-
-		# restore nginx password hashes
-		if [ -f /root/tempconfig/root/htpasswd ]; then
-			cp -f /root/tempconfig/root/htpasswd /etc/nginx/.htpasswd
-		fi
-
-		rm -rf /root/tempconfig
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'configuration' ]]; then
+            return
+        fi
+    fi
+
+    # this restores *.cfg and COMPLETION_FILE
+    if [ -d $USB_MOUNT/backup/config ]; then
+        echo $"Restoring configuration files"
+        restore_directory_from_usb /root/tempconfig config
+
+        cp -f /root/tempconfig/root/${PROJECT_NAME}.cfg $CONFIG_FILE
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            rm -rf /root/tempconfig
+            exit 5294
+        fi
+        if [ -f $CONFIG_FILE ]; then
+            # install according to the config file
+            freedombone -c $CONFIG_FILE
+        fi
+
+        cp -f /root/tempconfig/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            rm -rf /root/tempconfig
+            exit 6382
+        fi
+
+        if [ -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ]; then
+            cp -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
+            if [ ! "$?" = "0" ]; then
+                set_user_permissions
+                backup_unmount_drive
+                rm -rf /root/tempconfig
+                exit 62121
+            fi
+        fi
+
+        # restore nginx password hashes
+        if [ -f /root/tempconfig/root/htpasswd ]; then
+            cp -f /root/tempconfig/root/htpasswd /etc/nginx/.htpasswd
+        fi
+
+        rm -rf /root/tempconfig
+    fi
 }
 
 function same_admin_user {
-	PREV_ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
-	if [[ "$PREV_ADMIN_USERNAME" != "$ADMIN_USERNAME" ]]; then
-		echo $"The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME"
-		set_user_permissions
-		backup_unmount_drive
-		exit 73265
-	fi
+    PREV_ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+    if [[ "$PREV_ADMIN_USERNAME" != "$ADMIN_USERNAME" ]]; then
+        echo $"The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME"
+        set_user_permissions
+        backup_unmount_drive
+        exit 73265
+    fi
 }
 
 function restore_mariadb {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mariadb' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mariadb ]; then
-		echo $"Restoring mysql settings"
-		restore_directory_from_usb /root/tempmariadb mariadb
-		echo $"Get the MariaDB password from the backup"
-		if [ ! -f /root/tempmariadb/root/tempmariadb/db ]; then
-			echo $"MariaDB password file not found"
-			exit 495
-		fi
-		BACKUP_MARIADB_PASSWORD=$(cat /root/tempmariadb/root/tempmariadb/db)
-		if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then
-			echo $"Restore the MariaDB user table"
-			mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql)
-			if [ ! "$?" = "0" ]; then
-				echo $"Try again using the password obtained from backup"
-				mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql)
-			fi
-			if [ ! "$?" = "0" ]; then
-				echo "$mysqlsuccess"
-				set_user_permissions
-				backup_unmount_drive
-				exit 962
-			fi
-			echo $"Restarting database"
-			service mysql restart
-			echo $"Change the MariaDB password to the backup version"
-			DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
-		fi
-		shred -zu /root/tempmariadb/root/tempmariadb/db
-		rm -rf /root/tempmariadb
-
-		# Change database password file
-		echo "$DATABASE_PASSWORD" > /root/dbpass
-		chmod 600 /root/dbpass
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mariadb' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mariadb ]; then
+        echo $"Restoring mysql settings"
+        restore_directory_from_usb /root/tempmariadb mariadb
+        echo $"Get the MariaDB password from the backup"
+        if [ ! -f /root/tempmariadb/root/tempmariadb/db ]; then
+            echo $"MariaDB password file not found"
+            exit 495
+        fi
+        BACKUP_MARIADB_PASSWORD=$(cat /root/tempmariadb/root/tempmariadb/db)
+        if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then
+            echo $"Restore the MariaDB user table"
+            mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql)
+            if [ ! "$?" = "0" ]; then
+                echo $"Try again using the password obtained from backup"
+                mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < /root/tempmariadb/root/tempmariadb/mysql.sql)
+            fi
+            if [ ! "$?" = "0" ]; then
+                echo "$mysqlsuccess"
+                set_user_permissions
+                backup_unmount_drive
+                exit 962
+            fi
+            echo $"Restarting database"
+            service mysql restart
+            echo $"Change the MariaDB password to the backup version"
+            DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
+        fi
+        shred -zu /root/tempmariadb/root/tempmariadb/db
+        rm -rf /root/tempmariadb
+
+        # Change database password file
+        echo "$DATABASE_PASSWORD" > /root/dbpass
+        chmod 600 /root/dbpass
+    fi
 }
 
 function restore_letsencrypt {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'letsencrypt' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/letsencrypt ]; then
-		echo $"Restoring Lets Encrypt settings"
-		restore_directory_from_usb / letsencrypt
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'letsencrypt' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/letsencrypt ]; then
+        echo $"Restoring Lets Encrypt settings"
+        restore_directory_from_usb / letsencrypt
+    fi
 }
 
 function restore_tor {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'tor' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/tor ]; then
-		echo $"Restoring Tor settings"
-		restore_directory_from_usb / tor
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'tor' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/tor ]; then
+        echo $"Restoring Tor settings"
+        restore_directory_from_usb / tor
+    fi
 }
 
 function restore_mutt_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mutt' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mutt ]; then
-		for d in $USB_MOUNT/backup/mutt/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring Mutt settings for $USERNAME"
-				restore_directory_from_usb /root/tempmutt mutt/$USERNAME
-				if [ -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc ]; then
-					cp -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
-				fi
-				if [ -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc ]; then
-					cp -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
-				fi
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempmutt
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf /root/tempmutt
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mutt' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mutt ]; then
+        for d in $USB_MOUNT/backup/mutt/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring Mutt settings for $USERNAME"
+                restore_directory_from_usb /root/tempmutt mutt/$USERNAME
+                if [ -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc ]; then
+                    cp -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
+                fi
+                if [ -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc ]; then
+                    cp -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
+                fi
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempmutt
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf /root/tempmutt
+            fi
+        done
+    fi
 }
 
 function restore_gpg {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'gpg' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/gnupg ]; then
-		for d in $USB_MOUNT/backup/gnupg/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring gnupg settings for $USERNAME"
-				restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME
-				cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempgnupg
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf /root/tempgnupg
-				if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
-					cp -r /home/$USERNAME/.gnupg /root
-					if [ ! "$?" = "0" ]; then
-						set_user_permissions
-						backup_unmount_drive
-						exit 283
-					fi
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'gpg' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/gnupg ]; then
+        for d in $USB_MOUNT/backup/gnupg/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring gnupg settings for $USERNAME"
+                restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME
+                cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempgnupg
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf /root/tempgnupg
+                if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
+                    cp -r /home/$USERNAME/.gnupg /root
+                    if [ ! "$?" = "0" ]; then
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 283
+                    fi
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_procmail {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'procmail' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/procmail ]; then
-		for d in $USB_MOUNT/backup/procmail/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring procmail settings for $USERNAME"
-				restore_directory_from_usb /root/tempprocmail procmail/$USERNAME
-				cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempprocmail
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf /root/tempprocmail
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'procmail' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/procmail ]; then
+        for d in $USB_MOUNT/backup/procmail/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring procmail settings for $USERNAME"
+                restore_directory_from_usb /root/tempprocmail procmail/$USERNAME
+                cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempprocmail
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf /root/tempprocmail
+            fi
+        done
+    fi
 }
 
 function restore_spamassassin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'spamassassin' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/spamassassin ]; then
-		for d in $USB_MOUNT/backup/spamassassin/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
-					if [ ! -d /home/$USERNAME ]; then
-						${PROJECT_NAME}-adduser $USERNAME
-					fi
-					echo $"Restoring spamassassin settings for $USERNAME"
-					restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME
-					cp -rf /root/tempspamassassin/home/$USERNAME/.spamassassin /home/$USERNAME/
-					if [ ! "$?" = "0" ]; then
-						rm -rf /root/tempspamassassin
-						set_user_permissions
-						backup_unmount_drive
-						exit 276
-					fi
-					rm -rf /root/tempspamassassin
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'spamassassin' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/spamassassin ]; then
+        for d in $USB_MOUNT/backup/spamassassin/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
+                    if [ ! -d /home/$USERNAME ]; then
+                        ${PROJECT_NAME}-adduser $USERNAME
+                    fi
+                    echo $"Restoring spamassassin settings for $USERNAME"
+                    restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME
+                    cp -rf /root/tempspamassassin/home/$USERNAME/.spamassassin /home/$USERNAME/
+                    if [ ! "$?" = "0" ]; then
+                        rm -rf /root/tempspamassassin
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 276
+                    fi
+                    rm -rf /root/tempspamassassin
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_admin_readme {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'readme' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/readme ]; then
-		echo $"Restoring admin user README"
-
-		# Make a backup of the original README file
-		# incase old passwords need to be used
-		if [ -f /home/$ADMIN_USERNAME/README ]; then
-			if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then
-				cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original
-			fi
-		fi
-
-		restore_directory_from_usb /root/tempreadme readme
-		cp -f /root/tempreadme/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
-		if [ ! "$?" = "0" ]; then
-			rm -rf /root/tempreadme
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf /root/tempreadme
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'readme' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/readme ]; then
+        echo $"Restoring admin user README"
+
+        # Make a backup of the original README file
+        # incase old passwords need to be used
+        if [ -f /home/$ADMIN_USERNAME/README ]; then
+            if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then
+                cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original
+            fi
+        fi
+
+        restore_directory_from_usb /root/tempreadme readme
+        cp -f /root/tempreadme/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
+        if [ ! "$?" = "0" ]; then
+            rm -rf /root/tempreadme
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf /root/tempreadme
+    fi
 }
 
 function restore_ipfs {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'ipfs' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/ipfs ]; then
-		echo $"Restoring IPFS"
-		restore_directory_from_usb /root/tempipfs ipfs
-		cp -rf /root/tempipfs/home/$ADMIN_USERNAME/.ipfs/* /home/$ADMIN_USERNAME/.ipfs
-		if [ ! "$?" = "0" ]; then
-			rm -rf /root/tempipfs
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf /root/tempipfs
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'ipfs' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/ipfs ]; then
+        echo $"Restoring IPFS"
+        restore_directory_from_usb /root/tempipfs ipfs
+        cp -rf /root/tempipfs/home/$ADMIN_USERNAME/.ipfs/* /home/$ADMIN_USERNAME/.ipfs
+        if [ ! "$?" = "0" ]; then
+            rm -rf /root/tempipfs
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf /root/tempipfs
+    fi
 }
 
 function restore_user_ssh_keys {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'ssh' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/ssh ]; then
-		for d in $USB_MOUNT/backup/ssh/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring ssh keys for $USERNAME"
-				restore_directory_from_usb /root/tempssh ssh/$USERNAME
-				cp -r /root/tempssh/home/$USERNAME/.ssh /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempssh
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf /root/tempssh
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'ssh' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/ssh ]; then
+        for d in $USB_MOUNT/backup/ssh/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring ssh keys for $USERNAME"
+                restore_directory_from_usb /root/tempssh ssh/$USERNAME
+                cp -r /root/tempssh/home/$USERNAME/.ssh /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempssh
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf /root/tempssh
+            fi
+        done
+    fi
 }
 
 function restore_user_config {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userconfig' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/config ]; then
-		for d in $USB_MOUNT/backup/config/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring config files for $USERNAME"
-				restore_directory_from_usb /root/tempconfig config/$USERNAME
-				cp -r /root/tempconfig/home/$USERNAME/.config /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempconfig
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf /root/tempconfig
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userconfig' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/config ]; then
+        for d in $USB_MOUNT/backup/config/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring config files for $USERNAME"
+                restore_directory_from_usb /root/tempconfig config/$USERNAME
+                cp -r /root/tempconfig/home/$USERNAME/.config /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempconfig
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf /root/tempconfig
+            fi
+        done
+    fi
 }
 
 function restore_user_emacs {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'useremacs' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/emacs ]; then
-		for d in $USB_MOUNT/backup/emacs/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring Emacs config for $USERNAME"
-				restore_directory_from_usb /root/tempemacs emacs/$USERNAME
-				cp -r /root/tempemacs/home/$USERNAME/.emacs.d /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempemacs
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				cp -f /root/tempemacs/home/$USERNAME/.emacs.d/dotemacs /home/$USERNAME/.emacs
-				rm -rf /root/tempemacs
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'useremacs' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/emacs ]; then
+        for d in $USB_MOUNT/backup/emacs/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring Emacs config for $USERNAME"
+                restore_directory_from_usb /root/tempemacs emacs/$USERNAME
+                cp -r /root/tempemacs/home/$USERNAME/.emacs.d /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempemacs
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                cp -f /root/tempemacs/home/$USERNAME/.emacs.d/dotemacs /home/$USERNAME/.emacs
+                rm -rf /root/tempemacs
+            fi
+        done
+    fi
 }
 
 function gpg_pubkey_from_email {
-	key_owner_username=$1
-	key_email_address=$2
-	key_id=
-	if [[ $key_owner_username != "root" ]]; then
-		key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	else
-		key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	fi
-	echo $key_id
+    key_owner_username=$1
+    key_email_address=$2
+    key_id=
+    if [[ $key_owner_username != "root" ]]; then
+        key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    else
+        key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    fi
+    echo $key_id
 }
 
 function restore_user_monkeysphere {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/monkeysphere ]; then
-		for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring monkeysphere ids for $USERNAME"
-				restore_directory_from_usb /root/tempmonkeysphere monkeysphere/$USERNAME
-				cp -r /root/tempmonkeysphere/home/$USERNAME/.monkeysphere /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempmonkeysphere
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf /root/tempmonkeysphere
-			fi
-		done
-
-		# The admin user is the identity certifier
-		MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
-		if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
-			MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
-		fi
-		MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
-		fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
-		monkeysphere-authentication add-identity-certifier $fpr
-		monkeysphere-authentication update-users
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/monkeysphere ]; then
+        for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring monkeysphere ids for $USERNAME"
+                restore_directory_from_usb /root/tempmonkeysphere monkeysphere/$USERNAME
+                cp -r /root/tempmonkeysphere/home/$USERNAME/.monkeysphere /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempmonkeysphere
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf /root/tempmonkeysphere
+            fi
+        done
+
+        # The admin user is the identity certifier
+        MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
+        if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
+            MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
+        fi
+        MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
+        fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
+        monkeysphere-authentication add-identity-certifier $fpr
+        monkeysphere-authentication update-users
+    fi
 }
 
 function restore_user_fin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userfin' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/fin ]; then
-		for d in $USB_MOUNT/backup/fin/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring fin files for $USERNAME"
-				restore_directory_from_usb /root/tempfin fin/$USERNAME
-				cp -r /root/tempfin/home/$USERNAME/.fin /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempfin
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf /root/tempfin
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userfin' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/fin ]; then
+        for d in $USB_MOUNT/backup/fin/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring fin files for $USERNAME"
+                restore_directory_from_usb /root/tempfin fin/$USERNAME
+                cp -r /root/tempfin/home/$USERNAME/.fin /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempfin
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf /root/tempfin
+            fi
+        done
+    fi
 }
 
 function restore_user_local {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userlocal' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/local ]; then
-		for d in $USB_MOUNT/backup/local/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring local files for $USERNAME"
-				restore_directory_from_usb /root/templocal local/$USERNAME
-				cp -r /root/templocal/home/$USERNAME/.local /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/templocal
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf /root/templocal
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userlocal' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/local ]; then
+        for d in $USB_MOUNT/backup/local/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring local files for $USERNAME"
+                restore_directory_from_usb /root/templocal local/$USERNAME
+                cp -r /root/templocal/home/$USERNAME/.local /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/templocal
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf /root/templocal
+            fi
+        done
+    fi
 }
 
 function restore_certs {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'certs' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/ssl ]; then
-		echo $"Restoring certificates"
-		mkdir /root/tempssl
-		restore_directory_from_usb /root/tempssl ssl
-		cp -r /root/tempssl/etc/ssl/* /etc/ssl
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf /root/tempssl
-
-		# restore ownership
-		if [ -f /etc/ssl/private/xmpp.key ]; then
-			chown prosody:prosody /etc/ssl/private/xmpp.key
-			chown prosody:prosody /etc/ssl/certs/xmpp.*
-		fi
-		if [ -d /etc/dovecot ]; then
-			chown root:dovecot /etc/ssl/private/dovecot.*
-			chown root:dovecot /etc/ssl/certs/dovecot.*
-		fi
-		if [ -f /etc/ssl/private/exim.key ]; then
-			cp /etc/ssl/private/exim.key /etc/exim4
-			cp /etc/ssl/certs/exim.crt /etc/exim4
-			cp /etc/ssl/certs/exim.dhparam /etc/exim4
-			chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-			chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-		fi
-		if [ -f /etc/ssl/private/mumble.key ]; then
-			if [ -d /var/lib/mumble-server ]; then
-				cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
-				cp /etc/ssl/private/mumble.key /var/lib/mumble-server
-				chown -R mumble-server:mumble-server /var/lib/mumble-server
-			fi
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'certs' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/ssl ]; then
+        echo $"Restoring certificates"
+        mkdir /root/tempssl
+        restore_directory_from_usb /root/tempssl ssl
+        cp -r /root/tempssl/etc/ssl/* /etc/ssl
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf /root/tempssl
+
+        # restore ownership
+        if [ -f /etc/ssl/private/xmpp.key ]; then
+            chown prosody:prosody /etc/ssl/private/xmpp.key
+            chown prosody:prosody /etc/ssl/certs/xmpp.*
+        fi
+        if [ -d /etc/dovecot ]; then
+            chown root:dovecot /etc/ssl/private/dovecot.*
+            chown root:dovecot /etc/ssl/certs/dovecot.*
+        fi
+        if [ -f /etc/ssl/private/exim.key ]; then
+            cp /etc/ssl/private/exim.key /etc/exim4
+            cp /etc/ssl/certs/exim.crt /etc/exim4
+            cp /etc/ssl/certs/exim.dhparam /etc/exim4
+            chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+            chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+        fi
+        if [ -f /etc/ssl/private/mumble.key ]; then
+            if [ -d /var/lib/mumble-server ]; then
+                cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
+                cp /etc/ssl/private/mumble.key /var/lib/mumble-server
+                chown -R mumble-server:mumble-server /var/lib/mumble-server
+            fi
+        fi
+    fi
 }
 
 function restore_personal_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'personal' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/personal ]; then
-		for d in $USB_MOUNT/backup/personal/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
-					if [ ! -d /home/$USERNAME ]; then
-						${PROJECT_NAME}-adduser $USERNAME
-					fi
-					echo $"Restoring personal settings for $USERNAME"
-					restore_directory_from_usb /root/temppersonal personal/$USERNAME
-					if [ -d /home/$USERNAME/personal ]; then
-						rm -rf /home/$USERNAME/personal
-					fi
-					mv /root/temppersonal/home/$USERNAME/personal /home/$USERNAME
-					if [ ! "$?" = "0" ]; then
-						set_user_permissions
-						backup_unmount_drive
-						exit 184
-					fi
-					rm -rf /root/temppersonal
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'personal' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/personal ]; then
+        for d in $USB_MOUNT/backup/personal/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
+                    if [ ! -d /home/$USERNAME ]; then
+                        ${PROJECT_NAME}-adduser $USERNAME
+                    fi
+                    echo $"Restoring personal settings for $USERNAME"
+                    restore_directory_from_usb /root/temppersonal personal/$USERNAME
+                    if [ -d /home/$USERNAME/personal ]; then
+                        rm -rf /home/$USERNAME/personal
+                    fi
+                    mv /root/temppersonal/home/$USERNAME/personal /home/$USERNAME
+                    if [ ! "$?" = "0" ]; then
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 184
+                    fi
+                    rm -rf /root/temppersonal
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_mailing_list {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mailinglist' ]]; then
-			return
-		fi
-	fi
-	if [ -d /var/spool/mlmmj ]; then
-		echo $"Restoring public mailing list"
-		restore_directory_from_usb /root/tempmailinglist mailinglist
-		cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 526
-		fi
-		rm -rf /root/tempmailinglist
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mailinglist' ]]; then
+            return
+        fi
+    fi
+    if [ -d /var/spool/mlmmj ]; then
+        echo $"Restoring public mailing list"
+        restore_directory_from_usb /root/tempmailinglist mailinglist
+        cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 526
+        fi
+        rm -rf /root/tempmailinglist
+    fi
 }
 
 function restore_xmpp {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'xmpp' ]]; then
-			return
-		fi
-	fi
-	if [ -d /var/lib/prosody ]; then
-		echo $"Restoring XMPP settings"
-		restore_directory_from_usb /root/tempxmpp xmpp
-		cp -r /root/tempxmpp/var/lib/prosody/* /var/lib/prosody
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 725
-		fi
-		rm -rf /root/tempxmpp
-		service prosody restart
-		chown -R prosody:prosody /var/lib/prosody/*
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'xmpp' ]]; then
+            return
+        fi
+    fi
+    if [ -d /var/lib/prosody ]; then
+        echo $"Restoring XMPP settings"
+        restore_directory_from_usb /root/tempxmpp xmpp
+        cp -r /root/tempxmpp/var/lib/prosody/* /var/lib/prosody
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 725
+        fi
+        rm -rf /root/tempxmpp
+        service prosody restart
+        chown -R prosody:prosody /var/lib/prosody/*
+    fi
 }
 
 function restore_gnusocial {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'gnusocial' ]]; then
-			return
-		fi
-	fi
-	if [ $MICROBLOG_DOMAIN_NAME ]; then
-		# stop the daemons
-		cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs
-		scripts/stopdaemons.sh
-
-		restore_database gnusocial ${MICROBLOG_DOMAIN_NAME}
-		if [ -d /root/tempgnusocial ]; then
-			rm -rf /root/tempgnusocial
-		fi
-
-		# start the daemons
-		cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs
-		scripts/startdaemons.sh
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'gnusocial' ]]; then
+            return
+        fi
+    fi
+    if [ $MICROBLOG_DOMAIN_NAME ]; then
+        # stop the daemons
+        cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs
+        scripts/stopdaemons.sh
+
+        restore_database gnusocial ${MICROBLOG_DOMAIN_NAME}
+        if [ -d /root/tempgnusocial ]; then
+            rm -rf /root/tempgnusocial
+        fi
+
+        # start the daemons
+        cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs
+        scripts/startdaemons.sh
+    fi
 }
 
 function restore_rss {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'ttrss' ]]; then
-			return
-		fi
-	fi
-	if [ $RSS_READER_DOMAIN_NAME ]; then
-		restore_database ttrss ${RSS_READER_DOMAIN_NAME}
-		if [ -d $USB_MOUNT/backup/ttrss ]; then
-			chown -R www-data:www-data /etc/share/tt-rss
-			if [ -d /root/tempttrss ]; then
-				rm -rf /root/tempttrss
-			fi
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'ttrss' ]]; then
+            return
+        fi
+    fi
+    if [ $RSS_READER_DOMAIN_NAME ]; then
+        restore_database ttrss ${RSS_READER_DOMAIN_NAME}
+        if [ -d $USB_MOUNT/backup/ttrss ]; then
+            chown -R www-data:www-data /etc/share/tt-rss
+            if [ -d /root/tempttrss ]; then
+                rm -rf /root/tempttrss
+            fi
+        fi
+    fi
 }
 
 function restore_hubzilla {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'hubzilla' ]]; then
-			return
-		fi
-	fi
-	if [ $HUBZILLA_DOMAIN_NAME ]; then
-		restore_database hubzilla ${HUBZILLA_DOMAIN_NAME}
-		if [ -d $USB_MOUNT/backup/hubzilla ]; then
-			if [ ! -d /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3 ]; then
-				mkdir -p /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
-			fi
-			chmod 777 /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
-			chown -R www-data:www-data /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/*
-			if [ -d /root/temphubzilla ]; then
-				rm -rf /root/temphubzilla
-			fi
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'hubzilla' ]]; then
+            return
+        fi
+    fi
+    if [ $HUBZILLA_DOMAIN_NAME ]; then
+        restore_database hubzilla ${HUBZILLA_DOMAIN_NAME}
+        if [ -d $USB_MOUNT/backup/hubzilla ]; then
+            if [ ! -d /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3 ]; then
+                mkdir -p /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
+            fi
+            chmod 777 /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3
+            chown -R www-data:www-data /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/*
+            if [ -d /root/temphubzilla ]; then
+                rm -rf /root/temphubzilla
+            fi
+        fi
+    fi
 }
 
 function restore_syncthing {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'syncthing' ]]; then
-			return
-		fi
-	fi
-
-	if [ -f /etc/systemd/system/syncthing.service ]; then
-		systemctl stop syncthing
-		systemctl stop cron
-	fi
-
-	if [ -d $USB_MOUNT/backup/syncthingconfig ]; then
-		echo $"Restoring syncthing configuration"
-		restore_directory_from_usb /root/tempsyncthingconfig syncthingconfig
-		cp -r /root/tempsyncthingconfig/* /
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			systemctl start syncthing
-			systemctl start cron
-			exit 6833
-		fi
-		rm -rf /root/tempsyncthingconfig
-	fi
-
-	if [ -d $USB_MOUNT/backup/syncthingshared ]; then
-		echo $"Restoring syncthing shared files"
-		restore_directory_from_usb /root/tempsyncthingshared syncthingshared
-		cp -r /root/tempsyncthingshared/* /
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			systemctl start syncthing
-			systemctl start cron
-			exit 37904
-		fi
-		rm -rf /root/tempsyncthingshared
-	fi
-
-	if [ -d $USB_MOUNT/backup/syncthing ]; then
-		for d in $USB_MOUNT/backup/syncthing/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring syncthing files for $USERNAME"
-				restore_directory_from_usb /root/tempsyncthing syncthing/$USERNAME
-				cp -r /root/tempsyncthing/home/$USERNAME/Sync /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf /root/tempsyncthing
-					set_user_permissions
-					backup_unmount_drive
-					systemctl start syncthing
-					systemctl start cron
-					exit 68438
-				fi
-				rm -rf /root/tempsyncthing
-
-				# restore device IDs from config settings
-				if [ -f /home/$USERNAME/.config/syncthing/.syncthing-server-id ]; then
-					cp /home/$USERNAME/.config/syncthing/.syncthing-server-id /home/$USERNAME/.syncthing-server-id
-					chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
-				fi
-				if [ -f /home/$USERNAME/.config/syncthing/.syncthingids ]; then
-					cp /home/$USERNAME/.config/syncthing/.syncthingids /home/$USERNAME/.syncthingids
-					chown $USERNAME:$USERNAME /home/$USERNAME/.syncthingids
-				fi
-			fi
-		done
-	fi
-
-	if [ -f /etc/systemd/system/syncthing.service ]; then
-		systemctl start syncthing
-		systemctl start cron
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'syncthing' ]]; then
+            return
+        fi
+    fi
+
+    if [ -f /etc/systemd/system/syncthing.service ]; then
+        systemctl stop syncthing
+        systemctl stop cron
+    fi
+
+    if [ -d $USB_MOUNT/backup/syncthingconfig ]; then
+        echo $"Restoring syncthing configuration"
+        restore_directory_from_usb /root/tempsyncthingconfig syncthingconfig
+        cp -r /root/tempsyncthingconfig/* /
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            systemctl start syncthing
+            systemctl start cron
+            exit 6833
+        fi
+        rm -rf /root/tempsyncthingconfig
+    fi
+
+    if [ -d $USB_MOUNT/backup/syncthingshared ]; then
+        echo $"Restoring syncthing shared files"
+        restore_directory_from_usb /root/tempsyncthingshared syncthingshared
+        cp -r /root/tempsyncthingshared/* /
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            systemctl start syncthing
+            systemctl start cron
+            exit 37904
+        fi
+        rm -rf /root/tempsyncthingshared
+    fi
+
+    if [ -d $USB_MOUNT/backup/syncthing ]; then
+        for d in $USB_MOUNT/backup/syncthing/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring syncthing files for $USERNAME"
+                restore_directory_from_usb /root/tempsyncthing syncthing/$USERNAME
+                cp -r /root/tempsyncthing/home/$USERNAME/Sync /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf /root/tempsyncthing
+                    set_user_permissions
+                    backup_unmount_drive
+                    systemctl start syncthing
+                    systemctl start cron
+                    exit 68438
+                fi
+                rm -rf /root/tempsyncthing
+
+                # restore device IDs from config settings
+                if [ -f /home/$USERNAME/.config/syncthing/.syncthing-server-id ]; then
+                    cp /home/$USERNAME/.config/syncthing/.syncthing-server-id /home/$USERNAME/.syncthing-server-id
+                    chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
+                fi
+                if [ -f /home/$USERNAME/.config/syncthing/.syncthingids ]; then
+                    cp /home/$USERNAME/.config/syncthing/.syncthingids /home/$USERNAME/.syncthingids
+                    chown $USERNAME:$USERNAME /home/$USERNAME/.syncthingids
+                fi
+            fi
+        done
+    fi
+
+    if [ -f /etc/systemd/system/syncthing.service ]; then
+        systemctl start syncthing
+        systemctl start cron
+    fi
 }
 
 function restore_mediagoblin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mediagoblin' ]]; then
-			return
-		fi
-	fi
-	if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
-		return
-	fi
-
-	if [ -d $USB_MOUNT/backup/mediagoblin ]; then
-		restore_directory_from_usb /root/tempmediagoblin mediagoblin
-		cp -r /root/tempmediagoblin/* /
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 67843
-		fi
-		rm -rf /root/tempmediagoblin
-		chown -hR mediagoblin:www-data /var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mediagoblin' ]]; then
+            return
+        fi
+    fi
+    if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
+        return
+    fi
+
+    if [ -d $USB_MOUNT/backup/mediagoblin ]; then
+        restore_directory_from_usb /root/tempmediagoblin mediagoblin
+        cp -r /root/tempmediagoblin/* /
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 67843
+        fi
+        rm -rf /root/tempmediagoblin
+        chown -hR mediagoblin:www-data /var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs
+    fi
 }
 
 function restore_gogs {
-	export GVM_ROOT=$GVM_HOME
-	if [ -d $GVM_ROOT/bin ]; then
-		cd $GVM_ROOT/bin
-		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
-		gvm use go${GO_VERSION} --default
-		systemctl set-environment GOPATH=$GOPATH
-	fi
-
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'gogs' ]]; then
-			return
-		fi
-	fi
-	if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
-		restore_database gogs ${GIT_DOMAIN_NAME}
-		if [ -d $USB_MOUNT/backup/gogs ]; then
-			echo $"Restoring Gogs settings"
-			if [ ! -d $GOPATH/src/github.com/gogits/gogs/custom ]; then
-				mkdir -p $GOPATH/src/github.com/gogits/gogs/custom
-			fi
-			cp -r /root/tempgogs/$GOPATH/src/github.com/gogits/gogs/custom/* $GOPATH/src/github.com/gogits/gogs/custom
-			if [ ! "$?" = "0" ]; then
-				set_user_permissions
-				backup_unmount_drive
-				exit 981
-			fi
-			echo $"Restoring Gogs repos"
-			restore_directory_from_usb /root/tempgogsrepos gogsrepos
-			cp -r /root/tempgogsrepos/home/git/gogs-repositories/* /home/git/gogs-repositories/
-			if [ ! "$?" = "0" ]; then
-				set_user_permissions
-				backup_unmount_drive
-				exit 67574
-			fi
-			echo $"Restoring Gogs authorized_keys"
-			restore_directory_from_usb /root/tempgogsssh gogsssh
-			if [ ! -d /home/git/.ssh ]; then
-				mkdir /home/git/.ssh
-			fi
-			cp -r /root/tempgogsssh/home/git/.ssh/* /home/git/.ssh/
-			if [ ! "$?" = "0" ]; then
-				set_user_permissions
-				backup_unmount_drive
-				exit 8463
-			fi
-			rm -rf /root/tempgogs
-			rm -rf /root/tempgogsrepos
-			rm -rf /root/tempgogsssh
-			chown -R git:git /home/git
-		fi
-	fi
+    export GVM_ROOT=$GVM_HOME
+    if [ -d $GVM_ROOT/bin ]; then
+        cd $GVM_ROOT/bin
+        [[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
+        gvm use go${GO_VERSION} --default
+        systemctl set-environment GOPATH=$GOPATH
+    fi
+
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'gogs' ]]; then
+            return
+        fi
+    fi
+    if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
+        restore_database gogs ${GIT_DOMAIN_NAME}
+        if [ -d $USB_MOUNT/backup/gogs ]; then
+            echo $"Restoring Gogs settings"
+            if [ ! -d $GOPATH/src/github.com/gogits/gogs/custom ]; then
+                mkdir -p $GOPATH/src/github.com/gogits/gogs/custom
+            fi
+            cp -r /root/tempgogs/$GOPATH/src/github.com/gogits/gogs/custom/* $GOPATH/src/github.com/gogits/gogs/custom
+            if [ ! "$?" = "0" ]; then
+                set_user_permissions
+                backup_unmount_drive
+                exit 981
+            fi
+            echo $"Restoring Gogs repos"
+            restore_directory_from_usb /root/tempgogsrepos gogsrepos
+            cp -r /root/tempgogsrepos/home/git/gogs-repositories/* /home/git/gogs-repositories/
+            if [ ! "$?" = "0" ]; then
+                set_user_permissions
+                backup_unmount_drive
+                exit 67574
+            fi
+            echo $"Restoring Gogs authorized_keys"
+            restore_directory_from_usb /root/tempgogsssh gogsssh
+            if [ ! -d /home/git/.ssh ]; then
+                mkdir /home/git/.ssh
+            fi
+            cp -r /root/tempgogsssh/home/git/.ssh/* /home/git/.ssh/
+            if [ ! "$?" = "0" ]; then
+                set_user_permissions
+                backup_unmount_drive
+                exit 8463
+            fi
+            rm -rf /root/tempgogs
+            rm -rf /root/tempgogsrepos
+            rm -rf /root/tempgogsssh
+            chown -R git:git /home/git
+        fi
+    fi
 }
 
 function restore_wiki {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'wiki' ]]; then
-			return
-		fi
-	fi
-	if [ $WIKI_DOMAIN_NAME ]; then
-		echo $"Restoring Wiki installation ${WIKI_DOMAIN_NAME}"
-		restore_directory_from_usb /root/tempwiki wiki
-		cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 868
-		fi
-		restore_directory_from_usb /root/tempwiki2 wiki2
-		cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 869
-		fi
-		rm -rf /root/tempwiki
-		rm -rf /root/tempwiki2
-		chown -R www-data:www-data /var/lib/dokuwiki/*
-		# Ensure that the bundled SSL cert is being used
-		if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then
-			sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME}
-		fi
-		if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then
-			ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key
-			ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'wiki' ]]; then
+            return
+        fi
+    fi
+    if [ $WIKI_DOMAIN_NAME ]; then
+        echo $"Restoring Wiki installation ${WIKI_DOMAIN_NAME}"
+        restore_directory_from_usb /root/tempwiki wiki
+        cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 868
+        fi
+        restore_directory_from_usb /root/tempwiki2 wiki2
+        cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 869
+        fi
+        rm -rf /root/tempwiki
+        rm -rf /root/tempwiki2
+        chown -R www-data:www-data /var/lib/dokuwiki/*
+        # Ensure that the bundled SSL cert is being used
+        if [ -f /etc/ssl/certs/${WIKI_DOMAIN_NAME}.bundle.crt ]; then
+            sed -i "s|${WIKI_DOMAIN_NAME}.crt|${WIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${WIKI_DOMAIN_NAME}
+        fi
+        if [ -d /etc/letsencrypt/live/${WIKI_DOMAIN_NAME} ]; then
+            ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${WIKI_DOMAIN_NAME}.key
+            ln -s /etc/letsencrypt/live/${WIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${WIKI_DOMAIN_NAME}.pem
+        fi
+    fi
 }
 
 function restore_blog {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'blog' ]]; then
-			return
-		fi
-	fi
-	if [ $FULLBLOG_DOMAIN_NAME ]; then
-		echo $"Restoring blog installation"
-		restore_directory_from_usb /root/tempblog blog
-		rm -rf /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
-		cp -r /root/tempblog/var/www/${FULLBLOG_DOMAIN_NAME}/htdocs /var/www/${FULLBLOG_DOMAIN_NAME}/
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 593
-		fi
-		rm -rf /root/tempblog
-		if [ ! -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content ]; then
-			echo $"No content directory found after restoring blog"
-			set_user_permissions
-			backup_unmount_drive
-			exit 287
-		fi
-		chown -R www-data:www-data /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
-		# Ensure that the bundled SSL cert is being used
-		if [ -f /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.bundle.crt ]; then
-			sed -i "s|${FULLBLOG_DOMAIN_NAME}.crt|${FULLBLOG_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${FULLBLOG_DOMAIN_NAME}
-		fi
-		for d in /home/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
-					mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
-				fi
-			fi
-		done
-		if [ -d /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME} ]; then
-			ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${FULLBLOG_DOMAIN_NAME}.key
-			ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.pem
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'blog' ]]; then
+            return
+        fi
+    fi
+    if [ $FULLBLOG_DOMAIN_NAME ]; then
+        echo $"Restoring blog installation"
+        restore_directory_from_usb /root/tempblog blog
+        rm -rf /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
+        cp -r /root/tempblog/var/www/${FULLBLOG_DOMAIN_NAME}/htdocs /var/www/${FULLBLOG_DOMAIN_NAME}/
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 593
+        fi
+        rm -rf /root/tempblog
+        if [ ! -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content ]; then
+            echo $"No content directory found after restoring blog"
+            set_user_permissions
+            backup_unmount_drive
+            exit 287
+        fi
+        chown -R www-data:www-data /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
+        # Ensure that the bundled SSL cert is being used
+        if [ -f /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.bundle.crt ]; then
+            sed -i "s|${FULLBLOG_DOMAIN_NAME}.crt|${FULLBLOG_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${FULLBLOG_DOMAIN_NAME}
+        fi
+        for d in /home/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
+                    mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
+                fi
+            fi
+        done
+        if [ -d /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME} ]; then
+            ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${FULLBLOG_DOMAIN_NAME}.key
+            ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.pem
+        fi
+    fi
 }
 
 function restore_cjdns {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'cjdns' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/cjdns ]; then
-		echo $"Restoring cjdns installation"
-		restore_directory_from_usb /root/tempcjdns cjdns
-		rm -rf /etc/cjdns
-		cp -r /root/tempcjdns/etc/cjdns /etc/
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 8472
-		fi
-		rm -rf /root/tempcjdns
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'cjdns' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/cjdns ]; then
+        echo $"Restoring cjdns installation"
+        restore_directory_from_usb /root/tempcjdns cjdns
+        rm -rf /etc/cjdns
+        cp -r /root/tempcjdns/etc/cjdns /etc/
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 8472
+        fi
+        rm -rf /root/tempcjdns
+    fi
 }
 
 function restore_email {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'email' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mail ]; then
-		for d in $USB_MOUNT/backup/mail/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring emails for $USERNAME"
-				restore_directory_from_usb /root/tempmail mail/$USERNAME
-				if [ ! -d /home/$USERNAME/Maildir ]; then
-					mkdir /home/$USERNAME/Maildir
-				fi
-				tar -xzvf /root/tempmail/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
-				if [ ! "$?" = "0" ]; then
-					set_user_permissions
-					backup_unmount_drive
-					exit 927
-				fi
-				rm -rf /root/tempmail
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'email' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mail ]; then
+        for d in $USB_MOUNT/backup/mail/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring emails for $USERNAME"
+                restore_directory_from_usb /root/tempmail mail/$USERNAME
+                if [ ! -d /home/$USERNAME/Maildir ]; then
+                    mkdir /home/$USERNAME/Maildir
+                fi
+                tar -xzvf /root/tempmail/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
+                if [ ! "$?" = "0" ]; then
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 927
+                fi
+                rm -rf /root/tempmail
+            fi
+        done
+    fi
 }
 
 function restore_dlna {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'dlna' ]]; then
-			return
-		fi
-	fi
-	if [ -d /var/cache/minidlna ]; then
-		if [ -d $USB_MOUNT/backup/dlna ]; then
-			echo $"Restoring DLNA cache"
-			restore_directory_from_usb /root/tempdlna dlna
-			cp -r /root/tempdlna/var/cache/minidlna/* /var/cache/minidlna/
-			if [ ! "$?" = "0" ]; then
-				rm -rf /root/tempdlna
-				set_user_permissions
-				backup_unmount_drive
-				exit 982
-			fi
-			rm -rf /root/tempdlna
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'dlna' ]]; then
+            return
+        fi
+    fi
+    if [ -d /var/cache/minidlna ]; then
+        if [ -d $USB_MOUNT/backup/dlna ]; then
+            echo $"Restoring DLNA cache"
+            restore_directory_from_usb /root/tempdlna dlna
+            cp -r /root/tempdlna/var/cache/minidlna/* /var/cache/minidlna/
+            if [ ! "$?" = "0" ]; then
+                rm -rf /root/tempdlna
+                set_user_permissions
+                backup_unmount_drive
+                exit 982
+            fi
+            rm -rf /root/tempdlna
+        fi
+    fi
 }
 
 function restore_voip {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'voip' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/voip ]; then
-		echo $"Restoring VoIP settings"
-		temp_restore_dir=/root/tempvoip
-		restore_directory_from_usb $temp_restore_dir voip
-		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/
-		if [ ! "$?" = "0" ]; then
-			rm -rf $temp_restore_dir
-			set_user_permissions
-			backup_unmount_drive
-			exit 3679
-		fi
-		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/
-		if [ ! "$?" = "0" ]; then
-			rm -rf $temp_restore_dir
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf $temp_restore_dir
-		cp /etc/ssl/certs/mumble* /var/lib/mumble-server
-		cp /etc/ssl/private/mumble* /var/lib/mumble-server
-		chown -R mumble-server:mumble-server /var/lib/mumble-server
-		service mumble-server restart
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'voip' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/voip ]; then
+        echo $"Restoring VoIP settings"
+        temp_restore_dir=/root/tempvoip
+        restore_directory_from_usb $temp_restore_dir voip
+        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/
+        if [ ! "$?" = "0" ]; then
+            rm -rf $temp_restore_dir
+            set_user_permissions
+            backup_unmount_drive
+            exit 3679
+        fi
+        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/
+        if [ ! "$?" = "0" ]; then
+            rm -rf $temp_restore_dir
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf $temp_restore_dir
+        cp /etc/ssl/certs/mumble* /var/lib/mumble-server
+        cp /etc/ssl/private/mumble* /var/lib/mumble-server
+        chown -R mumble-server:mumble-server /var/lib/mumble-server
+        service mumble-server restart
+    fi
 }
 
 function restore_tox {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'tox' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/tox ]; then
-		echo $"Restoring Tox node settings"
-		restore_directory_from_usb / tox
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 6393
-		fi
-		cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
-		systemctl restart tox-bootstrapd.service
-		if [ ! "$?" = "0" ]; then
-			systemctl status tox-bootstrapd.service
-			set_user_permissions
-			backup_unmount_drive
-			exit 59369
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'tox' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/tox ]; then
+        echo $"Restoring Tox node settings"
+        restore_directory_from_usb / tox
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 6393
+        fi
+        cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
+        systemctl restart tox-bootstrapd.service
+        if [ ! "$?" = "0" ]; then
+            systemctl status tox-bootstrapd.service
+            set_user_permissions
+            backup_unmount_drive
+            exit 59369
+        fi
+    fi
 }
 
 function get_restore_app {
-	if [ ${1} ]; then
-		if [ ! -d /home/${1} ]; then
-			RESTORE_APP=${1}
-			echo $"Restore $RESTORE_APP"
-		fi
-	fi
+    if [ ${1} ]; then
+        if [ ! -d /home/${1} ]; then
+            RESTORE_APP=${1}
+            echo $"Restore $RESTORE_APP"
+        fi
+    fi
 }
 
 function restore_apps {
-	FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
-
-	APPS_COMPLETED=()
-
-	# for all the app scripts
-	for filename in $FILES
-	do
-		app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
-		if [[ $(item_in_array ${app_name} ${APPS_COMPLETED[@]}) != 0 ]]; then
-			function_check app_is_installed
-			if [[ "$(app_is_installed $a)" == "1" ]]; then
-				APPS_COMPLETED+=("${app_name}")
-				function_check restore_local_${app_name}
-				restore_local_${app_name}
-			fi
-		fi
-	done
+    FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
+
+    APPS_COMPLETED=()
+
+    # for all the app scripts
+    for filename in $FILES
+    do
+        app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
+        if [[ $RESTORE_APP == 'all' || $RESTORE_APP == "${app_name}"  ]]; then
+            if [[ $(item_in_array ${app_name} ${APPS_COMPLETED[@]}) != 0 ]]; then
+                function_check app_is_installed
+                if [[ "$(app_is_installed $a)" == "1" ]]; then
+                    APPS_COMPLETED+=("${app_name}")
+                    function_check restore_local_${app_name}
+                    restore_local_${app_name}
+                fi
+            fi
+        fi
+    done
 }
 
 get_restore_app ${2}