diff --git a/.conf/dps_128/mpd.conf b/.conf/dps_128/mpd.conf
index 64ae79f22f..7a085d27eb 100644
--- a/.conf/dps_128/mpd.conf
+++ b/.conf/dps_128/mpd.conf
@@ -6,8 +6,8 @@ pid_file "/var/run/mpd/pid"
 state_file "/mnt/dietpi_userdata/.mpd_cache/state"
 sticker_file "/mnt/dietpi_userdata/.mpd_cache/sticker.sql"
 
-user "mpd"
-group "dietpi"
+#user "mpd" #Set via service to allow for mpd user to use assigned groups "audio" and "dietpi"
+#group "dietpi" #Set via service to allow for mpd user to use assigned groups "audio" and "dietpi"
 
 bind_to_address "localhost"
 
diff --git a/.conf/dps_6/xorg_xu4.conf b/.conf/dps_6/xorg_xu4.conf
index bb0eb835de..286cf79fb1 100644
--- a/.conf/dps_6/xorg_xu4.conf
+++ b/.conf/dps_6/xorg_xu4.conf
@@ -1,30 +1,36 @@
-Section "Device"
+# X.Org X server configuration file for xf86-video-armsoc-odroid
 
-	Identifier 	"Mali-Fbdev"
+Section "Device"
+	Identifier	"Mali-Fbdev"
 	Driver		"armsoc"
-	Option		"fbdev"           	"/dev/fb0"
-	Option  	"Debug" 		"false"
+	Option		"fbdev"			"/dev/fb0"
+	Option		"Debug"			"false"
 	Option		"DPMS"			"false"
-	Option		"Fimg2DExa"		"true"
-	Option		"DRI2"			"true"
-	Option		"DRI2_PAGE_FLIP"	"false"
-#	Option		"Fimg2DExaSolid"	"false"
-#	Option		"Fimg2DExaCopy"		"false"
-	Option		"Fimg2DExaComposite"	"true"
-    Option          "SWcursorLCD"           "false"
-
+	Option		"NoFlip"		"true"
+	Option		"NoHardwareMouse"	"true"
+	Option		"NoG2D"			"false"
 EndSection
 
 Section "Screen"
-
-	Identifier   "Default Screen"
-	Device       "Mali-Fbdev"
-	DefaultDepth 24
-
+	Identifier	"Default Screen"
+	Device		"Mali-Fbdev"
+	DefaultDepth	24
 EndSection
 
 Section "DRI"
-
 	Mode 0666
+EndSection
+
+Section "Monitor"
+	Identifier	"Generic Monitor"
+	Option		"DPMS"			"Off"
+EndSection
 
+## disable automatic HDMI turn off
+Section "ServerLayout"
+	Identifier	"DefaultLayout"
+	Option		"BlankTime"		"0"
+	Option		"StandbyTime"		"0"
+	Option		"SuspendTime"		"0"
+	Option		"OffTime"		"0"
 EndSection
diff --git a/.conf/dps_65/netdata.service b/.conf/dps_65/netdata.service
index 4b308413d9..084a01e630 100644
--- a/.conf/dps_65/netdata.service
+++ b/.conf/dps_65/netdata.service
@@ -3,8 +3,11 @@
 [Unit]
 Description=Real time performance monitoring
 
+# Pull in non-static network-online.target
+Wants=network-online.target
+
 # append here other services you want netdata to wait for them to start
-After=network-online.target httpd.service squid.service nfs-server.service mysqld.service mysql.service named.service postfix.service chronyd.service
+After=network-online.target httpd.service squid.service nfs-server.service mysqld.service mysql.service mariadb.service named.service postfix.service chronyd.service
 
 [Service]
 Type=simple
diff --git a/.conf/dps_85/nginx.conf b/.conf/dps_85/nginx.conf
index bed9d28302..863d8e8b48 100644
--- a/.conf/dps_85/nginx.conf
+++ b/.conf/dps_85/nginx.conf
@@ -25,7 +25,7 @@ http {
 
 	charset utf-8;
 
-	# + Nginx - To avoid 2MB upload error: https://github.com/Fourdee/DietPi/issues/546
+	# + Nginx - To avoid 2MB upload error: https://github.com/MichaIng/DietPi/issues/546
 	client_max_body_size 2000M;
 
 	# Upstream to abstract back-end connection(s) for PHP
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 16cf4dfb61..577778e4f4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -21,3 +21,6 @@ about: Suggest an idea for this project
 #### Additional context
 <!-- Add any other context or screenshots about the feature request here.-->
 - ...
+
+#### Vote for this feature on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->
diff --git a/.github/ISSUE_TEMPLATE/image_request.md b/.github/ISSUE_TEMPLATE/image_request.md
index 3f3093f71c..f6870141db 100644
--- a/.github/ISSUE_TEMPLATE/image_request.md
+++ b/.github/ISSUE_TEMPLATE/image_request.md
@@ -21,3 +21,6 @@ about: Suggest a new SBC to be added to the offial support and image list of Die
 #### If not, are there install instructions for Debian available?
 <!-- EG: https://github.com/drtyhlpr/rpi23-gen-image/https://github.com/Debian/raspi3-image-spec -->
 - ...
+
+#### Vote for this iamge on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->
diff --git a/.github/ISSUE_TEMPLATE/software_request.md b/.github/ISSUE_TEMPLATE/software_request.md
index 1409551f4e..72892c0b1a 100644
--- a/.github/ISSUE_TEMPLATE/software_request.md
+++ b/.github/ISSUE_TEMPLATE/software_request.md
@@ -35,3 +35,6 @@ about: Suggest a software title to be added to DietPi-Software
 #### Are you willing to help maintaining the software installation, e.g. in case of needed setup changes due to updates etc.? This is not needed, but could speed up our decision to implement it, as man power is always a topic :wink:.
 <!-- EG: Yes, I could help out with this, e.g. if I experience issues. / Sorry, I am totally unexperienced in bash coding. -->
 - ...
+
+#### Vote for this software on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a7f0b6701b..c5d388eb2e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,12 @@
 <!--
 Before submitting a pull request:
-- Please ensure the target branch is "dev" (active development): https://github.com/Fourdee/DietPi/tree/dev
+- Please ensure the target branch is "dev" (active development): https://github.com/MichaIng/DietPi/tree/dev
 - Please ensure changes have been tested and verified functional.
 -->
 **Status**: WIP | Testing | Ready | ?
 - [ ] Example task 1
 
-**Reference**: https://github.com/Fourdee/DietPi/issues/XXXX
+**Reference**: https://github.com/MichaIng/DietPi/issues/XXXX
 
 **Commit list/description**:
 <!--
diff --git a/.meta/dietpi-cloud-migration b/.meta/dietpi-cloud-migration
index 07142326b4..992fe4e9fd 100644
--- a/.meta/dietpi-cloud-migration
+++ b/.meta/dietpi-cloud-migration
@@ -1,28 +1,24 @@
 #!/bin/bash
 
-(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the command with "sudo".\n' && exit 1
+(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the script with "sudo".\n' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Root privileges verified.'
 
-apt-get install -y rsync
-(( $? )) && echo -e '[\e[31mFAILED\e[0m] Installation of rsync failed. Please check your internet connection, proper apt-get function or try to install it manually: "apt-get install -y rsync"\n' && exit 1
+! apt-get install -y rsync && echo -e '[\e[31mFAILED\e[0m] "rsync" install failed. Please check your internet connection, proper apt-get function or try to install it manually: "apt-get install -y rsync"\n' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Successfully installed rsync.'
 
 run_backup(){
 
-	echo '[ INFO ] Enabling maintenance mode...'
-	sudo -u www-data php /var/www/$1/occ maintenance:mode --on
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Could not enable maintenance mode, please check running state of your instance and PHP functionality.\n' && exit 1
-
 	fp_config="/var/www/$1/config/config.php"
 
-	echo "[ INFO ] Scanning $fp_config for necessary information..."
-	[[ ! -f $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] File $fp_config not found, please check your installation.\n" && exit 1
+	echo '[ INFO ] Enabling maintenance mode...'
+	! sudo -u www-data php /var/www/$1/occ maintenance:mode --on && echo -e '[\e[31mFAILED\e[0m] Could not enable maintenance mode, please check running state of your instance and PHP functionality.\n' && exit 1
 
-	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
+	echo "[ INFO ] Scanning $fp_config for necessary information..."
+	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | cut -d \' -f 4)
+	local dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | cut -d \' -f 4)
+	local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | cut -d \' -f 4)
+	local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | cut -d \' -f 4)
+	local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | cut -d \' -f 4)
 	echo -e " - data directory:	$fp_datadir
  - database name:	$dbname
  - database hostname:	$dbhost
@@ -30,50 +26,45 @@ run_backup(){
  - database password:	$dbpass"
 
 	echo '[ INFO ] Backup database to data directory...'
-	mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" "$dbname" > "$fp_datadir"/dietpi-$1-database-backup.sql
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Database backup seems to have failed. Check state of your database server, check logs and in case repair table corruptions.\n' && exit 1
+	! mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" "$dbname" > "$fp_datadir"/dietpi-$1-database-backup.sql && echo -e '[\e[31mFAILED\e[0m] Database backup failed, please check state of your database server, check logs and in case repair table corruptions.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished database backup to: $fp_datadir/dietpi-$1-database-backup.sql"
 
 	echo '[ INFO ] Backup installation folder to data directory...'
-	rsync -aHp --delete /var/www/$1/ "$fp_datadir"/dietpi-$1-installation-backup
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
+	! rsync -aHp --delete /var/www/$1/ "$fp_datadir"/dietpi-$1-installation-backup && echo -e '[\e[31mFAILED\e[0m] "rsync" failed, please check for error reasons and try again.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished installation backup to: $fp_datadir/dietpi-$1-installation-backup/"
 
 	if [[ $2 ]]; then
 
 		echo '[ INFO ] You provided an additional backup location. Moving data directory...'
-		[[ ! -d $2 ]] && echo -e "[\e[31mFAILED\e[0m] $2 is no directory, please check spelling and mount status of your desired backup location.\n" && exit 1
+		[[ ! -d $2 ]] && echo -e "[\e[31mFAILED\e[0m] $2 is no existing directory, please check spelling and mount status of your desired backup drive.\n" && exit 1
 
-		rsync -aHp --delete "$fp_datadir"/ "$2"
-		(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
+		! rsync -aHp --delete "$fp_datadir"/ "$2" && echo -e '[\e[31mFAILED\e[0m] "rsync" failed, please check for error reasons and try again.\n' && exit 1
 		echo -e "[\e[32m  OK  \e[0m] Successfully synced data directory to: $2"
 
 	else
 
-		echo '[ INFO ] You did not provide an additional backup location. We assume your data directory is already on an external drive, ready for migration? If not, move it there or rerun this script, providing the external backup location as argument.'
+		echo '[ INFO ] You did not provide an additional backup location. We assume your data directory is already on an external drive, ready for migration? If not, move it there, or, rerun this script with the desired external backup path as argument.'
 
 	fi
 
-	echo -e "[\e[32m  OK  \e[0m] Backup successfully completed. On destination server, please move the whole data directory to the one, provided within /DietPi/dietpi.txt (default: \"/mnt/dietpi_userdata/$1_data\"), or create a symlink from there. On reinstallation, DietPi-Software will check this location for backups and in case automatically restore them."
+	echo -e "[\e[32m  OK  \e[0m] Backup successfully completed. On destination server, please move the whole data directory to the one, provided within /DietPi/dietpi.txt (default: \"/mnt/dietpi_userdata/$1_data\"), or create a symlink from there. On reinstall, DietPi-Software will check this location for backups and in case automatically restore them."
 
 }
 
 ### MAIN ###
 
-[[ ! -f /DietPi/dietpi/.installed ]] && echo -e '[\e[31mFAILED\e[0m] No proper DietPi installation found or DietPi-RamDisk is not running. Please ensure you are executing this script from a functional DietPi system and "dietpi-ramdisk" is up.\n' && exit 1
-
-if grep -q 'aSOFTWARE_INSTALL_STATE\[47\]=2' /DietPi/dietpi/.installed; then
+if [[ -f /var/www/owncloud/config/config.php ]]; then
 
 	echo '[ INFO ] ownCloud installation found, preparing backup...'
 	run_backup owncloud "$1"
 
 fi
 
-if grep -q 'aSOFTWARE_INSTALL_STATE\[114\]=2' /DietPi/dietpi/.installed; then
+if [[ -f /var/www/nextcloud/config/config.php ]]; then
 
         echo '[ INFO ] Nextcloud installation found, preparing backup...'
         run_backup nextcloud "$1"
 
 fi
 
-[[ ! $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] No ownCloud or Nextcloud installation found. Please verify that it was installed via dietpi-software, in case reinstall it, non of your existing data/settings will be overwritten.\n" && exit 1
+[[ ! $fp_config ]] && echo -e '[\e[31mFAILED\e[0m] No ownCloud or Nextcloud instance found at /var/www/owncloud|nextcloud. Aborting...\n' && exit 1
diff --git a/.meta/dietpi-fan_control b/.meta/dietpi-fan_control
index 70488023e6..bf99bf2292 100644
--- a/.meta/dietpi-fan_control
+++ b/.meta/dietpi-fan_control
@@ -62,7 +62,7 @@ dietpi-fan_control 1	=>	Non-interactively apply settings from $FP_SETTINGS.
 	INPUT=0
 	if [[ $@ ]]; then
 
-		if G_CHECK_VALIDINT "$@"; then
+		if disable_error=1 G_CHECK_VALIDINT "$@"; then
 
 			INPUT=$@
 
@@ -97,7 +97,7 @@ dietpi-fan_control 1	=>	Non-interactively apply settings from $FP_SETTINGS.
 
 		done
 		#	- Remove leading white space
-		TRIP_TEMPS_CURRENT="${TRIP_TEMPS_CURRENT# }"
+		TRIP_TEMPS_CURRENT=${TRIP_TEMPS_CURRENT# }
 
 		# - Read current trip point fan speeds
 		TRIP_SPEEDS_CURRENT=''
@@ -109,7 +109,7 @@ dietpi-fan_control 1	=>	Non-interactively apply settings from $FP_SETTINGS.
 
 		done
 		#	- Remove leading white space
-		TRIP_SPEEDS_CURRENT="${TRIP_SPEEDS_CURRENT# }"
+		TRIP_SPEEDS_CURRENT=${TRIP_SPEEDS_CURRENT# }
 
 		# - Read current static fan speed
 		#	- Convert 0-255 to 0-100%
@@ -122,11 +122,7 @@ dietpi-fan_control 1	=>	Non-interactively apply settings from $FP_SETTINGS.
 	# - $TRIP_TEMPS='XX YY ZZ'; XX°C YY°C ZZ°C
 	# - $TRIP_SPEEDS='AAA BBB CCC DDD'; AAA*100/255 %...
 	# - $STATIC_SPEED=EEE; EEE*100/255 %
-	Read_Settings(){
-
-		. $FP_SETTINGS
-
-	}
+	Read_Settings(){ . $FP_SETTINGS; }
 
 	# Verify valid settings, before applying
 	Verify_Settings(){
@@ -153,7 +149,7 @@ dietpi-fan_control 1	=>	Non-interactively apply settings from $FP_SETTINGS.
 		elif (( ! $TEMP_CONTROLLED )); then
 
 			# - $STATIC_SPEED is expected to be an integer.
-			if ! G_CHECK_VALIDINT $STATIC_SPEED; then
+			if ! disable_error=1 G_CHECK_VALIDINT $STATIC_SPEED; then
 
 				G_DIETPI-NOTIFY 1 "Invalid setting: \$STATIC_SPEED=$STATIC_SPEED"
 				return 1
@@ -236,7 +232,7 @@ _EOF_
 
 			done
 			#	- Remove leading white space
-			trip_speeds_target="${trip_speeds_target# }"
+			trip_speeds_target=${trip_speeds_target# }
 			echo "$trip_speeds_target" > $FP_TRIP_SPEEDS
 
 		else
@@ -266,49 +262,33 @@ _EOF_
 
 	Temps_Menu(){
 
-		G_WHIP_DEFAULT_ITEM="$TRIP_TEMPS"
+		G_WHIP_DEFAULT_ITEM=$TRIP_TEMPS
 		G_WHIP_INPUTBOX "Please enter $TRIP_POINT_COUNT space-separated temperature points in °C.
-EG: To have trip points at 35°C, 50°C and 65°C, enter\n     \"35 50 65\""
-		if (( ! $? )); then
-
-			TRIP_TEMPS="$G_WHIP_RETURNED_VALUE"
-
-		fi
+EG: To have trip points at 35°C, 50°C and 65°C, enter\n     \"35 50 65\"" && TRIP_TEMPS=$G_WHIP_RETURNED_VALUE
 
 	}
 
 	Speeds_Menu(){
 
-		G_WHIP_DEFAULT_ITEM="$TRIP_SPEEDS"
+		G_WHIP_DEFAULT_ITEM=$TRIP_SPEEDS
 		G_WHIP_INPUTBOX "Please enter $(( $TRIP_POINT_COUNT + 1 )) space-separated fan speeds in % (percent) of the maximum possible speed.
 EG: To disable the fan below $(( $(<$FP_TRIP_TEMPS) / 1000 ))°C, run it at 45% above, 70% after reaching $(( $(<${FP_TRIP_TEMPS/0_temp/1_temp}) / 1000 ))°C and 95% above $(( $(<${FP_TRIP_TEMPS/0_temp/2_temp}) / 1000 ))°C, enter
-     \"0 45 70 95\""
-		if (( ! $? )); then
-
-			TRIP_SPEEDS="$G_WHIP_RETURNED_VALUE"
-
-		fi
+     \"0 45 70 95\"" && TRIP_SPEEDS=$G_WHIP_RETURNED_VALUE
 
 	}
 
 	Static_Speed_Menu(){
 
-		G_WHIP_DEFAULT_ITEM="$STATIC_SPEED"
+		G_WHIP_DEFAULT_ITEM=$STATIC_SPEED
 		G_WHIP_INPUTBOX "Please enter the desired static fan speeds in % (percent) of the maximum possible speed.
-EG: To run the fan at 50%, enter\n     \"60\""
-		if (( ! $? )); then
-
-			STATIC_SPEED="$G_WHIP_RETURNED_VALUE"
-
-		fi
+EG: To run the fan at 50%, enter\n     \"60\"" && STATIC_SPEED=$G_WHIP_RETURNED_VALUE
 
 	}
 
 	Reboot_Menu(){
 
 		G_WHIP_BUTTON_CANCEL_TEXT='Later'
-		G_WHIP_YESNO 'Reboot now?\n\nThe system default fan controls are automatically applied after next reboot. Do you want to reboot now?'
-		if (( ! $? )); then
+		if G_WHIP_YESNO 'Reboot now?\n\nThe system default fan controls are automatically applied after next reboot. Do you want to reboot now?'; then
 
 			reboot
 			exit 0
@@ -372,7 +352,7 @@ EG: To run the fan at 50%, enter\n     \"60\""
 		if (( $TEMP_CONTROLLED )); then
 
 			# - Trip point temperature settings
-			TRIP_TEMPS="${TRIP_TEMPS:-$TRIP_TEMPS_CURRENT}"
+			TRIP_TEMPS=${TRIP_TEMPS:-$TRIP_TEMPS_CURRENT}
 			local trip_temps_text=''
 			for i in $TRIP_TEMPS
 			do
@@ -383,7 +363,7 @@ EG: To run the fan at 50%, enter\n     \"60\""
 			G_WHIP_MENU_ARRAY+=( 'Temp points' "Selected:     $trip_temps_text" )
 
 			# - Trip point speed settings
-			TRIP_SPEEDS="${TRIP_SPEEDS:-$TRIP_SPEEDS_CURRENT}"
+			TRIP_SPEEDS=${TRIP_SPEEDS:-$TRIP_SPEEDS_CURRENT}
 			local trip_speeds_text=''
 			for i in $TRIP_SPEEDS
 			do
@@ -482,7 +462,7 @@ EG: To run the fan at 50%, enter\n     \"60\""
 		# Read settings file, to generate menu entries and use current settings as default.
 		[[ -f $FP_SETTINGS ]] && Read_Settings
 
-		while true
+		while :
 		do
 
 			Main_Menu
diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index 39a3235e2c..8975a9a773 100644
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -4,7 +4,7 @@
 	# Created by Micha / micha@dietpi.com / dietpi.com
 
 	#-----------------------------------------------------------
-	#Globals - benchmarks
+	# Globals - benchmarks
 	#-----------------------------------------------------------
 	#	NB: PLEASE ENSURE HW_MODEL INDEX ENTRIES MATCH : PREP, dietpi-obtain_hw_model, dietpi-survey_results,
 	#	NBB: DO NOT REORDER INDEX's. These are now fixed and will never change (due to survey results etc)
@@ -71,7 +71,6 @@
 	# - Optional benchmarks
 	declare -A aBENCH_CUSTOMFS_WRITE
 	declare -A aBENCH_CUSTOMFS_READ
-
 	declare -A aBENCH_NET_LAN_SPEED
 
 	#Results
@@ -117,13 +116,11 @@
 	aBENCH_RESULT_NET_LAN_SPEED_AVG=()
 
 	#-----------------------------------------------------------
-	#Globals - Survey
+	# Globals - Survey
 	#-----------------------------------------------------------
 	SURVEY_COUNT_TOTAL=0
 	SURVEY_COUNT_EMPTY=0
 
-	aSURVEY_VERSION=()
-	aSURVEY_SENTCOUNT=()
 	declare -A aDIETPI_VERSION
 	declare -A aDEVICE_NAME
 	declare -A aCPU_ARCH
@@ -140,13 +137,6 @@
 	# v6.17 addition
 	declare -A aGIT_BRANCH
 
-	# Pre v6.10: Convert cpu arch index to name array
-	aCPU_NAME=()
-	aCPU_NAME[1]='armv6l'
-	aCPU_NAME[2]='armv7l'
-	aCPU_NAME[3]='aarch64'
-	aCPU_NAME[10]='x86_64'
-
 	# Convert autostart index to name array
 	aAUTOSTART_NAME=()
 	aAUTOSTART_NAME[0]='Console manual login'
@@ -169,7 +159,7 @@
 	aSOFTWARE_NAME=()
 	aSOFTWARE_NAME[0]='OpenSSH Client'
 	aSOFTWARE_NAME[1]='Samba Client'
-	aSOFTWARE_NAME[2]='Curlftpfs'
+	aSOFTWARE_NAME[2]='Folding@Home'
 	aSOFTWARE_NAME[3]='MC'
 	aSOFTWARE_NAME[4]='ViFM'
 	aSOFTWARE_NAME[5]='ALSA'
@@ -200,12 +190,12 @@
 	aSOFTWARE_NAME[30]='NoMachine'
 	aSOFTWARE_NAME[31]='Kodi'
 	aSOFTWARE_NAME[32]='YMPD'
-	aSOFTWARE_NAME[33]='AirSonic'
-	aSOFTWARE_NAME[34]='SubSonic 6'
+	aSOFTWARE_NAME[33]='Airsonic'
+	aSOFTWARE_NAME[34]='Subsonic 6'
 	aSOFTWARE_NAME[35]='SqueezeBox'
 	aSOFTWARE_NAME[36]='SqueezeLite'
 	aSOFTWARE_NAME[37]='Shairport Sync'
-	aSOFTWARE_NAME[38]='BruteFIR'
+	aSOFTWARE_NAME[38]='FreshRSS'
 	aSOFTWARE_NAME[39]='ReadyMedia'
 	aSOFTWARE_NAME[40]='Ampache'
 	aSOFTWARE_NAME[41]='Emby Server'
@@ -221,7 +211,7 @@
 	aSOFTWARE_NAME[51]='OpenTyrian'
 	aSOFTWARE_NAME[52]='Cuberite'
 	aSOFTWARE_NAME[53]='MineOS'
-	aSOFTWARE_NAME[54]='Forums'
+	aSOFTWARE_NAME[54]='phpBB'
 	aSOFTWARE_NAME[55]='Wordpress'
 	aSOFTWARE_NAME[56]='Image Gallery'
 	aSOFTWARE_NAME[57]='BaiKal'
@@ -247,13 +237,13 @@
 	aSOFTWARE_NAME[77]='Grafana'
 	aSOFTWARE_NAME[78]='LESP'
 	aSOFTWARE_NAME[79]='LEMP'
-	aSOFTWARE_NAME[80]='80'
+	aSOFTWARE_NAME[80]='Ubooquity'
 	aSOFTWARE_NAME[81]='LLSP'
 	aSOFTWARE_NAME[82]='LLMP'
 	aSOFTWARE_NAME[83]='Apache2'
 	aSOFTWARE_NAME[84]='Lighttpd'
 	aSOFTWARE_NAME[85]='Nginx'
-	aSOFTWARE_NAME[86]='86'
+	aSOFTWARE_NAME[86]='Roon Extension Manager'
 	aSOFTWARE_NAME[87]='SQlite'
 	aSOFTWARE_NAME[88]='MariaDB'
 	aSOFTWARE_NAME[89]='PHP'
@@ -263,17 +253,17 @@
 	aSOFTWARE_NAME[93]='Pi-hole'
 	aSOFTWARE_NAME[94]='ProFTP'
 	aSOFTWARE_NAME[95]='vsFTPD'
-	aSOFTWARE_NAME[96]='Samba'
+	aSOFTWARE_NAME[96]='Samba Server'
 	aSOFTWARE_NAME[97]='OpenVPN'
 	aSOFTWARE_NAME[98]='HaProxy'
 	aSOFTWARE_NAME[99]='EmonPi'
 	aSOFTWARE_NAME[100]='PiJuice'
 	aSOFTWARE_NAME[101]='Log Rotate'
 	aSOFTWARE_NAME[102]='Rsyslog'
-	aSOFTWARE_NAME[103]='DietPi-Ramlog'
+	aSOFTWARE_NAME[103]='DietPi-RAMlog'
 	aSOFTWARE_NAME[104]='Dropbear'
 	aSOFTWARE_NAME[105]='OpenSSH Server'
-	aSOFTWARE_NAME[106]='NTP'
+	aSOFTWARE_NAME[106]='Lidarr'
 	aSOFTWARE_NAME[107]='rTorrent'
 	aSOFTWARE_NAME[108]='AmiBerry'
 	aSOFTWARE_NAME[109]='NFS'
@@ -315,7 +305,7 @@
 	aSOFTWARE_NAME[145]='Radarr'
 	aSOFTWARE_NAME[146]='Tautulli'
 	aSOFTWARE_NAME[147]='Jackett'
-	aSOFTWARE_NAME[148]='JRiver MC'
+	aSOFTWARE_NAME[148]='148'
 	aSOFTWARE_NAME[149]='NZBget'
 	aSOFTWARE_NAME[150]='Mono'
 	aSOFTWARE_NAME[151]='Nvidia'
@@ -335,66 +325,17 @@
 	aSOFTWARE_NAME[165]='Gitea'
 	aSOFTWARE_NAME[166]='PI-SPC'
 	aSOFTWARE_NAME[167]='Raspotify'
-	aSOFTWARE_NAME[168]='moOde'
+	aSOFTWARE_NAME[168]='168'
 	aSOFTWARE_NAME[169]='Google AIY'
 
-	# - v6.9 software fixes: https://github.com/Fourdee/DietPi/issues/1927#issuecomment-426453144
-	aSOFTWARE_NAME6_9=()
-	# - v6.10 software index changes
-	aSOFTWARE_NAME6_10=()
-	for i in ${!aSOFTWARE_NAME[@]}
-	do
-
-		aSOFTWARE_NAME6_9[$i]=${aSOFTWARE_NAME[$i]}
-		aSOFTWARE_NAME6_10[$i]=${aSOFTWARE_NAME[$i]}
-
-	done
-	#aSOFTWARE_NAME6_10[2]='2' # CurlTMPFS Removed but not marked as removed => v6.12
-	aSOFTWARE_NAME6_10[80]='Ubooquity'
-	aSOFTWARE_NAME6_10[86]='Roon Extension Manager'
-	aSOFTWARE_NAME6_10[106]='106' # NTP
-	aSOFTWARE_NAME6_10[168]='168' # Moode
-
-	# - v6.11 hotfix
-	aSOFTWARE_NAME6_11=()
-	for i in ${!aSOFTWARE_NAME6_10[@]}
-	do
-
-		aSOFTWARE_NAME6_11[$i]=${aSOFTWARE_NAME6_10[$i]}
-
-	done
-
-	# - v6.12
-	aSOFTWARE_NAME6_12=()
-	for i in ${!aSOFTWARE_NAME6_11[@]}
-	do
-
-		aSOFTWARE_NAME6_12[$i]=${aSOFTWARE_NAME6_11[$i]}
-
-	done
-	aSOFTWARE_NAME6_12[2]='2' # CurlTMPFS
-	aSOFTWARE_NAME6_12[148]='148' # JRiver
-
-	# - v6.13
-	aSOFTWARE_NAME6_13=()
-	for i in ${!aSOFTWARE_NAME6_12[@]}
-	do
-
-		aSOFTWARE_NAME6_13[$i]=${aSOFTWARE_NAME6_12[$i]}
-
-	done
-	aSOFTWARE_NAME6_13[2]='Folding@Home'
-	aSOFTWARE_NAME6_13[106]='Lidarr'
-
-	# - v6.14
+	# - v6.14 (earliest version that can upload to ssh.dietpi.com)
 	aSOFTWARE_NAME6_14=()
-	for i in ${!aSOFTWARE_NAME6_13[@]}
+	for i in ${!aSOFTWARE_NAME[@]}
 	do
 
-		aSOFTWARE_NAME6_14[$i]=${aSOFTWARE_NAME6_13[$i]}
+		aSOFTWARE_NAME6_14[$i]=${aSOFTWARE_NAME[$i]}
 
 	done
-	aSOFTWARE_NAME6_14[38]='FreshRSS'
 
 	# - v6.15
 	aSOFTWARE_NAME6_15=()
@@ -435,6 +376,15 @@
 	aSOFTWARE_NAME6_20[171]='DietPi-NordVPN'
 	aSOFTWARE_NAME6_20[172]='WireGuard'
 
+	# - v6.21 + v6.22
+	for i in ${!aSOFTWARE_NAME6_20[@]}
+	do
+
+		aSOFTWARE_NAME6_21[$i]=${aSOFTWARE_NAME6_20[$i]}
+		aSOFTWARE_NAME6_22[$i]=${aSOFTWARE_NAME6_21[$i]}
+
+	done
+
 	Main(){
 
 		# Copy files to RAM to speed up grep
@@ -443,7 +393,7 @@
 		[[ -e /tmp/dietpi-survey_report ]] && rm -R /tmp/dietpi-survey_report
 		cp -R /home/dietpi-survey/survey /tmp/dietpi-survey_report
 
-		cd /tmp/dietpi-survey_report # so we can remove bad files from disk
+		cd /tmp/dietpi-survey_report
 		for file in *.txt
 		do
 
@@ -511,7 +461,6 @@
 					#Done, clear vars
 					unset BENCH_VERSION
 					unset BENCH_HW_MODEL
-
 					unset BENCH_CPU
 					unset BENCH_ROOTFS_WRITE
 					unset BENCH_ROOTFS_READ
@@ -519,7 +468,6 @@
 					unset BENCH_RAM_READ
 					unset BENCH_CPU_TEMP_START
 					unset BENCH_CPU_TEMP_END
-
 					unset BENCH_CUSTOMFS_WRITE
 					unset BENCH_CUSTOMFS_READ
 					unset BENCH_NET_LAN_SPEED
@@ -530,80 +478,13 @@
 
 			fi
 
-			# pre v6.10: Files need to be scraped:
-
-			# Reset variables
-			survey_version=0
-			survey_sendcount=0
-			dietpi_version='0.0'
-			device_name='NULL'
-			cpu_arch=0
-			cpu_count=0
-			distro_version='NULL'
-			autostart_option=-1
-			software_list=''
-			software=''
-
-			# Survey versions
-			#survey_version=$(grep -m1 '^DietPi-Survey v' $file)
-			#((aSURVEY_VERSION[${survey_version##* v}]++))
-			# - Can only be v5 on pre v6.10
-			((aSURVEY_VERSION[5]++))
-
-			# Upload count numbers
-			survey_sendcount=$(grep -m1 '^Upload Count' $file)
-			((aSURVEY_SENTCOUNT[${survey_sendcount##* : }]++))
-
-			# DietPi versions
-			#dietpi_version=$(grep -m1 '^DietPi Version' $file)
-			# As survey runs on v6.9 currently within patch file, the version string is still at v6.8. Currently manual edit is needed, on v6.10 survey will run on dietpi-update after version string increase.
-			#dietpi_version=${dietpi_version/6.8/6.9}
-			#((aDIETPI_VERSION[${dietpi_version##* : }]++))
-			# - Can only be v6.9
-			((aDIETPI_VERSION[6.9]++))
-
-			# Device name
-			device_name=$(grep -m1 '^Hardware Name' $file)
-			((aDEVICE_NAME[${device_name##* : }]++))
-
-			# CPU architecture
-			cpu_arch=$(grep -m1 '^CPU Arch Index' $file)
-			cpu_arch=${cpu_arch##* : }
-			((aCPU_ARCH[${aCPU_NAME[$cpu_arch]:=$cpu_arch}]++))
-
-			# CPU core count
-			cpu_count=$(grep -m1 '^CPU Count' $file)
-			((aCPU_COUNT[${cpu_count##* : }]++))
-
-			# Distro version
-			distro_version=$(grep -m1 '^Distro Name' $file)
-			((aDISTRO_VERSION[${distro_version##* : }]++))
-
-			# Autostart option
-			autostart_option=$(grep -m1 '^Autoboot Index' $file)
-			autostart_option=${autostart_option##* : }
-			((aAUTOSTART_OPTION[${aAUTOSTART_NAME[$autostart_option]:=$autostart_option}]++))
-
-			# Installed software
-			software_list=$(grep '^aSOFTWARE_INSTALL_STATE\[' $file)
-			while read software
-			do
-
-				software=${software##*[}
-				software=${software%%]*}
-				((aSOFTWARE[${aSOFTWARE_NAME[$software]:=$software}]++))
-
-			done <<< "$software_list"
-
 		done
 
-		SURVEY_SENTCOUNT_TOTAL=0
-		for i in ${!aSURVEY_SENTCOUNT[@]}
-		do
-
-			(( SURVEY_SENTCOUNT_TOTAL += $i * ${aSURVEY_SENTCOUNT[$i]} ))
+		# Navigate to parent /tmp
+		cd /tmp
 
-		done
+		# Clean up reports dir
+		rm -R /tmp/dietpi-survey_report
 
 		#Bench Results, HW_MODEL array:
 		local default_min_value=100000
@@ -843,15 +724,16 @@
 		done
 
 		# - Optional benchmarks CUSTOMFS
-		# aBENCH_RESULT_CUSTOMFS_WRITE_MIN[$i]=$default_min_value
-		# aBENCH_RESULT_CUSTOMFS_WRITE_MAX[$i]=0
-		# aBENCH_RESULT_CUSTOMFS_WRITE_AVG[$i]=0
+		#aBENCH_RESULT_CUSTOMFS_WRITE_MIN[$i]=$default_min_value
+		#aBENCH_RESULT_CUSTOMFS_WRITE_MAX[$i]=0
+		#aBENCH_RESULT_CUSTOMFS_WRITE_AVG[$i]=0
 
-		# aBENCH_RESULT_CUSTOMFS_READ_MIN[$i]=$default_min_value
-		# aBENCH_RESULT_CUSTOMFS_READ_MAX[$i]=0
-		# aBENCH_RESULT_CUSTOMFS_READ_AVG[$i]=0
+		#aBENCH_RESULT_CUSTOMFS_READ_MIN[$i]=$default_min_value
+		#aBENCH_RESULT_CUSTOMFS_READ_MAX[$i]=0
+		#aBENCH_RESULT_CUSTOMFS_READ_AVG[$i]=0
 
-		cat << _EOF_ > /var/www/survey/index.html
+		# Create HTML file
+		cat << _EOF_ > index.html
 <html>
 	<head>
 		<style>
@@ -871,30 +753,19 @@
 		</style>
 	</head>
 	<body>
-		<h2>DietPi-Survey report page:</h2>
-		<i>Last update: $(TZ=UTC date "+%Y-%m-%d %T UTC")</i>
+		<h2>DietPi-Survey report page</h2>
+                <i>Uploads since: 01.01.2019 00:00:00 UTC</i><br>
+                <i>Last update: $(TZ=UTC date "+%Y-%m-%d %T UTC")</i><br>
 		<br>
 		<table>
-			<tr><td>Total user count</td><td align="right">$SURVEY_COUNT_TOTAL</td></tr>
-			<tr><td>Users opted in</td><td align="right">$(( $SURVEY_COUNT_TOTAL - $SURVEY_COUNT_EMPTY ))</td></tr>
-			<tr><td>Users opted out</td><td align="right">$SURVEY_COUNT_EMPTY</td></tr>
-		</table>
-
-		<h4>DietPi-Survey versions:</h4>
-		<table>
-			$(for i in ${!aSURVEY_VERSION[@]}; do echo "<tr><td>DietPi-Survey v$i</td><td align=\"right\">	${aSURVEY_VERSION[$i]}</td></tr>"; done | sort -nrk 1.24 -t '	')
-		</table>
-
-		<h4>DietPi-Survey upload counts:</h4>
-		<table>
-			<tr><td>Overall upload count</td><td align="right">$SURVEY_SENTCOUNT_TOTAL</td></tr>
-			<tr><th>Upload count</th><th>by user count</th></tr>
-			$(for i in ${!aSURVEY_SENTCOUNT[@]}; do echo "<tr><td>$i</td><td align=\"right\">	${aSURVEY_SENTCOUNT[$i]}</td></tr>"; done | sort -nrk 1.9 -t '	')
+			<tr><td>Total install count</td><td align="right">$SURVEY_COUNT_TOTAL</td></tr>
+			<tr><td>Opted in installs</td><td align="right">$(( $SURVEY_COUNT_TOTAL - $SURVEY_COUNT_EMPTY ))</td></tr>
+			<tr><td>Opted out installs</td><td align="right">$SURVEY_COUNT_EMPTY</td></tr>
 		</table>
 
 		<h4>DietPi versions:</h4>
 		<table>
-			$(for i in "${!aDIETPI_VERSION[@]}"; do echo "<tr><td>DietPi v$i</td><td align=\"right\">	${aDIETPI_VERSION[$i]}</td></tr>"; done | sort -nrk 1.20 -t '	')
+			$(for i in "${!aDIETPI_VERSION[@]}"; do echo "<tr><td>DietPi v${i//6.9/6.09}</td><td align=\"right\">	${aDIETPI_VERSION[$i]}</td></tr>"; done | sort -nrk 1.17,1.20 -t '	')
 		</table>
 
 		<h4>Git branches:</h4>
@@ -1112,13 +983,13 @@
 </html>
 _EOF_
 
-		# Clean up tmp ramfs
-		rm -R /tmp/dietpi-survey_report
+		# Move HTML page in place
+		mv index.html /var/www/survey/index.html
 
 	}
 
 	#-----------------------------------------------------------
-	#Main
+	# Main
 	#-----------------------------------------------------------
 	Main #&> /var/log/dietpi-survey_report.log
 	#-----------------------------------------------------------
diff --git a/BRANCH_SYSTEM.md b/BRANCH_SYSTEM.md
index 5f62c94cf3..753fed6cab 100644
--- a/BRANCH_SYSTEM.md
+++ b/BRANCH_SYSTEM.md
@@ -18,7 +18,7 @@ Beta on an existing installation:
 G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=beta' /DietPi/dietpi.txt
 ```
 3. Run ```dietpi-update``` to update the system, then reboot.
-4. Test away, please report any issues on our GitHub page. Also ensure you mention "Beta branch" in your post: https://github.com/Fourdee/DietPi/issues
+4. Test away, please report any issues on our GitHub page. Also ensure you mention "Beta branch" in your post: https://github.com/MichaIng/DietPi/issues
 5. If you want to return the system to the previous restore state, run ```dietpi-backup``` to restore (or restore quickly with ```dietpi-backup -1```)
 
 ## Steps to use the DietPi "dev" branch
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 64d4cd2730..5a80f83f53 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,32 +1,77 @@
 
+v6.22
+(xx/03/19)
+
+Changes / Improvements / Optimisations:
+- Security | The DietPi-Software global password is now stored with enhanced security which also resolves a warning on Buster systems: https://github.com/MichaIng/DietPi/issues/2213
+- General | DietPi scripts now use the lightweight standalone "7zr" command to handle 7z archives. This allows us to lower DietPi core package dependencies from "p7zip-full" to "p7zip".
+- DietPi-NordVPN | Added sent/received usage stats for VPN tunnel.
+- DietPi-Sync | Sync will now abort if the source dir is empty. Merged dry run into real sync, as this was performed anyway to do required free space check. When "Sync" is selected, after dry run the user is presented a summary and given the option to view the detailed dry run log, cancel or continue with real sync. Some other minor fixes and enhancements have been applied as well. Many thanks to @midnightwatcher for doing this request: https://dietpi.com/phpbb/viewtopic.php?f=12&t=5588
+- DietPi-Software | Emby Server: Now installs the latest version automatically (currently 4.0.2) which as well offers a native ARMv8 package: https://github.com/MichaIng/DietPi/pull/2525
+- DietPi-Software | WireGuard: Switched from 10.8.0.0 to 10.9.0.0 IP addresses on fresh installs to avoid doubled IP range use with OpenVPN. Many thanks to @XRay437 for pointing this out: https://github.com/MichaIng/DietPi/issues/2491#issuecomment-461366739
+- DietPi-Software | WireGuard: Changed the way users are adviced to add multiple clients, to enhance concurrent connections. Many thanks to @curiosity-seeker for reporting and testing this issue: https://github.com/MichaIng/DietPi/issues/2491#issuecomment-462419860
+- DietPi-Software | WireGuard: Hardened "sid" repo handling on RPi to prevent accidental non-WireGuard package installs. Many thanks to @rucknapucknavitz @1985kasper and @g7kse for reporting this issue: https://github.com/MichaIng/DietPi/issues/2568#issuecomment-465725312
+- DietPi-Software | GMediaRender: Enabled support for Debian/Raspbian Buster by using the up-to-date APT repo package.
+- DietPi-Software | Aria2: Tweaked settings to enhance 3rd party plugin support and removed deprecated/doubled entries. Many thanks to @msongz for the commit: https://github.com/MichaIng/DietPi/pull/2538
+- DietPi-Software | UrBackup: Now installs updated version 2.3.7. Many thanks to @DeathIsUnknown for the information: https://github.com/MichaIng/DietPi/issues/2577
+- DietPi-Software | Deluge: Reworked the installer to better match the Debian package defaults and recommendations/examples from official docs. Deluge now runs as user "debian-deluged", logs have been moved to "/var/log/deluged/" and the init.d service with its traces are removed, which are all pre-generated by the Debian APT package. The systemd units have been adjusted according to the official Deluge documentation. These changes are applied as well to existing installs during DietPi update, the old user "deluge" and obsolete configurations are removed. Your active configurations and data are preserved, the installer has been as well enhanced to better handle existing installs and never touch existing configs. Note that access to the Deluge console has to be done as user "debian-deluged" (sudo -u debian-deluged deluge-console). A related access issue to the console has been fixed by this as well. Many thanks to @seanmikhaels for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5525
+- DietPi-Software | AmiBerry: Updated to latest version (2.25), thanks @midwan: https://github.com/MichaIng/DietPi/issues/2599
+- DietPi-Software | Netdata: On Debian Stretch/Buster and Raspbian Buster an up-to-date APT package is available, which will now be installed instead of our custom build. Many thanks to @74cmonty for this information: https://github.com/MichaIng/DietPi/issues/2446
+- DietPi-Software | DietPi-RAMlog: When installing/enabling RAMlog, the /var/log mountpoint will be now cleaned before mounting the tmpfs on it, while preserving the existing logs metadata. This resolves a warning on early boot stage and frees the disk space consumed by the disk log before.
+
+Bug Fixes:
+- System | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2529
+- System | Resolved an issue where /etc/rc.local was not executed due to an incompatible legacy rc-local.service. Many thanks to @Remonli for reporting this issue: https://github.com/MichaIng/DietPi/issues/2566
+- DietPi-Config | RPi: Resolved an issue where I-Sabre-K2M sound card selection failed. Thanks to @klasLiesen for reporting this issue: https://github.com/MichaIng/DietPi/issues/2547
+- DietPi-Config | RPi: Resolved an issue where serial console must be disabled, for Bluetooth to function correctly. This is now done automatically during BT enable: https://github.com/MichaIng/DietPi/issues/2607
+- DietPi-Config/Banner | Resolved an issue where wrong adapter state is shown if it is not connected but has an IP assigned. Thanks to @msongz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2573
+- DietPi-Drive_Manager | Resolved an issue where RootFS RO would not remain during reboots. Many thanks to @JBatSEEDLING for reporting this issue: https://github.com/MichaIng/DietPi/issues/2604
+- DietPi-Software | XU4 + X11: Resolved various issues related to incorrect xorg.conf settings on this device. xorg.conf now used is installed automatically from Meveric's repo, which auto detects 3.x and 4.x kernel configuration and required settings automatically: https://github.com/MichaIng/DietPi/issues/2584 + https://github.com/MichaIng/DietPi/issues/2351
+- DietPi-Software | MineOS/Koel: Resolved an issue where installs on ARMv8 devices failed. Many thanks to @DeathIsUnknown for reporting this issue and providing the solution: https://github.com/MichaIng/DietPi/issues/1880#issuecomment-464097174
+- DietPi-Software | GMediaRender: Resolved an issue where the daemon can attach to a wrong IP if multiple network devices are present. As well resolved a failing service start on fresh install if/as the log file does not yet exist. Many thanks to @WilburWalsh for reporting these issues and providing the fix: https://github.com/MichaIng/DietPi/issues/2576
+- DietPi-Software | OpenSSH Client: Resolved an issue where uninstalling the OpenSSH client will in case also remove the OpenSSH server.
+- DietPi-Software | Emby Server: We disabled the install option on Jessie ARM systems. This never succeeded since Debian Jessie does not provide the required minimum libc6 version. Many thanks to @mbone for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5502
+- DietPi-Software | Mopidy: Resolved issue with failed audio playback. Many thanks to @arkhub for reporting this issue: https://github.com/MichaIng/DietPi/issues/2536
+- DietPi-Software | WireGuard: Resolved an issue with wrong client DNS entry if 127.0.0.1/localhost loopback is used as DNS entry on server. Many thanks to @swrobel for reporting this issue: https://github.com/MichaIng/DietPi/issues/2482
+- DietPi-Software | WireGuard: Resolved an issue where on uninstall the Debian Sid repo was not removed from APT sources. Many thanks to @XRay437 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2545
+- DietPi-Software | Java: Resolved possible install failures on ARM. Many thanks to @WTFMaster for reporting this issue: https://github.com/MichaIng/DietPi/issues/2524
+- DietPi-Software | Remot3.it: Resolved an issue where install failed due to Git repo changes. Additionally Remot3.it is now available on x86_64 and ARMv8 systems as well. Many thanks to @techano for reporting this issue: https://github.com/MichaIng/DietPi/issues/2551
+- DietPi-Software | Pi-hole: Resolved an issue where "pihole -up" fails because of wrong file permissions. Many thanks to @jonare77 for resporting this issue: https://github.com/MichaIng/DietPi/issues/2516
+- DietPi-Software | MPD: Resolved an issue with failed playback due to permissions. Permissions are now set via systemd service to ensure the MPD user can use both dietpi and audio groups: https://github.com/MichaIng/DietPi/issues/2462
+- DietPi-Software | Airsonic: Resolved an issue where during install the FFmpeg transcoder symlink could be placed wrong, leading to a failing Airsonic start. Many thanks to @pecan_pie for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5637
+- DietPi-Software | DietPi-RAMlog: Fixed an issue where logging mode could be set wrong when uninstalling and reinstalling RAMlog. Many thanks to @abecvar for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=9&t=5666 
+
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?q=is%3Aclosed+base%3Amaster
+
+Known/Outstanding Issues:
+- DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103
+- DietPi-Config | RPi: Enabling OpenGL/VC4 causes sound card selection to be invalid: https://github.com/MichaIng/DietPi/issues/2173
+- DietPi-Drive_Manager | encryptfs is currently not supported and will be removed from fstab when executing drive manager: https://github.com/MichaIng/DietPi/issues/2078
+- RPi | LXAppearance (on LXDE desktop) hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791
+- Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955
+- DietPi-Software | Node-RED: Pre-installed modules cannot be updated via web UI: https://github.com/MichaIng/DietPi/issues/2073
+- DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/MichaIng/DietPi/issues/1747
+
+For all additional issues that may appear after release, please see the following link for active tickets: https://github.com/MichaIng/DietPi/issues
+
+-----------------------------------------------------------------------------------------------------------
+
 v6.21 (Hotfix)
 (07/02/19)
 
 Changes / Improvements / Optimisations:
 - DietPi-Software | VNC4: Automated VNC password based on $GLOBAL_PW.
-- DietPi-Software | GPU memory split: You will now be prompted to increase GPU memory if DietPi detects a higher value is required for installed software: https://github.com/Fourdee/DietPi/issues/2483
+- DietPi-Software | GPU memory split: You will now be prompted to increase GPU memory if DietPi detects a higher value is required for installed software: https://github.com/MichaIng/DietPi/issues/2483
 
 Bug Fixes:
-- General | G_RUN_CMD: Resolved issue with incorrect exit code return. This also prevented the ability to remove networked drives from dietpi-drive_manager: https://github.com/Fourdee/DietPi/issues/2508
-- General | Resolved an issue when updating to v6.20, where DietPi-RAMdisk failed to sync changes to disk, causing several issues after reboot: https://github.com/Fourdee/DietPi/issues/2471#issuecomment-460104856
-- DietPi-Software | WireGuard: Server installation also sets port as configured during installation to wg0-client.conf. Disabled installation for ARMv6 (no binaries). Many thanks to @WilburWalsh for reporting this issue: https://github.com/Fourdee/DietPi/issues/2474
+- General | G_RUN_CMD: Resolved issue with incorrect exit code return. This also prevented the ability to remove networked drives from dietpi-drive_manager: https://github.com/MichaIng/DietPi/issues/2508
+- General | Resolved an issue when updating to v6.20, where DietPi-RAMdisk failed to sync changes to disk, causing several issues after reboot: https://github.com/MichaIng/DietPi/issues/2471#issuecomment-460104856
+- DietPi-Software | WireGuard: Server installation also sets port as configured during installation to wg0-client.conf. Disabled installation for ARMv6 (no binaries). Many thanks to @WilburWalsh for reporting this issue: https://github.com/MichaIng/DietPi/issues/2474
 - DietPi-Software | VNCserver: Resolved "HOME" variable not set in service.
-- DietPi-Software | MariaDB: Resolved an issue with latest MariaDB v10.3 update on Buster due to deprecated/removed settings: https://github.com/Fourdee/DietPi/pull/2490
-- PREP | Resolved issues with failed installation, due to missing pre-req directory: https://github.com/Fourdee/DietPi/issues/2487
-
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
-
-Known/Outstanding Issues:
-- DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/Fourdee/DietPi/issues/2103
-- DietPi-Config | RPi | OpenGL/VC4 causes sound card selection to be invalid: https://github.com/Fourdee/DietPi/issues/2173
-- PineA64 | 3.5mm audio no sound output: https://github.com/Fourdee/DietPi/issues/2153
-- RPi | LXAppearance (on LXDE desktop) hangs on dbus-launch: https://github.com/Fourdee/DietPi/issues/1791
-- Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/Fourdee/DietPi/issues/1955
-- DietPi-Software | Node-RED: Pre-installed modules cannot be updated via webUI: https://github.com/Fourdee/DietPi/issues/2073
-- DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/Fourdee/DietPi/issues/1747
-- DietPi-Drive_Manager | encryptfs is currently not supported and will be removed from fstab, when executing drive manager: https://github.com/Fourdee/DietPi/issues/2078
+- DietPi-Software | MariaDB: Resolved an issue with latest MariaDB v10.3 update on Buster due to deprecated/removed settings: https://github.com/MichaIng/DietPi/pull/2490
+- PREP | Resolved issues with failed installation, due to missing pre-req directory: https://github.com/MichaIng/DietPi/issues/2487
 
-For all additional issues that may appear after release, please see the following link and select the 'Next Version Milestone' to see active tickets: https://github.com/Fourdee/DietPi/milestones
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -34,68 +79,68 @@ v6.20
 (28/01/19)
 
 Image line-up:
-- We removed Jessie images from our download server (besides for Odroid C1), since we see no advantage to use them anymore. Existing Jessie systems are still supported, but we encourage all users to consider switching to a fresh Stretch image by times: https://github.com/Fourdee/DietPi/issues/2332
+- We removed Jessie images from our download server (besides for Odroid C1), since we see no advantage to use them anymore. Existing Jessie systems are still supported, but we encourage all users to consider switching to a fresh Stretch image by times: https://github.com/MichaIng/DietPi/issues/2332
 
 Changes / Improvements / Optimisations:
-- DietPi-PREP | Removed the option to install a Jessie system. Removed the option to install DietPi on top of a Wheezy image, since an upgrade over two distro version would be required, which is not reliable. It is still possible to install DietPi on top of a Jessie image, where a distro upgrade to Stretch would be applied: https://github.com/Fourdee/DietPi/issues/2332
+- DietPi-PREP | Removed the option to install a Jessie system. Removed the option to install DietPi on top of a Wheezy image, since an upgrade over two distro version would be required, which is not reliable. It is still possible to install DietPi on top of a Jessie image, where a distro upgrade to Stretch would be applied: https://github.com/MichaIng/DietPi/issues/2332
 - General | RPi-Update: In our effort to improve system stability, and, offer software installations which build custom modules (eg: WireGuard), we can not longer support systems with non-stock APT kernel installed. If "rpi-update" is installed during update, DietPi will prompt and return you back to stock APT kernel.
 - General | Moved the remaining conf/* files located on DietPi-RAMdisk to /var/lib/dietpi or into DietPi-PREP, and removed /DietPi/dietpi/conf completely. These files were only used once or never, thus have no business inside the RAMdisk.
-- DietPi-Config | RPi: Improved available options for HDMI boost setting: https://github.com/Fourdee/DietPi/issues/2350
-- DietPi-Config | RPi: Headless display mode is now applied via undocumented config.txt setting. Removed/Replaced some other obsolete config.txt entries: https://github.com/Fourdee/DietPi/pull/2402
+- DietPi-Config | RPi: Improved available options for HDMI boost setting: https://github.com/MichaIng/DietPi/issues/2350
+- DietPi-Config | RPi: Headless display mode is now applied via undocumented config.txt setting. Removed/Replaced some other obsolete config.txt entries: https://github.com/MichaIng/DietPi/pull/2402
 - DietPi-Config | RPi: Added info to "hifiberry-dacplus" sound device overlay that it supports the AMP2 DAC. Thanks to @Lat Dior for reporting the issue and testing the solution: https://dietpi.com/phpbb/viewtopic.php?t=5396
 - DietPi-Config | WiFi Hotspot: You can now toggle support for 802.11 N. Please note this is device and compatibility dependent, mileage may vary.
-- DietPi-Drive_Manager | Now allows to check & repair the boot file system and trigger it for root file system on next reboot: https://github.com/Fourdee/DietPi/issues/1740#issuecomment-388325204
+- DietPi-Drive_Manager | Now allows to check & repair the boot file system and trigger it for root file system on next reboot: https://github.com/MichaIng/DietPi/issues/1740#issuecomment-388325204
 - DietPi-Software | AmiBerry: Updated to v2.24, thanks @midwan! Brings several bug fixes, new features and improvements over the previous version (2.19). Please check the version history for full details on the changes made: https://github.com/midwan/amiberry/wiki/Version-history
 - DietPi-Software | DietPi-NordVPN: Now available for installation. Includes a GUI which allows for easy connection to a list of NordVPN servers 'dietpi-nordvpn'. If you need a NordVPN subscription, please use this link: https://go.nordvpn.net/aff_c?offer_id=15&aff_id=5305&url_id=902
 - DietPi-Software | WireGuard VPN is now available for installation. Is can be easily configured as client or as server, passing either all client traffic through the tunnel, local network access only, or server access only, e.g. as well in combination with Pi-hole, to have remote ad blocking.
-- DietPi-Software | SickRage has been replaced by Medusa, which is now available for install: https://github.com/Fourdee/DietPi/issues/2239
-- DietPi-Software | Blynk: Reinstalls now preserve existing config files; New directory structure and blynk user (v6.19) is patched now as well to existing installs: https://github.com/Fourdee/DietPi/pull/2324
-- DietPi-Software | Plex Media Server: Updated to v1.14.0 on x86 images, switch to HTTPS ARM repo and automated locale switch to en_US.UTF-8: https://github.com/Fourdee/DietPi/issues/2294
-- DietPi-Software | Nextcloud Talk: Disabled the very verbose coturn logging by default to reduce disk I/O. This can be overridden via /etc/turnserver.conf: https://github.com/Fourdee/DietPi/issues/2321
-- DietPi-Software | Deluge: UMask 002 applied to all downloads: https://github.com/Fourdee/DietPi/issues/2339
-- DietPi-Software | Netdata: Updated to v1.11.1 and now runs as user "netdata": https://github.com/Fourdee/DietPi/pull/2337
-- DietPi-Software | ownCloud/Nextcloud: Updated webserver configs to match current recommendations and security hardenings. Only applied on new installs. To apply manually, run "dietpi-software reinstall 47" (owncloud) or "dietpi-software reinstall 114" (Nextcloud). You will be informed about the new configs, which then need to be manually moved to overwrite the old ones, since we don't want to mess with manual changes: https://github.com/Fourdee/DietPi/pull/2361
+- DietPi-Software | SickRage has been replaced by Medusa, which is now available for install: https://github.com/MichaIng/DietPi/issues/2239
+- DietPi-Software | Blynk: Reinstalls now preserve existing config files; New directory structure and blynk user (v6.19) is patched now as well to existing installs: https://github.com/MichaIng/DietPi/pull/2324
+- DietPi-Software | Plex Media Server: Updated to v1.14.0 on x86 images, switch to HTTPS ARM repo and automated locale switch to en_US.UTF-8: https://github.com/MichaIng/DietPi/issues/2294
+- DietPi-Software | Nextcloud Talk: Disabled the very verbose coturn logging by default to reduce disk I/O. This can be overridden via /etc/turnserver.conf: https://github.com/MichaIng/DietPi/issues/2321
+- DietPi-Software | Deluge: UMask 002 applied to all downloads: https://github.com/MichaIng/DietPi/issues/2339
+- DietPi-Software | Netdata: Updated to v1.11.1 and now runs as user "netdata": https://github.com/MichaIng/DietPi/pull/2337
+- DietPi-Software | ownCloud/Nextcloud: Updated webserver configs to match current recommendations and security hardenings. Only applied on new installs. To apply manually, run "dietpi-software reinstall 47" (owncloud) or "dietpi-software reinstall 114" (Nextcloud). You will be informed about the new configs, which then need to be manually moved to overwrite the old ones, since we don't want to mess with manual changes: https://github.com/MichaIng/DietPi/pull/2361
 - DietPi-Software | OpenSSH: Host keys won't be recreated anymore on reinstall, only on first boot of a fresh image, using now "dpkg-reconfigure openssh-server" to generate default key types based on distro.
 - DietPi-Software | Dropbear: Now installs only the "dropbear-run" package on Stretch (and above), which matches the default DietPi setup on our images and PREP script.
-- DietPi-Software | NAA Daemon: Updated to 3.5.5-39. Thanks to @volpone for the heads up: https://github.com/Fourdee/DietPi/issues/2387#issue-395321320
-- DietPi-Software | MPD: Updated to 0.20.23-1. Includes support for NFS and Samba: https://github.com/Fourdee/DietPi/issues/2377
-- DietPi-Software | MPD: Now runs as "mpd" user again, updated systemd unit to match official one and better handle existing cache and log files on reinstall: https://github.com/Fourdee/DietPi/issues/2378
-- DietPi-Software | Samba: Moved disk cache to RAM to reduce disk I/O. Thanks to @WolfganP for suggesting this enhancement: https://github.com/Fourdee/DietPi/issues/2396
-- DietPi-Software | Kodi RPi: Default GPU memory split is now 320MB for 1GB devices. This should improve overall performance and stability: https://github.com/Fourdee/DietPi/issues/2365
-- DietPi-Software | Airsonic: Now installs the latest upstream version automatically: https://github.com/Fourdee/DietPi/pull/2410
-- DietPi-Software | You will now receive a whiptail prompt, if config files are overwritten during software installations: https://github.com/Fourdee/DietPi/issues/2325
-- DietPi-Software | NoMachine: Enabled ARMv8 support and will now install current version 6.4.6: https://github.com/Fourdee/DietPi/pull/2408
-- DietPi-Software | Shairport Sync: Updated to 3.2.2 (previously 3.1.7): https://github.com/Fourdee/DietPi/issues/2439
-- DietPi-Software | Gitea: New installations now install 1.7 (previously 1.4). Many thanks to @yumiris for this update! https://github.com/Fourdee/DietPi/pull/2448
-- DietPi-Software | Grafana: Now the new official APT repo is used for all architectures (excluding ARMv6), which allows updates to the current upstream version (currently v5.4.3) as well. This change will be applied to existing installs on dietpi-update to v6.20. Thanks to @jvteleco for informing us: https://github.com/Fourdee/DietPi/issues/2449
+- DietPi-Software | NAA Daemon: Updated to 3.5.5-39. Thanks to @volpone for the heads up: https://github.com/MichaIng/DietPi/issues/2387#issue-395321320
+- DietPi-Software | MPD: Updated to 0.20.23-1. Includes support for NFS and Samba: https://github.com/MichaIng/DietPi/issues/2377
+- DietPi-Software | MPD: Now runs as "mpd" user again, updated systemd unit to match official one and better handle existing cache and log files on reinstall: https://github.com/MichaIng/DietPi/issues/2378
+- DietPi-Software | Samba: Moved disk cache to RAM to reduce disk I/O. Thanks to @WolfganP for suggesting this enhancement: https://github.com/MichaIng/DietPi/issues/2396
+- DietPi-Software | Kodi RPi: Default GPU memory split is now 320MB for 1GB devices. This should improve overall performance and stability: https://github.com/MichaIng/DietPi/issues/2365
+- DietPi-Software | Airsonic: Now installs the latest upstream version automatically: https://github.com/MichaIng/DietPi/pull/2410
+- DietPi-Software | You will now receive a whiptail prompt, if config files are overwritten during software installations: https://github.com/MichaIng/DietPi/issues/2325
+- DietPi-Software | NoMachine: Enabled ARMv8 support and will now install current version 6.4.6: https://github.com/MichaIng/DietPi/pull/2408
+- DietPi-Software | Shairport Sync: Updated to 3.2.2 (previously 3.1.7): https://github.com/MichaIng/DietPi/issues/2439
+- DietPi-Software | Gitea: New installations now install 1.7 (previously 1.4). Many thanks to @yumiris for this update! https://github.com/MichaIng/DietPi/pull/2448
+- DietPi-Software | Grafana: Now the new official APT repo is used for all architectures (excluding ARMv6), which allows updates to the current upstream version (currently v5.4.3) as well. This change will be applied to existing installs on dietpi-update to v6.20. Thanks to @jvteleco for informing us: https://github.com/MichaIng/DietPi/issues/2449
 - DietPi-Update | Added optional ability to automatically update DietPi, when updates are available. Please note, this is disabled by default.
 - DietPi-Sync | Removed the compression option, which has no effect on local sync, since files are not stored compressed, but only transferred compressed through remote sync protocols, which are currently not offered by DietPi-Sync.
 - DietPi-RAMlog/Logclear | The internally rotated LetsEncrypt (CertBot) log files are now removed, hourly with DietPi-RAMlog enabled, or when executing DietPi-Logclear manually.
 
 Bug Fixes:
-- DietPi-Software | LXDE: Installation will no longer enable the weather application. This is due to Yahoo API hard coded into LXpanel, being taken offline: https://github.com/Fourdee/DietPi/issues/2416#issuecomment-456805925
-- DietPi-Software | Nextcloud: Resolved an issue, where the Nextcloud Apache config was not downloaded correctly. Thanks to @Stefan3v for reporting this issue: https://github.com/Fourdee/DietPi/issues/2383
-- DietPi-Software | ownCloud/Nextcloud (Talk): Resolved an issue, where occ/ncc commands could fail, if Redis server is not running: https://github.com/Fourdee/DietPi/issues/2321
+- DietPi-Software | LXDE: Installation will no longer enable the weather application. This is due to Yahoo API hard coded into LXpanel, being taken offline: https://github.com/MichaIng/DietPi/issues/2416#issuecomment-456805925
+- DietPi-Software | Nextcloud: Resolved an issue, where the Nextcloud Apache config was not downloaded correctly. Thanks to @Stefan3v for reporting this issue: https://github.com/MichaIng/DietPi/issues/2383
+- DietPi-Software | ownCloud/Nextcloud (Talk): Resolved an issue, where occ/ncc commands could fail, if Redis server is not running: https://github.com/MichaIng/DietPi/issues/2321
 - DietPi-Software | ownCloud/Nextcloud: Resolved an issue, where during fresh installs on v6.19, Apache configs were not enabled correctly.
-- DietPi-Software | MPD: Resolved an issue on Stretch, where the mpd binary could not find the configuration file without giving it explicitely as argument. Thanks to @mfeif for reporting this issue: https://github.com/Fourdee/DietPi/issues/2378
-- DietPi-Software | Mopidy: Resolved an issue, where playlist files could not be created due to missing permissions. Further improved handling of existing configs, data and cache directories on (re)install. Thanks to @cyberlussi for reporting this issue: https://github.com/Fourdee/DietPi/issues/2384
+- DietPi-Software | MPD: Resolved an issue on Stretch, where the mpd binary could not find the configuration file without giving it explicitely as argument. Thanks to @mfeif for reporting this issue: https://github.com/MichaIng/DietPi/issues/2378
+- DietPi-Software | Mopidy: Resolved an issue, where playlist files could not be created due to missing permissions. Further improved handling of existing configs, data and cache directories on (re)install. Thanks to @cyberlussi for reporting this issue: https://github.com/MichaIng/DietPi/issues/2384
 - DietPi-Software | Deluge: Resolved a visual-only error in systemd unit, since same-line comments are not allowed anymore. Thanks to @Gabba for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?t=5378
-- DietPi-Software | No-IP: Fixed an issue, where on "Generic device" (ID 22), the wrong binary could have been installed. As well added failsafe "/usr/local/[bin|etc]" directory pre-creation, in case not present on the system or manually removed by user. Thanks to @walker93 for reporting this issue: https://github.com/Fourdee/DietPi/issues/2426
-- DietPi-Software | PHP: Resolved an issue where install fails on Stretch due to package name changes in the Debian repo. Thanks to @rox-wolf for reporting this issue: https://github.com/Fourdee/DietPi/issues/2438
+- DietPi-Software | No-IP: Fixed an issue, where on "Generic device" (ID 22), the wrong binary could have been installed. As well added failsafe "/usr/local/[bin|etc]" directory pre-creation, in case not present on the system or manually removed by user. Thanks to @walker93 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2426
+- DietPi-Software | PHP: Resolved an issue where install fails on Stretch due to package name changes in the Debian repo. Thanks to @rox-wolf for reporting this issue: https://github.com/MichaIng/DietPi/issues/2438
 - DietPi-Sync | Resolved an issue, where dry-run and compression options were not applied correctly. Thanks to @WilburWalsh for reporting the issue and identifying the faulty code: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5347
 - DietPi-Sync | Resolved an issue, where daily sync was not applied due to changed settings file scheme.
-- DietPi-Config | RPi: gpu_mem_256/512 are now capped when being applied (to prevent value exceeding limits of each board type): https://github.com/Fourdee/DietPi/issues/2417
-- DietPi-Config | Resolved a visual-only issue, where WiFi interface starts throw an error message about unsupported power management: https://github.com/Fourdee/DietPi/issues/2198
+- DietPi-Config | RPi: gpu_mem_256/512 are now capped when being applied (to prevent value exceeding limits of each board type): https://github.com/MichaIng/DietPi/issues/2417
+- DietPi-Config | Resolved a visual-only issue, where WiFi interface starts throw an error message about unsupported power management: https://github.com/MichaIng/DietPi/issues/2198
 - DietPi-WiFi-Monitor | Resolved an issue, where DietPi-WiFi-Monitor stuck in a reconnection loop, if no valid WiFi interface was detected or the WiFi adapter is unplugged.
-- DietPi-Cloudshell | Resolved an issue where CPU scene failed on VM and other devices that do not support CPU governors: https://github.com/Fourdee/DietPi/issues/2428
-- DietPi-LetsEncrypt | Resolved an issue where Nginx and Apache modules are missing, if one installs CertBot first and the webserver afterwards on a separate dietpi-software run: https://github.com/Fourdee/DietPi/issues/2295
+- DietPi-Cloudshell | Resolved an issue where CPU scene failed on VM and other devices that do not support CPU governors: https://github.com/MichaIng/DietPi/issues/2428
+- DietPi-LetsEncrypt | Resolved an issue where Nginx and Apache modules are missing, if one installs CertBot first and the webserver afterwards on a separate dietpi-software run: https://github.com/MichaIng/DietPi/issues/2295
 - General | Pinebook: Resolved issue with failed apt-get upgrades due to missing armbian-release data file. Also switched to stable kernel packages and kernel updates over APT are now enabled.
-- General | Enhanced and fixed some issue with dependencies and boot order of DietPi systemd units: https://github.com/Fourdee/DietPi/pull/2357
+- General | Enhanced and fixed some issue with dependencies and boot order of DietPi systemd units: https://github.com/MichaIng/DietPi/pull/2357
 - General | AudioPhonics I-Sabre-K2M: Once the driver is compiled, it will no longer be recompiled. This prevents ALSA installs from re-compiling the driver each time.
-- General | Resolved an issue, where login with non-bash session caused an error message. Thanks to @Elijahg for reporting this issue: https://github.com/Fourdee/DietPi/issues/2347
+- General | Resolved an issue, where login with non-bash session caused an error message. Thanks to @Elijahg for reporting this issue: https://github.com/MichaIng/DietPi/issues/2347
 - General | Resolved an issue where G_CHECK_URL would not terminate applications on failure. Also added option to retry + change networking options.
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -103,43 +148,41 @@ v6.19.7
 (10/12/18 Hotfix)
 
 Bug Fixes:
-- DietPi-Software | Netdata: Resolved an issue, where uninstalling netdata lead to a broken system. Thanks to @PDXUser for reporting this issue: https://github.com/Fourdee/DietPi/issues/2336
-- DietPi-Software | Docker: Resolved an issue on RPi, where a faulty "docker-ce" version from repository prevents service start on Raspberry Pi. Thanks to @iaresee and @Garret for reporting this issue, finding and testing workarounds: https://github.com/Fourdee/DietPi/issues/2282
+- DietPi-Software | Netdata: Resolved an issue, where uninstalling netdata lead to a broken system. Thanks to @PDXUser for reporting this issue: https://github.com/MichaIng/DietPi/issues/2336
+- DietPi-Software | Docker: Resolved an issue on RPi, where a faulty "docker-ce" version from repository prevents service start on Raspberry Pi. Thanks to @iaresee and @Garret for reporting this issue, finding and testing workarounds: https://github.com/MichaIng/DietPi/issues/2282
 
 v6.19.6
 (05/12/18 Hotfix)
 
 Bug Fixes:
-- DietPi-Software | Resolved an issue where "force-reload" of webservers lead to an error prompt, if the service was not actually running: https://github.com/Fourdee/DietPi/pull/2326#issuecomment-444646114
-- DietPi-Software | Nginx: Resolved an issue, where software specific webserver configs were not loaded after v6.19 update: https://github.com/Fourdee/DietPi/issues/2325#issuecomment-444564109
+- DietPi-Software | Resolved an issue where "force-reload" of webservers lead to an error prompt, if the service was not actually running: https://github.com/MichaIng/DietPi/pull/2326#issuecomment-444646114
+- DietPi-Software | Nginx: Resolved an issue, where software specific webserver configs were not loaded after v6.19 update: https://github.com/MichaIng/DietPi/issues/2325#issuecomment-444564109
 
 v6.19
 (04/12/18)
 
 Changes / Improvements / Optimisations:
 - General | ASUS TB: Image updated to mainline kernel, with midgard r13 GPU driver. Now supports hardware acceleration and support for Kodi. Please download the image to enable these features.
-- General | RPi 3A+: Added hardware code enabling correct naming of device throughout DietPi: https://github.com/Fourdee/DietPi/issues/2301
-- DietPi-Software | Renamed several software config files to have a consistent naming scheme: https://github.com/Fourdee/DietPi/pull/2312
+- General | RPi 3A+: Added hardware code enabling correct naming of device throughout DietPi: https://github.com/MichaIng/DietPi/issues/2301
+- DietPi-Software | Renamed several software config files to have a consistent naming scheme: https://github.com/MichaIng/DietPi/pull/2312
 - DietPi-Software | LXDE: Applied updated DietPi theme and wallpaper. For new installations only.
-- DietPi-Software | Blynk Server: Now installed to DietPi userdata directory, and, runs under blynk user. Many thanks to @joaofl for this PR! https://github.com/Fourdee/DietPi/pull/2287
+- DietPi-Software | Blynk Server: Now installed to DietPi userdata directory, and, runs under blynk user. Many thanks to @joaofl for this PR! https://github.com/MichaIng/DietPi/pull/2287
 - DietPi-Software | Reboot prompt: Will now occur prior to the system rebooting. Giving you time to do more, before rebooting! :D
 - DietPi-Software | Moved majority of conf/* files located on DietPi-RAMdisk, moved over to github for download during installations. Reducing the size of RAMdisk usage.
-- DietPi-Software | Pydio: Added rewrite rules to all webserver configs to allow sync client connection out of the box. Thanks to @MonZon for reporting this issue: https://github.com/Fourdee/DietPi/issues/2308
-- PREP | Serial console: Now enabled by default for all future DietPi images. Please note, only v6.19 images and above, will have this set by default. Existing images require edit of /boot/dietpi.txt and 'CONFIG_SERIAL_CONSOLE_ENABLE=1' before 1st run: https://github.com/Fourdee/DietPi/issues/2313
+- DietPi-Software | Pydio: Added rewrite rules to all webserver configs to allow sync client connection out of the box. Thanks to @MonZon for reporting this issue: https://github.com/MichaIng/DietPi/issues/2308
+- PREP | Serial console: Now enabled by default for all future DietPi images. Please note, only v6.19 images and above, will have this set by default. Existing images require edit of /boot/dietpi.txt and 'CONFIG_SERIAL_CONSOLE_ENABLE=1' before 1st run: https://github.com/MichaIng/DietPi/issues/2313
 
 Bug Fixes:
 - General | Asus TB (based on our recent 2.0.8 Tinker OS pre-image): Resolved issue with corrupt characters in desktops.
 - DietPi-Update | Prevented backup prompt during each subversion patch from displaying.
-- DietPi-Software | Chromium: Resolved incorrect scale of window under Kiosk mode: https://github.com/Fourdee/DietPi/issues/2298#issuecomment-442995196
-- DietPi-Software | OMPD: Resolved a reinstall issue due to SQL table not being correctly dropped, before re-created: https://github.com/Fourdee/DietPi/issues/2305
-- DietPi-Autostart | XU4: Resolved an issue with startx failing during boot: https://github.com/Fourdee/DietPi/issues/2130#issuecomment-443475525
+- DietPi-Software | Chromium: Resolved incorrect scale of window under Kiosk mode: https://github.com/MichaIng/DietPi/issues/2298#issuecomment-442995196
+- DietPi-Software | OMPD: Resolved a reinstall issue due to SQL table not being correctly dropped, before re-created: https://github.com/MichaIng/DietPi/issues/2305
+- DietPi-Autostart | XU4: Resolved an issue with startx failing during boot: https://github.com/MichaIng/DietPi/issues/2130#issuecomment-443475525
 
 Allo GUI:
-- GMrender: Resolved service failing to be enabled: https://github.com/Fourdee/DietPi/issues/2305
-
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
+- GMrender: Resolved service failing to be enabled: https://github.com/MichaIng/DietPi/issues/2305
 
-Known/Outstanding Core Issues:
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -147,58 +190,56 @@ v6.18
 (26/11/18)
 
 Changes / Improvements / Optimisations:
- - General | Concurrent execution detection: Now has a 5 second buffer to wait for exit (G_INIT_WAIT_CONCURRENT), before failing: https://github.com/Fourdee/DietPi/issues/2159#issuecomment-433619721
- - DietPi-Config | Added support for changing the brightness of the RPi touchscreen: https://github.com/Fourdee/DietPi/issues/2169
+ - General | Concurrent execution detection: Now has a 5 second buffer to wait for exit (G_INIT_WAIT_CONCURRENT), before failing: https://github.com/MichaIng/DietPi/issues/2159#issuecomment-433619721
+ - DietPi-Config | Added support for changing the brightness of the RPi touchscreen: https://github.com/MichaIng/DietPi/issues/2169
  - DietPi-Config | Added support for setting Xorg DPI scale.
- - DietPi-Services | MariaDB: DietPi now uses the pre-installed "mariadb" systemd service instead of obsoleve "mysql" init.d service: https://github.com/Fourdee/DietPi/pull/2196
- - DietPi-Software | Nextcloud Talk video calls with configured TURN server is now available for install: https://github.com/Fourdee/DietPi/pull/2197
+ - DietPi-Services | MariaDB: DietPi now uses the pre-installed "mariadb" systemd service instead of obsoleve "mysql" init.d service: https://github.com/MichaIng/DietPi/pull/2196
+ - DietPi-Software | Nextcloud Talk video calls with configured TURN server is now available for install: https://github.com/MichaIng/DietPi/pull/2197
  - DietPi-Software | NAA Daemon: Added installation support for ARMv8 and x86_64. Thanks Jussi!
- - DietPi-Software | Pi-hole: During (re)install you can now decide whether to show a blocking page to clients or not: https://github.com/Fourdee/DietPi/issues/2007
- - DietPi-Software | MotionEye: Now available to install for all devices. Removed support from Jessie: https://github.com/Fourdee/DietPi/issues/2229
- - DietPi-Software | G_BACKUP_FP: New feature rolled out to MPD and web server base DietPi-Software installations, in which config files are backed up before DietPi overwrites them: https://github.com/Fourdee/DietPi/issues/2187#issuecomment-433626639
- - DietPi-Software | SickRage: Is no longer available for installation. We will asses a replacement in v6.19. Sonarr is an excellent alternative with faster performance and stability.: https://github.com/Fourdee/DietPi/issues/2239
- - DietPi-Software | Docker: Now runs under 'simple' service type (previously 'notify'), to prevent service start delay which can occur on ARM based devices (eg: RPi), from delaying other applications starting on the system: https://github.com/Fourdee/DietPi/issues/2238#issuecomment-439474766
- - DietPi-Software | Mosquito: Service updated to systemd: https://github.com/Fourdee/DietPi/issues/2243
- - DietPi-Software | Radarr/Sonarr/Lidarr: logs (both .txt and .db*) have been moved to DietPi-RAMlog: https://github.com/Fourdee/DietPi/issues/2223
- - DietPi-Software | Pydio: WebUI warnings (security, performance) are now resolved for Nginx and Lighttpd webservers as well. Separate config files are created instead of touching the defaults, to enable required settings for Pydio only. Required PHP modules are installed and enabled, to be failsafe. Preserve existing install dirs on (re)install and inform user to update via WebUI updater: https://github.com/Fourdee/DietPi/issues/1913
- - DietPi-Software | Grafana: Existing database/plugin directory and admin password is now preserved on reinstall: https://github.com/Fourdee/DietPi/issues/2267
+ - DietPi-Software | Pi-hole: During (re)install you can now decide whether to show a blocking page to clients or not: https://github.com/MichaIng/DietPi/issues/2007
+ - DietPi-Software | MotionEye: Now available to install for all devices. Removed support from Jessie: https://github.com/MichaIng/DietPi/issues/2229
+ - DietPi-Software | G_BACKUP_FP: New feature rolled out to MPD and web server base DietPi-Software installations, in which config files are backed up before DietPi overwrites them: https://github.com/MichaIng/DietPi/issues/2187#issuecomment-433626639
+ - DietPi-Software | SickRage: Is no longer available for installation. We will asses a replacement in v6.19. Sonarr is an excellent alternative with faster performance and stability.: https://github.com/MichaIng/DietPi/issues/2239
+ - DietPi-Software | Docker: Now runs under 'simple' service type (previously 'notify'), to prevent service start delay which can occur on ARM based devices (eg: RPi), from delaying other applications starting on the system: https://github.com/MichaIng/DietPi/issues/2238#issuecomment-439474766
+ - DietPi-Software | Mosquito: Service updated to systemd: https://github.com/MichaIng/DietPi/issues/2243
+ - DietPi-Software | Radarr/Sonarr/Lidarr: logs (both .txt and .db*) have been moved to DietPi-RAMlog: https://github.com/MichaIng/DietPi/issues/2223
+ - DietPi-Software | Pydio: WebUI warnings (security, performance) are now resolved for Nginx and Lighttpd webservers as well. Separate config files are created instead of touching the defaults, to enable required settings for Pydio only. Required PHP modules are installed and enabled, to be failsafe. Preserve existing install dirs on (re)install and inform user to update via WebUI updater: https://github.com/MichaIng/DietPi/issues/1913
+ - DietPi-Software | Grafana: Existing database/plugin directory and admin password is now preserved on reinstall: https://github.com/MichaIng/DietPi/issues/2267
  - DietPi-Software | Syncthing: Updated installer to always pull the latest release and better handle existing installs. Thanks to @joaofl for bringing this to our attention.
  - DietPi-Software | Tautulli: Install enabled for ARMv8 devices.
 
 Bug Fixes:
  - PREP: Resovled an issue where master.zip would always be downloaded, regardless of selected branch.
- - PREP: Resolved failed rootFS resize: https://github.com/Fourdee/DietPi/issues/2181#issuecomment-433715556
- - General | Resolved various gwtcwd errors during boot and software installations on VM: https://github.com/Fourdee/DietPi/issues/2237
- - General | NanoPi Fire3: Resolved an issue with blank HDMI output. Device is now switched to tty2 during boot, as a workaround/fix due to tty1 failing: https://github.com/Fourdee/DietPi/issues/2225
- - General | Resolved an issue, where entering passwords via our internal whiptail password box leads to "invalid match", when special characters are used, forcing a retry: https://github.com/Fourdee/DietPi/issues/2215#issuecomment-437683709
+ - PREP: Resolved failed rootFS resize: https://github.com/MichaIng/DietPi/issues/2181#issuecomment-433715556
+ - General | Resolved various gwtcwd errors during boot and software installations on VM: https://github.com/MichaIng/DietPi/issues/2237
+ - General | NanoPi Fire3: Resolved an issue with blank HDMI output. Device is now switched to tty2 during boot, as a workaround/fix due to tty1 failing: https://github.com/MichaIng/DietPi/issues/2225
+ - General | Resolved an issue, where entering passwords via our internal whiptail password box leads to "invalid match", when special characters are used, forcing a retry: https://github.com/MichaIng/DietPi/issues/2215#issuecomment-437683709
  - DietPi-Cleaner | Resolved an issue where test runs on -dev package removal, would remove the packages.
- - DietPi-Cleaner | Resolved a syntax error with function 'Run_Cleaners', disabling the ability to run cleaners. Many thanks to @optio50 for reporting this issue! https://github.com/Fourdee/DietPi/issues/2241
+ - DietPi-Cleaner | Resolved a syntax error with function 'Run_Cleaners', disabling the ability to run cleaners. Many thanks to @optio50 for reporting this issue! https://github.com/MichaIng/DietPi/issues/2241
  - DietPi-Config | Resovled an visual error when selecting network options due to 'G_CHECK_VALIDINT'.
- - DietPi-Config | Locale: Resolved an issue where DietPi would always display en_GB as the current locale: https://github.com/Fourdee/DietPi/issues/2216#issuecomment-435599419
- - DietPi-Config | Resolved an issue where on Odroid C1/2 with current kernel 3.5" LCD shield does not work anymore. Thanks to @Kreeblah for reporting this issue and solution: https://github.com/Fourdee/DietPi/issues/2256
- - DietPi-Automation | CONFIG_NTP_MODE is now applied after APT cache, and, initial time sync is updated. Due to packages required for some modes: https://github.com/Fourdee/DietPi/issues/2181#issuecomment-433444882
- - DietPi-Software | Resolved an issue where rsyslog APT installation would report a failure, if service was already running previously but not installed via APT (mostly in backup/restore situations): https://github.com/Fourdee/DietPi/pull/2277/#issuecomment-441461982
- - DietPi-Software | Kodi: Resolved an issue where restart/shutdown options were not visable, due to lack of systemd-logind: https://github.com/Fourdee/DietPi/issues/2155
- - DietPi-Software | Mono applications (Radarr/Sonarr/Lidarr/Jackett): Rolled out "-O=-aot" (ahead of time optimzation) to all applications, which resolves a known external bug with recent Mono update. Many thanks to @Generator for testing and confirming this issue: https://github.com/Fourdee/DietPi/issues/2219#issuecomment-437594645
+ - DietPi-Config | Locale: Resolved an issue where DietPi would always display en_GB as the current locale: https://github.com/MichaIng/DietPi/issues/2216#issuecomment-435599419
+ - DietPi-Config | Resolved an issue where on Odroid C1/2 with current kernel 3.5" LCD shield does not work anymore. Thanks to @Kreeblah for reporting this issue and solution: https://github.com/MichaIng/DietPi/issues/2256
+ - DietPi-Automation | CONFIG_NTP_MODE is now applied after APT cache, and, initial time sync is updated. Due to packages required for some modes: https://github.com/MichaIng/DietPi/issues/2181#issuecomment-433444882
+ - DietPi-Software | Resolved an issue where rsyslog APT installation would report a failure, if service was already running previously but not installed via APT (mostly in backup/restore situations): https://github.com/MichaIng/DietPi/pull/2277/#issuecomment-441461982
+ - DietPi-Software | Kodi: Resolved an issue where restart/shutdown options were not visable, due to lack of systemd-logind: https://github.com/MichaIng/DietPi/issues/2155
+ - DietPi-Software | Mono applications (Radarr/Sonarr/Lidarr/Jackett): Rolled out "-O=-aot" (ahead of time optimzation) to all applications, which resolves a known external bug with recent Mono update. Many thanks to @Generator for testing and confirming this issue: https://github.com/MichaIng/DietPi/issues/2219#issuecomment-437594645
  - DietPi-Software | Roon Bridge: Resolved an issue where the remote update would fail due to underpriv permissions: https://community.roonlabs.com/t/dietpi-allo-units-not-getting-the-roonbridge-b167-update-from-b164/52503/6
- - DietPi-Software | Nextcloud: Resolved an issue with failed installation: https://github.com/Fourdee/DietPi/issues/2184
- - DietPi-Software | Nextcloud/Owncloud: Resolved an issue where userdata located on external drive would fail the installation: https://github.com/Fourdee/DietPi/issues/2221
- - DietPi-Software | OMPD/MyMPD: Resolved inability to update database. Currently we have rolled back the versions of these programs to a working state. We will investigate with the devs to find out the cause for future release: https://github.com/Fourdee/DietPi/issues/2156
- - DietPi-Software | Jackett: Resolved an issue where reinstall created an additional nested install dir. Thanks @msdos for reporting this issue: https://github.com/Fourdee/DietPi/issues/2212
+ - DietPi-Software | Nextcloud: Resolved an issue with failed installation: https://github.com/MichaIng/DietPi/issues/2184
+ - DietPi-Software | Nextcloud/Owncloud: Resolved an issue where userdata located on external drive would fail the installation: https://github.com/MichaIng/DietPi/issues/2221
+ - DietPi-Software | OMPD/MyMPD: Resolved inability to update database. Currently we have rolled back the versions of these programs to a working state. We will investigate with the devs to find out the cause for future release: https://github.com/MichaIng/DietPi/issues/2156
+ - DietPi-Software | Jackett: Resolved an issue where reinstall created an additional nested install dir. Thanks @msdos for reporting this issue: https://github.com/MichaIng/DietPi/issues/2212
  - DietPi-Software | RoonServer: Resolved an issue where reinstall created an additional nested install dir. Since RoonServer has an automated internal updater, download and install will be skipped, if install already exists.
  - DietPi-Software | PHP/databases: Resolved an issue where PHP database modules were not installed, when installing a new database and PHP was already installed before.
  - DietPi-Software | PHP: On Buster, moved to PHP7.3, since php-apcu and php-redis are not available for PHP7.2 any more. This resolves both PHP versions being installed concurrently.
- - DietPi-Software | OpenBazaar: Resolved an issue where remote OB clients could not connect to server with default configuration: https://github.com/Fourdee/DietPi/pull/2224
- - DietPi-Software | Resolved an issue where a global password with special characters lead to failing installs, due to missing escaping within our internal function G_CONFIG_INJECT. Thanks to @MistahDarcy for reporting this issue: https://github.com/Fourdee/DietPi/issues/2215
- - DietPi-Software | Docker: Resolved an issue where the Docker daemon failes to start due to invalid command argument. Thanks to @mspieth376 for reporting this issue: https://github.com/Fourdee/DietPi/issues/2238
+ - DietPi-Software | OpenBazaar: Resolved an issue where remote OB clients could not connect to server with default configuration: https://github.com/MichaIng/DietPi/pull/2224
+ - DietPi-Software | Resolved an issue where a global password with special characters lead to failing installs, due to missing escaping within our internal function G_CONFIG_INJECT. Thanks to @MistahDarcy for reporting this issue: https://github.com/MichaIng/DietPi/issues/2215
+ - DietPi-Software | Docker: Resolved an issue where the Docker daemon failes to start due to invalid command argument. Thanks to @mspieth376 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2238
  - DietPi-Software | Grafana: Resolved an issue, where WebUI password is not applied correctly, when containing ";" or "#". Thanks to @Warmbadger for reporting this issue and solution: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5248
  - DietPi-Software | Tautulli: Resolved an issue where Tautulli service failed to start up. As well improved reinstall, if install dir is already existent. Thanks to @Comfubar for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5256
  - DietPi-Obtain_network_details | Resolved a tiny visual-only error message on non-root logins. Thanks to @AndrewZ for reporting: https://dietpi.com/phpbb/viewtopic.php?f=9&t=5194
- - DietPi-Update | Resolved a visual-only issue, where wrong RC versions could have been shown during incremental patching: https://github.com/Fourdee/DietPi/issues/2190
+ - DietPi-Update | Resolved a visual-only issue, where wrong RC versions could have been shown during incremental patching: https://github.com/MichaIng/DietPi/issues/2190
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
-
-Known/Outstanding Core Issues:
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -206,60 +247,53 @@ v6.17
 (25/10/18)
 
 Changes / Improvements / Optimisations:
- - General | NanoPC T4: Image updated to include lastest kernel (4.4.154). Many thanks to @carlosedp for providing this kernel! https://github.com/Fourdee/DietPi/issues/1829#issuecomment-429324437
- - General | DietPi now has 3 branches (master=stable, beta=public testing, dev=dev). By default, all users are on master/stable branch: https://github.com/Fourdee/DietPi/issues/2083#issuecomment-426842537
- - General | Improved detection of permissions support during user data transfers: https://github.com/Fourdee/DietPi/issues/2096
- - General | IPv6: Due to the requirements of various software titles available in dietpi-software (eg: nginx, redis-server), and that IPv6 is slowly becoming more common place, IPv6 is now disabled via sysctl on interface level, while it stays enabled on kernel level: https://github.com/Fourdee/DietPi/issues/2027
- - DietPi-Autostart | Chromium: You will now be prompted to enter a homepage URL, which will be loaded when the application starts: https://github.com/Fourdee/DietPi/issues/2169#issuecomment-432297343
+ - General | NanoPC T4: Image updated to include lastest kernel (4.4.154). Many thanks to @carlosedp for providing this kernel! https://github.com/MichaIng/DietPi/issues/1829#issuecomment-429324437
+ - General | DietPi now has 3 branches (master=stable, beta=public testing, dev=dev). By default, all users are on master/stable branch: https://github.com/MichaIng/DietPi/issues/2083#issuecomment-426842537
+ - General | Improved detection of permissions support during user data transfers: https://github.com/MichaIng/DietPi/issues/2096
+ - General | IPv6: Due to the requirements of various software titles available in dietpi-software (eg: nginx, redis-server), and that IPv6 is slowly becoming more common place, IPv6 is now disabled via sysctl on interface level, while it stays enabled on kernel level: https://github.com/MichaIng/DietPi/issues/2027
+ - DietPi-Autostart | Chromium: You will now be prompted to enter a homepage URL, which will be loaded when the application starts: https://github.com/MichaIng/DietPi/issues/2169#issuecomment-432297343
  - DietPi-Config | RPi: Added support for LCD panel "Elecrow ESP01215E 7 inch HDMI IPS with touch input" (basically a cheaper RPi touchscreen): https://www.amazon.co.uk/gp/product/B07H79XMLT/ref=oh_aui_detailpage_o01_s00?ie=UTF8&psc=1
  - DietPi-Config | Added ability to benchmark network LAN transfer rates using 2 DietPi systems.
- - DietPi-Config | RPi: Changing the display resolution, will also apply to Chromium under kiosk/autostart mode: https://github.com/Fourdee/DietPi/issues/2158
+ - DietPi-Config | RPi: Changing the display resolution, will also apply to Chromium under kiosk/autostart mode: https://github.com/MichaIng/DietPi/issues/2158
  - DietPi-Config | Added an option to toggle preferring IPv4 connections with APT and wget, if IPv6 is enabled. This enhances compatibility and performance in some cases.
  - DietPi-Config | Online Benchmarks Database! Now available. Simply run the benchmark from the tools menu, to upload your scores and compare against others: https://dietpi.com/survey
  - DietPi-Automation | Added settings to dietpi.txt to toggle IPv6 and IPv4 preference on first boot.
- - DietPi-Update | You now have the option to view the changelog, prior to updating: https://github.com/Fourdee/DietPi/issues/2081
- - DietPi-Software | Sabnzbd: Updated to 2.3.5 for new installations only. Now runs under its own limited user account, and, umask of 0775 for downloads: https://github.com/Fourdee/DietPi/issues/2172
- - DietPi-Software | Card/CalDAV request redirection was added to new Baikal, ownCloud and Nextcloud installs. Now only the servers domain/IP need to be entered on Card/CalDAV clients, without any further path to the DAV endpoints: https://github.com/Fourdee/DietPi/issues/2057
- - DietPi-Software | Plex Media Server and Transmission services run now as group "dietpi", to allow cross access with download managers and media software: https://github.com/Fourdee/DietPi/issues/2067#issuecomment-427579779
- - DietPi-Set_Hardware | Odroid C2: When selecting USB DAC, smp affinity will be applied for USB IRQ's to improve stability: https://github.com/Fourdee/DietPi/issues/2101
+ - DietPi-Update | You now have the option to view the changelog, prior to updating: https://github.com/MichaIng/DietPi/issues/2081
+ - DietPi-Software | Sabnzbd: Updated to 2.3.5 for new installations only. Now runs under its own limited user account, and, umask of 0775 for downloads: https://github.com/MichaIng/DietPi/issues/2172
+ - DietPi-Software | Card/CalDAV request redirection was added to new Baikal, ownCloud and Nextcloud installs. Now only the servers domain/IP need to be entered on Card/CalDAV clients, without any further path to the DAV endpoints: https://github.com/MichaIng/DietPi/issues/2057
+ - DietPi-Software | Plex Media Server and Transmission services run now as group "dietpi", to allow cross access with download managers and media software: https://github.com/MichaIng/DietPi/issues/2067#issuecomment-427579779
+ - DietPi-Set_Hardware | Odroid C2: When selecting USB DAC, smp affinity will be applied for USB IRQ's to improve stability: https://github.com/MichaIng/DietPi/issues/2101
  - DietPi-Drive_Manager | Formatting: Now has the option to format the whole drive, or patition only, for drives with existing partitions.
- - DietPi-Drive_Manager | Mounting NTFS drives now enabled native linux permissions support (eg: you can use this as your userdata location). Many thanks to @Random90 for making this possible! https://github.com/Fourdee/DietPi/issues/2096#issuecomment-425553333
- - DietPi-Drive_Manager | Improved detection and formatting for NVMe based drives: https://github.com/Fourdee/DietPi/issues/2102
- - DietPi-Drive_Manager | Removed /proc from fstab. No longer required as this created at kernel/systemd level: https://github.com/Fourdee/DietPi/issues/2154
+ - DietPi-Drive_Manager | Mounting NTFS drives now enabled native linux permissions support (eg: you can use this as your userdata location). Many thanks to @Random90 for making this possible! https://github.com/MichaIng/DietPi/issues/2096#issuecomment-425553333
+ - DietPi-Drive_Manager | Improved detection and formatting for NVMe based drives: https://github.com/MichaIng/DietPi/issues/2102
+ - DietPi-Drive_Manager | Removed /proc from fstab. No longer required as this created at kernel/systemd level: https://github.com/MichaIng/DietPi/issues/2154
 
 Bug Fixes:
  - General | G_THREAD_START: Resolved issue where this was running in blocking mode. Now uses exit code to indentify finished tasks instead of PID.
- - DietPi-Cloudshell | Resolved various issues with inability to run service via SSH on another screen, and, G_DIETPI-NOTIFY errors. Many thanks to @potter-91 for reporting this issue! https://github.com/Fourdee/DietPi/issues/2104
- - DietPi-Config | WiFi-Monitor: Resolved an issue with syntax, and, incorrectly pinging the default gateway, instead of whats assigned to the wlan interface: https://github.com/Fourdee/DietPi/issues/2103
- - DietPi-Config | dietpi-wifi.db code has been optimized, and, also resolves an issue where '/var/lib/dietpi/dietpi-wifi.db' was not generated automatically: https://github.com/Fourdee/DietPi/issues/2087#issuecomment-423836528
- - DietPi-Config | Waveshare32b: Resolved inverted inputs under X11/Xorg: https://github.com/Fourdee/DietPi/issues/803
- - DietPi-Config | PineA64: HDMI sound is now correctly enabled when selected. 3.5mm support is still under investigation: https://github.com/Fourdee/DietPi/issues/2153
- - DietPi-Drive_Manager | Resolved an issue where swapfile would register as enabled when set to 0 size: https://github.com/Fourdee/DietPi/issues/2127
+ - DietPi-Cloudshell | Resolved various issues with inability to run service via SSH on another screen, and, G_DIETPI-NOTIFY errors. Many thanks to @potter-91 for reporting this issue! https://github.com/MichaIng/DietPi/issues/2104
+ - DietPi-Config | WiFi-Monitor: Resolved an issue with syntax, and, incorrectly pinging the default gateway, instead of whats assigned to the wlan interface: https://github.com/MichaIng/DietPi/issues/2103
+ - DietPi-Config | dietpi-wifi.db code has been optimized, and, also resolves an issue where '/var/lib/dietpi/dietpi-wifi.db' was not generated automatically: https://github.com/MichaIng/DietPi/issues/2087#issuecomment-423836528
+ - DietPi-Config | Waveshare32b: Resolved inverted inputs under X11/Xorg: https://github.com/MichaIng/DietPi/issues/803
+ - DietPi-Config | PineA64: HDMI sound is now correctly enabled when selected. 3.5mm support is still under investigation: https://github.com/MichaIng/DietPi/issues/2153
+ - DietPi-Drive_Manager | Resolved an issue where swapfile would register as enabled when set to 0 size: https://github.com/MichaIng/DietPi/issues/2127
  - DietPi-Survey | Resolved an issue where dietpi-survey under mode 1 would not generate the survey file.
- - DietPi-Software | MPD: Now runs under the group 'dietpi' and user 'root', allowing access to music directories when contained on samba networked drives: https://github.com/Fourdee/DietPi/issues/2092
- - DietPi-Software | Fixed an issue where software uninstalls could have failed due to dependant packages. Thanks to @dynobot for reporting this issue: https://github.com/Fourdee/DietPi/issues/2091
+ - DietPi-Software | MPD: Now runs under the group 'dietpi' and user 'root', allowing access to music directories when contained on samba networked drives: https://github.com/MichaIng/DietPi/issues/2092
+ - DietPi-Software | Fixed an issue where software uninstalls could have failed due to dependant packages. Thanks to @dynobot for reporting this issue: https://github.com/MichaIng/DietPi/issues/2091
  - DietPi-Software | Webservers/PHP: Fixed an issue, where PHP was not installed when a webserver was installed directly via "dietpi-software install 8X".
- - DietPi-Software | Nextcloud: On Jessie systems, no newer version than latest NC13 will be installed, because PHP5 support was dropped with NC14: https://github.com/Fourdee/DietPi/issues/1778#issuecomment-419918372
- - DietPi-Software | MyMPD: Resolved an issue where the service would fail to run: https://github.com/Fourdee/DietPi/issues/2088
- - DietPi-Software | MyMPD: Resolved an issue where the installation would fail, due to a recent MyMPD update with new pre-reqs: https://github.com/Fourdee/DietPi/issues/2088#issuecomment-423852124
- - DietPi-Software | SiCKRAGE: Resolved failing install due to changed capitalization of SiCKRAGE GitHub repo, and, various additional pre-reqs due to new install method required by SiCKRAGE. Thanks to @mdoary for reporting this issue: https://github.com/Fourdee/DietPi/issues/2126
- - DietPi-Software | VNC Server: Resolved an issue where VNC server would fail to start under shared desktop mode, many thanks to @LieDanG for reporting this issue: https://github.com/Fourdee/DietPi/issues/2142#issuecomment-430492281
- - DietPi-Process_tool | Resolved an issue where applying process settings on Plex Media Server failed, thanks to @symbios24 for reporting this issue: https://github.com/Fourdee/DietPi/issues/2089
+ - DietPi-Software | Nextcloud: On Jessie systems, no newer version than latest NC13 will be installed, because PHP5 support was dropped with NC14: https://github.com/MichaIng/DietPi/issues/1778#issuecomment-419918372
+ - DietPi-Software | MyMPD: Resolved an issue where the service would fail to run: https://github.com/MichaIng/DietPi/issues/2088
+ - DietPi-Software | MyMPD: Resolved an issue where the installation would fail, due to a recent MyMPD update with new pre-reqs: https://github.com/MichaIng/DietPi/issues/2088#issuecomment-423852124
+ - DietPi-Software | SiCKRAGE: Resolved failing install due to changed capitalization of SiCKRAGE GitHub repo, and, various additional pre-reqs due to new install method required by SiCKRAGE. Thanks to @mdoary for reporting this issue: https://github.com/MichaIng/DietPi/issues/2126
+ - DietPi-Software | VNC Server: Resolved an issue where VNC server would fail to start under shared desktop mode, many thanks to @LieDanG for reporting this issue: https://github.com/MichaIng/DietPi/issues/2142#issuecomment-430492281
+ - DietPi-Process_tool | Resolved an issue where applying process settings on Plex Media Server failed, thanks to @symbios24 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2089
  - General | Sparky SBC: Resolved an issue where 'sparky_eth_controller.sh' could incorrectly reboot the device after 20 seconds.
- - General | Resolved an issue with Rock64 being unable to run xserver. Please note this device still runs under limited software rendering due to lack of available working drivers/installation method for Debian systems: https://github.com/Fourdee/DietPi/issues/2086
- - General | Resolved an issue with Jessie failing to start networking with preboot script: https://github.com/Fourdee/DietPi/issues/2075
+ - General | Resolved an issue with Rock64 being unable to run xserver. Please note this device still runs under limited software rendering due to lack of available working drivers/installation method for Debian systems: https://github.com/MichaIng/DietPi/issues/2086
+ - General | Resolved an issue with Jessie failing to start networking with preboot script: https://github.com/MichaIng/DietPi/issues/2075
 
 Allo GUI v11:
 - Minor update to add GUI support for new DietPi version codes.
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
-
-Known/Outstanding Core Issues:
-- O!MPD and MyMPD fail to update libaries. YMPD is fine: https://github.com/Fourdee/DietPi/issues/2156
-- Kodi shutdown options missing: https://github.com/Fourdee/DietPi/issues/2155
-- DietPi-Config | RPi | OpenGL/VC4 causes soundcard selection to be invalid: https://github.com/Fourdee/DietPi/issues/2173
-- PineA64: No sound over 3.5mm jack: https://github.com/Fourdee/DietPi/issues/2153
-- For all additional issues that may appear after release, please see the following link and select the 'Next Version Milestone' to see active tickets: https://github.com/Fourdee/DietPi/milestones
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -267,16 +301,16 @@ v6.16
 (19/09/18)
 
 Changes / Improvements / Optimizations:
-DietPi-Config | WiFi: Added support for applying up-to 5 SSIDs: https://github.com/Fourdee/DietPi/issues/368
-DietPi-Drive_Manager | Samba Mount: Now mounts with user and group of 'DietPi'. This matches group permissions for DietPi applications that will prevent permission failure, when samba is used for userdata location: https://github.com/Fourdee/DietPi/issues/2067
+DietPi-Config | WiFi: Added support for applying up-to 5 SSIDs: https://github.com/MichaIng/DietPi/issues/368
+DietPi-Drive_Manager | Samba Mount: Now mounts with user and group of 'DietPi'. This matches group permissions for DietPi applications that will prevent permission failure, when samba is used for userdata location: https://github.com/MichaIng/DietPi/issues/2067
 DietPi-Software | Pi-hole: You can now install Pi-hole again on Debian Jessie system, as support got re-enabled with Pi-hole v4.0 FTLDNS update.
 
 Bug Fixes:
 General | Resolved an issue where 1st run setup password prompt, would run twice. Once on 1st run and once after updates are completed.
-General | Resolved an external issue where in very rare cases WiFi interfaces were not initiated successfully: https://github.com/Fourdee/DietPi/issues/2074
+General | Resolved an external issue where in very rare cases WiFi interfaces were not initiated successfully: https://github.com/MichaIng/DietPi/issues/2074
 DietPi-Config | Sparky SBC: Resolved an issue where Piano DAC firmware was not being fully installed.
-DietPi-Config | Resolved an issue with selected WiFi SSID not being correctly applied: https://github.com/Fourdee/DietPi/issues/2070#issuecomment-421060961
-DietPi-Drive_Manager | RockPro64: Resolved an issue where mtdblock devices would show up in the list. As far as well can tell, these are not currently required for EMMC/SD/USB devices. To ensure the list only shows actual devices, we have disabled them from showing up in view: https://github.com/Fourdee/DietPi/issues/2067#issuecomment-422400520
+DietPi-Config | Resolved an issue with selected WiFi SSID not being correctly applied: https://github.com/MichaIng/DietPi/issues/2070#issuecomment-421060961
+DietPi-Drive_Manager | RockPro64: Resolved an issue where mtdblock devices would show up in the list. As far as well can tell, these are not currently required for EMMC/SD/USB devices. To ensure the list only shows actual devices, we have disabled them from showing up in view: https://github.com/MichaIng/DietPi/issues/2067#issuecomment-422400520
 DietPi-Postboot | Resolved an issue where user scripts were not being executed '/var/lib/dietpi/postboot.d/*'.
 
 -----------------------------------------------------------------------------------------------------------
@@ -287,35 +321,35 @@ v6.15
 Many thanks to PINE64, for becoming our 1st Patreon Legend and supporting our project! As one of their rewards, you will see PINE64 displayed on login via the DietPi-Banner.
 
 Known issues / In progress:
-DietPi-Software | Open Bazaar: Installation updated to server version 2, which now runs via go language. At the current state, client OB connections are failing, still under investigation: https://github.com/Fourdee/DietPi/issues/1090#issuecomment-419613346
+DietPi-Software | Open Bazaar: Installation updated to server version 2, which now runs via go language. At the current state, client OB connections are failing, still under investigation: https://github.com/MichaIng/DietPi/issues/1090#issuecomment-419613346
 
 Changes / Improvements / Optimizations:
-General | Changed Survey and Bugreport uploads to use ssh.dietpi.com (previously IP): https://github.com/Fourdee/DietPi/issues/2022#issuecomment-415470064
+General | Changed Survey and Bugreport uploads to use ssh.dietpi.com (previously IP): https://github.com/MichaIng/DietPi/issues/2022#issuecomment-415470064
 General | 1st run setup and dietpi-update logs are now created in RAM, then copied to disk once completed '/var/tmp/dietpi/logs/dietpi-firstrun-setup.log'. This will speed up 1st run setup installation for slow SBCs and/or rootFS.
-General | PineA64: Image updated to v6.14, also contains the latest kernel/uboot by Ayufan (0.6.2): https://github.com/Fourdee/DietPi/issues/2026
-General | Resolved an isssue where the initial 1st run connection test would fail, if timesync had not yet completed, and, the SSL cert of the connection test site is not valid for current date on system: https://github.com/Fourdee/DietPi/issues/2039
+General | PineA64: Image updated to v6.14, also contains the latest kernel/uboot by Ayufan (0.6.2): https://github.com/MichaIng/DietPi/issues/2026
+General | Resolved an isssue where the initial 1st run connection test would fail, if timesync had not yet completed, and, the SSL cert of the connection test site is not valid for current date on system: https://github.com/MichaIng/DietPi/issues/2039
 General| SparkySBC: Support for native DSD playback on iFi Pro iDSD. Many thanks @sudeep: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz
-DietPi-Backup/Sync | rsync transfer: Now shows progress information during the transfer: https://github.com/Fourdee/DietPi/issues/2044#issuecomment-417779406
+DietPi-Backup/Sync | rsync transfer: Now shows progress information during the transfer: https://github.com/MichaIng/DietPi/issues/2044#issuecomment-417779406
 DietPi-Backup | Added an option to delete the currently selected backup, if it exists.
-DietPi-Config | Advanced Options: You can now toggle if a real RTC is installed. This adds/removes 'fake-hwclock' package installation as requested: https://github.com/Fourdee/DietPi/issues/2041
+DietPi-Config | Advanced Options: You can now toggle if a real RTC is installed. This adds/removes 'fake-hwclock' package installation as requested: https://github.com/MichaIng/DietPi/issues/2041
 DietPi-Config | Added support for setting CPU min/max frequencies on Intel based CPUs. NB: 'cpu' command will always list the min/max frequencies read from kernel values, Intel CPUs do not update these values, however, you can gauge CPU frequency range by running 'cpu' to monitor the current CPU freq (use of stress test in 'dietpi-config' may also help).
-DietPi-Drive_Manager | Added support to set a global idle duration, before drives are powered down. This feature uses hdparm. Not all drives will support this feature, however, its the best we can do, considering the lack of any standardised system across all drives, compatible with hdparm and visa versa: https://github.com/Fourdee/DietPi/issues/2001
-DietPi-Drive_Manager | When mounting drives to existing directories, if the directory is empty, you will given an option to mount regardless. If the directory contains any files or data, mounting will be denied: https://github.com/Fourdee/DietPi/issues/2056
-DietPi-Software | MPD: Updated to 0.20.21 and now includes SQL (sticker) support by default: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451
-DietPi-Software | myMPD: Now available for installation. A recent fork of YMPD with additional features: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451
-DietPi-Software | Emby: Reworked the installation to use standalone .debs, for fresh installations only. Now supports ARMv8 devices. ARMv6 devices are not supported: https://github.com/Fourdee/DietPi/issues/534#issuecomment-416405968
+DietPi-Drive_Manager | Added support to set a global idle duration, before drives are powered down. This feature uses hdparm. Not all drives will support this feature, however, its the best we can do, considering the lack of any standardised system across all drives, compatible with hdparm and visa versa: https://github.com/MichaIng/DietPi/issues/2001
+DietPi-Drive_Manager | When mounting drives to existing directories, if the directory is empty, you will given an option to mount regardless. If the directory contains any files or data, mounting will be denied: https://github.com/MichaIng/DietPi/issues/2056
+DietPi-Software | MPD: Updated to 0.20.21 and now includes SQL (sticker) support by default: https://github.com/MichaIng/DietPi/issues/2032#issuecomment-415559451
+DietPi-Software | myMPD: Now available for installation. A recent fork of YMPD with additional features: https://github.com/MichaIng/DietPi/issues/2032#issuecomment-415559451
+DietPi-Software | Emby: Reworked the installation to use standalone .debs, for fresh installations only. Now supports ARMv8 devices. ARMv6 devices are not supported: https://github.com/MichaIng/DietPi/issues/534#issuecomment-416405968
 
 Bug Fixes:
-General | fake-hwclock: is now installed for all systems, due to 'hwclock' detection reporting incorrect results, for those devices without a RTC attached: https://github.com/Fourdee/DietPi/issues/2035#issuecomment-416345155
-General | Resolved an issue where enabling the RPi camera (dietpi-config or installed via dietpi-software), would result in concurrent execution error: https://github.com/Fourdee/DietPi/issues/2008#issuecomment-414846353
-General | Resolved an issue with RK based network devices, where enabling offloading would cause stability issues. Many thanks to @carlosedp for this fix!: https://github.com/Fourdee/DietPi/issues/2028#issue-352323603
-General | Resolved an issue where automatic swapfile generation, would not run a freespace check prior: https://github.com/Fourdee/DietPi/issues/2048#issuecomment-417855645
-DietPi-Automation | Resolved an issue where 'AUTO_SETUP_INSTALL_SOFTWARE_ID' would include numbers contained within comments: https://github.com/Fourdee/DietPi/issues/2036#issuecomment-416613903
-DietPi-Cloudshell | Resolved incorrect RAM usage readout, and, inability to run from menu on same screen: https://github.com/Fourdee/DietPi/issues/2066
+General | fake-hwclock: is now installed for all systems, due to 'hwclock' detection reporting incorrect results, for those devices without a RTC attached: https://github.com/MichaIng/DietPi/issues/2035#issuecomment-416345155
+General | Resolved an issue where enabling the RPi camera (dietpi-config or installed via dietpi-software), would result in concurrent execution error: https://github.com/MichaIng/DietPi/issues/2008#issuecomment-414846353
+General | Resolved an issue with RK based network devices, where enabling offloading would cause stability issues. Many thanks to @carlosedp for this fix!: https://github.com/MichaIng/DietPi/issues/2028#issue-352323603
+General | Resolved an issue where automatic swapfile generation, would not run a freespace check prior: https://github.com/MichaIng/DietPi/issues/2048#issuecomment-417855645
+DietPi-Automation | Resolved an issue where 'AUTO_SETUP_INSTALL_SOFTWARE_ID' would include numbers contained within comments: https://github.com/MichaIng/DietPi/issues/2036#issuecomment-416613903
+DietPi-Cloudshell | Resolved incorrect RAM usage readout, and, inability to run from menu on same screen: https://github.com/MichaIng/DietPi/issues/2066
 DietPi-Config | Resolved an issue with PineA64 resolution changes, due to updated uEnv.txt on the latest PineA64 image. NB: for this feature to work, you must have an installation of the latest PineA64 v6.14 image from the DietPi site: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4431&p=14010#p14010
-DietPi-Drive_Manager | Correctly handles bind mounts, contained within '/etc/fstab': https://github.com/Fourdee/DietPi/issues/2013
-DietPi-Process_Tool | Resolved an issue with PIDs no longer existing, causing an apply to fail: https://github.com/Fourdee/DietPi/issues/2059
-DietPi-Software | PlexPy/Tautulli: Resolved an issue with recent pre-req changes for this application, required for start functionality: https://github.com/Fourdee/DietPi/issues/2047
+DietPi-Drive_Manager | Correctly handles bind mounts, contained within '/etc/fstab': https://github.com/MichaIng/DietPi/issues/2013
+DietPi-Process_Tool | Resolved an issue with PIDs no longer existing, causing an apply to fail: https://github.com/MichaIng/DietPi/issues/2059
+DietPi-Software | PlexPy/Tautulli: Resolved an issue with recent pre-req changes for this application, required for start functionality: https://github.com/MichaIng/DietPi/issues/2047
 DietPi-Update | Resolved an issue where all required EMR patches, would not be applied, in the 1st pass of the patch_file.
 
 -----------------------------------------------------------------------------------------------------------
@@ -324,19 +358,19 @@ v6.14
 (21/08/18)
 
 Changes / Improvements / Optimizations:
-DietPi-Software | GLOBAL_PW: The global password used by DietPi-Software is now encrypted with AES-256, removed from '/boot/dietpi.txt' and stored securely on rootFS with root:root/700 access only: https://github.com/Fourdee/DietPi/issues/2021
-DietPi-Software | FreshRSS, a self-hosted RSS feed aggregator, now available for installation. Thanks @msongz for requesting an RSS reader: https://github.com/Fourdee/DietPi/issues/1996
+DietPi-Software | GLOBAL_PW: The global password used by DietPi-Software is now encrypted with AES-256, removed from '/boot/dietpi.txt' and stored securely on rootFS with root:root/700 access only: https://github.com/MichaIng/DietPi/issues/2021
+DietPi-Software | FreshRSS, a self-hosted RSS feed aggregator, now available for installation. Thanks @msongz for requesting an RSS reader: https://github.com/MichaIng/DietPi/issues/1996
 DietPi-Software | BruteFIR: Due to low install count (7), we have removed this software from the DietPi database, and, is no longer available for installation.
 DietPi-Software | NAA Daemon: Installation updated to 3.5.4-38. Thanks Volpone for the heads up!: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4420
-General | '/etc/machine-id' is now unique for each DietPi installation. Regenerated during patch: https://github.com/Fourdee/DietPi/issues/2015
+General | '/etc/machine-id' is now unique for each DietPi installation. Regenerated during patch: https://github.com/MichaIng/DietPi/issues/2015
 
 Bug Fixes:
-DietPi-Drive_Manager | Resolved an issue where custom tmpfs and/or bind entries would be removed during script run: https://github.com/Fourdee/DietPi/issues/2013
+DietPi-Drive_Manager | Resolved an issue where custom tmpfs and/or bind entries would be removed during script run: https://github.com/MichaIng/DietPi/issues/2013
 DietPi-Software | NAA Daemon : Resolved an issue where this would fail to progress the installation, due to a whiptail prompt behind G_RUN_CMD.
-DietPi-Survey/Bugreport | Resolved an issue with failed uploads, due to Cloudflare: https://github.com/Fourdee/DietPi/issues/2022
+DietPi-Survey/Bugreport | Resolved an issue with failed uploads, due to Cloudflare: https://github.com/MichaIng/DietPi/issues/2022
 General | Sparky SBC: Previous patch for RTL8812AU driver support, will be reapplied, as the previous patch did not succeed.
-General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/Fourdee/DietPi/issues/2026#issuecomment-414475011
-General | Rock64: Image has been updated to Ayufan 0.7.9. Includes fixes for kernel upgrades via APT: https://github.com/Fourdee/DietPi/issues/2026
+General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/MichaIng/DietPi/issues/2026#issuecomment-414475011
+General | Rock64: Image has been updated to Ayufan 0.7.9. Includes fixes for kernel upgrades via APT: https://github.com/MichaIng/DietPi/issues/2026
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -346,42 +380,42 @@ v6.13
 Changes / Improvements / Optimizations:
 General | Sparky SBC: Added driver to support RTL8812AU WiFi based chipsets: https://github.com/sparky-sbc/sparky-test/tree/master/rtl8812au
 DietPi-Globals | G_THREAD_WAIT: Now displays errors for each thread, if they occured.
-DietPi-Config | NTP mirror selection has been reworked. It allows now to add local and external non-pool.ntp.org servers and local gateway auto detection: https://github.com/Fourdee/DietPi/issues/1688
+DietPi-Config | NTP mirror selection has been reworked. It allows now to add local and external non-pool.ntp.org servers and local gateway auto detection: https://github.com/MichaIng/DietPi/issues/1688
 DietPi-Config | Display Options > Backlight Brightness: Now available for Intel compatible backlight devices.
 DietPi-Explorer | Whiptail based, minimial/lightweight file explorer and manager now available for use!
-DietPi-Services | You can now include custom services, and, exclude DietPi controlling services known to it. Please see the following file '/DietPi/dietpi/.dietpi-services_include_exclude' for more information: https://github.com/Fourdee/DietPi/issues/1114#issuecomment-411325075
+DietPi-Services | You can now include custom services, and, exclude DietPi controlling services known to it. Please see the following file '/DietPi/dietpi/.dietpi-services_include_exclude' for more information: https://github.com/MichaIng/DietPi/issues/1114#issuecomment-411325075
 DietPi-Software | A new unified download&install function is implemented, which allows more consistent download and install of software, using /tmp RAMFS as working directory and parallel dependencies installation via G_THREAD.
 DietPi-Software | Koel: Installation will now skip webserver, as Koel uses PHP-CLI instead. To not mess with webserver served pages, Koel install directory is moved to "/mnt/dietpi_userdata/koel", for existing installs as well.
 DietPi-Software | Mono: Now installs 'mono-complete' by default, required for Mono based applications (eg: Radarr/Sonarr/Lidarr/Jackett etc)
-DietPi-Software | Lidarr: Now available for installation, automatically download music: https://github.com/Fourdee/DietPi/issues/1874
-DietPi-Software | Samba Server: Now creates and defaults to the login creds for the 'dietpi' user (previously 'root'). For fresh installations of Samba only: https://github.com/Fourdee/DietPi/issues/1991#issuecomment-410505982
+DietPi-Software | Lidarr: Now available for installation, automatically download music: https://github.com/MichaIng/DietPi/issues/1874
+DietPi-Software | Samba Server: Now creates and defaults to the login creds for the 'dietpi' user (previously 'root'). For fresh installations of Samba only: https://github.com/MichaIng/DietPi/issues/1991#issuecomment-410505982
 DietPi-Software | Folding@Home: Now available for installation on x86_64 machines. Folding@home is a distributed computing project for disease research that simulates protein folding, computational drug design, and other types of molecular dynamics. As of today, the project is using the idle resources of personal computers owned by volunteers from all over the world. Thousands of people contribute to the success of this project. Thanks to @nnovaes for bringing this to our attention!
 DietPi-Software | XFCE: Added support for shutdown, restart, hibernate and suspend directly from XFCE panel by default. Existing installs will not be touched, but if required simply run: "apt-get -y install upower policykit-1"
-DietPi-Software | Pi-hole: Installation code updated to support the latest release (v4). If you want to upgrade your existing installation, we highly recommend existing users who have this installed to: Uninstall Pi-hole via "dietpi-software", once completed, install Pi-hole again via "dietpi-software": https://github.com/Fourdee/DietPi/issues/1696
-DietPi-Drive_Manager | Added NFSv3 mount support. Drive manager now detects NFSv3-only server and offers to enter the required server-side path to the shared folder: https://github.com/Fourdee/DietPi/issues/1940
+DietPi-Software | Pi-hole: Installation code updated to support the latest release (v4). If you want to upgrade your existing installation, we highly recommend existing users who have this installed to: Uninstall Pi-hole via "dietpi-software", once completed, install Pi-hole again via "dietpi-software": https://github.com/MichaIng/DietPi/issues/1696
+DietPi-Drive_Manager | Added NFSv3 mount support. Drive manager now detects NFSv3-only server and offers to enter the required server-side path to the shared folder: https://github.com/MichaIng/DietPi/issues/1940
 DietPi-Drive_Manager | Now installs "ntfs-3g" and "hfsplus" on demand, if those file systems are detected. This allows us to ship images without "ntfs-3g" and "hfsplus" preinstalled, which are not required by most users. Those packages will be removed on v6.13 patch as well, if the related file systems are not detected.
-DietPi-LetsEncrypt | Added information/warning about HTTPS and HSTS according to web applications with standalone webserver: https://github.com/Fourdee/DietPi/issues/1908
+DietPi-LetsEncrypt | Added information/warning about HTTPS and HSTS according to web applications with standalone webserver: https://github.com/MichaIng/DietPi/issues/1908
 DietPi-Cron | /etc/cron.minutely/ is now disabled by default, to reduce cron executions and logs. This is also patched with v6.13, if no script is placed within the folder. Use "dietpi-cron" to enable and configure this feature.
-General | All DietPi scripts by default now use /tmp RAMFS to create, download and handle temporary files. By this we speed up especially installations and reduce disk I/O: https://github.com/Fourdee/DietPi/issues/1801
-General | By default systemd-logind is now masked on DietPi images. This can be changed by setting AUTO_UNMASK_LOGIND=1 within dietpi.txt. As well it will be unmasked automatically, if libpam-systemd was installed during dietpi-software installation: https://github.com/Fourdee/DietPi/issues/1767
+General | All DietPi scripts by default now use /tmp RAMFS to create, download and handle temporary files. By this we speed up especially installations and reduce disk I/O: https://github.com/MichaIng/DietPi/issues/1801
+General | By default systemd-logind is now masked on DietPi images. This can be changed by setting AUTO_UNMASK_LOGIND=1 within dietpi.txt. As well it will be unmasked automatically, if libpam-systemd was installed during dietpi-software installation: https://github.com/MichaIng/DietPi/issues/1767
 General | "fake-hwclock" is purged now on first run setup and v6.13 patch, if a real hardware clock is available.
-Image | NanoPC-T4: Image updated which now includes custom kernel/modules created by @carlosedp. Adds CIFS, docker support and much more. Please note, WiFi scan is intermittent with this kernel, and, may take a few attempts to be successful, however, we believe the additional modules are a higher priority: https://github.com/Fourdee/DietPi/issues/1829
+Image | NanoPC-T4: Image updated which now includes custom kernel/modules created by @carlosedp. Adds CIFS, docker support and much more. Please note, WiFi scan is intermittent with this kernel, and, may take a few attempts to be successful, however, we believe the additional modules are a higher priority: https://github.com/MichaIng/DietPi/issues/1829
 Image | RPi: New RPi images will be shipped without "initramfs-tools" preinstalled. The RPi bootloader does no require it and there are alternatives, e.g. "rpi-initramfs-tools" and "tiny-initramfs". The package can be manually purged on RPi systems, but "kmod" and "udev" need to be marked als manually installed first, so they will never be removed: "apt-mark manual kmod udev && apt-mark auto initramfs-tools && G_AGA"
 
 Bug Fixes:
 DietPi-Drive_Manager | Resolved an issue where mounting drives with the non-default path, would not re-select the same drive on the next screen.
-DietPi-Globals | G_THREAD_WAIT: Resolved an issue with 'G_THREAD_COUNT' not being re-init after all threads have finished, causing future threads to have NULL index: https://github.com/Fourdee/DietPi/issues/1801#issuecomment-406681129
-DietPi-Process_Tool | Resolved an issue where values were only being applied to the parent process, and, not all child threads. Many thanks to @antonellocaroli for reporting this issue: https://github.com/Fourdee/DietPi/issues/1942
+DietPi-Globals | G_THREAD_WAIT: Resolved an issue with 'G_THREAD_COUNT' not being re-init after all threads have finished, causing future threads to have NULL index: https://github.com/MichaIng/DietPi/issues/1801#issuecomment-406681129
+DietPi-Process_Tool | Resolved an issue where values were only being applied to the parent process, and, not all child threads. Many thanks to @antonellocaroli for reporting this issue: https://github.com/MichaIng/DietPi/issues/1942
 DietPi-Software | WiringPi: Resolved failed installation with RPi.
-DietPi-Software | Sonarr: Fixed APT install due to HTTPS error. Reverted to HTTP as of official install instructions. Thanks for report @GulyFMG: https://github.com/Fourdee/DietPi/issues/1953
-DietPi-Software | qBitTorrent: Resolved an issue with inability to save webUI settings: https://github.com/Fourdee/DietPi/issues/1957
-DietPi-Software | NZBget: Resolved an issue where application would apply incorrect umask to downloaded data, preventing other programs with allowed access, from accessing it: https://github.com/Fourdee/DietPi/issues/1999
-DietPi-Software | Plex: Resolved an issue with ARMv8 installations, where an exisiting install of Mono would cause a failed installation do to package dep issues: https://github.com/Fourdee/DietPi/issues/2006#issuecomment-412653984
-DietPi-Survey | Resolved an issue where a failed connection test would generate an error with UI blocking. As this program is not critical to device operation, the error is now silent without UI blocking: https://github.com/Fourdee/DietPi/issues/1968#issuecomment-408615457
+DietPi-Software | Sonarr: Fixed APT install due to HTTPS error. Reverted to HTTP as of official install instructions. Thanks for report @GulyFMG: https://github.com/MichaIng/DietPi/issues/1953
+DietPi-Software | qBitTorrent: Resolved an issue with inability to save webUI settings: https://github.com/MichaIng/DietPi/issues/1957
+DietPi-Software | NZBget: Resolved an issue where application would apply incorrect umask to downloaded data, preventing other programs with allowed access, from accessing it: https://github.com/MichaIng/DietPi/issues/1999
+DietPi-Software | Plex: Resolved an issue with ARMv8 installations, where an exisiting install of Mono would cause a failed installation do to package dep issues: https://github.com/MichaIng/DietPi/issues/2006#issuecomment-412653984
+DietPi-Survey | Resolved an issue where a failed connection test would generate an error with UI blocking. As this program is not critical to device operation, the error is now silent without UI blocking: https://github.com/MichaIng/DietPi/issues/1968#issuecomment-408615457
 DietPi-Login | Resolved an issue on Jessie systems, that prevented automated "dietpi-software" execution on first login. This was due to Jessie "pgrep" does not support "-i" argument (ignore cases).
 General | Resolved other minor issues related to pgrep "-i" argument not being supported on Jessie.
-General | Resolved an issue with recently implemented ramlog storage update from DietPi hourly cron job, thanks for reporting @sergiud: https://github.com/Fourdee/DietPi/issues/1947
-General | Pine64: Resolved an issue where WiFi module/functionality would not exist after reboot: https://github.com/Fourdee/DietPi/issues/1995#issuecomment-411168996
+General | Resolved an issue with recently implemented ramlog storage update from DietPi hourly cron job, thanks for reporting @sergiud: https://github.com/MichaIng/DietPi/issues/1947
+General | Pine64: Resolved an issue where WiFi module/functionality would not exist after reboot: https://github.com/MichaIng/DietPi/issues/1995#issuecomment-411168996
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -389,26 +423,26 @@ v6.12
 (19/07/18)
 
 Changes / Improvements / Optimizations:
-DietPi-Drive_Manager | Samba/CIFS mounting: Now automatically uses the highest available CIFS version supported on client and server: https://github.com/Fourdee/DietPi/issues/1893#issuecomment-403034799
-DietPi-Software | Jackett: Now runs as its own user, and, from the /opt/jackett directory, for new installations only. Many thanks to @userdeveloper98 for contributing this improvement: https://github.com/Fourdee/DietPi/pull/1895
+DietPi-Drive_Manager | Samba/CIFS mounting: Now automatically uses the highest available CIFS version supported on client and server: https://github.com/MichaIng/DietPi/issues/1893#issuecomment-403034799
+DietPi-Software | Jackett: Now runs as its own user, and, from the /opt/jackett directory, for new installations only. Many thanks to @userdeveloper98 for contributing this improvement: https://github.com/MichaIng/DietPi/pull/1895
 DietPi-Software | MiniDLNA: Now uses a SystemD service, also updates its library during service start.
-DietPi-Software | JRiver: Removed and no longer available for installation: https://github.com/Fourdee/DietPi/issues/1080#issuecomment-403489246
-DietPi-Software | Various titles: Now run under their own system user account, with limited permissions (previously root): https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403298679
-DietPi-Software | SABnzbd: Language packs are now installed by default: https://github.com/Fourdee/DietPi/issues/1917#issue-340631943
-DietPi-RAMlog | Increased the max size of /var/log to 50MB by default (previously 20MB). This should prevent 0 free space errors for excessive log file usage. Pi-Hole max logfile size is now 50MB/3 (16MB~) for high usage with daily stats support: https://github.com/pi-hole/pi-hole/issues/2270#issuecomment-405109135 | https://github.com/Fourdee/DietPi/issues/1923
-DietPi-RAMlog | Service is now disabled when RAMlog mode is not selected: https://github.com/Fourdee/DietPi/issues/1924
+DietPi-Software | JRiver: Removed and no longer available for installation: https://github.com/MichaIng/DietPi/issues/1080#issuecomment-403489246
+DietPi-Software | Various titles: Now run under their own system user account, with limited permissions (previously root): https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403298679
+DietPi-Software | SABnzbd: Language packs are now installed by default: https://github.com/MichaIng/DietPi/issues/1917#issue-340631943
+DietPi-RAMlog | Increased the max size of /var/log to 50MB by default (previously 20MB). This should prevent 0 free space errors for excessive log file usage. Pi-Hole max logfile size is now 50MB/3 (16MB~) for high usage with daily stats support: https://github.com/pi-hole/pi-hole/issues/2270#issuecomment-405109135 | https://github.com/MichaIng/DietPi/issues/1923
+DietPi-RAMlog | Service is now disabled when RAMlog mode is not selected: https://github.com/MichaIng/DietPi/issues/1924
 
 Bug Fixes:
-General | Resolved an issue where cron jobs, containing DietPi scripts, failed: https://github.com/Fourdee/DietPi/issues/1923
-General | Resolved an issue on ARM64 + Jessie with APT, due to debian-security removing suppport and packages for those devices. If you experience this issue, and are unable to update DietPi, please see : https://github.com/Fourdee/DietPi/issues/1915
-General | Resolved an issue where NFSv3 network drives could not be mounted: https://github.com/Fourdee/DietPi/issues/1898
-DietPi-Config | ASUS TB: Resolved loss of WiFi device after a reboot: https://github.com/Fourdee/DietPi/issues/1760
+General | Resolved an issue where cron jobs, containing DietPi scripts, failed: https://github.com/MichaIng/DietPi/issues/1923
+General | Resolved an issue on ARM64 + Jessie with APT, due to debian-security removing suppport and packages for those devices. If you experience this issue, and are unable to update DietPi, please see : https://github.com/MichaIng/DietPi/issues/1915
+General | Resolved an issue where NFSv3 network drives could not be mounted: https://github.com/MichaIng/DietPi/issues/1898
+DietPi-Config | ASUS TB: Resolved loss of WiFi device after a reboot: https://github.com/MichaIng/DietPi/issues/1760
 DietPi-Drive_Manager | Resolved an issue where the program could remove a non-empty directory in rare situations.
-DietPi-Software | Resolved a potential Mono instability issue with Radarr, Sonarr and Jackett, due to using '--optimize=all --server'. This has now been removed for new installations. Many thanks to @hellfirehd for debugging/testing and @Taloth for dev insights: https://github.com/Fourdee/DietPi/issues/1896
-DietPi-Software | Mono: Temp mono files are now cleared from memory once installed, preventing out of memory errors for additional software installs afterwards: https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403856446
-DietPi-Software | Xserver: Resolved rarely occuring uninstall issus by not purging dependencies, but leaving them for autoremove: https://github.com/Fourdee/DietPi/issues/1921
-DietPi-Software | MineOS: Resolved failed installation due to incompatibilities with nodejs v10. v8 is now installed: https://github.com/Fourdee/DietPi/issues/1880
-DietPi-Update | Resolved an issue where incorrect version would be displayed, once update was completed. This is due to '| tee' on a function, making var changes local: https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403866204
+DietPi-Software | Resolved a potential Mono instability issue with Radarr, Sonarr and Jackett, due to using '--optimize=all --server'. This has now been removed for new installations. Many thanks to @hellfirehd for debugging/testing and @Taloth for dev insights: https://github.com/MichaIng/DietPi/issues/1896
+DietPi-Software | Mono: Temp mono files are now cleared from memory once installed, preventing out of memory errors for additional software installs afterwards: https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403856446
+DietPi-Software | Xserver: Resolved rarely occuring uninstall issus by not purging dependencies, but leaving them for autoremove: https://github.com/MichaIng/DietPi/issues/1921
+DietPi-Software | MineOS: Resolved failed installation due to incompatibilities with nodejs v10. v8 is now installed: https://github.com/MichaIng/DietPi/issues/1880
+DietPi-Update | Resolved an issue where incorrect version would be displayed, once update was completed. This is due to '| tee' on a function, making var changes local: https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403866204
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -417,13 +451,13 @@ v6.11
 
 Changes / Improvements / Optimizations:
 DietPi-Drive_Manager | You can now specify an optional mount target directory, when mounting drives.
-DietPi-Software | Gogs: Installation optimizations, no gen homefolder as not required. For new installations only. Many thanks to @userdeveloper98 for this contribution.: https://github.com/Fourdee/DietPi/pull/1890
+DietPi-Software | Gogs: Installation optimizations, no gen homefolder as not required. For new installations only. Many thanks to @userdeveloper98 for this contribution.: https://github.com/MichaIng/DietPi/pull/1890
 DietPi-Update | Added reboot whiptail prompt after update is completed.
 
 Bug Fixes:
-General | Resolved black text in SSH sessions with some clients: https://github.com/Fourdee/DietPi/issues/1891
-DietPi-Config | Sparky SBC: Resolved Allo Piano DAC not being installed correctly: https://github.com/Fourdee/DietPi/issues/1894#issuecomment-402541469
-DietPi-Drive_Manager | NFS: Now uses the nfs mounting protocol (previously nfs4): https://github.com/Fourdee/DietPi/issues/1898#issuecomment-402781531
+General | Resolved black text in SSH sessions with some clients: https://github.com/MichaIng/DietPi/issues/1891
+DietPi-Config | Sparky SBC: Resolved Allo Piano DAC not being installed correctly: https://github.com/MichaIng/DietPi/issues/1894#issuecomment-402541469
+DietPi-Drive_Manager | NFS: Now uses the nfs mounting protocol (previously nfs4): https://github.com/MichaIng/DietPi/issues/1898#issuecomment-402781531
 
 AlloGUI v10:
 - Updates: To ensure stability and control of updates, they must now be completed outside the web interface, using either local or remote (SSH) terminal: https://dietpi.com/phpbb/viewtopic.php?f=8&t=2317&p=9218#p9218
@@ -435,51 +469,51 @@ v6.10
 
 Changes / Improvements / Optimizations:
 General | ASUS TB: GLES GPU and VPU support now enabled, once Xserver is installed.
-General | 'firmware-iwlwifi': Is now a pre-req to WiFi enable. Adds support for Intel based WiFi chips by default: https://github.com/Fourdee/DietPi/issues/1855
-General | "net-tools" commands (ifconfig, netstat, route, ...) were replaced by modern "ip" commands (ip a, ip r, ...) within DietPi scripts and the package therefore removed from DietPi core packages: https://github.com/Fourdee/DietPi/issues/1666
-General | Removed unused "/DietPi/config.txt" from non-RPi devices: https://github.com/Fourdee/DietPi/pull/1863
+General | 'firmware-iwlwifi': Is now a pre-req to WiFi enable. Adds support for Intel based WiFi chips by default: https://github.com/MichaIng/DietPi/issues/1855
+General | "net-tools" commands (ifconfig, netstat, route, ...) were replaced by modern "ip" commands (ip a, ip r, ...) within DietPi scripts and the package therefore removed from DietPi core packages: https://github.com/MichaIng/DietPi/issues/1666
+General | Removed unused "/DietPi/config.txt" from non-RPi devices: https://github.com/MichaIng/DietPi/pull/1863
 General | CurlFTPFS: Removed from DietPi scripts and is no longer supported. Due to lack of security, and, single digit install count (survey).
 General | Timesync: DietPi will now only check for a sucessful sync once per system boot, and, again hourly/daily if set. This is to prevent excess delay of systemd-timesyncd service, once the time has already been synced.
 General | Sparky SBC: Designs patch added for DSD on MPD-5 dac , new Ids added Mytek Manhatten , LH labs 1V5 2V0 ,HD-AVP/AVA IDA-8: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz
-DietPi-Backup | Rewritten. Userdata option removed, included by default backup. Added options to edit include/exclude filters in the GUI. Existing backups (v6.9 or less) are no longer supported: https://github.com/Fourdee/DietPi/issues/1851
-DietPi-Config | Soundcards (RPi): Allo Katana, now available for selection. https://github.com/Fourdee/DietPi/issues/1849
-DietPi-Config | IntelGPU Driver: Installation code added: https://github.com/Fourdee/DietPi/issues/1855#issue-333150262
-DietPi-Config | Networking: You can now view the sent and recieved totals for both network devices. NB: 32bit devices will reset the values after 32bit int limit is reached (roughly 4.3GB~), this is a kernel/arch limitation: https://github.com/Fourdee/DietPi/issues/1666#issuecomment-401546728
+DietPi-Backup | Rewritten. Userdata option removed, included by default backup. Added options to edit include/exclude filters in the GUI. Existing backups (v6.9 or less) are no longer supported: https://github.com/MichaIng/DietPi/issues/1851
+DietPi-Config | Soundcards (RPi): Allo Katana, now available for selection. https://github.com/MichaIng/DietPi/issues/1849
+DietPi-Config | IntelGPU Driver: Installation code added: https://github.com/MichaIng/DietPi/issues/1855#issue-333150262
+DietPi-Config | Networking: You can now view the sent and recieved totals for both network devices. NB: 32bit devices will reset the values after 32bit int limit is reached (roughly 4.3GB~), this is a kernel/arch limitation: https://github.com/MichaIng/DietPi/issues/1666#issuecomment-401546728
 DietPi-Drive_Manager | Rewrite and improvements:
- - Now supports ROM devices (eg: DVD). NB: compatibility for DVD/CD devices relies on kernel support. Not all devices will support DVD/CD devices, and/or their filesystem format: https://github.com/Fourdee/DietPi/issues/1858
- - Resize ext4 options added: https://github.com/Fourdee/DietPi/issues/1821
+ - Now supports ROM devices (eg: DVD). NB: compatibility for DVD/CD devices relies on kernel support. Not all devices will support DVD/CD devices, and/or their filesystem format: https://github.com/MichaIng/DietPi/issues/1858
+ - Resize ext4 options added: https://github.com/MichaIng/DietPi/issues/1821
  - Support for detecting and formatting non-partitioned drives
- - You can now benchmark read/write for all available mounted drives: https://github.com/Fourdee/DietPi/issues/1858
- - Now supports mounting, viewing, removal of network drives on system (nfs4, cifs). This replaces the previous options in 'dietpi-config': https://github.com/Fourdee/DietPi/issues/1858
- - Moving of DietPi user data to filesystems that do not support permission (FAT), is no longer supported and disabled: https://github.com/Fourdee/DietPi/issues/1846
-DietPi-Globals | G_PROMPT_BACKUP: Added to globals. This will be gradually rolled out in DietPi scripts, allowing the user to create a system backup, prior to significant system changes: https://github.com/Fourdee/DietPi/issues/1871#issuecomment-400443401
-DietPi-Globals | G_CHECK_USERDATA: Added to DietPi scripts: https://github.com/Fourdee/DietPi/issues/1850#issuecomment-401407996
-DietPi-Services | Rsync: Added to service control. This will prevent errors if rsync is running in daemon mode, when 'dietpi-backup' is run: https://github.com/Fourdee/DietPi/issues/1869#issuecomment-399890771
-DietPi-Software | Ubooquity: Now available for installation: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=12969#p12969 (https://github.com/Fourdee/DietPi/issues/1845#issuecomment-397447909)
-DietPi-Software | Roon Extension Manager: Now available for installation. Many thanks to @JanKoudijs for contributing this great addition!: https://github.com/Fourdee/DietPi/pull/1865
-DietPi-Software | Mosquitto: Now uses Debian APT installation: https://github.com/Fourdee/DietPi/issues/1868#issuecomment-399982278
-DietPi-Software | Gogs: Now runs under its own user. For new installations only: https://github.com/Fourdee/DietPi/issues/1877
+ - You can now benchmark read/write for all available mounted drives: https://github.com/MichaIng/DietPi/issues/1858
+ - Now supports mounting, viewing, removal of network drives on system (nfs4, cifs). This replaces the previous options in 'dietpi-config': https://github.com/MichaIng/DietPi/issues/1858
+ - Moving of DietPi user data to filesystems that do not support permission (FAT), is no longer supported and disabled: https://github.com/MichaIng/DietPi/issues/1846
+DietPi-Globals | G_PROMPT_BACKUP: Added to globals. This will be gradually rolled out in DietPi scripts, allowing the user to create a system backup, prior to significant system changes: https://github.com/MichaIng/DietPi/issues/1871#issuecomment-400443401
+DietPi-Globals | G_CHECK_USERDATA: Added to DietPi scripts: https://github.com/MichaIng/DietPi/issues/1850#issuecomment-401407996
+DietPi-Services | Rsync: Added to service control. This will prevent errors if rsync is running in daemon mode, when 'dietpi-backup' is run: https://github.com/MichaIng/DietPi/issues/1869#issuecomment-399890771
+DietPi-Software | Ubooquity: Now available for installation: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=12969#p12969 (https://github.com/MichaIng/DietPi/issues/1845#issuecomment-397447909)
+DietPi-Software | Roon Extension Manager: Now available for installation. Many thanks to @JanKoudijs for contributing this great addition!: https://github.com/MichaIng/DietPi/pull/1865
+DietPi-Software | Mosquitto: Now uses Debian APT installation: https://github.com/MichaIng/DietPi/issues/1868#issuecomment-399982278
+DietPi-Software | Gogs: Now runs under its own user. For new installations only: https://github.com/MichaIng/DietPi/issues/1877
 DietPi-Software | Xserver: 'mesa-utils-extra' now also installed by default, useful for GLES testing 'es2_info es2gears' etc.
-DietPi-Software | Moode: Removed from our software lineup: https://github.com/Fourdee/DietPi/issues/1223#issuecomment-401549371
-DietPi-Software | Radarr, Sonarr and Jackett: Services optimized and no longer run in debugging mode. Should improve runtime performance. Many thanks to @userdeveloper98 for this contribution! https://github.com/Fourdee/DietPi/pull/1889
-DietPi-Survey | Simplified available options. You can now either Opt In, or, Opt Out and automatically have any existing data cleared. Interactive installations will be prompted to Opt In or Out during 1st run. Automated installations are Opted In by default, you can change this once setup is completed. More information on DietPi-Survey and how to change the options: https://dietpi.com/phpbb/viewtopic.php?f=8&t=20 https://github.com/Fourdee/DietPi/issues/1827#issuecomment-396005575
-PREP | 'os-prober' installed by default for x86_64 devices. Ensures dual boot OSs are detected by grub. Also added a 3 second timeout to grub boot prompt, allowing OS selection: https://github.com/Fourdee/DietPi/issues/1855
+DietPi-Software | Moode: Removed from our software lineup: https://github.com/MichaIng/DietPi/issues/1223#issuecomment-401549371
+DietPi-Software | Radarr, Sonarr and Jackett: Services optimized and no longer run in debugging mode. Should improve runtime performance. Many thanks to @userdeveloper98 for this contribution! https://github.com/MichaIng/DietPi/pull/1889
+DietPi-Survey | Simplified available options. You can now either Opt In, or, Opt Out and automatically have any existing data cleared. Interactive installations will be prompted to Opt In or Out during 1st run. Automated installations are Opted In by default, you can change this once setup is completed. More information on DietPi-Survey and how to change the options: https://dietpi.com/phpbb/viewtopic.php?f=8&t=20 https://github.com/MichaIng/DietPi/issues/1827#issuecomment-396005575
+PREP | 'os-prober' installed by default for x86_64 devices. Ensures dual boot OSs are detected by grub. Also added a 3 second timeout to grub boot prompt, allowing OS selection: https://github.com/MichaIng/DietPi/issues/1855
 
 Bug Fixes:
 ASUS TB | Resolved square (broken) X11 fonts.
-Raspberry Pi | Removed "initial_turbo" setting from DietPi-Config and config.txt, as it prevents CPU governor from throttling down: https://github.com/Fourdee/DietPi/issues/1836
-DietPi-Drive_Manager | Resolved incorrect detection of available drives: https://github.com/Fourdee/DietPi/issues/1858
+Raspberry Pi | Removed "initial_turbo" setting from DietPi-Config and config.txt, as it prevents CPU governor from throttling down: https://github.com/MichaIng/DietPi/issues/1836
+DietPi-Drive_Manager | Resolved incorrect detection of available drives: https://github.com/MichaIng/DietPi/issues/1858
 DietPi-Software | GMrender: Resolved an issue where two systems on the same network would nullify the other. Hostname is now used for the server name, UUID used is applied via DietPi generated UUID during 1st run: https://dietpi.com/phpbb/viewtopic.php?f=11&t=3900&p=12985#p12985
 DietPi-Software | Apache2: Fixed a syntax error that leads to Apache logging to "/error.log" instead of "/var/log/apache2/error.log"
-DietPi-Software | Nukkit: Fixed the broken download link on installation. Many thanks to @symbios24 for reporting bug and providing solution: https://github.com/Fourdee/DietPi/issues/1875
-DietPi-Software | Linux software: Resolved an issue with NULL entry being displayed: https://github.com/Fourdee/DietPi/pull/1830#issuecomment-401612168
+DietPi-Software | Nukkit: Fixed the broken download link on installation. Many thanks to @symbios24 for reporting bug and providing solution: https://github.com/MichaIng/DietPi/issues/1875
+DietPi-Software | Linux software: Resolved an issue with NULL entry being displayed: https://github.com/MichaIng/DietPi/pull/1830#issuecomment-401612168
 DietPi-Config | Fixen an issue, where IPv6 could not be disabled on RPi. On current kernel version it is no dedicated kernel module any more and needs to be toggled via "/boot/cmdline.txt".
 
 AlloGUI v9:
-- Changing the root password, no longer breaks web interface: https://github.com/Fourdee/DietPi/issues/1841
-- Resolved issues with terminal leakage in the web interface: https://github.com/Fourdee/DietPi/issues/1841
+- Changing the root password, no longer breaks web interface: https://github.com/MichaIng/DietPi/issues/1841
+- Resolved issues with terminal leakage in the web interface: https://github.com/MichaIng/DietPi/issues/1841
 - System settings: Current version is always shown, even if an update is available.
-- System settings: Allo Katana, now available for selection. https://github.com/Fourdee/DietPi/issues/1849
+- System settings: Allo Katana, now available for selection. https://github.com/MichaIng/DietPi/issues/1849
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -487,43 +521,43 @@ v6.9
 (07/06/18)
 
 Changes / Improvements / Optimizations:
-General | During first run of DietPi (and during this patch), you will now be given the option to change the global password for 'root' + 'dietpi' accounts, and all future software to be installed that requires a password: https://github.com/Fourdee/DietPi/issues/1782
-General | Increased verbosity and logging of DietPi boot scripts to assist with debugging: https://github.com/Fourdee/DietPi/issues/1772
+General | During first run of DietPi (and during this patch), you will now be given the option to change the global password for 'root' + 'dietpi' accounts, and all future software to be installed that requires a password: https://github.com/MichaIng/DietPi/issues/1782
+General | Increased verbosity and logging of DietPi boot scripts to assist with debugging: https://github.com/MichaIng/DietPi/issues/1772
 General | G_ERROR_HANDLER: Retry mechanic added, allows you to re-run and retry the last command when an error occurs. Also included option to send DietPi a bug report when an issue occurs.
-General | NTP removed from DietPi-Config time sync options and DietPi core packages. All time sync modes are now offered via systemd-timesyncd, which is part of every Debian based core system: https://github.com/Fourdee/DietPi/pull/1628
-Generel | DietPi-Set_Core_Environment was removed. DietPi service and system config files are now updates automatically via new update system, other environment setup steps are moved into DietPi-PREP: https://github.com/Fourdee/DietPi/issues/1749
+General | NTP removed from DietPi-Config time sync options and DietPi core packages. All time sync modes are now offered via systemd-timesyncd, which is part of every Debian based core system: https://github.com/MichaIng/DietPi/pull/1628
+Generel | DietPi-Set_Core_Environment was removed. DietPi service and system config files are now updates automatically via new update system, other environment setup steps are moved into DietPi-PREP: https://github.com/MichaIng/DietPi/issues/1749
 DietPi-BugReport | Has been revised and improved to remove end user security concerns.
 DietPi-Drive_Manager | Swapfile: Added ability to move the swapfile and set size. This replaces the previous option in DietPi-Config.
 DietPi-Process_Tool | NoMachine + Webmin: Processes can now be controlled.
 DietPi-Services | Webmin: Added and now controlled.
 DietPi-Software | Fail2Ban: Install now uses the systemD backend. No longer requires Rsyslog pre-req. For new installations only.
 DietPi-Software | Search: Feature now available. Find the software you require for install, faster! https://twitter.com/DietPi_/status/1000858660682305536
-DietPi-Software | InfluxDB and Grafana now available for installation. Many thanks to @marcobrianza for the install code and documentation guides: https://github.com/Fourdee/DietPi/issues/1784
-DietPi-Software | LXDE: Resolved missing icons with 'pcmanfm' under RPi devices: https://github.com/Fourdee/DietPi/issues/1558#issuecomment-390328173
-DietPi-Software | Webmin: Resolved failed installation due to missing package pre-reqs. Upgraded to use a systemD service: https://github.com/Fourdee/DietPi/issues/1741
-DietPi-Software | Removed npm root access error during installs: https://github.com/Fourdee/DietPi/issues/1340#issuecomment-389899081
-DietPi-Software | OpenJDK/JRE now installs Java version 8 across all DietPi system. This is for stability across all programs that require it: https://github.com/Fourdee/DietPi/issues/1340#issuecomment-389889264
-DietPi-Software | Updated several non-APT software titles for fresh installs and reinstalls: https://github.com/Fourdee/DietPi/pull/1774
-DietPi-Software | Transmission: General clean up of install config file. G_CONFIG_INJECT is now used to replace/add our optimized entries. Also cleaned up the service, now runs as forking: https://github.com/Fourdee/DietPi/issues/1754
-DietPi-Software | sabnzbd: Updated to latest version 2.3.4 (for new installations only): https://github.com/Fourdee/DietPi/issues/1340
-DietPi-Software | CAVA: Updated to latest version 0.6.1. Enabled for x86_64: https://github.com/Fourdee/DietPi/issues/1340
-DietPi-Software | OctoPrint: libjpeg-dev now installed by default, this is required for additional plugin installations (eg: Astroprintcloud Plugin): https://github.com/Fourdee/DietPi/issues/1800
-DietPi-Software | Xserver: DPMS and all known screen blanking/saving is now disabled by default. To re-enable this feature, remove the following file '/etc/X11/xorg.conf.d/99-dietpi-dpms_off.conf': https://github.com/Fourdee/DietPi/issues/1823
+DietPi-Software | InfluxDB and Grafana now available for installation. Many thanks to @marcobrianza for the install code and documentation guides: https://github.com/MichaIng/DietPi/issues/1784
+DietPi-Software | LXDE: Resolved missing icons with 'pcmanfm' under RPi devices: https://github.com/MichaIng/DietPi/issues/1558#issuecomment-390328173
+DietPi-Software | Webmin: Resolved failed installation due to missing package pre-reqs. Upgraded to use a systemD service: https://github.com/MichaIng/DietPi/issues/1741
+DietPi-Software | Removed npm root access error during installs: https://github.com/MichaIng/DietPi/issues/1340#issuecomment-389899081
+DietPi-Software | OpenJDK/JRE now installs Java version 8 across all DietPi system. This is for stability across all programs that require it: https://github.com/MichaIng/DietPi/issues/1340#issuecomment-389889264
+DietPi-Software | Updated several non-APT software titles for fresh installs and reinstalls: https://github.com/MichaIng/DietPi/pull/1774
+DietPi-Software | Transmission: General clean up of install config file. G_CONFIG_INJECT is now used to replace/add our optimized entries. Also cleaned up the service, now runs as forking: https://github.com/MichaIng/DietPi/issues/1754
+DietPi-Software | sabnzbd: Updated to latest version 2.3.4 (for new installations only): https://github.com/MichaIng/DietPi/issues/1340
+DietPi-Software | CAVA: Updated to latest version 0.6.1. Enabled for x86_64: https://github.com/MichaIng/DietPi/issues/1340
+DietPi-Software | OctoPrint: libjpeg-dev now installed by default, this is required for additional plugin installations (eg: Astroprintcloud Plugin): https://github.com/MichaIng/DietPi/issues/1800
+DietPi-Software | Xserver: DPMS and all known screen blanking/saving is now disabled by default. To re-enable this feature, remove the following file '/etc/X11/xorg.conf.d/99-dietpi-dpms_off.conf': https://github.com/MichaIng/DietPi/issues/1823
 DietPi-Survey | Has been revised and improved to remove end user security concerns.
-DietPi-Update | Implemented an automated update system for DietPi files, placed outside of /DietPi, e.g. system configurations and service files. This allows significant reduction of script code and assures consistency across all systems: https://github.com/Fourdee/DietPi/pull/1802
+DietPi-Update | Implemented an automated update system for DietPi files, placed outside of /DietPi, e.g. system configurations and service files. This allows significant reduction of script code and assures consistency across all systems: https://github.com/MichaIng/DietPi/pull/1802
 
 Bug Fixes:
-General | Login and globals moved to /etc/bashrc.d/*, due to issues with remote shell and desktop terms under /etc/profile.d/99-dietpi-login.sh: https://github.com/Fourdee/DietPi/issues/1777#issuecomment-390248960
-General | Completely removed root permission requirements from login scirpts and banner. Also users without sudo permissions will see the login banner and will be able to use dietpi-* and G_* functions: https://github.com/Fourdee/DietPi/pull/1790
-General | Sparky SBC + USB-DAC unmute fix (v2), now sets volume to max: https://github.com/Fourdee/DietPi/pull/1779
-General | UID bit reapplied for Sudo. Reported not applied on current XU4 image: https://github.com/Fourdee/DietPi/issues/794#issuecomment-392335392
-DietPi-Config | WiFi HotSpot: Resolved inability to toggle state (enable/disable) and change channel: https://github.com/Fourdee/DietPi/issues/1810#issuecomment-394126835
+General | Login and globals moved to /etc/bashrc.d/*, due to issues with remote shell and desktop terms under /etc/profile.d/99-dietpi-login.sh: https://github.com/MichaIng/DietPi/issues/1777#issuecomment-390248960
+General | Completely removed root permission requirements from login scirpts and banner. Also users without sudo permissions will see the login banner and will be able to use dietpi-* and G_* functions: https://github.com/MichaIng/DietPi/pull/1790
+General | Sparky SBC + USB-DAC unmute fix (v2), now sets volume to max: https://github.com/MichaIng/DietPi/pull/1779
+General | UID bit reapplied for Sudo. Reported not applied on current XU4 image: https://github.com/MichaIng/DietPi/issues/794#issuecomment-392335392
+DietPi-Config | WiFi HotSpot: Resolved inability to toggle state (enable/disable) and change channel: https://github.com/MichaIng/DietPi/issues/1810#issuecomment-394126835
 DietPi-Drive_Manager | Format: Resolved an issue where formatting any drive, would reset the swapfile back to auto size and default location: https://dietpi.com/phpbb/viewtopic.php?f=11&t=3851&p=12864#p12864
 DietPi-set_dphys-swapfile | Resolved issues with fallocate on vfat partitions which caused a failure.
-DietPi-Software | SickRage: SystemD service updated to prevent timeouts, allowing the process to fully init. Experienced by some users installs: https://github.com/Fourdee/DietPi/issues/1762
-DietPi-Software | AirSonic: Resolved issues with incorrect memory limit being set during installation: https://github.com/Fourdee/DietPi/issues/1764
-DietPi-Software | AirSonic/SubSonic: Resolved 503 error when accessing web interface: https://github.com/Fourdee/DietPi/issues/1764
-DietPi-Software | CloudPrint: Resolved an issue where the CUPS web interface would fail to connect: https://github.com/Fourdee/DietPi/issues/1797
+DietPi-Software | SickRage: SystemD service updated to prevent timeouts, allowing the process to fully init. Experienced by some users installs: https://github.com/MichaIng/DietPi/issues/1762
+DietPi-Software | AirSonic: Resolved issues with incorrect memory limit being set during installation: https://github.com/MichaIng/DietPi/issues/1764
+DietPi-Software | AirSonic/SubSonic: Resolved 503 error when accessing web interface: https://github.com/MichaIng/DietPi/issues/1764
+DietPi-Software | CloudPrint: Resolved an issue where the CUPS web interface would fail to connect: https://github.com/MichaIng/DietPi/issues/1797
 DietPi-Software | VNC + LXDE: Resolved error message 'no session for PID x'.:
 
 -----------------------------------------------------------------------------------------------------------
@@ -532,46 +566,46 @@ v6.8
 (13/05/18)
 
 Changes / Improvements / Optimizations:
-General | All future DietPi images (v6.8 and onwards), now has serial console enabled by default for the 1st run setup. It will be disabled automatically after first run setup to save on resources, unless 'CONFIG_SERIAL_CONSOLE_ENABLE=1' is set in dietpi.txt: https://github.com/Fourdee/DietPi/issues/1759
+General | All future DietPi images (v6.8 and onwards), now has serial console enabled by default for the 1st run setup. It will be disabled automatically after first run setup to save on resources, unless 'CONFIG_SERIAL_CONSOLE_ENABLE=1' is set in dietpi.txt: https://github.com/MichaIng/DietPi/issues/1759
 General | DietPi.com website: Server has been upgraded to Debian Stretch, featuring HTTPS redirect.
-General | FBset is no longer a pre-req package for DietPi systems. This will be removed on fresh installations (not existing, to avoid any package conflicts): https://github.com/Fourdee/DietPi/issues/1716
-General | DietPi login script and globals init moved to /etc/profile.d/99-dietpi-login.sh. Ensuring any user on system with sudo permissions can load them. Global commands are also now supported across multiple users, eg: either 'sudo -i G_AGI pacakge' or 'G_SUDO G_AGI package': https://github.com/Fourdee/DietPi/issues/1477
-General | G_WHIP*: Improved scaling detection based on character count and line count. We now also calculate character count per line, to determine if additional lines are required against X. In other words, it should be a more 'snug' fit :) https://github.com/Fourdee/DietPi/issues/1740
+General | FBset is no longer a pre-req package for DietPi systems. This will be removed on fresh installations (not existing, to avoid any package conflicts): https://github.com/MichaIng/DietPi/issues/1716
+General | DietPi login script and globals init moved to /etc/profile.d/99-dietpi-login.sh. Ensuring any user on system with sudo permissions can load them. Global commands are also now supported across multiple users, eg: either 'sudo -i G_AGI pacakge' or 'G_SUDO G_AGI package': https://github.com/MichaIng/DietPi/issues/1477
+General | G_WHIP*: Improved scaling detection based on character count and line count. We now also calculate character count per line, to determine if additional lines are required against X. In other words, it should be a more 'snug' fit :) https://github.com/MichaIng/DietPi/issues/1740
 DietPi-Automation | 'AUTO_SETUP_RAMLOG_MAXSIZE' added to dietpi.txt. Sets max /var/log tmpfs size during 1st run. Requires v6.8 or higher image.
 DietPi-Config | Native PC > Soundcard: 'firmware-intel-sound' is now installed automatically for Intel based CPUs.
-DietPi-Drive_Manager | Added ability to adjust reserved blocks percentage on ext4 file system: https://github.com/Fourdee/DietPi/issues/1662
-DietPi-Drive_Manager | Added ability to check and optionally repair a filesystem. Many thanks to MonZon for the feature request! rootFS and /boot checks will be added in v6.9, currently additional drives are supported by this feature https://github.com/Fourdee/DietPi/issues/1740
-DietPi-Drive_Manager | Enabled access for virtual machines: https://github.com/Fourdee/DietPi/issues/1765
+DietPi-Drive_Manager | Added ability to adjust reserved blocks percentage on ext4 file system: https://github.com/MichaIng/DietPi/issues/1662
+DietPi-Drive_Manager | Added ability to check and optionally repair a filesystem. Many thanks to MonZon for the feature request! rootFS and /boot checks will be added in v6.9, currently additional drives are supported by this feature https://github.com/MichaIng/DietPi/issues/1740
+DietPi-Drive_Manager | Enabled access for virtual machines: https://github.com/MichaIng/DietPi/issues/1765
 DietPi-LetsEncrypt | Lighttpd: SSL configuration upgrade according to Mozillas SSL generator: https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=lighttpd-1.4.35&openssl=1.0.1t&hsts=yes&profile=intermediate
-DietPi-LetsEncrypt | Minor code and error handling improvements, as well increasing transparancy of what the script is currently doing: https://github.com/Fourdee/DietPi/pull/1738
-DietPi-Process_tool | Rewrite of save file, to allow for stringed entries. The save file will be cleared during the update, to support this feature: https://github.com/Fourdee/DietPi/issues/1750
-DietPi-Process_tool | Added Plex Media Server to process tool, however, transcoding will not be affected by this: https://github.com/Fourdee/DietPi/issues/1750#issuecomment-386826317
-DietPi-Set_Hardware | Allo Piano firmware is now installed on demand and will be removed on update, if not chosen as soundcard: https://github.com/Fourdee/DietPi/issues/1656
-DietPi-Software | AmiBerry (Amiga Emulator): Updated to v2.19, contains bug fixes and improvements: https://github.com/Fourdee/DietPi/issues/1707#issue-314377609
-DietPi-Software | Chromium: No longer requires a desktop and can be installed as a lightweight single use program, using dietpi-autostart to run under kiosk mode. Many thanks to @AYapejian! 720p is the default window size, please see '/var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh' for full options when running under 'dietpi-autostart' mode: https://github.com/Fourdee/DietPi/issues/1737
-DietPi-Software | Readymedia (MiniDLNA): Removed ALSA pre-req as it is not required. Many thanks to @bokiroki: https://github.com/Fourdee/DietPi/issues/1712
-DietPi-Software | Pi-hole: Enabled support for FTLDNS: https://github.com/Fourdee/DietPi/issues/1696
-DietPi-Software | Gitea: Updated to latest version (1.4), for new installations only. Many thanks to @yumiris: https://github.com/Fourdee/DietPi/pull/1723
+DietPi-LetsEncrypt | Minor code and error handling improvements, as well increasing transparancy of what the script is currently doing: https://github.com/MichaIng/DietPi/pull/1738
+DietPi-Process_tool | Rewrite of save file, to allow for stringed entries. The save file will be cleared during the update, to support this feature: https://github.com/MichaIng/DietPi/issues/1750
+DietPi-Process_tool | Added Plex Media Server to process tool, however, transcoding will not be affected by this: https://github.com/MichaIng/DietPi/issues/1750#issuecomment-386826317
+DietPi-Set_Hardware | Allo Piano firmware is now installed on demand and will be removed on update, if not chosen as soundcard: https://github.com/MichaIng/DietPi/issues/1656
+DietPi-Software | AmiBerry (Amiga Emulator): Updated to v2.19, contains bug fixes and improvements: https://github.com/MichaIng/DietPi/issues/1707#issue-314377609
+DietPi-Software | Chromium: No longer requires a desktop and can be installed as a lightweight single use program, using dietpi-autostart to run under kiosk mode. Many thanks to @AYapejian! 720p is the default window size, please see '/var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh' for full options when running under 'dietpi-autostart' mode: https://github.com/MichaIng/DietPi/issues/1737
+DietPi-Software | Readymedia (MiniDLNA): Removed ALSA pre-req as it is not required. Many thanks to @bokiroki: https://github.com/MichaIng/DietPi/issues/1712
+DietPi-Software | Pi-hole: Enabled support for FTLDNS: https://github.com/MichaIng/DietPi/issues/1696
+DietPi-Software | Gitea: Updated to latest version (1.4), for new installations only. Many thanks to @yumiris: https://github.com/MichaIng/DietPi/pull/1723
 DietPi-Software | PHPBB3: Latest version update (3.2.2), for new installations only.
-DietPi-Software | Docker: Enabled for ARMv8 devices: https://github.com/Fourdee/DietPi/issues/1736
-PREP | G_HW_MODEL: Added for 'OrangePi PC Plus'. Many thanks to @SuBLiNeR: https://github.com/Fourdee/DietPi/pull/1704
+DietPi-Software | Docker: Enabled for ARMv8 devices: https://github.com/MichaIng/DietPi/issues/1736
+PREP | G_HW_MODEL: Added for 'OrangePi PC Plus'. Many thanks to @SuBLiNeR: https://github.com/MichaIng/DietPi/pull/1704
 PREP | Optimized rootfs re-parition and resize. This will reduced the required intial system reboot count by one. Will take affect from official v6.8 DietPi images and onwards.
 
 Bug Fixes:
-General | Remote SCP/Rsync fix when running under 'dietpi' user: https://github.com/Fourdee/DietPi/issues/1703
-General | ASUS TB: Resolved issues with onboard WiFi not being detected. Our latest image is required for this fix due to kernel: https://github.com/Fourdee/DietPi/issues/1760
+General | Remote SCP/Rsync fix when running under 'dietpi' user: https://github.com/MichaIng/DietPi/issues/1703
+General | ASUS TB: Resolved issues with onboard WiFi not being detected. Our latest image is required for this fix due to kernel: https://github.com/MichaIng/DietPi/issues/1760
 General | Sparky SBC: Unmute USB-DAC audio fix applied during boot. Many thanks to @sudeep.
 DietPi-Config | RPi onboard sound: Resolved an issue where changing from 3.5mm output back to auto, would not have any effect.
 DietPi-Config | Resolved an error when selecting 'Sample Rate' CPU option.
-DietPi-Drive_Manager | Resolved issues with incorrect detection of drives and mounts on Debian Stretch: https://github.com/Fourdee/DietPi/issues/1748
-DietPi-Drive_Manager | Resolved issues RootFS transfer being stuck in a endless rsync loop: https://github.com/Fourdee/DietPi/issues/1748
-DietPi-Drive_Manager | Resolved an issue where setting read only/write modes had no effect on fstab entries. This affected recent images only: https://github.com/Fourdee/DietPi/issues/1758
+DietPi-Drive_Manager | Resolved issues with incorrect detection of drives and mounts on Debian Stretch: https://github.com/MichaIng/DietPi/issues/1748
+DietPi-Drive_Manager | Resolved issues RootFS transfer being stuck in a endless rsync loop: https://github.com/MichaIng/DietPi/issues/1748
+DietPi-Drive_Manager | Resolved an issue where setting read only/write modes had no effect on fstab entries. This affected recent images only: https://github.com/MichaIng/DietPi/issues/1758
 DietPi-Justboom | ALSA must now be installed, and /etc/asound.conf must exist, before this application can be run.
 DietPi-LetsEncrypt | Now skips any webserver configuration edit, if CertBot execution returns with error: https://dietpi.com/phpbb/viewtopic.php?f=11&t=1909
 DietPi-Software | Pi-SPC: PATH fix for sds.sh.
 DietPi-Software | WiringPi: Now installed to '$HOME/WiringPi', previously this would be wiringPi-HEAD-8d188fa.
-DietPi-Software | XRDP: Resolved an issue with blue screen running under Xorg. VNC4 is now installed by default, and the new connection method is 'Xvnc': https://github.com/Fourdee/DietPi/issues/1727#issuecomment-383858979
-DietPi-Software | AmiBerry: Fix for standard boot SDL2 keyboard leaking to background. Please note fast boot is still affected by the SDL2 keyboard leak: https://github.com/Fourdee/DietPi/issues/1707
+DietPi-Software | XRDP: Resolved an issue with blue screen running under Xorg. VNC4 is now installed by default, and the new connection method is 'Xvnc': https://github.com/MichaIng/DietPi/issues/1727#issuecomment-383858979
+DietPi-Software | AmiBerry: Fix for standard boot SDL2 keyboard leaking to background. Please note fast boot is still affected by the SDL2 keyboard leak: https://github.com/MichaIng/DietPi/issues/1707
 
 Allo GUI v7:
 - Resolved errors with swapfile display/change.
@@ -584,26 +618,26 @@ v6.7
 
 Changes / Improvements / Optimizations:
 General | G_AG* visual update. Should offer a cleaner visual experience.
-DietPi-Backup | Free space check is now run, prior to backup: https://github.com/Fourdee/DietPi/pull/1686
-DietPi-Banner | Added additional credits and support for displaying image creator + pre-image name: https://github.com/Fourdee/DietPi/issues/1621
-DietPi-Config | MPEG2/VC1 keys: GPU memory is now increased automatically to 128 (if currently lower), required for this features to function: https://github.com/Fourdee/DietPi/issues/1487
-DietPi-Drive_Manager | When formatting EXT4, reserved block size is now set to 0%. This will provide the max available storage for the device (previously 5% was reserved): https://github.com/Fourdee/DietPi/issues/1662#issuecomment-378860605
-DietPi-PREP | Updated to G_WHIP. Added image creator and pre-image name input box (used in banner). All user input questions/prompts at begining of script: https://github.com/Fourdee/DietPi/issues/1621
-DietPi-Software | Samba Server: Reduced the process count of smbd from 4 to 3, by fully disabling printer support. Applied to new installations only: https://github.com/Fourdee/DietPi/issues/1689#issuecomment-379038594
+DietPi-Backup | Free space check is now run, prior to backup: https://github.com/MichaIng/DietPi/pull/1686
+DietPi-Banner | Added additional credits and support for displaying image creator + pre-image name: https://github.com/MichaIng/DietPi/issues/1621
+DietPi-Config | MPEG2/VC1 keys: GPU memory is now increased automatically to 128 (if currently lower), required for this features to function: https://github.com/MichaIng/DietPi/issues/1487
+DietPi-Drive_Manager | When formatting EXT4, reserved block size is now set to 0%. This will provide the max available storage for the device (previously 5% was reserved): https://github.com/MichaIng/DietPi/issues/1662#issuecomment-378860605
+DietPi-PREP | Updated to G_WHIP. Added image creator and pre-image name input box (used in banner). All user input questions/prompts at begining of script: https://github.com/MichaIng/DietPi/issues/1621
+DietPi-Software | Samba Server: Reduced the process count of smbd from 4 to 3, by fully disabling printer support. Applied to new installations only: https://github.com/MichaIng/DietPi/issues/1689#issuecomment-379038594
 DietPi-Software | Samba Server: Max connections is now limited to 'CPU cores * 2'. This will prevent excess connections and resource usage. Applied to new installations only.
 DietPi-Software | (RPi): 'rpi-bcm2835-ultrahq' is now the default installed soundcard, if no other soundcard has been selected. Previously this was 'rpi-bcm2835', which offered a lower quality audio output when compared to 'rpi-bcm2835-ultrahq'.
-DietPi-Sync | Free space check is now run, prior to sync: https://github.com/Fourdee/DietPi/pull/1686
+DietPi-Sync | Free space check is now run, prior to sync: https://github.com/MichaIng/DietPi/pull/1686
 
 Bug Fixes:
-General | Swapfile Generation: Resolved an issue where 'fallocate' would fail for f2fs/xfs filesystem types. dd and pre-allocation is now used for those types: https://github.com/Fourdee/DietPi/issues/1680
-DietPi-Config | Fixed an issue, where "CPU Min Freq Limit" could not be set: https://github.com/Fourdee/DietPi/issues/1690
-DietPi-Config | (RPi) Resolved an issue where Samba client would fail to mount. 'vers=1.0' is now also used for compatibility: https://github.com/Fourdee/DietPi/issues/1693
-DietPi-Software | OpenJDK (RPi): Resolved an external bug with installation of this package via RPi repo, that would error on installation: https://github.com/Fourdee/DietPi/issues/1682
-DietPi-Software | Sonarr: Resolved failed installation for ARMv8 devices: https://github.com/Fourdee/DietPi/issues/1502
+General | Swapfile Generation: Resolved an issue where 'fallocate' would fail for f2fs/xfs filesystem types. dd and pre-allocation is now used for those types: https://github.com/MichaIng/DietPi/issues/1680
+DietPi-Config | Fixed an issue, where "CPU Min Freq Limit" could not be set: https://github.com/MichaIng/DietPi/issues/1690
+DietPi-Config | (RPi) Resolved an issue where Samba client would fail to mount. 'vers=1.0' is now also used for compatibility: https://github.com/MichaIng/DietPi/issues/1693
+DietPi-Software | OpenJDK (RPi): Resolved an external bug with installation of this package via RPi repo, that would error on installation: https://github.com/MichaIng/DietPi/issues/1682
+DietPi-Software | Sonarr: Resolved failed installation for ARMv8 devices: https://github.com/MichaIng/DietPi/issues/1502
 DietPi-Software | Mono: Uninstalling this program, will now also uninstall the mono APT packages.
-DietPi-Software | NodeRed: User is now added to the GPIO group automatically: https://github.com/Fourdee/DietPi/issues/1687
-DietPi-Software | Deluge: Resolved multiple issues where the deluge service would sometimes fail to run: https://github.com/Fourdee/DietPi/issues/1689#issuecomment-379017388
-DietPi-Software | Pi-hole: Workaround applied to prevent lighttpd install during Pi-hole script, when Apache2/Nginx is installed: https://github.com/Fourdee/DietPi/issues/1696
+DietPi-Software | NodeRed: User is now added to the GPIO group automatically: https://github.com/MichaIng/DietPi/issues/1687
+DietPi-Software | Deluge: Resolved multiple issues where the deluge service would sometimes fail to run: https://github.com/MichaIng/DietPi/issues/1689#issuecomment-379017388
+DietPi-Software | Pi-hole: Workaround applied to prevent lighttpd install during Pi-hole script, when Apache2/Nginx is installed: https://github.com/MichaIng/DietPi/issues/1696
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -614,22 +648,22 @@ Image additions:
 Nintendo Switch: DietPi Image now available, includes GPU, Kodi and RetroPie support! Many thanks to Mrs April and Mr Fall.
 
 Changes / Improvements / Optimizations:
-General | Removed minutely running "make_nas_processes_faster" cron job, which is present on some device base images, without any effect on raw DietPi: https://github.com/Fourdee/DietPi/issues/1654
+General | Removed minutely running "make_nas_processes_faster" cron job, which is present on some device base images, without any effect on raw DietPi: https://github.com/MichaIng/DietPi/issues/1654
 General | firmware-misc-nonfree is now installed by default for Native PC (x86_64) devices. Contains additional firmware for Intel CPUs.
 General | RPi: Disabled the ability to fry an egg on the RPi 3 CPU. CPU temps are now halved under load! Many thanks to Mrs April and Mr Fall.
-DietPi-Boot | Dropbear: Adding ecdsa and dss host keys as well on 1st boot, to avoid boot error messages: https://github.com/Fourdee/DietPi/issues/1670
+DietPi-Boot | Dropbear: Adding ecdsa and dss host keys as well on 1st boot, to avoid boot error messages: https://github.com/MichaIng/DietPi/issues/1670
 DietPi-Boot | Now executes "iw" and "amixer" only, if binaries exist, unhide command outputs instead.
 DietPi-Boot | Now executes "ifup/down wlan0" only, if interface is configured, to avoid error message about it.
 DietPi-Boot | Now adds sourcing of DietPi-Globals to /root/.bashrc, if missing, e.g. due to user edit.
-DietPi-Boot | Various code improvements according to: https://github.com/Fourdee/DietPi/issues/1510
+DietPi-Boot | Various code improvements according to: https://github.com/MichaIng/DietPi/issues/1510
 DietPi-Cron | Added the ability to disable the new minutely cron job, if not needed, to reduce logs
-DietPi-Services | Start/Stop order is now based on service dependencies: https://github.com/Fourdee/DietPi/issues/1462
+DietPi-Services | Start/Stop order is now based on service dependencies: https://github.com/MichaIng/DietPi/issues/1462
 
 Bug Fixes:
-General | RPi: Resolved issue with updating 'raspberrypi-sys-mods', where the patch would incorrectly apply a new apt mirror, breaking the ability to update: https://github.com/Fourdee/DietPi/issues/1659#issuecomment-377297103
-General | firmware-misc-nonfree is now installed by default on all DietPi systems (minus those via PREP with WiFi disabled). Mostly Intel/Nvidia firmware, however, it also contains ralink WiFi firmware: https://github.com/Fourdee/DietPi/issues/1675#issuecomment-377806609
-DietPi-Globals | G_RPI_UPDATE: Added APT hold state for "libraspberrypi0", to include all "raspberrypi-firmware" packages, that are overwritten by "rpi-update": https://github.com/Fourdee/DietPi/pull/1657
-DietPi-Process_Tool | Deluge: Is now a SystemD service, which resolves failed process tool apply on forking deluge process: https://github.com/Fourdee/DietPi/issues/1658
+General | RPi: Resolved issue with updating 'raspberrypi-sys-mods', where the patch would incorrectly apply a new apt mirror, breaking the ability to update: https://github.com/MichaIng/DietPi/issues/1659#issuecomment-377297103
+General | firmware-misc-nonfree is now installed by default on all DietPi systems (minus those via PREP with WiFi disabled). Mostly Intel/Nvidia firmware, however, it also contains ralink WiFi firmware: https://github.com/MichaIng/DietPi/issues/1675#issuecomment-377806609
+DietPi-Globals | G_RPI_UPDATE: Added APT hold state for "libraspberrypi0", to include all "raspberrypi-firmware" packages, that are overwritten by "rpi-update": https://github.com/MichaIng/DietPi/pull/1657
+DietPi-Process_Tool | Deluge: Is now a SystemD service, which resolves failed process tool apply on forking deluge process: https://github.com/MichaIng/DietPi/issues/1658
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -637,36 +671,36 @@ v6.5
 (28/03/18)
 
 Changes / Improvements / Optimizations:
-General | Minor code performance enhancements: https://github.com/Fourdee/DietPi/issues/1510
-General | Our scripts preserve now the terminal scrollback buffer, when cleaning current terminal view: https://github.com/Fourdee/DietPi/issues/1615
+General | Minor code performance enhancements: https://github.com/MichaIng/DietPi/issues/1510
+General | Our scripts preserve now the terminal scrollback buffer, when cleaning current terminal view: https://github.com/MichaIng/DietPi/issues/1615
 General | G_WHIP_*: Rolled out to all DietPi scripts.
 General | Sparky SBC: Kernel update: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz
-DietPi-Environment | Move sudoers adjustments to "/etc/sudoers.d/dietpi": https://github.com/Fourdee/DietPi/pull/1635
-DietPi-Environment | Move sysctl adjustments to "/etc/sysctl.d/dietpi.conf" to assure higher priority than "/etc/sysctl.d/99-sysctl.conf": https://github.com/Fourdee/DietPi/pull/1635
-DietPi-Config | Enabled possibility to adjust display resolution for VMs, but max guest display resolution might need to be adjusted within VM software as well: https://github.com/Fourdee/DietPi/issues/1227
-DietPi-Config | Advanced options: You can now define the swapfile location: https://github.com/Fourdee/DietPi/issues/1602
-DietPi-Config | Soundcards (RPi): Added option for ApplePi DAC: https://github.com/Fourdee/DietPi/issues/1626
+DietPi-Environment | Move sudoers adjustments to "/etc/sudoers.d/dietpi": https://github.com/MichaIng/DietPi/pull/1635
+DietPi-Environment | Move sysctl adjustments to "/etc/sysctl.d/dietpi.conf" to assure higher priority than "/etc/sysctl.d/99-sysctl.conf": https://github.com/MichaIng/DietPi/pull/1635
+DietPi-Config | Enabled possibility to adjust display resolution for VMs, but max guest display resolution might need to be adjusted within VM software as well: https://github.com/MichaIng/DietPi/issues/1227
+DietPi-Config | Advanced options: You can now define the swapfile location: https://github.com/MichaIng/DietPi/issues/1602
+DietPi-Config | Soundcards (RPi): Added option for ApplePi DAC: https://github.com/MichaIng/DietPi/issues/1626
 DietPi-Process_Tool | Added ability to add custom process entries to "/DietPi/dietpi/.dietpi-process_tool_include". Add one process each line with the format <chosenName>:<executableFileName>. Check via htop, e.g. "DHCP client:dhclient"
-DietPi-Software | NoMachine: Installation updated to 6.0.78 (new installations only): https://github.com/Fourdee/DietPi/issues/1340#issuecomment-372845397
-DietPi-Software | Squeezebox server: Updated to systemd native service: https://github.com/Fourdee/DietPi/issues/1613
-DietPi-Software | AmiBerry: Updated to 2.18. Improved audio latency, Unique new feature: WHDLoad booter! (check the wiki for details), bug fixes: https://github.com/Fourdee/DietPi/issues/1410#issuecomment-374060452
-DietPi-Software | RPi: For all software titles which require unrar, unrar-nonfree is now installed via Debian package (previously unrar-free): https://github.com/Fourdee/DietPi/issues/865#issuecomment-375315827
+DietPi-Software | NoMachine: Installation updated to 6.0.78 (new installations only): https://github.com/MichaIng/DietPi/issues/1340#issuecomment-372845397
+DietPi-Software | Squeezebox server: Updated to systemd native service: https://github.com/MichaIng/DietPi/issues/1613
+DietPi-Software | AmiBerry: Updated to 2.18. Improved audio latency, Unique new feature: WHDLoad booter! (check the wiki for details), bug fixes: https://github.com/MichaIng/DietPi/issues/1410#issuecomment-374060452
+DietPi-Software | RPi: For all software titles which require unrar, unrar-nonfree is now installed via Debian package (previously unrar-free): https://github.com/MichaIng/DietPi/issues/865#issuecomment-375315827
 DietPi-Software | MPD: Resolved an issue where "libwrap0" (libwrap.so.0) was missing to start MPD service: https://dietpi.com/phpbb/viewtopic.php?f=9&t=2779
-DietPi-Software | MPD: Updated to 0.20.18. Compiled with UPnP support enabled: https://github.com/Fourdee/DietPi/issues/1614
+DietPi-Software | MPD: Updated to 0.20.18. Compiled with UPnP support enabled: https://github.com/MichaIng/DietPi/issues/1614
 
 Bug Fixes:
-General | dphys-swapfile: Has been removed and replace with our own swapfile generation system. Uses fallocate to quickly create the swapfile of any size (1-2 seconds): https://github.com/Fourdee/DietPi/issues/1602
-General | RPi: Resolved issue with gettext error during login due to /etc/profile.d/wifi-country.sh: https://github.com/Fourdee/DietPi/issues/1631
+General | dphys-swapfile: Has been removed and replace with our own swapfile generation system. Uses fallocate to quickly create the swapfile of any size (1-2 seconds): https://github.com/MichaIng/DietPi/issues/1602
+General | RPi: Resolved issue with gettext error during login due to /etc/profile.d/wifi-country.sh: https://github.com/MichaIng/DietPi/issues/1631
 General | RPi: Resolved missing Allo Piano DAC firmware.
-General | RPi 3B+: Resolved inability to scan/connect with WiFi: https://github.com/Fourdee/DietPi/issues/1627#issuecomment-375912747
-DietPi-Drive_Manager | Resolved an issue where x-systemd.automount would fail if autofs4 was disabled in kernel/modules (eg: Rock64). x-systemd.automount is now disabled for systems which fail autofs4 detection: https://github.com/Fourdee/DietPi/issues/1607
-DietPi-Config | Removed 'firmware-ralink' pre-req from WiFi enable. This is a virtual package for 'firmware-misc-nonfree': https://github.com/Fourdee/DietPi/issues/1631
+General | RPi 3B+: Resolved inability to scan/connect with WiFi: https://github.com/MichaIng/DietPi/issues/1627#issuecomment-375912747
+DietPi-Drive_Manager | Resolved an issue where x-systemd.automount would fail if autofs4 was disabled in kernel/modules (eg: Rock64). x-systemd.automount is now disabled for systems which fail autofs4 detection: https://github.com/MichaIng/DietPi/issues/1607
+DietPi-Config | Removed 'firmware-ralink' pre-req from WiFi enable. This is a virtual package for 'firmware-misc-nonfree': https://github.com/MichaIng/DietPi/issues/1631
 DietPi-Config | RPi: Resolved missing Allo Piano DAC 2.1 entry.
-DietPi-Software | PineA64: Resolved issue with failure to run fbturbo driver on Debian Stretch: https://github.com/Fourdee/DietPi/issues/1604
-DietPi-Software | LMS/Squeezebox: Resolved an issue where installation could fail to complete, due to service failing to stop gracefully. Resolved CPAN issues running under ARMv8 and Stretch: https://github.com/Fourdee/DietPi/issues/1613#issuecomment-372787574
-DietPi-Software | ShairportSync (Jessie): Resolved failed service start due to lack of libssl1.1: https://github.com/Fourdee/DietPi/issues/1620
-DietPi-Software | MATE + VNC4: Resolved grey screen: https://github.com/Fourdee/DietPi/issues/1645
-DietPi-Software | Mopidy: Resolved no sound due to missing gstreamer1.0-alsa package: https://github.com/Fourdee/DietPi/issues/1625
+DietPi-Software | PineA64: Resolved issue with failure to run fbturbo driver on Debian Stretch: https://github.com/MichaIng/DietPi/issues/1604
+DietPi-Software | LMS/Squeezebox: Resolved an issue where installation could fail to complete, due to service failing to stop gracefully. Resolved CPAN issues running under ARMv8 and Stretch: https://github.com/MichaIng/DietPi/issues/1613#issuecomment-372787574
+DietPi-Software | ShairportSync (Jessie): Resolved failed service start due to lack of libssl1.1: https://github.com/MichaIng/DietPi/issues/1620
+DietPi-Software | MATE + VNC4: Resolved grey screen: https://github.com/MichaIng/DietPi/issues/1645
+DietPi-Software | Mopidy: Resolved no sound due to missing gstreamer1.0-alsa package: https://github.com/MichaIng/DietPi/issues/1625
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -674,17 +708,17 @@ v6.4 - HotFix
 (09/03/18)
 
 Changes / Improvements / Optimizations:
-DietPi-Cron | Added ability to set minutely based cron jobs (eg: every 3 minutes), using /etc/cron.minutely. Many thanks to @d5c0d3 for adding this feature: https://github.com/Fourdee/DietPi/pull/1578
-DietPi-Software | UrBackupServer: Updated to latest version 2.2.8: https://github.com/Fourdee/DietPi/issues/1600
+DietPi-Cron | Added ability to set minutely based cron jobs (eg: every 3 minutes), using /etc/cron.minutely. Many thanks to @d5c0d3 for adding this feature: https://github.com/MichaIng/DietPi/pull/1578
+DietPi-Software | UrBackupServer: Updated to latest version 2.2.8: https://github.com/MichaIng/DietPi/issues/1600
 
 Bug Fixes:
-General | Resolved an issue with dietpi user password, being reset during patch, due to set_core_environment: https://github.com/Fourdee/DietPi/issues/1592
-General | Resolved issues with swapfile being disabled by default due to image bug. To resolve existing installations with 0 swapfile, swapfile will be forcefully re-created during this patch for all systems, with automatic size (2GB-RAM): https://github.com/Fourdee/DietPi/issues/1593#issuecomment-371516418
+General | Resolved an issue with dietpi user password, being reset during patch, due to set_core_environment: https://github.com/MichaIng/DietPi/issues/1592
+General | Resolved issues with swapfile being disabled by default due to image bug. To resolve existing installations with 0 swapfile, swapfile will be forcefully re-created during this patch for all systems, with automatic size (2GB-RAM): https://github.com/MichaIng/DietPi/issues/1593#issuecomment-371516418
 General | Resolved incorrect scaling with G_WHIP_VIEWFILE: https://dietpi.com/phpbb/viewtopic.php?f=9&t=2882&p=11317#p11317
-General | Resolved issues with G_AGDUG missing the additional distro specific command line options: https://github.com/Fourdee/DietPi/issues/1594
+General | Resolved issues with G_AGDUG missing the additional distro specific command line options: https://github.com/MichaIng/DietPi/issues/1594
 General | Resolved an issue with DietPi-RAMdisk/log, where /var/tmp/dietpi/logs would not be generated if removed, causing the service to fail: https://dietpi.com/phpbb/viewtopic.php?f=11&t=1148&p=11322#p11322
-General | Resolved an issue where 'dhcpcd' and 'dhclient' were active side-by-side: https://github.com/Fourdee/DietPi/issues/1560#issuecomment-370136642
-General | Resolved an issue, where CPU microcode APT package was based on image creating CPU instead of target CPU: https://github.com/Fourdee/DietPi/pull/1596
+General | Resolved an issue where 'dhcpcd' and 'dhclient' were active side-by-side: https://github.com/MichaIng/DietPi/issues/1560#issuecomment-370136642
+General | Resolved an issue, where CPU microcode APT package was based on image creating CPU instead of target CPU: https://github.com/MichaIng/DietPi/pull/1596
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -693,51 +727,51 @@ v6.3
 
 Image Changes:
 Native PC BIOS | Image now available: https://dietpi.com/download
-NanoPi Neo | Image now available (based on FriendlyARM official image): https://github.com/Fourdee/DietPi/issues/1588
+NanoPi Neo | Image now available (based on FriendlyARM official image): https://github.com/MichaIng/DietPi/issues/1588
 
 Changes / Improvements / Optimizations:
-General | DietPi now uses its own "dietpi-postboot.service" to initiate dietpi-services, instead of /etc/rc.local. The latter will be reset on update, but in case of manual adjustments, a backup is safed to dietpi_userdata. The initiating "rc-local.service" will stay in place as well, so /etc/rc.local can be used as before: https://github.com/Fourdee/DietPi/issues/1376
-General | Additional getty's (2-6) are now disabled via mask. This reduces resource usage for unneeded screens: https://github.com/Fourdee/DietPi/issues/1541
-General | APT: 'Disabled install recommends' is now standard and default across all DietPi images: https://github.com/Fourdee/DietPi/issues/1482#issuecomment-368031044
+General | DietPi now uses its own "dietpi-postboot.service" to initiate dietpi-services, instead of /etc/rc.local. The latter will be reset on update, but in case of manual adjustments, a backup is safed to dietpi_userdata. The initiating "rc-local.service" will stay in place as well, so /etc/rc.local can be used as before: https://github.com/MichaIng/DietPi/issues/1376
+General | Additional getty's (2-6) are now disabled via mask. This reduces resource usage for unneeded screens: https://github.com/MichaIng/DietPi/issues/1541
+General | APT: 'Disabled install recommends' is now standard and default across all DietPi images: https://github.com/MichaIng/DietPi/issues/1482#issuecomment-368031044
 General | Sparky SBC kernel patches: Pro-Ject-S2 dac DSD native support on sparky, also other few dac ids. Thanks @sudeep.
-General | /tmp tmpfs size is now automatically set to 50% of RAM+SWAP, (previously 50% RAM only). To prevent out of memory errors during certain software installations (eg: Mono), where the swapfile can be used only when needed: https://github.com/Fourdee/DietPi/issues/1027#issuecomment-369435049
-DietPi-Automation | dietpi.txt entries and support added for WPA2 Enterprise (WPA-EAP). Many thanks to @symo for implementing this feature!: https://github.com/Fourdee/DietPi/pull/1547
+General | /tmp tmpfs size is now automatically set to 50% of RAM+SWAP, (previously 50% RAM only). To prevent out of memory errors during certain software installations (eg: Mono), where the swapfile can be used only when needed: https://github.com/MichaIng/DietPi/issues/1027#issuecomment-369435049
+DietPi-Automation | dietpi.txt entries and support added for WPA2 Enterprise (WPA-EAP). Many thanks to @symo for implementing this feature!: https://github.com/MichaIng/DietPi/pull/1547
 DietPi-Backup | Once backup is completed, you will be asked if you wish to view the log file, for the full rsync log.
-DietPi-Banner | Improved notification when no network is detected: https://github.com/Fourdee/DietPi/issues/1576
-DietPi-Globals | G_WHIP*: Further additions and improvements, including automatic scaling: https://github.com/Fourdee/DietPi/issues/1546 https://github.com/Fourdee/DietPi/issues/1546#issuecomment-370173876
-DietPi-LetsEncrypt | Lighttpd: Added support for HSTS (HTTP Strict Transport Security): https://github.com/Fourdee/DietPi/pull/1553
-DietPi-LetsEncrypt | Minor rework and cleaning, using now /etc/systemd/system/certbot.service.d/dietpi-script.conf for web server specific renewal hooks: https://github.com/Fourdee/DietPi/pull/1553
-DietPi-Software | Shairport-sync: Updated to 3.1.7 for all devices. Also enabled for x86_64: https://github.com/Fourdee/DietPi/issues/1548
-DietPi-Software | Proftp: Now defaults to dietpi user with root login off: https://github.com/Fourdee/DietPi/issues/1529#issuecomment-367644593
-DietPi-Software | RPi Cam Web Interface (Previously DietPiCam): Updated to 6.4.17 and resolves previously failed installation. URL has also changed to http://ip/rpicam : https://github.com/Fourdee/DietPi/issues/1512
-DietPi-Software | Sonarr: Now uses the develop repo branch, inline with our Radarr install: https://github.com/Fourdee/DietPi/issues/1566#issuecomment-369334473
-DietPi-Software | Mono: Raspbian dist is now used for RPi devices: https://github.com/Fourdee/DietPi/issues/1566
-DietPi-Software | FFmpeg: Fix backports dependency issues for all Odroids: https://github.com/Fourdee/DietPi/issues/1556
-DietPi-Software | Improved UI options during NTPD failure. You will now be given multiple options that will assist in resolving NTPD time sync issues on your network: https://github.com/Fourdee/DietPi/issues/1580#issuecomment-370153882
+DietPi-Banner | Improved notification when no network is detected: https://github.com/MichaIng/DietPi/issues/1576
+DietPi-Globals | G_WHIP*: Further additions and improvements, including automatic scaling: https://github.com/MichaIng/DietPi/issues/1546 https://github.com/MichaIng/DietPi/issues/1546#issuecomment-370173876
+DietPi-LetsEncrypt | Lighttpd: Added support for HSTS (HTTP Strict Transport Security): https://github.com/MichaIng/DietPi/pull/1553
+DietPi-LetsEncrypt | Minor rework and cleaning, using now /etc/systemd/system/certbot.service.d/dietpi-script.conf for web server specific renewal hooks: https://github.com/MichaIng/DietPi/pull/1553
+DietPi-Software | Shairport-sync: Updated to 3.1.7 for all devices. Also enabled for x86_64: https://github.com/MichaIng/DietPi/issues/1548
+DietPi-Software | Proftp: Now defaults to dietpi user with root login off: https://github.com/MichaIng/DietPi/issues/1529#issuecomment-367644593
+DietPi-Software | RPi Cam Web Interface (Previously DietPiCam): Updated to 6.4.17 and resolves previously failed installation. URL has also changed to http://ip/rpicam : https://github.com/MichaIng/DietPi/issues/1512
+DietPi-Software | Sonarr: Now uses the develop repo branch, inline with our Radarr install: https://github.com/MichaIng/DietPi/issues/1566#issuecomment-369334473
+DietPi-Software | Mono: Raspbian dist is now used for RPi devices: https://github.com/MichaIng/DietPi/issues/1566
+DietPi-Software | FFmpeg: Fix backports dependency issues for all Odroids: https://github.com/MichaIng/DietPi/issues/1556
+DietPi-Software | Improved UI options during NTPD failure. You will now be given multiple options that will assist in resolving NTPD time sync issues on your network: https://github.com/MichaIng/DietPi/issues/1580#issuecomment-370153882
 DietPi-Software | NTPD check will now run after the internet connection test, to prevent unnecessary delay when network is not yet configured:
-DietPi-Software | SubSonic 5: Replaced with Airsonic: https://github.com/Fourdee/DietPi/issues/1585
-DietPi-Software | Aria2: Optimized installation and connection settings based on hardware. Now uses a configuration file '/var/lib/dietpi/dietpi-software/installed/aria2.conf', which will allow users to change aria2 settings permanently. Please note, the aria2-webui does not support saving settings after session shutdown, this is a known limitation with the software, please use the aria2.conf to make changes: https://github.com/Fourdee/DietPi/issues/1575
+DietPi-Software | SubSonic 5: Replaced with Airsonic: https://github.com/MichaIng/DietPi/issues/1585
+DietPi-Software | Aria2: Optimized installation and connection settings based on hardware. Now uses a configuration file '/var/lib/dietpi/dietpi-software/installed/aria2.conf', which will allow users to change aria2 settings permanently. Please note, the aria2-webui does not support saving settings after session shutdown, this is a known limitation with the software, please use the aria2.conf to make changes: https://github.com/MichaIng/DietPi/issues/1575
 DietPi-Sync | Once sync is completed, you will be asked if you wish to view the log file, for the full rsync log.
 DietPi-Update | G_AGUP/G_AGUG: Now runs prior to our patch system. Ensuring APT is upto date during our updates: https://dietpi.com/phpbb/viewtopic.php?f=11&t=2894&p=11150#p11149
 
 Bug Fixes:
 General | G_AGUG: --allow-unauthenticated added for Stretch+ by default (inline with other G_AG commands)
-General | Resolved POSIX issues with dropbear (limitation) and SSH sessions. We now detect for presence of POSIX and set user selected locale during session load: https://github.com/Fourdee/DietPi/issues/1540
-General | Resolved multiple issues with failed GNU key management during APT installs from non-standard repos. Dirmngr is now installed on all DietPi systems by default: https://github.com/Fourdee/DietPi/issues/1388
-General | Resolved basic APT issues with Meveric's repo and failing dependencies. Debian repo is now used in the first instance: https://github.com/Fourdee/DietPi/pull/1571#issuecomment-369973745
-General | DietPi-Globals are now loaded prior to login script. Ensures aliases are functional during exit of 1st run setup: https://github.com/Fourdee/DietPi/issues/1580#issuecomment-370149636
-DietPi-Config | Resolved an issue with NTPD mode #4 (systemd) reporting dbus errors, dbus is now installed on demand: https://github.com/Fourdee/DietPi/issues/1580#issuecomment-370173703
-DietPi-LetsEncrypt | Lighttpd/Minio: Fixed auto renewal: https://github.com/Fourdee/DietPi/pull/1553
-DietPi-LetsEncrypt | Minio: Fixed an issue, where port 443 listening would fail due to missing libcap2-bin/setcap package: https://github.com/Fourdee/DietPi/pull/1553#issuecomment-368261474
-DietPi-Software | Radarr/Sonarr: Reinstall patch, to bring binaries upto date, which resolves issues with the latest mono lib version: https://github.com/Fourdee/DietPi/issues/1566
+General | Resolved POSIX issues with dropbear (limitation) and SSH sessions. We now detect for presence of POSIX and set user selected locale during session load: https://github.com/MichaIng/DietPi/issues/1540
+General | Resolved multiple issues with failed GNU key management during APT installs from non-standard repos. Dirmngr is now installed on all DietPi systems by default: https://github.com/MichaIng/DietPi/issues/1388
+General | Resolved basic APT issues with Meveric's repo and failing dependencies. Debian repo is now used in the first instance: https://github.com/MichaIng/DietPi/pull/1571#issuecomment-369973745
+General | DietPi-Globals are now loaded prior to login script. Ensures aliases are functional during exit of 1st run setup: https://github.com/MichaIng/DietPi/issues/1580#issuecomment-370149636
+DietPi-Config | Resolved an issue with NTPD mode #4 (systemd) reporting dbus errors, dbus is now installed on demand: https://github.com/MichaIng/DietPi/issues/1580#issuecomment-370173703
+DietPi-LetsEncrypt | Lighttpd/Minio: Fixed auto renewal: https://github.com/MichaIng/DietPi/pull/1553
+DietPi-LetsEncrypt | Minio: Fixed an issue, where port 443 listening would fail due to missing libcap2-bin/setcap package: https://github.com/MichaIng/DietPi/pull/1553#issuecomment-368261474
+DietPi-Software | Radarr/Sonarr: Reinstall patch, to bring binaries upto date, which resolves issues with the latest mono lib version: https://github.com/MichaIng/DietPi/issues/1566
 DietPi-Software | Desktops: USB drive removed from .gtk-bookmarks as no longer used in DietPi.
-DietPi-Software | Shairport-Sync: Resolved ARMv6 binary Illegal instruction: https://github.com/Fourdee/DietPi/issues/1548
+DietPi-Software | Shairport-Sync: Resolved ARMv6 binary Illegal instruction: https://github.com/MichaIng/DietPi/issues/1548
 DietPi-Software | Lighttpd: Resolved an issue with failed enable of php module, due to perl being a undocumented pre-req for 'lighttpd-enable-mod'.
-DietPi-Software | MotionEye: Resolved failed installation due to missing build-essential pre-req: https://github.com/Fourdee/DietPi/issues/1564
-DietPi-Software | SubSonic6: Resolved broken URL link. Binary now hosted on dietpi.com: https://github.com/Fourdee/DietPi/issues/1582
-DietPi-Services | Service stop order is now reversed: https://github.com/Fourdee/DietPi/issues/1462#issue-294140894
-DietPi-Set_Hardware | Resolved issues with serial consoles not be disabled without dbus installed. Serial consoles are now masked/unmasked (previously disabled): https://github.com/Fourdee/DietPi/issues/1482
-DietPi-Update | Resolved an issue where .update_available would exist during reboot, causing banner to display update available incorrectly: https://github.com/Fourdee/DietPi/issues/1535
+DietPi-Software | MotionEye: Resolved failed installation due to missing build-essential pre-req: https://github.com/MichaIng/DietPi/issues/1564
+DietPi-Software | SubSonic6: Resolved broken URL link. Binary now hosted on dietpi.com: https://github.com/MichaIng/DietPi/issues/1582
+DietPi-Services | Service stop order is now reversed: https://github.com/MichaIng/DietPi/issues/1462#issue-294140894
+DietPi-Set_Hardware | Resolved issues with serial consoles not be disabled without dbus installed. Serial consoles are now masked/unmasked (previously disabled): https://github.com/MichaIng/DietPi/issues/1482
+DietPi-Update | Resolved an issue where .update_available would exist during reboot, causing banner to display update available incorrectly: https://github.com/MichaIng/DietPi/issues/1535
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -745,26 +779,26 @@ v6.2
 (18/02/18)
 
 Changes / Improvements / Optimizations:
-Native PC UEFI | Image now includes options to install to either EMMC (eg: onboard) or SDA (1st HDD) device: https://github.com/Fourdee/DietPi/issues/1171#issuecomment-336522021 | https://dietpi.com/phpbb/viewtopic.php?f=9&t=2809&p=10808#p10808
+Native PC UEFI | Image now includes options to install to either EMMC (eg: onboard) or SDA (1st HDD) device: https://github.com/MichaIng/DietPi/issues/1171#issuecomment-336522021 | https://dietpi.com/phpbb/viewtopic.php?f=9&t=2809&p=10808#p10808
 DietPi-Backup | Rsync: Error control now handled by G_RUN_CMD
 DietPi-Config | Locale: Reworked, now only lists UTF-8 items, no longer using dpkg-reconfigure. Our custom set_software script handles all locales ensuring en_GB is always installed, and selected item is applied as system default.
 DietPi-Config | Display options > Resolution: Added fkms/kms (OpenGL) modes for RPi 2/3.
 DietPi-Config | Sparky SBC: Added option to select usb-dac-1.1 soundcard, which will enable USB1.1 compatibility.
-DietPi-Config | WiFi: Now supports connecting to hidden WiFi networks, thanks @shahwahed : https://github.com/Fourdee/DietPi/pull/1497
-DietPi-LetsEncrypt | On Jessie, changed certificate auto renewal to native certbot renew command, to prevent certificate duplication: https://github.com/Fourdee/DietPi/issues/734
+DietPi-Config | WiFi: Now supports connecting to hidden WiFi networks, thanks @shahwahed : https://github.com/MichaIng/DietPi/pull/1497
+DietPi-LetsEncrypt | On Jessie, changed certificate auto renewal to native certbot renew command, to prevent certificate duplication: https://github.com/MichaIng/DietPi/issues/734
 DietPi-LetsEncrypt | On Stretch, added automated Minio certificate renewal. Rerun "dietpi-letsencrypt" on your Stretch system to gain this feature.
 DietPi-Process_tool | Reduction of onscreen print. Additional status print will only occur when HIERARCHY is less than 2 and/or an error occurs.
-DietPi-Software | AmiBerry: Massive update to v2.14 and SDL2, new installations only. Currently for RPi's under Stretch only, however, we have plans to impliment for other devices: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=64#p64 https://github.com/Fourdee/DietPi/issues/1410
-DietPi-Software | LMS/Squeezebox: Has undergone an install review and re-write. All archs are now supported for Stretch + Jessie: https://github.com/Fourdee/DietPi/issues/1496
-DietPi-Software | Pydio: Add PHP module 'intl' on installation, as requested via web ui warning: https://github.com/Fourdee/DietPi/issues/1240
-DietPi-Software | Nginx: To further reduce recource usage, by default 'nginx-light' will be installed now: https://github.com/Fourdee/DietPi/issues/1240
-DietPi-Software | PHP: Removed some unused PHP modules from default installation: https://github.com/Fourdee/DietPi/issues/1240
-DietPi-Software | Added information regarding DietPi controlling services (stopping them), prior to install/uninstall. Thanks @gpioneer90: https://github.com/Fourdee/DietPi/issues/1484#issuecomment-363802523
-DietPi-Software | PiJuice: Available for installation: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=10740#p10740 | https://github.com/Fourdee/DietPi/issues/1488
-DietPi-Software | Grasshopper: Removed, no longer available for installation: https://github.com/Fourdee/DietPi/issues/1491
-DietPi-Software | Raspcontrol: Removed, no longer available for installation: https://github.com/Fourdee/DietPi/issues/1491
-DietPi-Software | NetData: Updated to latest version (v1.9.0, previously v1.6.0): https://github.com/Fourdee/DietPi/issues/1494#issuecomment-364504645
-DietPi-Software | MariaDB: Installation does now automatically migrate existing databases in /mnt/dietpi_userdata/mysql or /var/lib/mysql, which would be not easily possible afterwards: https://github.com/Fourdee/DietPi/pull/1475
+DietPi-Software | AmiBerry: Massive update to v2.14 and SDL2, new installations only. Currently for RPi's under Stretch only, however, we have plans to impliment for other devices: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=64#p64 https://github.com/MichaIng/DietPi/issues/1410
+DietPi-Software | LMS/Squeezebox: Has undergone an install review and re-write. All archs are now supported for Stretch + Jessie: https://github.com/MichaIng/DietPi/issues/1496
+DietPi-Software | Pydio: Add PHP module 'intl' on installation, as requested via web ui warning: https://github.com/MichaIng/DietPi/issues/1240
+DietPi-Software | Nginx: To further reduce recource usage, by default 'nginx-light' will be installed now: https://github.com/MichaIng/DietPi/issues/1240
+DietPi-Software | PHP: Removed some unused PHP modules from default installation: https://github.com/MichaIng/DietPi/issues/1240
+DietPi-Software | Added information regarding DietPi controlling services (stopping them), prior to install/uninstall. Thanks @gpioneer90: https://github.com/MichaIng/DietPi/issues/1484#issuecomment-363802523
+DietPi-Software | PiJuice: Available for installation: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=10740#p10740 | https://github.com/MichaIng/DietPi/issues/1488
+DietPi-Software | Grasshopper: Removed, no longer available for installation: https://github.com/MichaIng/DietPi/issues/1491
+DietPi-Software | Raspcontrol: Removed, no longer available for installation: https://github.com/MichaIng/DietPi/issues/1491
+DietPi-Software | NetData: Updated to latest version (v1.9.0, previously v1.6.0): https://github.com/MichaIng/DietPi/issues/1494#issuecomment-364504645
+DietPi-Software | MariaDB: Installation does now automatically migrate existing databases in /mnt/dietpi_userdata/mysql or /var/lib/mysql, which would be not easily possible afterwards: https://github.com/MichaIng/DietPi/pull/1475
 DietPi-Software | Xserver: libgl1-mesa-dri libgles2-mesa mesa-utils, now installed by default. Required for OpenGL/GLES support across various devices.
 DietPi-Sync | Rsync: Error control now handled by G_RUN_CMD
 G_AGP | Will now only remove packages which are installed. Non matching items will be ignored. Supports wildcards. Prevents APT failure if the package is simply not installed.
@@ -772,24 +806,24 @@ G_DIETPI-NOTIFY | Added initiating program name, to start of line print.
 
 Bug Fixes:
 General | Resolved an issue where externally launched DietPi-Config with target menu, (eg: dietpi-config 8 1) had no effect. EG: fail connection, should go straight to networking submenu.
-General | Locales have been reworked and reset: To resolve broken Locales, they have been reset to en_GB.UTF-8.\n\nIf you had a different locale configured on this system, please use dietpi-config at a later date to re-configure. Backups of previous env and locale settings, are created in /mnt/dietpi_userdata/*.bak: https://github.com/Fourdee/DietPi/issues/1430
+General | Locales have been reworked and reset: To resolve broken Locales, they have been reset to en_GB.UTF-8.\n\nIf you had a different locale configured on this system, please use dietpi-config at a later date to re-configure. Backups of previous env and locale settings, are created in /mnt/dietpi_userdata/*.bak: https://github.com/MichaIng/DietPi/issues/1430
 DietPi-Autostart | Custom: Resolved issue with the dietpi-autostart_custom service failing to run: https://dietpi.com/phpbb/viewtopic.php?f=11&t=2832&p=10862
-DietPi-Config | AudioPhonics I-Sabre-K2M: Resolved issue with failed installation. This is now a source build ondemand: https://github.com/Fourdee/DietPi/issues/1437
-DietPi-LetsEncrypt | Work around a non-DietPi issue, that prevents certificate renewal via Apache and Nginx on Stretch systems: https://github.com/Fourdee/DietPi/issues/734#issuecomment-361774084
-DietPi-Services | OpenVPN and DNSMASQ (PiHole): Are no longer controlled. This is to prevent unexpected loss of connection during DietPi scripts: https://github.com/Fourdee/DietPi/issues/1501
-DietPi-Software | Jessie: Pi-hole is now disabled, pending release of FTL 4.0, which is required to resolve incompatible logging with outdated dnsmasq options under Jessie: https://github.com/Fourdee/DietPi/issues/1524
-DietPi-Software | Nginx: Resolved failed installation when IPv6 is disabled, thanks @MichaIng: https://github.com/Fourdee/DietPi/pull/1441
-DietPi-Software | OpenVPN Server: Resolved failed installation under Debian Stretch: https://github.com/Fourdee/DietPi/issues/1450
-DietPi-Software | Resolved an issue where uninstalling multiple items, could result in endless loop: https://github.com/Fourdee/DietPi/issues/1454
+DietPi-Config | AudioPhonics I-Sabre-K2M: Resolved issue with failed installation. This is now a source build ondemand: https://github.com/MichaIng/DietPi/issues/1437
+DietPi-LetsEncrypt | Work around a non-DietPi issue, that prevents certificate renewal via Apache and Nginx on Stretch systems: https://github.com/MichaIng/DietPi/issues/734#issuecomment-361774084
+DietPi-Services | OpenVPN and DNSMASQ (PiHole): Are no longer controlled. This is to prevent unexpected loss of connection during DietPi scripts: https://github.com/MichaIng/DietPi/issues/1501
+DietPi-Software | Jessie: Pi-hole is now disabled, pending release of FTL 4.0, which is required to resolve incompatible logging with outdated dnsmasq options under Jessie: https://github.com/MichaIng/DietPi/issues/1524
+DietPi-Software | Nginx: Resolved failed installation when IPv6 is disabled, thanks @MichaIng: https://github.com/MichaIng/DietPi/pull/1441
+DietPi-Software | OpenVPN Server: Resolved failed installation under Debian Stretch: https://github.com/MichaIng/DietPi/issues/1450
+DietPi-Software | Resolved an issue where uninstalling multiple items, could result in endless loop: https://github.com/MichaIng/DietPi/issues/1454
 DietPi-Software | phpMyAdmin: Its new default MariaDB user 'phpmyadmin' now has full admin privileges: https://dietpi.com/phpbb/viewtopic.php?f=11&t=2775
 DietPi-Software | RPi.GPIO: Resolved failed installation.
-DietPi-Software | Raspcontrol: Resolved an issue with missing webserver stack pre-req: https://github.com/Fourdee/DietPi/issues/1485
-DietPi-Software | Resolved an issue where an existing higher GPU mem split, would be overridden with a lower value, during install of certain software: https://github.com/Fourdee/DietPi/issues/1484
-DietPi-Software | qBitTorrent: Resolved issue with failed login on Debian Jessie, the default password is now 'adminadmin': https://github.com/Fourdee/DietPi/issues/1499
+DietPi-Software | Raspcontrol: Resolved an issue with missing webserver stack pre-req: https://github.com/MichaIng/DietPi/issues/1485
+DietPi-Software | Resolved an issue where an existing higher GPU mem split, would be overridden with a lower value, during install of certain software: https://github.com/MichaIng/DietPi/issues/1484
+DietPi-Software | qBitTorrent: Resolved issue with failed login on Debian Jessie, the default password is now 'adminadmin': https://github.com/MichaIng/DietPi/issues/1499
 DietPi-Software | dietpi-software install: Command line run will now prevent disabled G_HW_ARCH G_HW_MODEL software titles, from being installed.
-DietPi-Software | MQTT Mosquito: Resolved issue with ARMv6 installation/binary: https://github.com/Fourdee/DietPi/issues/1306#issuecomment-366228445
-DietPi-Software | Automation - custom script: Resolved an issue with banners, where Google AIY would be incorrectly reported as installing: https://github.com/Fourdee/DietPi/issues/1514
-DietPi-Software | NodeRed: resolved an issue where the nodered user lacked a home dir, required for additional module installation: https://github.com/Fourdee/DietPi/issues/1446#issuecomment-366370800
+DietPi-Software | MQTT Mosquito: Resolved issue with ARMv6 installation/binary: https://github.com/MichaIng/DietPi/issues/1306#issuecomment-366228445
+DietPi-Software | Automation - custom script: Resolved an issue with banners, where Google AIY would be incorrectly reported as installing: https://github.com/MichaIng/DietPi/issues/1514
+DietPi-Software | NodeRed: resolved an issue where the nodered user lacked a home dir, required for additional module installation: https://github.com/MichaIng/DietPi/issues/1446#issuecomment-366370800
 
 Allo Web Interface v6:
 Sparky SBC: Resolved an issue where USB1.1 compatibility setting would always be applied, when usb-dac selected.
@@ -801,9 +835,9 @@ v6.1 | Hotfix
 (29/01/18)
 
 Bug Fixes:
-DietPi-Software | Kodi: Resolved failed installation due to libcec package naming. Patched re-install during dietpi-update: https://github.com/Fourdee/DietPi/issues/1428#issuecomment-361092857
-DietPi-Software | Tonido: Resolved issue with service failing to start. Patched re-install during dietpi-update: https://github.com/Fourdee/DietPi/issues/1432
-DietPi-Software | Fail2Ban: Resolved issue with service failing to start. Patched re-install during dietpi-update: https://github.com/Fourdee/DietPi/issues/1431
+DietPi-Software | Kodi: Resolved failed installation due to libcec package naming. Patched re-install during dietpi-update: https://github.com/MichaIng/DietPi/issues/1428#issuecomment-361092857
+DietPi-Software | Tonido: Resolved issue with service failing to start. Patched re-install during dietpi-update: https://github.com/MichaIng/DietPi/issues/1432
+DietPi-Software | Fail2Ban: Resolved issue with service failing to start. Patched re-install during dietpi-update: https://github.com/MichaIng/DietPi/issues/1431
 
 -----------------------------------------------------------------------------------------------------------
 
@@ -812,71 +846,71 @@ v6.0 (previously v160)
 
 Important Information:
 All DietPi images have been re-created. Existing installations (v159 or lower), can no longer be updated, or supported. To continue support, users must install the latest v6.0 image.
- - https://github.com/Fourdee/DietPi/issues/1385
+ - https://github.com/MichaIng/DietPi/issues/1385
  - All images are now Debian Stretch (excluding Odroid's)
  - ARMbian based images are now mainline kernel 4.13+.
- - Native PC (EFI): is now an ISO, with clonezilla bundled. Simplifies installation via Rufus write: https://github.com/Fourdee/DietPi/issues/1171#issuecomment-336522021
+ - Native PC (EFI): is now an ISO, with clonezilla bundled. Simplifies installation via Rufus write: https://github.com/MichaIng/DietPi/issues/1171#issuecomment-336522021
  - If you are happy with your existing installation of v159 (or lower), you are not required to install the v6.0 image, however, we cannot continue to provide support for v159 (or lower) installations.
 
 Minor notes:
 The XMAS tree has now been taken down, stored away on github history for next year. Hope you all had a good one :D
 
 Changes / Improvements / Optimizations:
-General | DietPi RPi kernel, now reverted to stock RPi kernel: https://github.com/Fourdee/DietPi/issues/1378
+General | DietPi RPi kernel, now reverted to stock RPi kernel: https://github.com/MichaIng/DietPi/issues/1378
 General | We have completed much needed backbone work for DietPi, which will allow for improved expansion in source code. This includes the use of dietpi-globals.
-DietPi-Globals | New script which optimizes most used DietPi commands and vars, throughout our scripts. Also exported to bash session, please type 'G_' then press 'TAB' to see a full list of options: https://github.com/Fourdee/DietPi/issues/1311
-General | FHS compliance completed. /etc/dietpi has moved to /var/lib/dietpi. RAMlog store has moved to /var/tmp/dietpi: https://github.com/Fourdee/DietPi/issues/1297#issuecomment-352241193
-General | We have refreshed our terminal messages look & feel, oriented on RPi boot messages, and with process animation: https://github.com/Fourdee/DietPi/pull/1377
-General | wget: Now set to prefer IPv4 by default (generally faster, can be changed by 'CONFIG_PREFER_IPVERSION' in dietpi.txt): https://github.com/Fourdee/DietPi/issues/1285#issuecomment-353230187
-General | APT: Now set to force IPv4 by default (generally faster, can be changed by 'CONFIG_PREFER_IPVERSION' in dietpi.txt): https://github.com/Fourdee/DietPi/issues/1285#issuecomment-353230187
+DietPi-Globals | New script which optimizes most used DietPi commands and vars, throughout our scripts. Also exported to bash session, please type 'G_' then press 'TAB' to see a full list of options: https://github.com/MichaIng/DietPi/issues/1311
+General | FHS compliance completed. /etc/dietpi has moved to /var/lib/dietpi. RAMlog store has moved to /var/tmp/dietpi: https://github.com/MichaIng/DietPi/issues/1297#issuecomment-352241193
+General | We have refreshed our terminal messages look & feel, oriented on RPi boot messages, and with process animation: https://github.com/MichaIng/DietPi/pull/1377
+General | wget: Now set to prefer IPv4 by default (generally faster, can be changed by 'CONFIG_PREFER_IPVERSION' in dietpi.txt): https://github.com/MichaIng/DietPi/issues/1285#issuecomment-353230187
+General | APT: Now set to force IPv4 by default (generally faster, can be changed by 'CONFIG_PREFER_IPVERSION' in dietpi.txt): https://github.com/MichaIng/DietPi/issues/1285#issuecomment-353230187
 General | SparkySBC: CPU gov default changed to Performance, reports of increased stability.
-General | Swapfile generation is now completed during 1st run of dietpi-software (previously boot stage): https://github.com/Fourdee/DietPi/issues/1270#issue-278797206
+General | Swapfile generation is now completed during 1st run of dietpi-software (previously boot stage): https://github.com/MichaIng/DietPi/issues/1270#issue-278797206
 General | DietPi-Funtime: Removed from DietPi. Although it looked pretty, it did absolutely nothing (except slow down a program)
 DietPi-Automation | All dietpi.txt entries have been renamed and cleaned up.
-DietPi-Automation | dietpi.txt: CONFIG_NTP_MODE will now be applied during 1st run of device: https://github.com/Fourdee/DietPi/issues/1379
-DietPi-Boot | Improved the method of initial FS_partition and FS_expansion during 1st run, via systemD services. 'fs_force_resize=' in dietpi.txt is no longer supported: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-352159930
+DietPi-Automation | dietpi.txt: CONFIG_NTP_MODE will now be applied during 1st run of device: https://github.com/MichaIng/DietPi/issues/1379
+DietPi-Boot | Improved the method of initial FS_partition and FS_expansion during 1st run, via systemD services. 'fs_force_resize=' in dietpi.txt is no longer supported: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-352159930
 DietPi-Banner | IP: Will now also list the active network adapter used (eg: eth0/wlan0)
 DietPi-Config | Dion Audio LOCO V1/V2: Soundcards added for RPi.
 DietPi-Config | Locale: en_GB.UTF-8 is now automatically installed, alongside user selected choice. Required for DietPi scripts to function.
-DietPi-Drive_Manager | Added support for exFAT, many thanks @MichaIng : https://github.com/Fourdee/DietPi/pull/1312
-DietPi-Globals | Global variables and functions are now exported during login. Please see the sourcecode for more information: https://github.com/Fourdee/DietPi/issues/1311
-DietPi-Set_Hardware | Sparky SBC: enable aotg.aotg1_speed compatibility setting for USB 1.1, when USB-DAC configured: https://github.com/Fourdee/DietPi/issues/1301
-DietPi-Set_Software | "pool" directive is now used for NTPD: https://github.com/Fourdee/DietPi/pull/1404
-DietPi-Software | NAA Daemon: Updated to latest (3.5.2-36). Existing installs will be patched automatically: https://github.com/Fourdee/DietPi/issues/1305
-DietPi-Software | PHP-FPM: Increased from "$CPU_CORES_TOTAL" to "pm.max_children = $(( $CPU_CORES_TOTAL * 3 ))". This should avoid failed forking of PHP-FPM processes/requests : https://github.com/Fourdee/DietPi/issues/1298
-DietPi-Software | ownCloud/Nextcloud: Added option to choose data directory via dietpi.txt pre installation: https://github.com/Fourdee/DietPi/issues/1314#issuecomment-352782055
+DietPi-Drive_Manager | Added support for exFAT, many thanks @MichaIng : https://github.com/MichaIng/DietPi/pull/1312
+DietPi-Globals | Global variables and functions are now exported during login. Please see the sourcecode for more information: https://github.com/MichaIng/DietPi/issues/1311
+DietPi-Set_Hardware | Sparky SBC: enable aotg.aotg1_speed compatibility setting for USB 1.1, when USB-DAC configured: https://github.com/MichaIng/DietPi/issues/1301
+DietPi-Set_Software | "pool" directive is now used for NTPD: https://github.com/MichaIng/DietPi/pull/1404
+DietPi-Software | NAA Daemon: Updated to latest (3.5.2-36). Existing installs will be patched automatically: https://github.com/MichaIng/DietPi/issues/1305
+DietPi-Software | PHP-FPM: Increased from "$CPU_CORES_TOTAL" to "pm.max_children = $(( $CPU_CORES_TOTAL * 3 ))". This should avoid failed forking of PHP-FPM processes/requests : https://github.com/MichaIng/DietPi/issues/1298
+DietPi-Software | ownCloud/Nextcloud: Added option to choose data directory via dietpi.txt pre installation: https://github.com/MichaIng/DietPi/issues/1314#issuecomment-352782055
 DietPi-Software | ownCloud/Nextcloud: Switch to pretty URLs (without "index.php") on Apache
 DietPi-Software | ownCloud/Nextcloud: Automated backup restoring on install and creation und uninstall to ownCloud/Nextcloud data directory
 DietPi-Software | ownCloud: Switch to non-package/archive installation. This allows usage of preferred web based updater.
 DietPi-Software | Nextcloud: Resolved OPcache admin panel warnings now also on Lighttpd
-DietPi-Software | UrBackup: Installation updated to latest version 2.1.20. For new installations only: https://github.com/Fourdee/DietPi/issues/1335
-DietPi-Software | NodeRed: Corrected user which nodered runs under, now runs as its own user, created during install: https://github.com/Fourdee/DietPi/issues/1294#issuecomment-354314318
-DietPi-Software | SqueezeBox/LMS (Stretch): Installation resolved: https://github.com/Fourdee/DietPi/issues/1124
-DietPi-Software | MySQL: Completely remove MySQL from DietPi in favour of MariaDB: https://github.com/Fourdee/DietPi/issues/1397
-DietPi-Software | Ampache: MySQL DB and configs have been updated (adds correct userdata folder for music by default): https://github.com/Fourdee/DietPi/issues/1420
-run_ntpd | Added support for systemd-timesyncd completion/detection: https://github.com/Fourdee/DietPi/issues/1379
+DietPi-Software | UrBackup: Installation updated to latest version 2.1.20. For new installations only: https://github.com/MichaIng/DietPi/issues/1335
+DietPi-Software | NodeRed: Corrected user which nodered runs under, now runs as its own user, created during install: https://github.com/MichaIng/DietPi/issues/1294#issuecomment-354314318
+DietPi-Software | SqueezeBox/LMS (Stretch): Installation resolved: https://github.com/MichaIng/DietPi/issues/1124
+DietPi-Software | MySQL: Completely remove MySQL from DietPi in favour of MariaDB: https://github.com/MichaIng/DietPi/issues/1397
+DietPi-Software | Ampache: MySQL DB and configs have been updated (adds correct userdata folder for music by default): https://github.com/MichaIng/DietPi/issues/1420
+run_ntpd | Added support for systemd-timesyncd completion/detection: https://github.com/MichaIng/DietPi/issues/1379
 
 Bug Fixes:
-General | Fixed two systemd error messages during shutdown and boot: https://github.com/Fourdee/DietPi/issues/1330
-DietPi-Automation | Resolved an issue where AUTO_SETUP_TIMEZONE was not being applied correctly, thanks @k-plan: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-356310496
-DietPi-Automation | dietpi.txt: CONFIG_NTP_MIRROR will now be applied to systemd-timesyncd configuration: https://github.com/Fourdee/DietPi/issues/1379
-DietPi-Config | Resolved an issue with WiFi Country code, failing to set on some devices: https://github.com/Fourdee/DietPi/issues/838
-DietPi-Config | Resolved an issue where disabling IPv6 didn't have an effect on AMD64 devices: https://github.com/Fourdee/DietPi/issues/1343#issuecomment-359652751
-DietPi-Services | dietpi-wifi-monitor: Is no longer controlled, to prevent WiFi drop during software installs/updates etc: https://github.com/Fourdee/DietPi/issues/1288#issuecomment-350653480
-DietPi-Software | General: MySQL using software titles now have their own database user, instead of accessing as "root": https://github.com/Fourdee/DietPi/issues/1397#issuecomment-359655198
-DietPi-Software | qBittorrent: Resolved an issue with inability to log into web interface: https://github.com/Fourdee/DietPi/issues/1366
-DietPi-Software | Resolved an issue where our custom LD_LIBRARY_PATH would cause APT failures. LD_LIBRARY_PATH has now been reverted, apologies if this effected your system: https://github.com/Fourdee/DietPi/issues/1329
-DietPi-Software | Resolved an issue where APT installations would fail if services were masked. All known DietPi software services, will be enabled/unmasked, before installation: https://github.com/Fourdee/DietPi/issues/1320
-DietPi-Software | WiFi Hotspot (Stretch): Resolved an issue where hostapd would fail to run due to missing libssl1.0.0 lib, not available in repos: https://github.com/Fourdee/DietPi/issues/1299
-DietPi-Software | Shairport-sync (Stretch): Resolved an issue where this would fail to install, due to pre-req URLS becomming invalid: https://github.com/Fourdee/DietPi/issues/1303
+General | Fixed two systemd error messages during shutdown and boot: https://github.com/MichaIng/DietPi/issues/1330
+DietPi-Automation | Resolved an issue where AUTO_SETUP_TIMEZONE was not being applied correctly, thanks @k-plan: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-356310496
+DietPi-Automation | dietpi.txt: CONFIG_NTP_MIRROR will now be applied to systemd-timesyncd configuration: https://github.com/MichaIng/DietPi/issues/1379
+DietPi-Config | Resolved an issue with WiFi Country code, failing to set on some devices: https://github.com/MichaIng/DietPi/issues/838
+DietPi-Config | Resolved an issue where disabling IPv6 didn't have an effect on AMD64 devices: https://github.com/MichaIng/DietPi/issues/1343#issuecomment-359652751
+DietPi-Services | dietpi-wifi-monitor: Is no longer controlled, to prevent WiFi drop during software installs/updates etc: https://github.com/MichaIng/DietPi/issues/1288#issuecomment-350653480
+DietPi-Software | General: MySQL using software titles now have their own database user, instead of accessing as "root": https://github.com/MichaIng/DietPi/issues/1397#issuecomment-359655198
+DietPi-Software | qBittorrent: Resolved an issue with inability to log into web interface: https://github.com/MichaIng/DietPi/issues/1366
+DietPi-Software | Resolved an issue where our custom LD_LIBRARY_PATH would cause APT failures. LD_LIBRARY_PATH has now been reverted, apologies if this effected your system: https://github.com/MichaIng/DietPi/issues/1329
+DietPi-Software | Resolved an issue where APT installations would fail if services were masked. All known DietPi software services, will be enabled/unmasked, before installation: https://github.com/MichaIng/DietPi/issues/1320
+DietPi-Software | WiFi Hotspot (Stretch): Resolved an issue where hostapd would fail to run due to missing libssl1.0.0 lib, not available in repos: https://github.com/MichaIng/DietPi/issues/1299
+DietPi-Software | Shairport-sync (Stretch): Resolved an issue where this would fail to install, due to pre-req URLS becomming invalid: https://github.com/MichaIng/DietPi/issues/1303
 DietPi-Software | Plex Media Server: Resolved uninstall to include /var/lib/plexmediaserver in removal (which is not completed via apt purge).
-DietPi-Software | MariaDB: Resolved an issue where MariaDB would fail to uninstall correctly: https://github.com/Fourdee/DietPi/pull/1280
-DietPi-Software | Aira2 (Stretch): Resolved installation, now used APT installation: https://github.com/Fourdee/DietPi/issues/1310
-DietPi-Software | Mosquitto: Resolved various issues with failed install, due to Mosq repo not being maintained (deb's missing from repo header list, requires non-stretch available packages). deb's are now hosted on dietpi.com: https://github.com/Fourdee/DietPi/issues/1306
-DietPi-Software | ownCloud/Nextcloud: Fixed an installation issue on Jessie with MariaDB: https://github.com/Fourdee/DietPi/pull/1319
-DietPi-Software | Google AIY: Updated install to gitbranch=voicekit. Many thanks to @mpember for the heads up: https://github.com/Fourdee/DietPi/issues/1065#issuecomment-354304388
-DietPi-Software | OpenJDK: Replaces OracleJDK: https://github.com/Fourdee/DietPi/issues/1401
-DietPi-Update | dietpi.txt is now checked for missing entries, and, will now be patched during the update: https://github.com/Fourdee/DietPi/issues/1292#issuecomment-350818969
+DietPi-Software | MariaDB: Resolved an issue where MariaDB would fail to uninstall correctly: https://github.com/MichaIng/DietPi/pull/1280
+DietPi-Software | Aira2 (Stretch): Resolved installation, now used APT installation: https://github.com/MichaIng/DietPi/issues/1310
+DietPi-Software | Mosquitto: Resolved various issues with failed install, due to Mosq repo not being maintained (deb's missing from repo header list, requires non-stretch available packages). deb's are now hosted on dietpi.com: https://github.com/MichaIng/DietPi/issues/1306
+DietPi-Software | ownCloud/Nextcloud: Fixed an installation issue on Jessie with MariaDB: https://github.com/MichaIng/DietPi/pull/1319
+DietPi-Software | Google AIY: Updated install to gitbranch=voicekit. Many thanks to @mpember for the heads up: https://github.com/MichaIng/DietPi/issues/1065#issuecomment-354304388
+DietPi-Software | OpenJDK: Replaces OracleJDK: https://github.com/MichaIng/DietPi/issues/1401
+DietPi-Update | dietpi.txt is now checked for missing entries, and, will now be patched during the update: https://github.com/MichaIng/DietPi/issues/1292#issuecomment-350818969
 Sparky SBC | Kernel updated, which resolves issues with HQPlayer playback: https://www.computeraudiophile.com/forums/topic/32132-allo-sparky-usbridge/?do=findComment&comment=753100
 
 Allo Web Interface v5:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 13ce8416f7..b19ed9b562 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 ### DietPi Project Contribution
 
-Git coders, please use the active development branch: [dev](https://github.com/Fourdee/DietPi/tree/dev)
+Git coders, please use the active development branch: [dev](https://github.com/MichaIng/DietPi/tree/dev)
 
-- [How to add new software installation options to DietPi-Software](https://github.com/Fourdee/DietPi/issues/490#issuecomment-244416570)
+- [How to add new software installation options to DietPi-Software](https://github.com/MichaIng/DietPi/issues/490#issuecomment-244416570)
 
 Are you able to:
 
@@ -18,4 +18,4 @@ We are always looking for talented people who believe in the DietPi project, and
 
 - Send me an Email: daniel.knight@dietpi.com
 - Join our forums: https://dietpi.com/phpbb
-- GitHub: https://github.com/Fourdee/DietPi
+- GitHub: https://github.com/MichaIng/DietPi
diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
index bcc235a6e7..505e4890f2 100644
--- a/PREP_SYSTEM_FOR_DIETPI.sh
+++ b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -18,7 +18,8 @@
 
 	#Core globals
 	G_PROGRAM_NAME='DietPi-PREP'
-	GITOWNER=${GITOWNER:-Fourdee}
+	G_GITOWNER=${GITOWNER:-MichaIng}
+	unset GITOWNER
 
 	#------------------------------------------------------------------------------------------------
 	# Critical checks and pre-reqs, with exit, prior to initial run of script
@@ -32,7 +33,7 @@
 	fi
 
 	#Work inside /tmp as usually ramfs to reduce disk I/O and speed up download and unpacking
-	# - Save full script path, beforehand: https://github.com/Fourdee/DietPi/pull/2341#discussion_r241784962
+	# - Save full script path, beforehand: https://github.com/MichaIng/DietPi/pull/2341#discussion_r241784962
 	FP_PREP_SCRIPT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")"
 	cd /tmp
 
@@ -69,7 +70,7 @@
 	)
 
 	#Removing conflicting /etc/apt/sources.list.d entries
-	# - Meveric: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-355759321
+	# - Meveric: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-355759321
 	[[ -f /etc/apt/sources.list.d/deb-multimedia.list ]] && rm /etc/apt/sources.list.d/deb-multimedia.list
 	# - OMV: https://dietpi.com/phpbb/viewtopic.php?f=11&t=2772&p=10646#p10594
 	[[ -f /etc/apt/sources.list.d/openmediavault.list ]] && rm /etc/apt/sources.list.d/openmediavault.list
@@ -128,7 +129,7 @@
 
 	if WHIP_RETURN=$(whiptail --title "$G_PROGRAM_NAME" --menu 'Please select a Git branch:' --default-item 'master' --ok-button 'Ok' --cancel-button 'Exit' --backtitle "$G_PROGRAM_NAME" 12 80 3 "${aWHIP_BRANCH[@]}" 3>&1 1>&2 2>&3); then
 
-		GITBRANCH=$WHIP_RETURN
+		G_GITBRANCH=$WHIP_RETURN
 
 	else
 
@@ -139,14 +140,14 @@
 
 	unset aWHIP_BRANCH WHIP_RETURN
 
-	echo "[ INFO ] Selected Git branch: $GITOWNER/$GITBRANCH"
+	echo "[ INFO ] Selected Git branch: $G_GITOWNER/$G_GITBRANCH"
 
 	#------------------------------------------------------------------------------------------------
 	# DietPi-Globals
 	#------------------------------------------------------------------------------------------------
 	# - Download
-	# - NB: We'll have to manually handle errors, until DietPi-Globals are sucessfully loaded.
-	if ! wget "https://raw.githubusercontent.com/$GITOWNER/DietPi/$GITBRANCH/dietpi/func/dietpi-globals" -O dietpi-globals; then
+	# - NB: We'll have to manually handle errors, until DietPi-Globals are successfully loaded.
+	if ! wget "https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/dietpi/func/dietpi-globals" -O dietpi-globals; then
 
 		echo -e '[FAILED] Unable to download dietpi-globals. Aborting...\n'
 		exit 1
@@ -508,11 +509,11 @@
 		G_DIETPI-NOTIFY 2 '-----------------------------------------------------------------------------------'
 		#------------------------------------------------------------------------------------------------
 
-		INTERNET_ADDRESS="https://github.com/$GITOWNER/DietPi/archive/$GITBRANCH.zip"
+		INTERNET_ADDRESS="https://github.com/$G_GITOWNER/DietPi/archive/$G_GITBRANCH.zip"
 		G_CHECK_URL "$INTERNET_ADDRESS"
 		G_RUN_CMD wget "$INTERNET_ADDRESS" -O package.zip
 
-		[[ -d DietPi-$GITBRANCH ]] && l_message='Cleaning previously extracted files' G_RUN_CMD rm -R "DietPi-$GITBRANCH"
+		[[ -d DietPi-$G_GITBRANCH ]] && l_message='Cleaning previously extracted files' G_RUN_CMD rm -R "DietPi-$G_GITBRANCH"
 		l_message='Extracting DietPi sourcecode' G_RUN_CMD unzip package.zip
 		rm package.zip
 
@@ -523,41 +524,46 @@
 		# - HW specific config.txt, boot.ini uEnv.txt
 		if (( $G_HW_MODEL < 10 )); then
 
-			G_RUN_CMD mv "DietPi-$GITBRANCH/config.txt" /boot/
+			G_RUN_CMD mv "DietPi-$G_GITBRANCH/config.txt" /boot/
 
 		elif (( $G_HW_MODEL == 10 )); then
 
-			G_RUN_CMD mv "DietPi-$GITBRANCH/boot_c1.ini" /boot/boot.ini
+			G_RUN_CMD mv "DietPi-$G_GITBRANCH/boot_c1.ini" /boot/boot.ini
 
 		elif (( $G_HW_MODEL == 11 )); then
 
-			G_RUN_CMD mv "DietPi-$GITBRANCH/boot_xu4.ini" /boot/boot.ini
+			G_RUN_CMD mv "DietPi-$G_GITBRANCH/boot_xu4.ini" /boot/boot.ini
 
 		elif (( $G_HW_MODEL == 12 )); then
 
-			G_RUN_CMD mv "DietPi-$GITBRANCH/boot_c2.ini" /boot/boot.ini
+			G_RUN_CMD mv "DietPi-$G_GITBRANCH/boot_c2.ini" /boot/boot.ini
 
 		fi
 
-		G_RUN_CMD mv "DietPi-$GITBRANCH/dietpi.txt" /boot/
-		G_RUN_CMD mv "DietPi-$GITBRANCH/README.md" /boot/dietpi-README.md
-		G_RUN_CMD mv "DietPi-$GITBRANCH/CHANGELOG.txt" /boot/dietpi-CHANGELOG.txt
+		G_RUN_CMD mv "DietPi-$G_GITBRANCH/dietpi.txt" /boot/
+		G_RUN_CMD mv "DietPi-$G_GITBRANCH/README.md" /boot/dietpi-README.md
+		G_RUN_CMD mv "DietPi-$G_GITBRANCH/CHANGELOG.txt" /boot/dietpi-CHANGELOG.txt
+
+		# - Reading version string for later use
+		G_DIETPI_VERSION_CORE=$(sed -n 1p "DietPi-$G_GITBRANCH/dietpi/server_version-6")
+		G_DIETPI_VERSION_SUB=$(sed -n 2p "DietPi-$G_GITBRANCH/dietpi/server_version-6")
+		G_DIETPI_VERSION_RC=$(sed -n 3p "DietPi-$G_GITBRANCH/dietpi/server_version-6")
 
 		# - Remove server_version* / (pre-)patch_file (downloads fresh from dietpi-update)
-		rm "DietPi-$GITBRANCH/dietpi/server_version"*
-		rm "DietPi-$GITBRANCH/dietpi/pre-patch_file"
-		rm "DietPi-$GITBRANCH/dietpi/patch_file"
+		rm "DietPi-$G_GITBRANCH/dietpi/server_version"*
+		rm "DietPi-$G_GITBRANCH/dietpi/pre-patch_file"
+		rm "DietPi-$G_GITBRANCH/dietpi/patch_file"
 
-		l_message='Copy DietPi core files to /boot/dietpi' G_RUN_CMD cp -Rf "DietPi-$GITBRANCH/dietpi" /boot/
-		l_message='Copy DietPi rootfs files in place' G_RUN_CMD cp -Rf "DietPi-$GITBRANCH/rootfs"/. /
-		l_message='Clean download location' G_RUN_CMD rm -R "DietPi-$GITBRANCH"
+		l_message='Copy DietPi core files to /boot/dietpi' G_RUN_CMD cp -Rf "DietPi-$G_GITBRANCH/dietpi" /boot/
+		l_message='Copy DietPi rootfs files in place' G_RUN_CMD cp -Rf "DietPi-$G_GITBRANCH/rootfs"/. /
+		l_message='Clean download location' G_RUN_CMD rm -R "DietPi-$G_GITBRANCH"
 		l_message='Set execute permissions for DietPi scripts' G_RUN_CMD chmod -R +x /boot/dietpi /var/lib/dietpi/services /etc/cron.*/dietpi
 
 		G_RUN_CMD systemctl daemon-reload
 		G_RUN_CMD systemctl enable dietpi-ramdisk
 
 		# - Mount tmpfs
-		mkdir -p /DietPi
+		G_RUN_CMD mkdir -p /DietPi
 		G_RUN_CMD mount -t tmpfs -o size=10m tmpfs /DietPi
 		l_message='Starting DietPi-RAMdisk' G_RUN_CMD systemctl start dietpi-ramdisk
 
@@ -574,7 +580,7 @@
 		# - We need to forward $DISTRO_TARGET* to dietpi-set_software, as well as $G_HW_MODEL for Debian vs Raspbian decision.
 		G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_MODEL=$G_HW_MODEL G_RUN_CMD /DietPi/dietpi/func/dietpi-set_software apt-mirror 'default'
 
-		# - Meveric, update repo to use our EU mirror: https://github.com/Fourdee/DietPi/issues/1519#issuecomment-368234302
+		# - Meveric, update repo to use our EU mirror: https://github.com/MichaIng/DietPi/issues/1519#issuecomment-368234302
 		sed -i 's@https://oph.mdrjr.net/meveric@http://fuzon.co.uk/meveric@' /etc/apt/sources.list.d/meveric* &> /dev/null
 
 		# - (Re)create DietPi logs dir, used by G_AGx
@@ -582,12 +588,12 @@
 
 		G_AGUP
 
-		# - @MichaIng https://github.com/Fourdee/DietPi/pull/1266/files
+		# - @MichaIng https://github.com/MichaIng/DietPi/pull/1266/files
 		G_DIETPI-NOTIFY 2 'Marking all packages as auto-installed first, to allow effective autoremove afterwards'
 
 		G_RUN_CMD apt-mark auto $(apt-mark showmanual)
 
-		# - @MichaIng https://github.com/Fourdee/DietPi/pull/1266/files
+		# - @MichaIng https://github.com/MichaIng/DietPi/pull/1266/files
 		G_DIETPI-NOTIFY 2 'Disable automatic recommends/suggests install and allow them to be autoremoved:'
 
 		#	Remove any existing APT recommends settings
@@ -638,7 +644,7 @@ _EOF_
 			'kmod'			# "modprobe", "lsmod", used by several DietPi scripts
 			'locales'		# Support locales, necessary for DietPi scripts, as we use en_GB.UTF8 as default language
 			'nano'			# Simple text editor
-			'p7zip-full'		# .7z wrapper
+			'p7zip'			# .7z wrapper
 			'parted'		# Drive partitioning, required by DietPi-Boot + DietPi-Drive_Manager
 			'procps'		# "kill", "ps", "pgrep", "sysctl", used by several DietPi scripts
 			'psmisc'		# "killall", used by several DietPi scripts
@@ -654,7 +660,7 @@ _EOF_
 
 		)
 
-		# - G_HW_MODEL specific required repo key packages: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-358301273
+		# - G_HW_MODEL specific required repo key packages: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-358301273
 		if (( $G_HW_MODEL >= 10 )); then
 
 			G_AGI debian-archive-keyring
@@ -699,7 +705,7 @@ _EOF_
 		# - Kernel required packages
 		# - G_HW_ARCH specific required Kernel packages
 		#	As these are kernel, or bootloader packages, we need to install them directly to allow autoremove of in case older kernel packages:
-		#	https://github.com/Fourdee/DietPi/issues/1285#issuecomment-354602594
+		#	https://github.com/MichaIng/DietPi/issues/1285#issuecomment-354602594
 		#	x86_64
 		if (( $G_HW_ARCH == 10 )); then
 
@@ -758,11 +764,10 @@ _EOF_
 		#	RPi
 		elif (( $G_HW_MODEL < 10 )); then
 
-			apt-mark unhold libraspberrypi-bin libraspberrypi0 raspberrypi-bootloader raspberrypi-kernel raspberrypi-sys-mods raspi-copies-and-fills
+			# Remove old kernel modules first
 			rm -Rf /lib/modules/*
-			G_AGI libraspberrypi-bin libraspberrypi0 raspberrypi-bootloader raspberrypi-kernel raspberrypi-sys-mods
-			G_AGI --reinstall libraspberrypi-bin libraspberrypi0 raspberrypi-bootloader raspberrypi-kernel
-			# Buster systemd-udevd doesn't support the current raspi-copies-and-fills: https://github.com/Fourdee/DietPi/issues/1286
+			G_AGI --reinstall libraspberrypi-bin libraspberrypi0 raspberrypi-bootloader raspberrypi-kernel raspberrypi-sys-mods
+			# Buster systemd-udevd doesn't support the current raspi-copies-and-fills: https://github.com/MichaIng/DietPi/issues/1286
 			(( $DISTRO_TARGET < 5 )) && G_AGI raspi-copies-and-fills
 
 		#	Odroid N1
@@ -830,7 +835,7 @@ _EOF_
 				aPACKAGES_REQUIRED_INSTALL+=('firmware-brcm80211')	# WiFi dongle firmware
 				aPACKAGES_REQUIRED_INSTALL+=('firmware-iwlwifi')	# Intel WiFi dongle/PCI-e firwmare
 
-				# Intel/Nvidia/WiFi (ralink) dongle firmware: https://github.com/Fourdee/DietPi/issues/1675#issuecomment-377806609
+				# Intel/Nvidia/WiFi (ralink) dongle firmware: https://github.com/MichaIng/DietPi/issues/1675#issuecomment-377806609
 				# On Jessie, firmware-misc-nonfree is not available, firmware-ralink instead as dedicated package.
 				if (( $G_DISTRO < 4 )); then
 
@@ -851,9 +856,10 @@ _EOF_
 		l_message='Marking required packages as manually installed' G_RUN_CMD apt-mark manual ${aPACKAGES_REQUIRED_INSTALL[@]}
 
 		# Purging additional packages, that (in some cases) do not get autoremoved:
-		# - dhcpcd5: https://github.com/Fourdee/DietPi/issues/1560#issuecomment-370136642
 		# - dbus: Not required for headless images, but sometimes marked as "important", thus not autoremoved.
-		G_AGP dbus dhcpcd5
+		# - dhcpcd5: https://github.com/MichaIng/DietPi/issues/1560#issuecomment-370136642
+		# - mountall: https://github.com/MichaIng/DietPi/issues/2613
+		G_AGP dbus dhcpcd5 mountall
 		G_AGA
 
 		#------------------------------------------------------------------------------------------------
@@ -929,16 +935,16 @@ _EOF_
 		[[ -d /usr/share/fonts ]] && rm -R /usr/share/fonts
 		[[ -d /usr/share/icons ]] && rm -R /usr/share/icons
 
-		# - Stop, disable and remove not required services
+		# - Stop, disable and remove not required 3rd party services
 		local aservices=(
 
 			# - ARMbian
-			firstrun
-			resize2fs
-			log2ram
-			armbian*
+			'firstrun'
+			'resize2fs'
+			'log2ram'
+			'armbian*'
 			# - Meveric
-			cpu_governor
+			'cpu_governor'
 
 		)
 
@@ -986,7 +992,7 @@ _EOF_
 		# - Meveric specific
 		[[ -f /usr/local/sbin/setup-odroid ]] && rm /usr/local/sbin/setup-odroid
 
-		# - RPi specific https://github.com/Fourdee/DietPi/issues/1631#issuecomment-373965406
+		# - RPi specific https://github.com/MichaIng/DietPi/issues/1631#issuecomment-373965406
 		[[ -f /etc/profile.d/wifi-country.sh ]] && rm /etc/profile.d/wifi-country.sh
 
 		# - make_nas_processes_faster cron job on Rock64 + NanoPi + Pine64(?) images
@@ -994,7 +1000,7 @@ _EOF_
 
 		#-----------------------------------------------------------------------------------
 		#Boot Logo
-		[[ -f /boot/boot.bmp ]] && G_RUN_CMD wget https://github.com/$GITOWNER/DietPi/raw/$GITBRANCH/.meta/images/dietpi-logo_boot.bmp -O /boot/boot.bmp
+		[[ -f /boot/boot.bmp ]] && G_RUN_CMD wget https://github.com/$G_GITOWNER/DietPi/raw/$G_GITBRANCH/.meta/images/dietpi-logo_boot.bmp -O /boot/boot.bmp
 
 		#-----------------------------------------------------------------------------------
 		#Bash Profiles
@@ -1017,7 +1023,7 @@ _EOF_
 		l_message='Creating DietPi User Account' G_RUN_CMD /DietPi/dietpi/func/dietpi-set_software useradd dietpi
 
 		#-----------------------------------------------------------------------------------
-		#UID bit for sudo: https://github.com/Fourdee/DietPi/issues/794
+		#UID bit for sudo: https://github.com/MichaIng/DietPi/issues/794
 
 		G_DIETPI-NOTIFY 2 'Configuring Sudo UID bit'
 
@@ -1107,6 +1113,9 @@ _EOF_
 		echo 'nameserver 8.8.8.8' > /etc/resolvconf/run/resolv.conf # Temp apply, in case was not previously symlink, resets on next ifup.
 		ln -sfv /etc/resolvconf/run/resolv.conf /etc/resolv.conf
 
+		# ifupdown starts the daemon outside of systemd, the enabled systemd unit just thows an error on boot due to missing dbus and with dbus might interfere with ifupdown
+		systemctl disable wpa_supplicant 2> /dev/null && G_DIETPI-NOTIFY 2 'Disabled non-required wpa_supplicant systemd unit'
+
 		#-----------------------------------------------------------------------------------
 		#MISC
 
@@ -1185,19 +1194,19 @@ _EOF_
 
 			sed -i '/iface wlan0 inet dhcp/apre-up modprobe xradio_wlan\npre-up iwconfig wlan0 power on' /etc/network/interfaces
 
-		#	ASUS TB WiFi: https://github.com/Fourdee/DietPi/issues/1760
+		#	ASUS TB WiFi: https://github.com/MichaIng/DietPi/issues/1760
 		elif (( $G_HW_MODEL == 52 )); then
 
 			G_CONFIG_INJECT '8723bs' '8723bs' /etc/modules
 
 		fi
 
-		#	Fix rare WiFi interface start issue: https://github.com/Fourdee/DietPi/issues/2074
+		#	Fix rare WiFi interface start issue: https://github.com/MichaIng/DietPi/issues/2074
 		[[ -f /etc/network/if-pre-up.d/wireless-tools ]] && sed -i '\|^[[:blank:]]ifconfig "$IFACE" up$|c\\t/sbin/ip link set dev "$IFACE" up' /etc/network/if-pre-up.d/wireless-tools
 
 		G_DIETPI-NOTIFY 2 'Tweaking DHCP timeout:'
 
-		# - Reduce DHCP request retry count and timeouts: https://github.com/Fourdee/DietPi/issues/711
+		# - Reduce DHCP request retry count and timeouts: https://github.com/MichaIng/DietPi/issues/711
 		G_CONFIG_INJECT 'timeout[[:blank:]]' 'timeout 10;' /etc/dhcp/dhclient.conf
 		G_CONFIG_INJECT 'retry[[:blank:]]' 'retry 4;' /etc/dhcp/dhclient.conf
 
@@ -1296,7 +1305,7 @@ _EOF_
 			dpkg --add-architecture i386
 			#G_AGUP # Not required here, since this will be done on every update+install
 
-			# - Disable nouveau: https://github.com/Fourdee/DietPi/issues/1244 // https://dietpi.com/phpbb/viewtopic.php?f=11&t=2462&p=9688#p9688
+			# - Disable nouveau: https://github.com/MichaIng/DietPi/issues/1244 // https://dietpi.com/phpbb/viewtopic.php?f=11&t=2462&p=9688#p9688
 			cat << _EOF_ > /etc/modprobe.d/blacklist-nouveau.conf
 blacklist nouveau
 blacklist lbm-nouveau
@@ -1334,7 +1343,7 @@ _EOF_
 
 		fi
 
-		# - ARMbian OPi Zero 2: https://github.com/Fourdee/DietPi/issues/876#issuecomment-294350580
+		# - ARMbian OPi Zero 2: https://github.com/MichaIng/DietPi/issues/876#issuecomment-294350580
 		if (( $G_HW_MODEL == 35 )); then
 
 			echo 'blacklist bmp085' > /etc/modprobe.d/bmp085.conf
@@ -1359,7 +1368,7 @@ _EOF_
 
 			cp /DietPi/uEnv.txt /boot/uenv.txt #temp solution
 
-			#	Blacklist GPU and touch screen modules: https://github.com/Fourdee/DietPi/issues/699#issuecomment-271362441
+			#	Blacklist GPU and touch screen modules: https://github.com/MichaIng/DietPi/issues/699#issuecomment-271362441
 			cat << _EOF_ > /etc/modprobe.d/disable_sparkysbc_touchscreen.conf
 blacklist owl_camera
 blacklist gsensor_stk8313
@@ -1392,7 +1401,7 @@ _EOF_
 		# - RPI:
 		elif (( $G_HW_MODEL < 10 )); then
 
-			# - Scroll lock fix for RPi by Midwan: https://github.com/Fourdee/DietPi/issues/474#issuecomment-243215674
+			# - Scroll lock fix for RPi by Midwan: https://github.com/MichaIng/DietPi/issues/474#issuecomment-243215674
 			cat << _EOF_ > /etc/udev/rules.d/50-leds.rules
 ACTION=="add", SUBSYSTEM=="leds", ENV{DEVPATH}=="*/input*::scrolllock", ATTR{trigger}="kbd-scrollock"
 _EOF_
@@ -1414,12 +1423,12 @@ _EOF_
 			# - Ensure WiFi module pre-exists
 			G_CONFIG_INJECT '8723bs' '8723bs' /etc/modules
 
-		#Rock64, remove HW accell config, as its not currently functional: https://github.com/Fourdee/DietPi/issues/2086
+		#Rock64, remove HW accell config, as its not currently functional: https://github.com/MichaIng/DietPi/issues/2086
 		elif (( $G_HW_MODEL == 43 )); then
 
 			[[ -f /etc/X11/xorg.conf.d/20-armsoc.conf ]] && rm /etc/X11/xorg.conf.d/20-armsoc.conf
 
-		# - Odroids FFMPEG fix. Prefer debian.org over Meveric for backports: https://github.com/Fourdee/DietPi/issues/1273 + https://github.com/Fourdee/DietPi/issues/1556#issuecomment-369463910
+		# - Odroids FFMPEG fix. Prefer debian.org over Meveric for backports: https://github.com/MichaIng/DietPi/issues/1273 + https://github.com/MichaIng/DietPi/issues/1556#issuecomment-369463910
 		elif (( $G_HW_MODEL > 9 && $G_HW_MODEL < 15 )); then
 
 			rm -f /etc/apt/preferences.d/meveric*
@@ -1466,7 +1475,7 @@ _EOF_
 		[[ -f ~/.bash_history ]] && rm ~/.bash_history
 		rm -f /home/*/.bash_history
 
-		# - Remove Nano histroy file
+		# - Remove Nano history file
 		[[ -f ~/.nano_history ]] && rm ~/.nano_history
 		rm -f /home/*/.nano_history
 
@@ -1582,7 +1591,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with this program. If not, please see http://www.gnu.org/licenses/'
+You should have received a copy of the GNU General Public License along with this program. If not, please see http://www.gnu.org/licenses/
 _EOF_
 
 		G_DIETPI-NOTIFY 2 'Clearing APT cache'
@@ -1596,7 +1605,7 @@ _EOF_
 		#	RPi remove saved G_HW_MODEL , allowing obtain-hw_model to auto detect RPi model
 		(( $G_HW_MODEL < 10 )) && [[ -f /etc/.dietpi_hw_model_identifier ]] && rm /etc/.dietpi_hw_model_identifier
 
-		# - BBB remove fsexpansion: https://github.com/Fourdee/DietPi/issues/931#issuecomment-345451529
+		# - BBB remove fsexpansion: https://github.com/MichaIng/DietPi/issues/931#issuecomment-345451529
 		if (( $G_HW_MODEL == 71 )); then
 
 			rm /etc/systemd/system/dietpi-fs_partition_resize.service
@@ -1609,17 +1618,13 @@ _EOF_
 
 		fi
 
-		G_DIETPI-NOTIFY 2 'Storing DietPi version ID'
+		G_DIETPI-NOTIFY 2 'Storing DietPi version info'
 
-		G_RUN_CMD wget "https://raw.githubusercontent.com/$GITOWNER/DietPi/$GITBRANCH/dietpi/.version" -O /DietPi/dietpi/.version
+		G_CONFIG_INJECT 'DEV_GITBRANCH=' "DEV_GITBRANCH=$G_GITBRANCH" /DietPi/dietpi.txt
+		G_CONFIG_INJECT 'DEV_GITOWNER=' "DEV_GITOWNER=$G_GITOWNER" /DietPi/dietpi.txt
 
-		chmod +x /DietPi/dietpi/.version
-		. /DietPi/dietpi/.version
 		#	Reduce sub_version by 1, allows us to create image, prior to release and patch if needed.
 		((G_DIETPI_VERSION_SUB--))
-
-		G_CONFIG_INJECT 'DEV_GITBRANCH=' "DEV_GITBRANCH=$GITBRANCH" /DietPi/dietpi.txt
-		G_CONFIG_INJECT 'DEV_GITOWNER=' "DEV_GITOWNER=$GITOWNER" /DietPi/dietpi.txt
 		G_VERSIONDB_SAVE
 
 		G_RUN_CMD cp /DietPi/dietpi/.version /var/lib/dietpi/.dietpi_image_version
@@ -1671,7 +1676,7 @@ _EOF_
 
 		#Read image
 
-		#Resize rootfs parition to mininum size +50MB
+		#Resize rootfs partition to minimum size +50MB
 
 	}
 
diff --git a/README.md b/README.md
index e5a6efebd0..8b6be71ed9 100644
--- a/README.md
+++ b/README.md
@@ -41,19 +41,17 @@ Use `dietpi-software` to quickly and easily install popular software that's "Rea
 
 ### Lead
 
-**Daniel Knight (Fourdee)**
+**Micha (MichaIng)**
 
-Creator, programmer and project lead of DietPi.
+Project lead of DietPi (20/02/2019 and onwards), source code contributor, bug fixes, software improvements, DietPi forum administrator.
 
 ---
 
-### Current Contributors
+### Currently active contributors
 
-#### MichaIng
+#### Daniel Knight (Fourdee)
 
-_Joined Q3 2017_
-
-Source code contributor, bug fixes, software improvements, DietPi forum co-administrator.
+Project founder and previous project lead (19/02/2019 and previous), source code contributor and tester.
 
 #### JohnVick
 
@@ -82,7 +80,7 @@ DietPi forum moderator and version history maintainer on forums.
 _02/09/2016_
 
 Joint venture to bring you the ultimate Amiga experience on your SBC, running lightweight and optimised DietPi at its core:
-https://github.com/Fourdee/DietPi/issues/474
+https://github.com/MichaIng/DietPi/issues/474
 
 ---
 
@@ -122,9 +120,9 @@ A personal thanks to **Pilovali** for helping DietPi during our early days with
 
 ## Contributing
 
-Git coders, please use the active development branch: [dev](https://github.com/Fourdee/DietPi/tree/dev)
+Git coders, please use the active development branch: [dev](https://github.com/MichaIng/DietPi/tree/dev)
 
-- [How to add new software installation options to DietPi-Software](https://github.com/Fourdee/DietPi/issues/490#issuecomment-244416570)
+- [How to add new software installation options to DietPi-Software](https://github.com/MichaIng/DietPi/issues/490#issuecomment-244416570)
 
 Are you able to:
 
@@ -140,13 +138,13 @@ We are always looking for talented people who believe in the DietPi project, and
 
 - Send me an Email: daniel.knight@dietpi.com
 - Join our forums: https://dietpi.com/phpbb
-- GitHub: https://github.com/Fourdee/DietPi
+- GitHub: https://github.com/MichaIng/DietPi
 
 ### FeatHub
 
 Vote for new suggestions, feature-, software- or image requests, or add your own to our new FeatHub page:
 
-[![Feature Requests](http://feathub.com/Fourdee/DietPi?format=svg)](http://feathub.com/Fourdee/DietPi)
+[![Feature Requests](http://feathub.com/MichaIng/DietPi?format=svg)](http://feathub.com/MichaIng/DietPi)
 
 ## License
 
@@ -170,7 +168,7 @@ along with this program.  If not, see https://www.gnu.org/licenses/
 
 ### DietPi Source
 
-- Source: https://github.com/Fourdee/DietPi
+- Source: https://github.com/MichaIng/DietPi
 - Build: Not applicable (as DietPi currently uses Bash scripts, no building or compiling is required).
 
 ### DietPi file list
@@ -213,7 +211,7 @@ Links to additional software used in DietPi and their source and build instructi
 - [RetroPie Setup Script](https://github.com/petrockblog/RetroPie-Setup)
 - [PiVPN VPN Server](https://github.com/pivpn/pivpn)
 - [OpenTyrian](https://bitbucket.org/opentyrian/opentyrian/wiki/Home)
-- [DietPiCam](https://github.com/Fourdee/RPi_Cam_Web_Interface)
+- [DietPiCam](https://github.com/MichaIng/RPi_Cam_Web_Interface)
 - [PHP OPcache GUI](https://github.com/amnuts/opcache-gui)
 - [Nginx](https://hg.nginx.org/nginx/)
 - [Lighttpd](https://redmine.lighttpd.net/projects/lighttpd/repository)
diff --git a/TESTING-BRANCH.md b/TESTING-BRANCH.md
deleted file mode 100644
index 5deb2fa095..0000000000
--- a/TESTING-BRANCH.md
+++ /dev/null
@@ -1 +0,0 @@
-## This page has been replaced by the following: https://github.com/Fourdee/DietPi/blob/dev/BRANCH_SYSTEM.md#steps-to-use-the-dietpi-beta-branch
diff --git a/config.txt b/config.txt
index 210c378ceb..5c44670bd3 100644
--- a/config.txt
+++ b/config.txt
@@ -85,7 +85,7 @@ enable_uart=1
 
 #-------Overclock-------
 temp_limit=65
-# Initial turbo currently leads to CPU not being throttled down by CPU governor: https://github.com/Fourdee/DietPi/issues/1836
+# Initial turbo currently leads to CPU not being throttled down by CPU governor: https://github.com/MichaIng/DietPi/issues/1836
 #initial_turbo=20
 force_turbo=0
 
diff --git a/dietpi.txt b/dietpi.txt
index 15fde0bb79..9d4d78b3f6 100644
--- a/dietpi.txt
+++ b/dietpi.txt
@@ -248,7 +248,7 @@ SOFTWARE_CHROMIUM_AUTOSTART_URL=https://google.com
 # Dev settings
 #------------------------------------------------------------------------------------------------------
 DEV_GITBRANCH=master
-DEV_GITOWNER=Fourdee
+DEV_GITOWNER=MichaIng
 
 #------------------------------------------------------------------------------------------------------
 # D I E T - P I
diff --git a/dietpi/.version b/dietpi/.version
deleted file mode 100644
index 4ac699de82..0000000000
--- a/dietpi/.version
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-G_DIETPI_VERSION_CORE=6
-G_DIETPI_VERSION_SUB=21
-G_DIETPI_VERSION_RC=0
-G_GITBRANCH='master'
-G_GITOWNER='Fourdee'
diff --git a/dietpi/boot b/dietpi/boot
index 9eb6071e0e..2120222beb 100644
--- a/dietpi/boot
+++ b/dietpi/boot
@@ -27,7 +27,7 @@
 
 		#----------------------------------------------------------------
 		# Workarounds
-		# - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/Fourdee/DietPi/issues/2225
+		# - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/MichaIng/DietPi/issues/2225
 		if (( $G_HW_MODEL == 62 )) && dmesg | grep -qi 'NanoPi Fire3'; then
 
 			chvt 2
@@ -76,18 +76,18 @@ _EOF_
 	Run_Init(){
 
 		#----------------------------------------------------------------
-		# WiFi Country | Additional fallback for (older kernel?) devices that fail with wpa_supplicant.conf https://github.com/Fourdee/DietPi/issues/838
-		which iw &> /dev/null && iw reg set "$(grep -m1 '^[[:blank:]]*CONFIG_WIFI_COUNTRY_CODE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')" &
+		# WiFi Country | Additional fallback for (older kernel?) devices that fail with wpa_supplicant.conf https://github.com/MichaIng/DietPi/issues/838
+		command -v iw &> /dev/null && iw reg set "$(grep -m1 '^[[:blank:]]*CONFIG_WIFI_COUNTRY_CODE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')" &
 		#----------------------------------------------------------------
 		# Network failure workarounds
-		# - Jessie service fails to start: https://github.com/Fourdee/DietPi/issues/2075#issuecomment-424747579
+		# - Jessie service fails to start: https://github.com/MichaIng/DietPi/issues/2075#issuecomment-424747579
 		(( $G_DISTRO == 3 )) && systemctl start networking
 
 		# - Failsafe, bring up interfaces, if somehow not done by networking.service. If those are up already, nothing will happen.
 		if grep -qiE '^[[:blank:]]*(allow-hotplug|auto)[[:blank:]]+wlan' /etc/network/interfaces; then
 
 			local wlan_index=$(sed -n 2p /DietPi/dietpi/.network)
-			# - Workaround: Wlan currently fails to connect during boot, so, manually drop and reconnect: https://github.com/Fourdee/DietPi/issues/602#issuecomment-262806470
+			# - Workaround: WLAN currently fails to connect during boot, so, manually drop and reconnect: https://github.com/MichaIng/DietPi/issues/602#issuecomment-262806470
 			#	OPi Zero 2 / Neo Air
 			(( $G_HW_MODEL == 35 || $G_HW_MODEL == 64 )) && ifdown wlan$wlan_index 2> /dev/null
 
diff --git a/dietpi/dietpi-autostart b/dietpi/dietpi-autostart
index fb5a45005c..fa97aa9b36 100644
--- a/dietpi/dietpi-autostart
+++ b/dietpi/dietpi-autostart
@@ -23,7 +23,7 @@
 	G_INIT
 	#Import DietPi-Globals ---------------------------------------------------------------
 
-	#Grab Input (valid interger)
+	#Grab Input (valid integer)
 	INPUT=-1
 	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1
 
@@ -65,7 +65,7 @@
 
 		#----------------------------------------------------------------------
 		#Enable autoboot options
-		#	Custom script, service without auto login: https://github.com/Fourdee/DietPi/issues/1024
+		#	Custom script, service without auto login: https://github.com/MichaIng/DietPi/issues/1024
 		if (( $AUTO_START_INDEX == 14 )); then
 
 			cat << _EOF_ > /etc/systemd/system/dietpi-autostart_custom.service
diff --git a/dietpi/dietpi-backup b/dietpi/dietpi-backup
index 78081ad492..e0f5556c3e 100644
--- a/dietpi/dietpi-backup
+++ b/dietpi/dietpi-backup
@@ -132,7 +132,7 @@ _EOF_
 	Services_Stop(){
 
 		/DietPi/dietpi/dietpi-services stop
-		killall -w rsync &> /dev/null # :https://github.com/Fourdee/DietPi/issues/1869#issuecomment-400036370
+		killall -w rsync &> /dev/null # :https://github.com/MichaIng/DietPi/issues/1869#issuecomment-400036370
 
 	}
 
@@ -186,14 +186,14 @@ _EOF_
 
 					# - - Check for sufficient free space
 					#	NB: working in KiB until end MiB conversion, as, don't like using long long int, and, KiB should offer a good end result.
-					local old_backup_size=$(du -ks "$FP_TARGET_BACKUP"/data | mawk '{print $1}')
+					local old_backup_size=$(du -ks "$FP_TARGET_BACKUP"/data | mawk '{print $1}') # Actual disk space usage
 
 					rsync --dry-run --stats $RSYNC_RUN_OPTIONS_BACKUP "$FP_SOURCE" "$FP_TARGET_BACKUP"/data/ > /tmp/dietpi-backup_result
-					local new_backup_size=$(( $(grep -m1 'Total file size' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g') / 1024 ))
-					local total_file_count=$(( $(mawk '/Number of files/ {print $6;exit}' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g') ))
-					local total_folder_count=$(( $(mawk '/Number of files/ {print $8;exit}' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g') ))
+					local new_backup_size=$(( $(grep -m1 '^Total file size:' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g') / 1024 +1 ))  # Theoretical, data size only
+					local total_file_count=$(mawk '/^Number of files:/ {print $6;exit}' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g')
+					local total_folder_count=$(mawk '/^Number of files:/ {print $8;exit}' /tmp/dietpi-backup_result | sed 's/[^0-9]*//g')
 					local target_fs_blocksize=$(stat -fc %s "$FP_TARGET_BACKUP"/data)
-					new_backup_size=$(( $new_backup_size + ( $total_file_count + $total_folder_count ) * $target_fs_blocksize / 1024 ))
+					new_backup_size=$(( $new_backup_size + ( $total_file_count + $total_folder_count ) * $target_fs_blocksize / 1024 + 1 )) # Add one block size to each file + dir as worst case result
 					local end_result=$(( ( $new_backup_size - $old_backup_size ) / 1024 + 1 ))
 					rm /tmp/dietpi-backup_result
 
@@ -332,7 +332,7 @@ _EOF_
 
 			fi
 
-			TARGET_FILESYSTEM_TYPE="$( df -T $FP_TARGET_BACKUP | sed -n '2p' | mawk '{print $2}')"
+			TARGET_FILESYSTEM_TYPE=$(df -T $FP_TARGET_BACKUP | sed -n 2p | mawk '{print $2}')
 			for ((i=0; i<${#aSUPPORTED_FILESYSTEMS[@]}; i++))
 			do
 
@@ -492,7 +492,7 @@ _EOF_
 	#TARGETMENUID=1
 	Menu_Set_Directory(){
 
-		local current_directory="$FP_TARGET_BACKUP"
+		local current_directory=$FP_TARGET_BACKUP
 
 		G_WHIP_MENU_ARRAY=(
 
@@ -522,8 +522,8 @@ _EOF_
 						for ((i=0; i<${#search_results_list[@]}; i++))
 						do
 
-							local last_backup_date=$( grep 'Completed' ${search_results_list[$i]} | tail -1 | sed 's/.*: //' ) # Date of last backup for this backup
-							local backup_directory=$( echo -e ${search_results_list[$i]} | sed 's/\/'"$BACKUP_STATS_FILENAME"'//g' ) # Backup directory (minus the backup file), that we can use for target backup directory.
+							local last_backup_date=$(grep 'Completed' ${search_results_list[$i]} | tail -1 | sed 's/.*: //') # Date of last backup for this backup
+							local backup_directory=$(echo -e ${search_results_list[$i]} | sed 's/\/'"$BACKUP_STATS_FILENAME"'//g') # Backup directory (minus the backup file), that we can use for target backup directory.
 							G_WHIP_MENU_ARRAY+=("$backup_directory" ": $last_backup_date")
 
 						done
@@ -668,19 +668,19 @@ _EOF_
 
 	#-----------------------------------------------------------------------------
 	#Run menu
-	elif (( $INPUT == 0 )); then
+	else
 
 		while (( $TARGETMENUID > -1 )); do
 
 			printf '\ec' # clear current terminal screen
 
-			if (( $TARGETMENUID == 0 )); then
+			if (( $TARGETMENUID == 1 )); then
 
-				Menu_Main
+				Menu_Set_Directory
 
-			elif (( $TARGETMENUID == 1 )); then
+			else
 
-				Menu_Set_Directory
+				Menu_Main
 
 			fi
 
diff --git a/dietpi/dietpi-bugreport b/dietpi/dietpi-bugreport
index 8d26806ed7..9843a95405 100644
--- a/dietpi/dietpi-bugreport
+++ b/dietpi/dietpi-bugreport
@@ -27,13 +27,13 @@
 	#Import DietPi-Globals ---------------------------------------------------------------
 
 	INPUT=0
-	disable_error=1 G_CHECK_VALIDINT $1 && INPUT=$1
+	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1
 
 	UNIQUE_ID=$(sed -n 5p /DietPi/dietpi/.hw_model)
 	UPLOAD_FILENAME="$UNIQUE_ID.7z"
 
 	# - byte
-	UPLOAD_FILESIZE_LIMIT=10000000
+	UPLOAD_FILESIZE_LIMIT=20000000
 	UPLOAD_FILESIZE=0
 
 	SFTP_ADDR='ssh.dietpi.com'
@@ -43,28 +43,28 @@
 	# List of commands we want to run and redirect to upload archive
 	aCOMMAND_LIST=(
 
-		'ls -lha /var/log'
 		'dpkg -l'
+		'ip l'
 		'ip a'
 		'ip r'
-		'ip l'
 		'lsusb'
 		'cat /proc/cpuinfo'
+		'free -m'
 		'ps aux'
 		'blkid'
 		'mount'
 		'df -h'
-		"ls /etc/rc*.d/"
+		'ls /etc/rc*.d/'
 		'cut -d: -f1 /etc/passwd'
 		'locale'
-		'ls -lha /mnt' #dietpi userdata location
+		'ls -lAh /mnt' # dietpi_userdata location
 		'dmesg'
 		'uname -a'
 		'lsmod'
 		'aplay -l'
 		'aplay -L'
-		"systemctl status *.service -l"
-		"systemctl status *.mount -l"
+		'systemctl status *.service -l'
+		'systemctl status *.mount -l'
 		'/DietPi/dietpi/dietpi-services status'
 
 	)
@@ -72,38 +72,43 @@
 	# List of files and folders we want to add to upload archive
 	aFILE_LIST=(
 
-		# - command output file
+		# - aCOMMAND_LIST output file
 		'CMD_OUT.txt'
 
-		# - Git Error file
+		# - Git error file
 		'G_ERROR_HANDLER_GITREPORT'
 
-		# - logs
-		"/var/log/*"
+		# - Logs
+		'/var/log'
 
-		# - DietPi scripts / logs
-		"/DietPi/*"
-		'/boot/dietpi.txt'
+		# - Boot/kernel configs
 		'/boot/config.txt'
-		"/boot/dietpi/*"
-		"/tmp/.G*"
-		"/var/tmp/dietpi/logs/*"
+		'/boot/cmdline.txt'
+		'/boot/boot.ini'
+		'/boot/uEnv.ini'
+		'/boot/armbianEnv.ini'
 
-		# - /var/lib/dietpi
-		"/var/lib/dietpi/*"
+		# - DietPi files
+		'/DietPi'
+		'/boot/dietpi.txt'
+		'/boot/dietpi'
+		'/tmp/.G*'
+		'/var/lib/dietpi'
+		'/var/tmp/dietpi'
 
-		# - confs
+		# - Login scripts
 		#	- bash shell
 		'/etc/bash.bashrc'
-		"/etc/bashrc.d/*"
+		'/etc/bashrc.d'
 		'/root/.bashrc'
-		"/home/*/.bashrc"
+		'/home/*/.bashrc'
 		#	- login shell
 		'/etc/profile'
-		"/etc/profile.d/*"
+		'/etc/profile.d'
 		'/root/.profile'
-		"/home/*/.profile"
+		'/home/*/.profile'
 
+		# - System
 		'/etc/rc.local'
 		'/etc/X11/xorg.conf'
 		'/etc/asound.conf'
@@ -111,16 +116,16 @@
 		'/etc/wpa_supplicant/wpa_supplicant.conf'
 		'/etc/fstab'
 		'/etc/sysctl.conf'
-		"/etc/sysctl.d/*"
+		'/etc/sysctl.d'
 
 		# - Services
-		"/etc/init.d/*"
-		"/etc/systemd/system/*"
-		"/lib/systemd/system/*"
+		'/etc/init.d'
+		'/etc/systemd/system'
+		'/lib/systemd/system'
 
 		# - APT
 		'/etc/apt/sources.list'
-		"/etc/apt/sources.list.d/*"
+		'/etc/apt/sources.list.d'
 
 	)
 
@@ -131,34 +136,33 @@
 		do
 
 			echo -e "\n----------\n${aCOMMAND_LIST[$i]}:\n----------" >> CMD_OUT.txt
-			${aCOMMAND_LIST[$i]} >> CMD_OUT.txt
+			${aCOMMAND_LIST[$i]} &>> CMD_OUT.txt
 
 		done
 		unset aCOMMAND_LIST
 
 		# - Have the git error in 1st directory.
-		cp /tmp/.G_ERROR_HANDLER_GITREPORT ./G_ERROR_HANDLER_GITREPORT &> /dev/null
+		[[ -f /tmp/.G_ERROR_HANDLER_GITREPORT ]] && cp /tmp/.G_ERROR_HANDLER_GITREPORT ./G_ERROR_HANDLER_GITREPORT
 
 		G_DIETPI-NOTIFY 2 'Packing upload archive, please wait...'
-		7z a -t7z -spf "$UPLOAD_FILENAME" ${aFILE_LIST[@]} &> /tmp/dietpi-bugreport_compress.log
+		7zr a -spf "$UPLOAD_FILENAME" ${aFILE_LIST[@]} &> dietpi-bugreport_compress.log
 
 	}
 
 	Upload_Bug_Report(){
 
 		# Check upload location is online
-		G_CHECK_URL "$SFTP_ADDR"
-		if (( ! $? )); then
+		if G_CHECK_URL "$SFTP_ADDR"; then
 
 			if [[ ! -f $UPLOAD_FILENAME ]]; then
 
 				G_WHIP_MSG "Failed to create compressed upload file: $UPLOAD_FILENAME\n\nOn the next screen you will be prompted to view the log. If problems persist, please contact DietPi for support."
-				log=1 G_WHIP_VIEWFILE /tmp/dietpi-bugreport_compress.log
+				log=1 G_WHIP_VIEWFILE dietpi-bugreport_compress.log
 				exit 1
 
 			fi
 
-			rm /tmp/dietpi-bugreport_compress.log &> /dev/null
+			[[ -f dietpi-bugreport_compress.log ]] && rm dietpi-bugreport_compress.log
 
 			# Limit filesize
 			UPLOAD_FILESIZE=$(stat -c%s "$UPLOAD_FILENAME")
@@ -167,8 +171,7 @@
 			if (( $UPLOAD_FILESIZE <= $UPLOAD_FILESIZE_LIMIT )); then
 
 				G_DIETPI-NOTIFY -2 'Running cURL'
-				curl --connect-timeout 4 --retry 1 --retry-delay 4 -sT "$UPLOAD_FILENAME" sftp://"$SFTP_USER":"$SFTP_PASS"@"$SFTP_ADDR"/bugreport/
-				if (( ! $? )); then
+				if curl --connect-timeout 4 --retry 1 --retry-delay 4 -sT "$UPLOAD_FILENAME" sftp://"$SFTP_USER":"$SFTP_PASS"@"$SFTP_ADDR"/bugreport/; then
 
 					# Bug report removal via empty file upload
 					if (( $UPLOAD_FILESIZE == 0 )); then
@@ -208,57 +211,50 @@
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Interactive menu
-	if (( $INPUT == 0 )); then
+	while (( $INPUT == 0 ))
+	do
 
-		while true
-		do
-
-			G_WHIP_MENU_ARRAY=(
+		G_WHIP_MENU_ARRAY=(
 
-				'1' ': Send bug report archive to help the developers investigate an issue.'
-				'2' ': Remove my previous uploaded bug report.'
-				'3' ': Show me what is included with the upload archive.'
+			'1' ': Send bug report archive to help the developers investigate an issue.'
+			'2' ': Remove my previous uploaded bug report.'
+			'3' ': Show me what is included with the upload archive.'
 
-			)
+		)
 
-			G_WHIP_MENU "By sending a bug report file, you can help the developers to investigate your issue, in relation to your report on GitHub or the DietPi forum.
+		if G_WHIP_MENU "By sending a bug report file, you can help the developers to investigate your issue, in relation to your report on GitHub or the DietPi forum.
 The file is sent via secured connection to our SFTP server and is stored there unreadable to the public upload user.
 The file will be removed after your issue is solved and you can remove it by yourself as well by running \"dietpi-bugreport -1\" or via this menu.
 
-Would you like to send a bug report archive or remove an already uploaded one?"
-			if (( ! $? )); then
+Would you like to send a bug report archive or remove an already uploaded one?"; then
 
-				if (( $G_WHIP_RETURNED_VALUE == 1 )); then
+			if (( $G_WHIP_RETURNED_VALUE == 1 )); then
 
-					INPUT=1
-					break
+				INPUT=1
 
-				elif (( $G_WHIP_RETURNED_VALUE == 2 )); then
+			elif (( $G_WHIP_RETURNED_VALUE == 2 )); then
 
-					INPUT=-1
-					break
+				INPUT=-1
 
-				elif (( $G_WHIP_RETURNED_VALUE == 3 )); then
+			elif (( $G_WHIP_RETURNED_VALUE == 3 )); then
 
-					G_WHIP_SCROLLBOX "The upload will contain the following command outputs:
+				G_WHIP_SCROLLBOX "The upload will contain the following command outputs:
 
 $(printf "\t- %s\n" "${aCOMMAND_LIST[@]}")
 
-It will contain as well the following file locations:
+It will contain as well the following files and directories:
 
 $(printf "\t- %s\n" "${aFILE_LIST[@]}")"
 
-				fi
-
-			else
+			fi
 
-				break
+		else
 
-			fi
+			break
 
-		done
+		fi
 
-	fi
+	done
 
 	if (( $INPUT == 1 || $INPUT == -1 )); then
 
diff --git a/dietpi/dietpi-cloudshell b/dietpi/dietpi-cloudshell
index f99437edb3..58325ac569 100644
--- a/dietpi/dietpi-cloudshell
+++ b/dietpi/dietpi-cloudshell
@@ -428,7 +428,7 @@
 		CPU_USAGE=$(bc -l <<< "scale=0;$CPU_USAGE / $G_HW_CPU_CORES")
 
 		# TOP (accurate)
-		# Fails to output in low screen res (https://github.com/Fourdee/DietPi/issues/203#issuecomment-189711968)
+		# Fails to output in low screen res (https://github.com/MichaIng/DietPi/issues/203#issuecomment-189711968)
 		#CPU_USAGE=$(BC_ADD_LEADING_ZERO "$(echo "scale=1; 100 - $(top -b -n 1 | grep '%Cpu(s):' | mawk '{print $8}')" | bc -l)")
 
 		#convert to interger and graph it
@@ -493,7 +493,7 @@
 		local index_end=$2
 
 
-		#df will endless hang when NFS server is down: https://github.com/Fourdee/DietPi/issues/395
+		#df will endless hang when NFS server is down: https://github.com/MichaIng/DietPi/issues/395
 		# - So lets run it as another thread so we can kill it if it hangs.
 		local df_failed=0
 		rm $FP_TEMP
@@ -533,7 +533,7 @@
 			for ((i=$index_start; i<=$index_end; i++))
 			do
 
-				STORAGE_PERCENT[$i]="${STORAGE_PATH[$i]}"
+				STORAGE_PERCENT[$i]=${STORAGE_PATH[$i]}
 				STORAGE_FREE[$i]='DF failed'
 
 			done
@@ -555,7 +555,7 @@
 
 				else
 
-					STORAGE_PERCENT[$i]="${STORAGE_PATH[$i]}"
+					STORAGE_PERCENT[$i]=${STORAGE_PATH[$i]}
 					STORAGE_FREE[$i]='Mount not active'
 
 				fi
@@ -671,7 +671,7 @@
 		local network_usage_current_recieved=$(</sys/class/net/$NETWORK_DETAILS_ADAPTER/statistics/rx_bytes)
 		local network_usage_current_sent=$(</sys/class/net/$NETWORK_DETAILS_ADAPTER/statistics/tx_bytes)
 
-		#Check for valid integer scrapes, before running calculations: https://dietpi.com/phpbb/viewtopic.php?f=11&t=441&p=1927#p1927 | https://github.com/Fourdee/DietPi/issues/355
+		#Check for valid integer scrapes, before running calculations: https://dietpi.com/phpbb/viewtopic.php?f=11&t=441&p=1927#p1927 | https://github.com/MichaIng/DietPi/issues/355
 		if disable_error=1 G_CHECK_VALIDINT "$network_usage_current_recieved" && disable_error=1 G_CHECK_VALIDINT "$network_usage_current_sent"; then
 
 			#Store previous totals
@@ -707,7 +707,7 @@
 
 			#Usage today
 			# - Has the day changed? Also runs on init.
-			#	String if statement, to prevent "leading zero integer error" from $(date): https://github.com/Fourdee/DietPi/issues/272
+			#	String if statement, to prevent "leading zero integer error" from $(date): https://github.com/MichaIng/DietPi/issues/272
 			local dayofmonth=$(date +"%d")
 			if [[ $NETWORK_USAGE_DAY_OF_MONTH != $dayofmonth ]]; then
 
@@ -1262,7 +1262,7 @@ _EOF_
 
 		fi
 		#--------------------------------------------------------------------------------
-		#Update DietPi network shared data: https://github.com/Fourdee/DietPi/issues/359
+		#Update DietPi network shared data: https://github.com/MichaIng/DietPi/issues/359
 		/DietPi/dietpi/func/obtain_network_details
 
 	}
@@ -1478,12 +1478,11 @@ _EOF_
 
 		)
 
-		G_WHIP_DEFAULT_ITEM="$LASTSELECTED_ITEM"
+		G_WHIP_DEFAULT_ITEM=$LASTSELECTED_ITEM
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
-		G_WHIP_MENU
-		if (( $? == 0 )); then
+		if G_WHIP_MENU; then
 
-			LASTSELECTED_ITEM="$G_WHIP_RETURNED_VALUE"
+			LASTSELECTED_ITEM=$G_WHIP_RETURNED_VALUE
 
 			case "$G_WHIP_RETURNED_VALUE" in
 
@@ -1501,34 +1500,19 @@ _EOF_
 
 				'Net Usage Current')
 
-					((NETWORK_USAGE_CURRENT_OUTPUT_TYPE++))
-					if (( $NETWORK_USAGE_CURRENT_OUTPUT_TYPE > 1 )); then
-
-						NETWORK_USAGE_CURRENT_OUTPUT_TYPE=0
-
-					fi
+					(( $NETWORK_USAGE_CURRENT_OUTPUT_TYPE )) && NETWORK_USAGE_CURRENT_OUTPUT_TYPE=0 || NETWORK_USAGE_CURRENT_OUTPUT_TYPE=1
 
 				;;
 
 				'Temperature')
 
-					((TEMPERATURE_OUTPUT_TYPE++))
-					if (( $TEMPERATURE_OUTPUT_TYPE > 1 )); then
-
-						TEMPERATURE_OUTPUT_TYPE=0
-
-					fi
+					(( $TEMPERATURE_OUTPUT_TYPE )) && TEMPERATURE_OUTPUT_TYPE=0 || TEMPERATURE_OUTPUT_TYPE=1
 
 				;;
 
 				'Output Display')
 
-					((OUTPUT_DISPLAY_INDEX++))
-					if (( $OUTPUT_DISPLAY_INDEX > 1 )); then
-
-						OUTPUT_DISPLAY_INDEX=0
-
-					fi
+					(( $OUTPUT_DISPLAY_INDEX )) && OUTPUT_DISPLAY_INDEX=0 || OUTPUT_DISPLAY_INDEX=1
 
 				;;
 
@@ -1592,13 +1576,8 @@ _EOF_
 
 		)
 
-		G_WHIP_DEFAULT_ITEM="$USER_COLOUR_INDEX"
-		G_WHIP_MENU 'Please select a colour scheme.'
-		if (( $? == 0 )); then
-
-			USER_COLOUR_INDEX=$G_WHIP_RETURNED_VALUE
-
-		fi
+		G_WHIP_DEFAULT_ITEM=$USER_COLOUR_INDEX
+		G_WHIP_MENU 'Please select a colour scheme.' && USER_COLOUR_INDEX=$G_WHIP_RETURNED_VALUE
 
 	}
 
@@ -1790,12 +1769,8 @@ _EOF_
 			local index=$G_WHIP_RETURNED_VALUE
 
 			/DietPi/dietpi/dietpi-drive_manager 1
-			local return_string="$(</tmp/dietpi-drive_manager_selmnt)"
-			if [[ $return_string ]]; then
-
-				STORAGE_PATH[$index]="$return_string"
-
-			fi
+			local return_string=$(</tmp/dietpi-drive_manager_selmnt)
+			[[ $return_string ]] && STORAGE_PATH[$index]=$return_string
 
 			TARGETMENUID=5
 
@@ -1849,7 +1824,7 @@ _EOF_
 
 	#-----------------------------------------------------------------------------------
 	#Run DietPi-Cloudshell
-	elif (( $INPUT >= 1 )); then
+	elif (( $INPUT > 0 )); then
 
 		Run_Cloudshell
 
@@ -1857,7 +1832,7 @@ _EOF_
 
 	#-----------------------------------------------------------------------------------
 	#Clean up temp files
-	rm $FP_TEMP &> /dev/null
+	[[ -f $FP_TEMP ]] && rm $FP_TEMP
 	#-----------------------------------------------------------------------------------
 	#Delete[] Global arrays
 	unset aCOLOUR
diff --git a/dietpi/dietpi-config b/dietpi/dietpi-config
index fd6d7fd985..7305c4a64c 100644
--- a/dietpi/dietpi-config
+++ b/dietpi/dietpi-config
@@ -570,7 +570,7 @@
 
 					G_CONFIG_INJECT 'decode_WVC1=' "decode_WVC1=$G_WHIP_RETURNED_VALUE" /DietPi/config.txt
 
-					#https://github.com/Fourdee/DietPi/issues/1487
+					#https://github.com/MichaIng/DietPi/issues/1487
 					local current_gpu_mem=$(grep -m1 '^[[:blank:]]*gpu_mem_1024' /DietPi/config.txt | sed 's/^[^=]*=//g')
 					(( $current_gpu_mem < 128 )) && /DietPi/dietpi/func/dietpi-set_hardware gpumemsplit 128
 
@@ -585,7 +585,7 @@
 
 					G_CONFIG_INJECT 'decode_MPG2=' "decode_MPG2=$G_WHIP_RETURNED_VALUE" /DietPi/config.txt
 
-					#https://github.com/Fourdee/DietPi/issues/1487
+					#https://github.com/MichaIng/DietPi/issues/1487
 					local current_gpu_mem=$(grep -m1 '^[[:blank:]]*gpu_mem_1024' /DietPi/config.txt | sed 's/^[^=]*=//g')
 					(( $current_gpu_mem < 128 )) && /DietPi/dietpi/func/dietpi-set_hardware gpumemsplit 128
 
@@ -1612,9 +1612,9 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 			local current_cpu_temp_limit=$(grep -m1 'temp_limit' /DietPi/config.txt | sed 's/^[^=]*=//')
 			G_WHIP_MENU_ARRAY+=('ARM Temp Limit   ' ": [${current_cpu_temp_limit}'c]")
 
-			##Disabled due to https://github.com/Fourdee/DietPi/issues/73
+			##Disabled due to https://github.com/MichaIng/DietPi/issues/73
 			#G_WHIP_MENU_ARRAY+=("Lower Idle Frequencies" ": $rpi_freq_min_text")
-			# initial_turbo disabled due to: https://github.com/Fourdee/DietPi/issues/1836
+			# initial_turbo disabled due to: https://github.com/MichaIng/DietPi/issues/1836
 			#G_WHIP_MENU_ARRAY+=('ARM Initial Turbo' ": $text_current_initial_turbo")
 
 		fi
@@ -1868,7 +1868,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 
 							if (( $G_WHIP_RETURNED_VALUE > 65 )); then
 
-								G_WHIP_MSG "Higher operating temperatures will reduce the life of your ARM SoC. Heat also dissipates through the PCB into other components, decreasing the lifespan of the whole device. Use at your own risk.\n\nDietPi recommends 65'c as a safe value (75'c for RPi 3).\n\nMore info: https://github.com/Fourdee/DietPi/issues/356"
+								G_WHIP_MSG "Higher operating temperatures will reduce the life of your ARM SoC. Heat also dissipates through the PCB into other components, decreasing the lifespan of the whole device. Use at your own risk.\n\nDietPi recommends 65'c as a safe value (75'c for RPi 3).\n\nMore info: https://github.com/MichaIng/DietPi/issues/356"
 
 							fi
 
@@ -2621,7 +2621,7 @@ _EOF_
 			# - Restart networking
 			Network_Restart
 
-			# - Additional fallback for (older kernel?) devices that fail with wpa_supplicant.conf https://github.com/Fourdee/DietPi/issues/838
+			# - Additional fallback for (older kernel?) devices that fail with wpa_supplicant.conf https://github.com/MichaIng/DietPi/issues/838
 			#	NB: Requires adapter up... hence, not in dietpi-set_hardware
 			iw reg set $wifi_country_code_target
 
@@ -2765,7 +2765,7 @@ _EOF_
 			ETH_MODE_TARGET=$ETH_MODE
 
 			#Connected and Valid IP?
-			ETH_CONNECTED=$(ip r | grep -ci -m1 "eth$ETH_DEV_INDEX")
+			ETH_CONNECTED=$(ip -o r l dev eth$ETH_DEV_INDEX | grep -vcim1 '[[:blank:]]linkdown')
 
 			#Enabled and Connected
 			if (( $ETH_DISABLED == 0 && $ETH_CONNECTED == 1 )); then
@@ -2789,7 +2789,7 @@ _EOF_
 			WIFI_MODE_TARGET=$WIFI_MODE
 
 			#Connected and Valid IP?
-			WIFI_CONNECTED=$(ip r | grep -ci -m1 "wlan$WIFI_DEV_INDEX")
+			WIFI_CONNECTED=$(ip -o r l dev wlan$ETH_DEV_INDEX | grep -vcim1 '[[:blank:]]linkdown')
 
 			#Enabled and Connected
 			if (( $WIFI_DISABLED == 0 && $WIFI_CONNECTED == 1 )); then
@@ -3994,7 +3994,7 @@ Additional benchmarks:
 
 		fi
 
-		# - RPi, low power mode (PSU noise ripple reduction): https://github.com/Fourdee/DietPi/issues/757
+		# - RPi, low power mode (PSU noise ripple reduction): https://github.com/MichaIng/DietPi/issues/757
 		if (( $G_HW_MODEL < 10 )); then
 
 			local current_cpu_governor=$(grep -m1 '^[[:blank:]]*CONFIG_CPU_GOVERNOR=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
@@ -4463,7 +4463,7 @@ Additional benchmarks:
 					# - Raspbian
 					if (( $G_HW_MODEL < 10 )); then
 
-						G_WHIP_MENU_ARRAY+=('http://raspbian.raspberrypi.org/raspbian' ': Global')
+						G_WHIP_MENU_ARRAY+=('http://raspbian.raspberrypi.org/raspbian' ': Global mirror director')
 						G_WHIP_MENU_ARRAY+=('http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian' ': UK')
 						G_WHIP_MENU_ARRAY+=('ftp://ftp.fu-berlin.de/linux/raspbian/raspbian' ': Germany')
 						G_WHIP_MENU_ARRAY+=('http://mirror.umd.edu/raspbian/raspbian' ': US')
@@ -4857,7 +4857,7 @@ _EOF_
 
 				G_WHIP_MSG "[FAILED] Unknown menu ID $TARGETMENUID, reverting to DietPi-Config main menu\n
 This error should never show up. Please try to reproduce it. If it reappears, you found a coding bug.
-Please report it to: https://github.com/Fourdee/DietPi/issues"
+Please report it to: https://github.com/MichaIng/DietPi/issues"
 				TARGETMENUID=0
 
 			fi
diff --git a/dietpi/dietpi-drive_manager b/dietpi/dietpi-drive_manager
index 905ac8269a..50a7ee7a5c 100644
--- a/dietpi/dietpi-drive_manager
+++ b/dietpi/dietpi-drive_manager
@@ -50,7 +50,7 @@
 	INDEX_DRIVE_BEING_EDITED=0
 	DRIVE_TARGET_BEING_EDITED=''
 
-	FORMAT_GPT=1 # default GPT: https://github.com/Fourdee/DietPi/issues/531. 0=MBR
+	FORMAT_GPT=1 # default GPT: https://github.com/MichaIng/DietPi/issues/531. 0=MBR
 	FORMAT_FILESYSTEM_TYPE=0 #0=ext4 1=ntfs 2=fat32 3=hfs+ 4=btrfs 5=f2fs 6=exfat
 	FORMAT_RECREATE_PARTITION_TABLE=1
 	FORMAT_COMPLETED=0
@@ -124,43 +124,36 @@
 		# Recreate FStab
 		cp -a /etc/fstab $FP_TEMP_FSTAB
 
-		# Grab current tmpfs entries
-		local tmpfs_mounts=$(grep '^tmpfs[[:blank:]]' $FP_TEMP_FSTAB)
+		# Mounts
+		local swap_mount=''
+		local tmpfs_mounts=''
+		local bind_mounts=''
+		local net_mounts=''
 
-		# Grab current bind mounts
-		local bind_mounts=$(grep '[[:blank:],]bind[[:blank:],]' $FP_TEMP_FSTAB)
-
-		# Grab current swap
-		local swap_mount=$(grep -m1 '[[:blank:]]swap[[:blank:]]' $FP_TEMP_FSTAB)
-
-		# Grab current network mounts + creds
-		local net_mounts_samba=$(grep '[[:blank:]]cifs[[:blank:]]' $FP_TEMP_FSTAB)
-		local net_mounts_nfs=$(grep '[[:blank:]]nfs.*[[:blank:]]' $FP_TEMP_FSTAB)
-		local net_mounts_ftp=$(grep '^curlftpfs' $FP_TEMP_FSTAB)
-
-		# Force reset/clean fstab (PREP)
+		# Mode 4: Force reset/clean fstab (PREP)
 		if (( $INPUT == 4 )); then
 
-			bind_mounts=''
-			swap_mount=''
-			net_mounts_samba=''
-			net_mounts_nfs=''
-			net_mounts_ftp=''
-
 			local var_log_size=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_RAMLOG_MAXSIZE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 			tmpfs_mounts="tmpfs /tmp tmpfs defaults,noatime,nodev,nosuid,mode=1777 0 0
 tmpfs /var/log tmpfs defaults,size=${var_log_size}m,noatime,nodev,nosuid,mode=1777 0 0
 tmpfs /DietPi tmpfs defaults,size=10m,noatime,nodev,nosuid,mode=1777 0 0"
 
+		# Else: Grab current mounts
+		else
+
+			swap_mount=$(grep -m1 '[[:blank:]]swap[[:blank:]]' $FP_TEMP_FSTAB)
+			tmpfs_mounts=$(grep '^tmpfs[[:blank:]]' $FP_TEMP_FSTAB)
+			bind_mounts=$(grep '[[:blank:],]bind[[:blank:],]' $FP_TEMP_FSTAB)
+			# CurlFtpFS, CIFS/SMB/Samba, NFS
+			net_mounts=$(grep -E '(^curlftpfs|[[:blank:]]cifs[[:blank:]]|[[:blank:]]nfs[4]?[[:blank:]])' $FP_TEMP_FSTAB)
+
 		fi
 
 		echo "#-----------------------------------------------------------
 #NETWORK
 #-----------------------------------------------------------
 #Please use DietPi-Drive_Manager to setup network mounts
-$net_mounts_samba
-$net_mounts_ftp
-$net_mounts_nfs
+$net_mounts
 
 #-----------------------------------------------------------
 #TMPFS
@@ -186,7 +179,7 @@ $swap_mount
 		df -Pha | tail -n +2 > .dietpi-drive_manager_df_tmp
 
 		# - Remove items from list
-		#	Bind: https://github.com/Fourdee/DietPi/issues/2013#issuecomment-416394374
+		#	Bind: https://github.com/MichaIng/DietPi/issues/2013#issuecomment-416394374
 		while read line
 		do
 
@@ -318,7 +311,7 @@ $swap_mount
 		done < .dietpi-drive_manager_df_tmp
 		rm .dietpi-drive_manager_df_tmp
 
-		# - Check blkid for unmounted drives, if drive is not mounted, add entry as disabled mount
+		# - Check blkid for unmounted drives, if drive is not mounted, add entry as disabled/commented mount
 		blkid -o device > .dietpi-drive_manager_blkid_tmp
 		while read line
 		do
@@ -361,7 +354,7 @@ $swap_mount
 		rm .dietpi-drive_manager_blkid_tmp
 
 		# - Find drives that have no partitions
-		#	Exclude mtdblock devices: https://github.com/Fourdee/DietPi/issues/2067#issuecomment-422400520
+		#	Exclude mtdblock devices: https://github.com/MichaIng/DietPi/issues/2067#issuecomment-422400520
 		lsblk -nro NAME | sed '/^mtdblock[0-9]/d' > .dietpi-drive_manager_lsblk_tmp
 		while read line
 		do
@@ -439,7 +432,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 		fi
 
-		# - Remove x-systemd.automount if not supported by kernel: https://github.com/Fourdee/DietPi/issues/1607#issuecomment-372030565
+		# - Remove x-systemd.automount if not supported by kernel: https://github.com/MichaIng/DietPi/issues/1607#issuecomment-372030565
 		if ! modprobe autofs4 --dry-run &> /dev/null; then
 
 			sed -i 's/,x-systemd.automount//g' $FP_TEMP_FSTAB
@@ -480,7 +473,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 	Rm_Empty_Dir(){
 
-		local fp_dir="$1"
+		local fp_dir=$1
 		if [[ -d $fp_dir && ! $(ls -A $fp_dir) ]]; then
 
 			rm -R "$fp_dir"
@@ -565,7 +558,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 			G_DIETPI-NOTIFY 2 "Creating mount folder for $target"
 			mkdir -p $target
 			G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD mount $source $target $additional_options
-			DRIVE_TARGET_BEING_EDITED="$target"
+			DRIVE_TARGET_BEING_EDITED=$target
 
 		fi
 
@@ -661,7 +654,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 				G_DIETPI-NOTIFY 2 "Creating partition table, with target type: $parition_table_type"
 
 				G_RUN_CMD parted -s /dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]} mklabel $parition_table_type
-				G_RUN_CMD parted -a optimal /dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]} mkpart primary 0% 100%
+				G_RUN_CMD parted -s /dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]} mkpart primary 0% 100%
 				partprobe /dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]}
 
 				sleep 1 # due to systemd automount, wait for it.
@@ -675,7 +668,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 					aDRIVE_MOUNT_SOURCE[$INDEX_DRIVE_BEING_EDITED]="/dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]}1"
 
-				#	NanoPC-T4 + NVMe special: https://github.com/Fourdee/DietPi/issues/2102#issue-366001513
+				#	NanoPC-T4 + NVMe special: https://github.com/MichaIng/DietPi/issues/2102#issue-366001513
 				elif (( $G_HW_MODEL == 68 )) && [[ ${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]} == nvme* ]]; then
 
 					aDRIVE_MOUNT_SOURCE[$INDEX_DRIVE_BEING_EDITED]="/dev/${aDRIVE_SOURCE_DEVICE[$INDEX_DRIVE_BEING_EDITED]}p6"
@@ -786,7 +779,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 		#	Add new rootfs entry
 		local dev_entry="UUID=${aDRIVE_UUID[$INDEX_DRIVE_BEING_EDITED]}"
 		(( $G_HW_MODEL < 10 )) && dev_entry="PARTUUID=${aDRIVE_PART_UUID[$INDEX_DRIVE_BEING_EDITED]}"
-		sed -i "\@[[:space:]]/[[:space:]]auto@c $dev_entry / auto defaults,noatime 0 1" /etc/fstab
+		sed -i "\@[[:space:]]/[[:space:]][[:space:]]*auto@c $dev_entry / auto defaults,noatime,rw 0 1" /etc/fstab
 
 		# - Disable Swap
 		/DietPi/dietpi/func/dietpi-set_dphys-swapfile 0
@@ -833,8 +826,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 		systemctl daemon-reload
 		sync
 
-		G_WHIP_MSG 'RootFS transfer completed. Press enter to reboot system.'
-		reboot
+		G_WHIP_YESNO 'RootFS transfer completed. A reboot is required for this to take affect.\n\nWould you like to reboot the system now?' && reboot
 
 	}
 
@@ -850,6 +842,13 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 		else
 
+			# - RootFS, set fstab now, else, will not be applied to /etc/fstab during Init as already RO: https://github.com/MichaIng/DietPi/issues/2604
+			if [[ ${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]} == '/' ]]; then
+
+				local line_number=$(grep -n "[[:blank:]]${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]}[[:blank:]].*,rw" /etc/fstab | cut -d : -f 1)
+				sed -i "${line_number}s/,rw/,ro/" /etc/fstab
+
+			fi
 			message_result=$(mount -v -o ro,remount ${aDRIVE_MOUNT_SOURCE[$INDEX_DRIVE_BEING_EDITED]} 2>&1)
 			exit_status=$?
 
@@ -966,13 +965,13 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 		# - User data
 		local userdata_location_text="RootFS ($FP_USERDATA_CURRENT)"
-		[[ $FP_USERDATA_CURRENT == $G_FP_DIETPI_USERDATA ]] || userdata_location_text="$FP_USERDATA_CURRENT"
+		[[ $FP_USERDATA_CURRENT == $G_FP_DIETPI_USERDATA ]] || userdata_location_text=$FP_USERDATA_CURRENT
 
-		G_WHIP_DEFAULT_ITEM="$MENU_LASTITEM"
+		G_WHIP_DEFAULT_ITEM=$MENU_LASTITEM
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
 		if G_WHIP_MENU "Please select a drive to see available options.\n - User data location: $userdata_location_text"; then
 
-			MENU_LASTITEM="$G_WHIP_RETURNED_VALUE"
+			MENU_LASTITEM=$G_WHIP_RETURNED_VALUE
 
 			# - Refresh
 			if [[ $G_WHIP_RETURNED_VALUE == 'Refresh' ]]; then
@@ -1039,7 +1038,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 			elif [[ $G_WHIP_RETURNED_VALUE ]]; then
 
 				TARGETMENUID=1
-				DRIVE_TARGET_BEING_EDITED="$G_WHIP_RETURNED_VALUE"
+				DRIVE_TARGET_BEING_EDITED=$G_WHIP_RETURNED_VALUE
 				Init_Drives_and_Refresh
 
 			fi
@@ -1359,7 +1358,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 			elif [[ $G_WHIP_RETURNED_VALUE == 'User data' ]]; then
 
-				local fp_target_userdata_dir="${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]}"
+				local fp_target_userdata_dir=${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]}
 				#	Assign location if under RootFS
 				[[ ${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]} == '/' ]] && fp_target_userdata_dir='/mnt'
 
@@ -1454,7 +1453,7 @@ aDRIVE_ISPARTITIONTABLE ${aDRIVE_ISPARTITIONTABLE[$i]}
 
 			elif [[ $G_WHIP_RETURNED_VALUE == 'Benchmark' ]]; then
 
-				FP_BENCHFILE="${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]}" /DietPi/dietpi/func/dietpi-benchmark 1
+				FP_BENCHFILE=${aDRIVE_MOUNT_TARGET[$INDEX_DRIVE_BEING_EDITED]} /DietPi/dietpi/func/dietpi-benchmark 1
 
 			elif [[ $G_WHIP_RETURNED_VALUE == 'Check & Repair' ]]; then
 
@@ -1636,11 +1635,11 @@ NB:
 		G_WHIP_MENU_ARRAY+=('Filesystem Type' ": $format_type_text")
 		G_WHIP_MENU_ARRAY+=('Format' ': Start the format process with selected options')
 
-		G_WHIP_DEFAULT_ITEM="$MENU_LASTITEM"
+		G_WHIP_DEFAULT_ITEM=$MENU_LASTITEM
 		G_WHIP_BUTTON_CANCEL_TEXT='Back'
 		if G_WHIP_MENU 'Please select formatting options:'; then
 
-			MENU_LASTITEM="$G_WHIP_RETURNED_VALUE"
+			MENU_LASTITEM=$G_WHIP_RETURNED_VALUE
 
 			if [[ $G_WHIP_RETURNED_VALUE == 'Partition Type' ]]; then
 
@@ -1687,7 +1686,7 @@ NB:
 
 				)
 
-				G_WHIP_DEFAULT_ITEM="$FORMAT_FILESYSTEM_TYPE"
+				G_WHIP_DEFAULT_ITEM=$FORMAT_FILESYSTEM_TYPE
 				G_WHIP_MENU 'Please select a filesystem type for this format:\n\nEXT4:\nHighly recommended if you plan to use this drive solely on this system (dedicated drive).\n\nNTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU usage during transfers.\n\nFull list of different filesystem types:\nhttps://dietpi.com/phpbb/viewtopic.php?f=8&t=673&p=2898#p2898'
 				if (( ! $? )); then
 
@@ -1724,7 +1723,7 @@ NB:
 
 					fi
 
-					FORMAT_FILESYSTEM_TYPE="$G_WHIP_RETURNED_VALUE"
+					FORMAT_FILESYSTEM_TYPE=$G_WHIP_RETURNED_VALUE
 
 				fi
 
@@ -1759,12 +1758,12 @@ NB:
 
 			G_WHIP_DEFAULT_ITEM=$samba_clientname
 			G_WHIP_INPUTBOX 'Please enter the fileservers IP address\n - eg: 192.168.0.2' || break
-			samba_clientname="$G_WHIP_RETURNED_VALUE"
+			samba_clientname=$G_WHIP_RETURNED_VALUE
 
 			G_WHIP_DEFAULT_ITEM=$samba_clientshare
 			G_WHIP_INPUTBOX 'Please enter the fileservers shared folder name\n - eg: MySharedFolder' || break
-			#	NB: Convert spaces into '\040': https://github.com/Fourdee/DietPi/issues/1201#issuecomment-339720271
-			samba_clientshare="${G_WHIP_RETURNED_VALUE//[[:space:]]/\\\\040}"
+			#	NB: Convert spaces into '\040': https://github.com/MichaIng/DietPi/issues/1201#issuecomment-339720271
+			samba_clientshare=${G_WHIP_RETURNED_VALUE//[[:space:]]/\\\\040}
 
 			G_WHIP_DEFAULT_ITEM=$samba_clientuser
 			G_WHIP_INPUTBOX 'Please enter the fileservers username\n - eg: JoeBloggs' || break
@@ -1808,7 +1807,7 @@ NB:
 					sed -i "\#[[:space:]]$samba_fp_mount_target[[:space:]]#d" /etc/fstab
 					echo "//$samba_clientname/$samba_clientshare $samba_fp_mount_target cifs username=$samba_clientuser,password=$samba_clientpassword,iocharset=utf8,uid=dietpi,gid=dietpi,file_mode=0770,dir_mode=0770,vers=${acifs_versions[$i]},_netdev,nofail 0 0" >> /etc/fstab
 
-					DRIVE_TARGET_BEING_EDITED="$samba_fp_mount_target"
+					DRIVE_TARGET_BEING_EDITED=$samba_fp_mount_target
 					TARGETMENUID=1
 
 					G_WHIP_MSG "Mount completed. The new mount can be accessed via:\n - $samba_fp_mount_target\n - CIFS vers=${acifs_versions[$i]}"
@@ -1844,15 +1843,15 @@ NB:
 		# Server-side path to share, needed for NFSv3 only
 		local nfs_fp_server_share='/'
 
-		rm /mnt/nfs_client/readme.txt &> /dev/null
+		[[ -f /mnt/nfs_client/readme.txt ]] && rm /mnt/nfs_client/readme.txt
 		Rm_Empty_Dir /mnt/nfs_client
 
 		while :
 		do
 
-			G_WHIP_DEFAULT_ITEM="$nfs_server_ip"
+			G_WHIP_DEFAULT_ITEM=$nfs_server_ip
 			G_WHIP_INPUTBOX 'Please enter the NFS servers IP address (eg: 192.168.0.2).' || break
-			nfs_server_ip="$G_WHIP_RETURNED_VALUE"
+			nfs_server_ip=$G_WHIP_RETURNED_VALUE
 
 			# - Show current chosen mount target without leading "/mnt/"
 			G_WHIP_DEFAULT_ITEM=${nfs_fp_mount_target#/mnt/}
@@ -1881,7 +1880,7 @@ NB:
 				sed -i "\#[[:space:]]$nfs_fp_mount_target[[:space:]]#d" /etc/fstab
 				echo "$nfs_server_ip:/ $nfs_fp_mount_target nfs auto,_netdev,nofail 0 0" >> /etc/fstab
 
-				DRIVE_TARGET_BEING_EDITED="$nfs_fp_mount_target"
+				DRIVE_TARGET_BEING_EDITED=$nfs_fp_mount_target
 				TARGETMENUID=1
 
 				G_WHIP_MSG "Mount completed. The new mount can be accessed via:\n - $nfs_fp_mount_target"
@@ -1891,10 +1890,10 @@ NB:
 			elif grep -q '[[:blank:]]vers 3[[:blank:]]' $fp_tmp &&
 				grep -q 'access denied by server while mounting' $fp_tmp; then
 
-				G_WHIP_DEFAULT_ITEM="$nfs_fp_server_share"
+				G_WHIP_DEFAULT_ITEM=$nfs_fp_server_share
 				G_WHIP_INPUTBOX 'Your NFS server appears to support NFSv3 only. Mounting NFSv3 shares requires the shares path server side to be entered.
 \nPlease enter the absolute path to the share on the NFS server (eg: /mnt/nfs_share).' || break
-				nfs_fp_server_share="$G_WHIP_RETURNED_VALUE"
+				nfs_fp_server_share=$G_WHIP_RETURNED_VALUE
 
 				if mount -vt nfs -o port=2049 "$nfs_server_ip":"$nfs_fp_server_share" $nfs_fp_mount_target &> $fp_tmp; then
 
@@ -1967,26 +1966,30 @@ $(<$fp_tmp)" || break
 
 	Menu_Select_Mount_Location(){
 
+		#Remove last selection
+		[[ -f $FP_DRIVE_MANAGER_SELECTION ]] && rm $FP_DRIVE_MANAGER_SELECTION
+
 		#Generate menu
 		G_WHIP_MENU_ARRAY=()
 
-		df -Ph | tail -n +2 | sed '/tmpfs/d' | sed '/^udev/d' > dietpi-drive_manager_selmnt
+		df -Ph | tail -n +2 | sed -E '/(^udev|tmpfs)/d' > dietpi-drive_manager_selmnt
 
 		while read line
 		do
 
-			G_WHIP_MENU_ARRAY+=("$(mawk '{print $6}' <<< $line)" ": $(mawk '{print $1" | size: "$2" | available: "$4}' <<< $line)")
+			G_WHIP_MENU_ARRAY+=("$(mawk '{print $6}' <<< $line)" ": $(mawk '{print $1" | size: "$2"iB | available: "$4"iB"}' <<< $line)")
 
 		done < dietpi-drive_manager_selmnt
 		rm dietpi-drive_manager_selmnt
 
-		G_WHIP_DEFAULT_ITEM=$MENU_LASTITEM
 		if G_WHIP_MENU 'Please select a mount location to use:'; then
 
-			local drive_manager_selection=$G_WHIP_RETURNED_VALUE
+			G_DIETPI-NOTIFY 0 "Drive mount selected: $G_WHIP_RETURNED_VALUE"
+			echo "$G_WHIP_RETURNED_VALUE" > $FP_DRIVE_MANAGER_SELECTION
 
-			G_DIETPI-NOTIFY 0 "Drive mount selected: $drive_manager_selection"
-			echo "$drive_manager_selection" > "$FP_DRIVE_MANAGER_SELECTION"
+		else
+
+			EXIT_CODE=1
 
 		fi
 
@@ -2017,31 +2020,23 @@ $(<$fp_tmp)" || break
 	# Stop Services
 	(( $SERVICE_CONTROL )) && /DietPi/dietpi/dietpi-services stop
 	#-----------------------------------------------------------------------------------
-	#Generate /etc/fstab based on current drive mounts
-	if (( $INPUT == 4 )); then
-
-		Init_Drives_and_Refresh
-
-	#Menu system for user to select an active mount and return value
-	elif (( $INPUT == 1 )); then
+	# Init drives, generate /etc/fstab based on current drive mounts
+	Init_Drives_and_Refresh
+	#-----------------------------------------------------------------------------------
+	# Mode 1: Select an active mount and return value
+	if (( $INPUT == 1 )); then
 
-		Init_Drives_and_Refresh
 		Menu_Select_Mount_Location
 
-	#Drive Manager
-	else
-
-		Init_Drives_and_Refresh
+	# Mode 4: Force reset/clean fstab and exit (PREP)
+	# Else  : Run menus
+	elif ! (( $INPUT == 4 )); then
 
 		while (( $TARGETMENUID > -1 )); do
 
 			printf '\ec'
 
-			if (( $TARGETMENUID == 0 )); then
-
-				Menu_Main_Drive_Manager
-
-			elif (( $TARGETMENUID == 1 )); then
+			if (( $TARGETMENUID == 1 )); then
 
 				Menu_Drive_Manager_Edit_Drive
 
@@ -2053,6 +2048,10 @@ $(<$fp_tmp)" || break
 
 				Menu_Add_Network_Drive
 
+			else
+
+				Menu_Main_Drive_Manager
+
 			fi
 
 		done
diff --git a/dietpi/dietpi-letsencrypt b/dietpi/dietpi-letsencrypt
index db466a25bd..e8238fd4c7 100644
--- a/dietpi/dietpi-letsencrypt
+++ b/dietpi/dietpi-letsencrypt
@@ -71,7 +71,7 @@
 			G_RUN_CMD systemctl restart apache2
 
 			local options='--apache'
-			#Use webroot authentication on Stretch+ for now: https://github.com/Fourdee/DietPi/issues/734#issuecomment-361774084
+			#Use webroot authentication on Stretch+ for now: https://github.com/MichaIng/DietPi/issues/734#issuecomment-361774084
 			(( $G_DISTRO > 3 )) && options='-a webroot -w /var/www/ -i apache'
 			(( $LETSENCRYPT_REDIRECT )) && options+=' --redirect' || options+=' --no-redirect'
 			(( $LETSENCRYPT_HSTS )) && options+=' --hsts'
@@ -151,34 +151,35 @@ _EOF_
 			cat << _EOF_ > /etc/lighttpd/conf-enabled/letsencrypt.conf
 # Based on: https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=lighttpd-1.4.35&openssl=1.0.1t&hsts=yes&profile=intermediate
 \$SERVER["socket"] == ":443" {
-	protocol     = "https://"
-	ssl.engine   = "enable"
+	protocol   = "https://"
+	ssl.engine = "enable"
 	ssl.disable-client-renegotiation = "enable"
 
 	# pemfile is cert+privkey, ca-file is the intermediate chain in one file
-	ssl.pemfile               = "$fp_cert_dir/combined.pem"
-	ssl.ca-file               = "$fp_cert_dir/fullchain.pem"
+	ssl.pemfile         = "$fp_cert_dir/combined.pem"
+	ssl.ca-file         = "$fp_cert_dir/fullchain.pem"
 
 	# for DH/DHE ciphers, dhparam should be >= 2048-bit
-	#ssl.dh-file               = "/path/to/dhparam.pem"
+	#ssl.dh-file         = "/path/to/dhparam.pem"
 	# ECDH/ECDHE ciphers curve strength (see 'openssl ecparam -list_curves')
-	ssl.ec-curve              = "secp384r1"
+	ssl.ec-curve        = "secp384r1"
 	# Compression is by default off at compile-time, but use if needed
-	# ssl.use-compression     = "disable"
+	#ssl.use-compression = "disable"
 
 	# Environment flag for HTTPS enabled
-	setenv.add-environment = (
-		"HTTPS" => "on"
-	)
+	setenv.add-environment = ( "HTTPS" => "on" )
 
 	# intermediate configuration, tweak to your needs
 	ssl.use-sslv2 = "disable"
 	ssl.use-sslv3 = "disable"
-	ssl.honor-cipher-order    = "enable"
-	ssl.cipher-list           = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"
+	ssl.honor-cipher-order = "enable"
+	ssl.cipher-list        = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"
 }
 _EOF_
 
+			# Enable new "mod_openssl" on Buster
+			(( $G_DISTRO > 4 )) && sed -i '1i\server.modules += ( "mod_openssl" )\n' /etc/lighttpd/conf-enabled/letsencrypt.conf
+
 			# Redirect
 			rm /etc/lighttpd/conf-enabled/redirect.conf &> /dev/null
 			if (( $LETSENCRYPT_REDIRECT )); then
@@ -205,9 +206,10 @@ _EOF_
 _EOF_
 				lighttpd-enable-mod dietpi-hsts
 
-			else
+			elif [[ -f /etc/lighttpd/conf-available/99-dietpi-hsts.conf ]]; then
 
 				lighttpd-disable-mod dietpi-hsts
+				rm /etc/lighttpd/conf-available/99-dietpi-hsts.conf
 
 			fi
 
@@ -225,7 +227,7 @@ _EOF_
 			systemctl restart nginx
 
 			local options='--nginx'
-			#Use webroot authentication on Stretch+ for now: https://github.com/Fourdee/DietPi/issues/734#issuecomment-361774084
+			#Use webroot authentication on Stretch+ for now: https://github.com/MichaIng/DietPi/issues/734#issuecomment-361774084
 			(( $G_DISTRO > 3 )) && options='-a webroot -w /var/www/ -i nginx'
 			(( $LETSENCRYPT_REDIRECT )) && options+=' --redirect' || options+=' --no-redirect'
 			(( $LETSENCRYPT_HSTS )) && options+=' --hsts'
@@ -365,13 +367,13 @@ Would you like to switch to DietPi-Software, to install one of the above?' && /D
 			local turn_port=5349
 			if grep -q '^[[:blank:]]*tls-listening-port=' /etc/turnserver.conf; then
 
-				turn_port="$(grep -m1 '^[[:blank:]]*tls-listening-port=' /etc/turnserver.conf)"
-				turn_port="${turn_port#*tls-listening-port=}"
+				turn_port=$(grep -m1 '^[[:blank:]]*tls-listening-port=' /etc/turnserver.conf)
+				turn_port=${turn_port#*tls-listening-port=}
 
 			elif grep -q '^[[:blank:]]*listening-port=' /etc/turnserver.conf; then
 
-				turn_port="$(grep -m1 '^[[:blank:]]*listening-port=' /etc/turnserver.conf)"
-				turn_port="${turn_port#*listening-port=}"
+				turn_port=$(grep -m1 '^[[:blank:]]*listening-port=' /etc/turnserver.conf)
+				turn_port=${turn_port#*listening-port=}
 				# - Comment non-TLS port setting to avoid doubled port use
 				G_CONFIG_INJECT 'listening-port=' "#listening-port=$turn_port" /etc/turnserver.conf
 
@@ -506,7 +508,7 @@ _EOF_
 
 		)
 
-		G_WHIP_DEFAULT_ITEM="$PREVIOUS_MENU_SELECTION"
+		G_WHIP_DEFAULT_ITEM=$PREVIOUS_MENU_SELECTION
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
 		if G_WHIP_MENU 'Please select an option:'; then
 
@@ -519,7 +521,7 @@ _EOF_
 					while :
 					do
 
-						LETSENCRYPT_DOMAIN="$(Input_Box $LETSENCRYPT_DOMAIN Website-Domain)"
+						LETSENCRYPT_DOMAIN=$(Input_Box $LETSENCRYPT_DOMAIN Website-Domain)
 						[[ $LETSENCRYPT_DOMAIN == *?.?* && ! $(sed 's/\.//g' <<< $LETSENCRYPT_DOMAIN) =~ ^[0-9]*$ ]] && break
 
 						G_WHIP_MSG "[FAILED] \"$LETSENCRYPT_DOMAIN\" is no valid domain name.\n\nNote that raw IP addresses are not allowed by LetsEncrypt, thus a domain is required.\nYou can install No-IP with DietPi-Software to aquire one.\n\nPlease try again..."
@@ -530,27 +532,23 @@ _EOF_
 
 				'Email')
 
-					LETSENCRYPT_EMAIL="$(Input_Box $LETSENCRYPT_EMAIL Email-Address)"
+					LETSENCRYPT_EMAIL=$(Input_Box $LETSENCRYPT_EMAIL Email-Address)
 
 				;;
 
 				'Key Size')
 
-					if (( $LETSENCRYPT_KEYSIZE == 2048 )); then
-
-						LETSENCRYPT_KEYSIZE=4096
-
-					else
-
-						LETSENCRYPT_KEYSIZE=2048
-
-					fi
+					(( $LETSENCRYPT_KEYSIZE == 2048 )) && LETSENCRYPT_KEYSIZE=4096 || LETSENCRYPT_KEYSIZE=2048
 
 				;;
 
 				'HSTS')
 
-					if (( $LETSENCRYPT_HSTS == 0 )); then
+					if (( $LETSENCRYPT_HSTS )); then
+
+						LETSENCRYPT_HSTS=0
+
+					else
 
 						G_WHIP_YESNO 'HTTP Strict Transport Security (HSTS)\n
 Carefully read the following, before enabling this feature:
@@ -566,12 +564,7 @@ Enabling HSTS will prevent access to applications which use a standalone webserv
 
 It is possible to enable HTTPS support for standalone web servers, however, you will need to research and achieve this manually.
 
-Are you sure that you want to enable HTTP Strict Transport Security?'
-						(( ! $? )) && LETSENCRYPT_HSTS=1
-
-					else
-
-						LETSENCRYPT_HSTS=0
+Are you sure that you want to enable HTTP Strict Transport Security?' && LETSENCRYPT_HSTS=1
 
 					fi
 
@@ -579,8 +572,7 @@ Are you sure that you want to enable HTTP Strict Transport Security?'
 
 				'Redirect')
 
-					((LETSENCRYPT_REDIRECT++))
-					(( $LETSENCRYPT_REDIRECT > 1 )) && LETSENCRYPT_REDIRECT=0
+					(( $LETSENCRYPT_REDIRECT )) && LETSENCRYPT_REDIRECT=0 || LETSENCRYPT_REDIRECT=1
 
 				;;
 
@@ -613,17 +605,17 @@ Are you sure that you want to enable HTTP Strict Transport Security?'
 		local input_value=$1
 		local input_desc=$2
 
-		G_WHIP_DEFAULT_ITEM="$input_value"
+		G_WHIP_DEFAULT_ITEM=$input_value
 		if G_WHIP_INPUTBOX "Please enter a value for $input_desc"; then
 
-			input_value="$G_WHIP_RETURNED_VALUE"
+			input_value=$G_WHIP_RETURNED_VALUE
 
 			# - Prevent null values
-			[[ -z $input_value ]] && input_value='NULL'
+			[[ $input_value ]] || input_value='NULL'
 
 		fi
 
-		echo -e "$input_value"
+		echo "$input_value"
 
 	}
 
diff --git a/dietpi/dietpi-login b/dietpi/dietpi-login
new file mode 100644
index 0000000000..104a20eb3f
--- /dev/null
+++ b/dietpi/dietpi-login
@@ -0,0 +1,267 @@
+#!/bin/bash
+{
+	#////////////////////////////////////
+	# DietPi Login Script
+	#
+	#////////////////////////////////////
+	# Created by Daniel Knight / daniel.knight@dietpi.com / dietpi.com
+	#
+	#////////////////////////////////////
+	#
+	# Info:
+	# - filename /DietPi/dietpi/dietpi-login
+	# - activates on login /etc/bashrc.d/dietpi-login.sh
+	#////////////////////////////////////
+
+	# Import DietPi-Globals --------------------------------------------------------------
+	# In main loop
+	# Import DietPi-Globals --------------------------------------------------------------
+
+	#/////////////////////////////////////////////////////////////////////////////////////
+	# Globals
+	#/////////////////////////////////////////////////////////////////////////////////////
+	FP_DIETPI_FIRSTRUNSETUP_LOG='/var/tmp/dietpi/logs/dietpi-firstrun-setup.log'
+	FP_DIETPI_FIRSTRUNSETUP_PID='/tmp/.dietpi-login_firstrun_setup.pid' # Must be on RAM, in case of reboot from dietpi-software etc, to reset file before this script can remove it.
+
+	Show_License(){
+
+		if [[ -f /var/lib/dietpi/license.txt ]] && (( $G_USER_INPUTS )); then
+
+			G_WHIP_VIEWFILE /var/lib/dietpi/license.txt
+			rm /var/lib/dietpi/license.txt
+
+		fi
+
+	}
+
+	# Autoboot
+	Run_AutoStart(){
+
+		# - Do we have a valid screen for autoboot?
+		local screen_valid=0
+		[[ ! $DISPLAY && $(tty) == '/dev/tty1' ]] && screen_valid=1
+
+		# - Boot to specific program
+		if (( $screen_valid )); then
+
+			# - Kodi
+			if (( $auto_start_index == 1 )); then
+
+				/DietPi/dietpi/misc/start_kodi
+
+			# - Desktop (LXDE/MATE etc)
+			elif (( $auto_start_index == 2 )); then
+
+				clear
+				if (( $G_HW_MODEL == 11 )); then
+
+					sleep 5 && startx &
+
+				else
+
+					startx
+
+				fi
+
+			# - RetroPie/Emulation station
+			elif (( $auto_start_index == 3 )); then
+
+				#	emulationstation - can no longer be run as root
+				/opt/retropie/supplementary/emulationstation/emulationstation.sh
+
+			# - OpenTyrian
+			elif (( $auto_start_index == 4 )); then
+
+				/usr/local/games/opentyrian/run
+
+			# - DietPi-Cloudshell
+			elif (( $auto_start_index == 5 )); then
+
+				setterm --blank 0 --powersave off --cursor off
+				systemctl start dietpi-cloudshell
+
+			# - Amiberry standard boot
+			elif (( $auto_start_index == 8 )); then
+
+				systemctl start amiberry
+
+			# - DXX-Rebirth
+			elif (( $auto_start_index == 9 )); then
+
+				$G_FP_DIETPI_USERDATA/dxx-rebirth/run.sh
+
+			# - CAVA
+			elif (( $auto_start_index == 10 )); then
+
+				sleep 4 # Wait for MPD fifo to start
+				setterm --blank 0 --powersave off
+				cava
+
+			# - Chromium
+			elif (( $auto_start_index == 11 )); then
+
+				/var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh
+
+			# - LightDM
+			elif (( $auto_start_index == 16 )); then
+
+				/usr/sbin/lightdm
+
+			fi
+
+		fi
+
+	}
+
+	# First Run Setup
+	Run_DietPi_First_Run_Setup(){
+
+		# - Set non-interactive shell if automated install chosen, as .bashrc run via STDIN check is interactive
+		grep -qi '^[[:blank:]]*AUTO_SETUP_AUTOMATED=1' /DietPi/dietpi.txt && export G_USER_INPUTS=0
+
+		# - Prompt and wait if this script runs in other session already
+		local pid_firstrunsetup=''
+		[[ -f $FP_DIETPI_FIRSTRUNSETUP_PID ]] && pid_firstrunsetup=$(<$FP_DIETPI_FIRSTRUNSETUP_PID)
+		if [[ $pid_firstrunsetup ]] && (( $pid_firstrunsetup != $$ )); then
+
+			# - First run setup running in other session
+			local additional_text='Please resume setup on the active screen.'
+			(( $G_USER_INPUTS )) || additional_text='Automated setup is in progress. When completed, the system will be rebooted.'
+
+			G_WHIP_MSG "[INFO] DietPi first run setup: Currently running on another screen (PID=$pid_firstrunsetup).\n\n$additional_text"
+
+			local restart_loop_delay=5
+			G_DIETPI-NOTIFY 2 "Waiting $restart_loop_delay seconds before checking again. Please wait... (Press CTRL+C to abort)"
+			sleep $restart_loop_delay
+
+		elif (( $UID )); then
+
+			G_WHIP_MSG '[ERROR] Root login required\n
+To finish DietPi first run setup, root permissions are required.\n
+Please login again as user "root" with password "dietpi", respectively the one you chose in "dietpi.txt".'
+
+			exit 1
+
+		# Proceed with 1st run setup
+		else
+
+			# Prevent re-run from another session.
+			echo $$ > $FP_DIETPI_FIRSTRUNSETUP_PID
+
+			Show_License
+
+			# 1st run dietpi-update
+			if (( $G_DIETPI_INSTALL_STAGE == 0 )); then
+
+				# - Check internet
+				optional_cmd_inputs='--no-check-certificate' G_CHECK_URL "$(grep -m1 '^[[:blank:]]*deb ' /etc/apt/sources.list | mawk '{print $2}')" # Will exit on failure here then prompt user to configure network
+
+				# - Check NTP synced
+				/DietPi/dietpi/func/run_ntpd
+
+				# - Start DietPi-Update
+				/DietPi/dietpi/dietpi-update 1 # Sets G_DIETPI_INSTALL_STAGE=1
+
+			# 1st run dietpi-software installs
+			elif (( $G_DIETPI_INSTALL_STAGE == 1 )); then
+
+				# - Start DietPi-Software
+				/DietPi/dietpi/dietpi-software 2>&1 | tee $FP_DIETPI_FIRSTRUNSETUP_LOG # Sets G_DIETPI_INSTALL_STAGE=2
+
+				# - done
+				[[ -f $FP_DIETPI_FIRSTRUNSETUP_PID ]] && rm $FP_DIETPI_FIRSTRUNSETUP_PID
+
+			fi
+
+		fi
+
+	}
+
+	Main(){
+
+		# Wait for full system boot
+		local i=0
+		until sudo systemctl -ln 0 --no-pager status dietpi-postboot | grep -qi 'exited' # "sudo" required for non-root logins
+		do
+
+			echo -ne "\e[90m[\e[0m INFO \e[90m]\e[0m Waiting for DietPi-Postboot to finish... (Press CTRL+C to abort) ($((i++)))\r"
+			sleep 1
+
+		done
+
+		while :
+		do
+
+			# Import DietPi-Globals --------------------------------------------------------------
+			. /DietPi/dietpi/func/dietpi-globals
+			G_PROGRAM_NAME='DietPi-Login'
+			#G_INIT # To allow concurrent logins
+			# Import DietPi-Globals --------------------------------------------------------------
+
+			/DietPi/dietpi/func/obtain_network_details
+
+			#----------------------------------------------------------------
+			# Normal Login
+			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
+
+				Show_License
+
+				/DietPi/dietpi/func/dietpi-banner 1
+
+				local auto_start_index=0
+				[[ -f /DietPi/dietpi/.dietpi-autostart_index ]] && auto_start_index=$(</DietPi/dietpi/.dietpi-autostart_index)
+				(( $auto_start_index > 0 )) && Run_AutoStart
+
+				break
+
+			#----------------------------------------------------------------
+			# Run DietPi-Update/DietPi-Software (1st run setup) (G_DIETPI_INSTALL_STAGE=0/1)
+			elif (( $G_DIETPI_INSTALL_STAGE == 0 || $G_DIETPI_INSTALL_STAGE == 1 )); then
+
+				/DietPi/dietpi/func/dietpi-banner 0
+
+				Run_DietPi_First_Run_Setup
+
+			#----------------------------------------------------------------
+			# Unknown install state
+			else
+
+				/DietPi/dietpi/func/dietpi-banner 0
+
+				# - Force interactive mode to show G_WHIP error prompts
+				#   NB: We need to write this to dietpi.txt as well to not have this overwritten on next loop.
+				export G_USER_INPUTS=1
+				G_CONFIG_INJECT 'AUTO_SETUP_AUTOMATED=' 'AUTO_SETUP_AUTOMATED=0' /DietPi/dietpi.txt
+
+				if G_WHIP_DEFAULT_ITEM='yes' G_WHIP_YESNO "[FAILED] Unknown install state/First run setup failed\n
+An error has occured either during first run update or installs.\n
+First run setup will now attempt to re-apply the last step, forced as interactive run.
+If this repeatedly fails, please collect all terminal output and the content of $FP_DIETPI_FIRSTRUNSETUP_LOG if available and report this issue to: https://github.com/MichaIng/DietPi/issues\n
+Would you like to restart the first run setup and installation?"; then
+
+					# - Reset and force re-run of first run
+					killall -qw dietpi-software dietpi-update
+					echo 0 > /DietPi/dietpi/.install_stage
+					[[ -f $FP_DIETPI_FIRSTRUNSETUP_PID ]] && rm $FP_DIETPI_FIRSTRUNSETUP_PID
+
+				else
+
+					break
+
+				fi
+
+			fi
+
+		done
+
+	}
+
+	#/////////////////////////////////////////////////////////////////////////////////////
+	# Main Loop
+	#/////////////////////////////////////////////////////////////////////////////////////
+	Main
+
+	#-----------------------------------------------------------------------------------
+	exit
+	#-----------------------------------------------------------------------------------
+}
diff --git a/dietpi/dietpi-services b/dietpi/dietpi-services
index 75256a26cf..0bbc035aa1 100644
--- a/dietpi/dietpi-services
+++ b/dietpi/dietpi-services
@@ -60,7 +60,7 @@
 		#Backends --------------------------------------------------------------
 		# - MySQL/Databases
 		'redis-server'
-		'mariadb' # 'mysql' applied on Jessie systems during availablility check: https://github.com/Fourdee/DietPi/issues/1000#issuecomment-30776051
+		'mariadb' # 'mysql' applied on Jessie systems during availablility check: https://github.com/MichaIng/DietPi/issues/1000#issuecomment-30776051
 
 		# - PHP
 		'php5-fpm'
@@ -173,7 +173,7 @@
 		# - Network
 		'noip2'
 		'virtualhere'
-		#'pihole-FTL' #: https://github.com/Fourdee/DietPi/issues/1696
+		#'pihole-FTL' #: https://github.com/MichaIng/DietPi/issues/1696
 		'hostapd'
 
 		# - System stats / Management
@@ -190,7 +190,7 @@
 
 	)
 
-	#Additional services: https://github.com/Fourdee/DietPi/issues/1869#issuecomment-401017251
+	#Additional services: https://github.com/MichaIng/DietPi/issues/1869#issuecomment-401017251
 	[[ -f '/etc/rsyncd.conf' ]] && aSERVICE_NAME+=('rsync')
 
 	#Hidden/not-controlled services
@@ -199,17 +199,17 @@
 
 		# - SSH
 		aSERVICE_NAME+=('dropbear')
-		aSERVICE_NAME+=('ssh') 						#: OpenSSH-server
+		aSERVICE_NAME+=('ssh') 				#: OpenSSH-server
 
 		# - Misc
 		#aSERVICE_NAME+=('systemd-timesyncd') 		#: Timesync. DietPi stops this by default after success, may confuse user/prompt questions.
-		aSERVICE_NAME+=('dnsmasq') 					#: https://github.com/Fourdee/DietPi/issues/1501
-		aSERVICE_NAME+=('pihole-FTL')					#: https://github.com/Fourdee/DietPi/issues/1696
-		aSERVICE_NAME+=('openvpn') 					#: https://github.com/Fourdee/DietPi/issues/1501
-		aSERVICE_NAME+=('vncserver') 				#: DietPi vnc server service/script
-		aSERVICE_NAME+=('nxserver') 				#: Nomachine
-		aSERVICE_NAME+=('xrdp') 					#: XRDP server
-		aSERVICE_NAME+=('amiberry') 				#: DietPi AmiBerry run service
+		aSERVICE_NAME+=('dnsmasq') 			#: https://github.com/MichaIng/DietPi/issues/1501
+		aSERVICE_NAME+=('pihole-FTL')			#: https://github.com/MichaIng/DietPi/issues/1696
+		aSERVICE_NAME+=('openvpn') 			#: https://github.com/MichaIng/DietPi/issues/1501
+		aSERVICE_NAME+=('vncserver') 			#: DietPi vnc server service/script
+		aSERVICE_NAME+=('nxserver') 			#: Nomachine
+		aSERVICE_NAME+=('xrdp') 			#: XRDP server
+		aSERVICE_NAME+=('amiberry') 			#: DietPi AmiBerry run service
 
 		# - DietPi
 		aSERVICE_NAME+=('dietpi-ramdisk')
@@ -217,9 +217,9 @@
 		aSERVICE_NAME+=('dietpi-preboot')
 		aSERVICE_NAME+=('dietpi-boot')
 		aSERVICE_NAME+=('dietpi-postboot')
-		aSERVICE_NAME+=('dietpi-wifi-monitor') 		#: https://github.com/Fourdee/DietPi/issues/1288#issuecomment-350653480
-		aSERVICE_NAME+=('dietpi-nordvpn') 			#: NordVPN install + client
-		#aSERVICE_NAME+=('wg-quick@wg0') 			#: Wireguard
+		aSERVICE_NAME+=('dietpi-wifi-monitor') 		#: https://github.com/MichaIng/DietPi/issues/1288#issuecomment-350653480
+		aSERVICE_NAME+=('dietpi-nordvpn') 		#: NordVPN install + client
+		#aSERVICE_NAME+=('wg-quick@wg0') 		#: WireGuard
 
 	fi
 
@@ -288,8 +288,7 @@
 	}
 
 	#Check if service name is available on system.
-	Populate_Available_Array()
-	{
+	Populate_Available_Array(){
 
 		Process_Includes_Excludes
 
@@ -297,7 +296,7 @@
 		dpkg --get-selections | grep -v '^lib' | mawk '{print $1}' > $FP_TEMP
 
 		aSERVICE_AVAILABLE=()
-		for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+		for i in ${!aSERVICE_NAME[@]}
 		do
 
 			aSERVICE_AVAILABLE[$i]=0
@@ -323,8 +322,7 @@
 
 	}
 
-	Print_Status()
-	{
+	Print_Status(){
 
 		#$1 = Method
 		#$2 = name
@@ -373,10 +371,10 @@
 
 				)
 
-				for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+				for i in ${!aSERVICE_NAME[@]}
 				do
 
-					for ((j=0; j<${#aallo_excluded_services_during_stop[@]}; j++))
+					for j in ${!aallo_excluded_services_during_stop[@]}
 					do
 
 						if [[ ${aSERVICE_NAME[$i]} == ${aallo_excluded_services_during_stop[$j]} ]]; then
@@ -427,7 +425,7 @@
 		# - EG: START/RESTART: Standard service order
 		elif (( ! $DISABLE_SERVICES_START )); then
 
-			for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+			for i in ${!aSERVICE_NAME[@]}
 			do
 
 				if (( ${aSERVICE_AVAILABLE[$i]} )); then
@@ -493,14 +491,9 @@ _EOF_
 	if [[ $INPUT_MODE == 'dietpi_controlled' || $INPUT_MODE == 'systemd_controlled' ]]; then
 
 		SYSTEMD_CMD='disable'
+		[[ $INPUT_MODE == 'systemd_controlled' ]] && SYSTEMD_CMD='enable'
 
-		if [[ $INPUT_MODE == 'systemd_controlled' ]]; then
-
-			SYSTEMD_CMD='enable'
-
-		fi
-
-		for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+		for i in ${!aSERVICE_NAME[@]}
 		do
 
 			#Apply
@@ -524,23 +517,18 @@ _EOF_
 
 		#Switch to mask, as DietPi_Controlled uses disable to take over from systemd
 		SYSTEMD_CMD='mask'
-		if [[ $INPUT_MODE == 'enable' || $INPUT_MODE == 'unmask' ]]; then
-
-			SYSTEMD_CMD='unmask'
-
-		fi
+		[[ $INPUT_MODE == 'enable' || $INPUT_MODE == 'unmask' ]] && SYSTEMD_CMD='unmask'
 
 		# - Process ALL known services
 		if [[ $INPUT_S2 == 'all' ]]; then
 
 			[[ $INPUT_MODE == 'disable' || $INPUT_MODE == 'mask' ]] && Set_Running_State stop
 
-			for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+			for i in ${!aSERVICE_NAME[@]}
 			do
 
 				if (( ${aSERVICE_AVAILABLE[$i]} )); then
 
-
 					G_DIETPI-NOTIFY 0 "$INPUT_MODE $INPUT_S2: ${aSERVICE_NAME[$i]}"
 					systemctl $SYSTEMD_CMD ${aSERVICE_NAME[$i]}
 
@@ -554,8 +542,7 @@ _EOF_
 
 			[[ $INPUT_MODE == 'disable' || $INPUT_MODE == 'mask' ]] && systemctl stop $INPUT_S2
 
-			systemctl $SYSTEMD_CMD $INPUT_S2
-			if (( $? == 0 )); then
+			if systemctl $SYSTEMD_CMD $INPUT_S2; then
 
 				G_DIETPI-NOTIFY 0 "$INPUT_MODE $INPUT_S2"
 
@@ -569,30 +556,26 @@ _EOF_
 
 		systemctl daemon-reload
 
-		if [[ $INPUT_MODE == 'unmask' || $INPUT_MODE == 'enable' ]]; then
-
-			Set_Running_State start
-
-		fi
+		[[ $INPUT_MODE == 'unmask' || $INPUT_MODE == 'enable' ]] && Set_Running_State start
 
 	#-----------------------------------------------------------------------------------
 	#status
 	elif [[ $INPUT_MODE == 'status' ]]; then
 
-		for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
+		for i in ${!aSERVICE_NAME[@]}
 		do
 
 			#Apply
 			if (( ${aSERVICE_AVAILABLE[$i]} )); then
 
-				STATUS="${aSERVICE_NAME[$i]}\t$(systemctl status ${aSERVICE_NAME[$i]} | grep -m1 'Active' | cut -c12-)"
+				STATUS=${aSERVICE_NAME[$i]}\t$(systemctl status ${aSERVICE_NAME[$i]} | grep -m1 'Active' | cut -c12-)
 
-				if [[ $STATUS =~ .*'failed'.* ]]; then
+				if [[ $STATUS =~ 'failed' ]]; then
 
 					G_DIETPI-NOTIFY 1 "$STATUS"
-					systemctl status ${aSERVICE_NAME[$i]} -l --no-pager
+					systemctl -l --no-pager status ${aSERVICE_NAME[$i]}
 
-				elif [[ $STATUS =~ .*'inactive'.* ]]; then
+				elif [[ $STATUS =~ 'inactive' ]]; then
 
 					G_DIETPI-NOTIFY 2 "$STATUS"
 
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 67eb37632f..9576471ba3 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -108,7 +108,7 @@ _EOF_
 		#Load
 		[[ -f $fp_target ]] && . $fp_target
 
-		#Always reset choice system during first run to defaults: https://github.com/Fourdee/DietPi/issues/1122
+		#Always reset choice system during first run to defaults: https://github.com/MichaIng/DietPi/issues/1122
 		if (( $G_DIETPI_INSTALL_STAGE == 1 )); then
 
 			INDEX_SSHSERVER_CURRENT=-1
@@ -133,7 +133,7 @@ _EOF_
 
 		# Internet
 		# - Use /etc/apt/sources.list for connection test
-		optional_cmd_inputs='--no-check-certificate' G_CHECK_URL "$(grep -m1 '^[[:blank:]]*deb ' /etc/apt/sources.list | awk '{print $2}')" # Will exit on failure here then prompt user to configure network
+		optional_cmd_inputs='--no-check-certificate' G_CHECK_URL "$(grep -m1 '^[[:blank:]]*deb ' /etc/apt/sources.list | mawk '{print $2}')" # Will exit on failure here then prompt user to configure network
 
 		/DietPi/dietpi/func/run_ntpd
 
@@ -156,7 +156,10 @@ _EOF_
 		# - Encrypted
 		if [[ -r '/var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin' ]]; then
 
-			GLOBAL_PW=$(cat /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin | openssl enc -base64 -d -aes-256-cbc -nosalt -pass pass:'DietPiRocks!')
+			# - Use new "pbkdf2" function on Buster to resolve warning about deprecated key derivation used: https://github.com/MichaIng/DietPi/issues/2213
+			local pbkdf2=''
+			(( $G_DISTRO > 4 )) && pbkdf2='-iter 10000'
+			GLOBAL_PW=$(openssl enc -d -a -aes-256-cbc $pbkdf2 -salt -pass pass:'DietPiRocks!' -in /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin)
 
 		# - 1st run automated setup only
 		else
@@ -176,7 +179,7 @@ _EOF_
 	}
 
 	#Total system RAM (used to calculate percentage based value for software cache levels, eg: opcache/apcu max sizes)
-	RAM_TOTAL=$(free -m | grep -m1 'Mem:' | awk '{print $2}')
+	RAM_TOTAL=$(free -m | mawk '/Mem:/ {print $2;exit}')
 
 	#Run Installation Flag (1 = run installs)
 	GOSTARTINSTALL=0
@@ -256,7 +259,7 @@ _EOF_
 	#
 	# Reference:
 	# - Adding new software to DietPi-Software:
-	#   https://github.com/Fourdee/DietPi/issues/490#issuecomment-244416570
+	#   https://github.com/MichaIng/DietPi/issues/490#issuecomment-244416570
 	#
 	# Adding software to the install list:
 	# ------------------------------------
@@ -552,7 +555,7 @@ _EOF_
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=13978#p13978'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=13978#p13978'
 
 		#------------------
 		software_id=119
@@ -562,7 +565,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=3928#p3928'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=3928#p3928'
 
 		#------------------
 		software_id=33
@@ -595,7 +598,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='logitech media server (lms)'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1009#p1009'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1009#p1009'
 
 		#------------------
 		software_id=36
@@ -605,7 +608,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1009#p1009'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1009#p1009'
 
 		#------------------
 		software_id=37
@@ -615,7 +618,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1221#p1221'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1221#p1221'
 
 		#------------------
 		software_id=39
@@ -648,11 +651,14 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface media streaming server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1789#p1789'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1789#p1789'
 
-		# - Disable for ARM6: https://github.com/Fourdee/DietPi/issues/534#issuecomment-416405968
+		# - Disable for ARMv6: https://github.com/MichaIng/DietPi/issues/534#issuecomment-416405968
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 
+		# - Disable for all ARM on Jessie: https://github.com/MichaIng/DietPi/issues/2521
+		(( $G_DISTRO < 4 )) && aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,2]=0 && aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
+
 		#------------------
 		software_id=42
 
@@ -660,9 +666,9 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface media streaming server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1949#p1949'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1949#p1949'
 
-		# - Disable for ARMv6: https://github.com/Fourdee/DietPi/issues/648
+		# - Disable for ARMv6: https://github.com/MichaIng/DietPi/issues/648
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 
 		#------------------
@@ -672,7 +678,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='mumble voip server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1691#p1691'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1691#p1691'
 
 		#------------------
 		software_id=118
@@ -724,7 +730,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='feature-rich, web interface audio player for mpd'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=5171#p5171'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=5171#p5171'
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
 		aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1
 			  aSOFTWARE_REQUIRES_PHP[$software_id]=1
@@ -741,7 +747,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6526#p6526'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6526#p6526'
 
 		# - VM
 		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,20]=0
@@ -753,7 +759,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface for spotify premium'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7013#p7013'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7013#p7013'
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
 
 		# - Currently ARMv7+ only, so disable all archs, then re-enable armv7+
@@ -788,7 +794,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='monitoring and tracking tool for Plex'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7463#p7463'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7463#p7463'
  			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
 
 		#------------------
@@ -798,7 +804,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='Roon capable audio player and core'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7966#p7966'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7966#p7966'
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
 		   aSOFTWARE_REQUIRES_FFMPEG[$software_id]=1
 
@@ -836,12 +842,12 @@ _EOF_
 		#------------------
 		software_id=163
 
-				 aSOFTWARE_WHIP_NAME[$software_id]='Gmediarender'
+				 aSOFTWARE_WHIP_NAME[$software_id]='GMediaRender'
 				 aSOFTWARE_WHIP_DESC[$software_id]='DLNA audio render/endpoint'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=9012#p9012'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9012#p9012'
 
 		#------------------
 		software_id=167
@@ -851,7 +857,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=9368#p9368'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9368#p9368'
 
 		# Disable for ARMv8 + x86_64:
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
@@ -865,7 +871,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 					  aSOFTWARE_TYPE[$software_id]=0
 	 aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=12969#p12969'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=12969#p12969'
 
 		#------------------
 		software_id=86
@@ -876,7 +882,7 @@ _EOF_
 					  aSOFTWARE_TYPE[$software_id]=0
 			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
 		   aSOFTWARE_REQUIRES_NODEJS[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=13160#p13160'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=13160#p13160'
 
 		#BitTorrent
 		#--------------------------------------------------------------------------------
@@ -886,7 +892,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='bittorrent server with web interface (c)'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5#p46'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=46#p46'
 
 		#------------------
 		software_id=45
@@ -895,7 +901,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='bittorrent server with web interface (python)'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&start=10#p61'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=61#p61'
 
 		#------------------
 		software_id=46
@@ -933,7 +939,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='download manager with web interface'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6177#p6177'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6177#p6177'
 		aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1
 			  aSOFTWARE_REQUIRES_PHP[$software_id]=1
 		   aSOFTWARE_REQUIRES_SQLITE[$software_id]=1
@@ -955,7 +961,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='automatically download movies'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6747#p6747'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6747#p6747'
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
 			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
 
@@ -966,7 +972,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='automatically download TV shows'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7455#p7455'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7455#p7455'
 		   aSOFTWARE_REQUIRES_SQLITE[$software_id]=1
 
 		#------------------
@@ -976,7 +982,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='automatically download movies'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7457#p7457'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7457#p7457'
 		   aSOFTWARE_REQUIRES_SQLITE[$software_id]=1
 
 		#------------------
@@ -1005,7 +1011,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='nzb download manager'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7575#p7575'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7575#p7575'
 
 		#------------------ BitTorrent: HTPC Manager ------------------
 		software_id=155
@@ -1015,7 +1021,7 @@ _EOF_
 			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=3
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=8043#p8043'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=8043#p8043'
 
 		#Cloud / Backups
 		#--------------------------------------------------------------------------------
@@ -1066,7 +1072,7 @@ _EOF_
 		aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1
 			  aSOFTWARE_REQUIRES_PHP[$software_id]=1
 			aSOFTWARE_REQUIRES_MYSQL[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1064#p1064'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1064#p1064'
 
 		#------------------
 		software_id=111
@@ -1075,7 +1081,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='full system backup server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=4
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=65#p65'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=65#p65'
 
 		# No deb packages for ARMv6:
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
@@ -1110,7 +1116,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='lightweight cloud based backup system'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=4
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6476#p6476'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6476#p6476'
 
 		# - ARMv6
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
@@ -1144,7 +1150,7 @@ _EOF_
 						 aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_GIT[$software_id]=1
 			 aSOFTWARE_REQUIRES_MYSQL[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=9863#p9863'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9863#p9863'
 
 
 		#Emulation / Gaming
@@ -1198,7 +1204,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=2963#p2963'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=2963#p2963'
 
 		# - Disable for All non-RPi
 		for ((i=10; i<=$MAX_G_HW_MODEL; i++))
@@ -1240,7 +1246,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='client'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=8016#p8016'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=8016#p8016'
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
 	  aSOFTWARE_REQUIRES_XSERVERXORG[$software_id]=1
 		  aSOFTWARE_REQUIRES_DESKTOP[$software_id]=1
@@ -1261,7 +1267,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 					  aSOFTWARE_TYPE[$software_id]=0
 	   aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=10675#p10675'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=10675#p10675'
 
 		#Social Media
 		#--------------------------------------------------------------------------------
@@ -1333,7 +1339,7 @@ _EOF_
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
 			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
 		  aSOFTWARE_REQUIRES_USERINPUT[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1796#p1796'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1796#p1796'
 
 		#------------------
 		software_id=133
@@ -1343,7 +1349,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=6
 					  aSOFTWARE_TYPE[$software_id]=0
 	   aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6202#p6202'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6202#p6202'
 
 		#------------------
 		software_id=2
@@ -1352,7 +1358,7 @@ _EOF_
 		aSOFTWARE_WHIP_DESC[$software_id]='distributed disease research project'
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=20
 		aSOFTWARE_TYPE[$software_id]=0
-		aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=13704#p13704'
+		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=13704#p13704'
 		# - x86_64 only
 		for ((i=1; i<$MAX_G_HW_ARCH; i++))
 		do
@@ -1360,7 +1366,7 @@ _EOF_
 			aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,$i]=0
 
 		done
-		# - Not supported on Jessie: https://github.com/Fourdee/DietPi/pull/1992#issuecomment-410772255
+		# - Not supported on Jessie: https://github.com/MichaIng/DietPi/pull/1992#issuecomment-410772255
 		aSOFTWARE_AVAIL_G_DISTRO[$software_id,3]=0
 
 		#------------------
@@ -1392,7 +1398,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface & surveillance for your camera'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=7
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6610#p6610'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6610#p6610'
  		   aSOFTWARE_REQUIRES_FFMPEG[$software_id]=1
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
 
@@ -1413,7 +1419,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='turn your device into a wifi hotspot'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=8
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1207#p1207'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1207#p1207'
 
 		# - VM
 		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,20]=0
@@ -1425,7 +1431,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='optional: route hotspot traffic through tor'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=8
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1529#p1529'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1529#p1529'
 
 		# - VM
 		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,20]=0
@@ -1462,7 +1468,7 @@ _EOF_
 					  aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1
 			  aSOFTWARE_REQUIRES_PHP[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&start=30#p451'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=451#p451'
 
 		#------------------
 		software_id=65
@@ -1471,8 +1477,9 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='real-time performance monitoring'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=9
 					  aSOFTWARE_TYPE[$software_id]=0
-		   aSOFTWARE_REQUIRES_NODEJS[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&start=60#p1611'
+		# Node.js only required for our custom package
+		(( $G_DISTRO < 4 || ( $G_HW_MODEL < 10 && $G_DISTRO < 5 ) )) && aSOFTWARE_REQUIRES_NODEJS[$software_id]=1
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1611#p1611'
 
 		#------------------
 		software_id=66
@@ -1481,7 +1488,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface system stats'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=9
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&start=50#p1503'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1503#p1503'
 
 		# - Disable for All non-RPi
 		for ((i=10; i<=$MAX_G_HW_MODEL; i++))
@@ -1527,11 +1534,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='(Weaved) access your device over the internet'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=10
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&start=20#p188'
-
-		# - Currently ARMv6/7 only
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]=0
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=188#p188'
 
 		#------------------
 		software_id=138
@@ -1540,7 +1543,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='server: share USB devices over the network'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=10
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6709#p6709'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6709#p6709'
 
 		#------------------
 
@@ -1570,7 +1573,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=11
 					  aSOFTWARE_TYPE[$software_id]=0
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1066#p1066'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1066#p1066'
 
 		# - RPi / Odroids
 		for ((i=20; i<=$MAX_G_HW_MODEL; i++))
@@ -1624,7 +1627,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='pisupply ups'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=11
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=10740#p10740'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=10740#p10740'
 
 		# - Disable for All non-RPi
 		for ((i=10; i<=$MAX_G_HW_MODEL; i++))
@@ -1661,7 +1664,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='msg controller for blynk mobile app and sbcs'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=11
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=5901#p5901'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=5901#p5901'
 	   aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
 		   aSOFTWARE_REQUIRES_NODEJS[$software_id]=1
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
@@ -1673,7 +1676,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='audiophonics pi-spc power control module'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=11
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=9359#p9359'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9359#p9359'
 
 		# - Disable for All non-RPi
 		for ((i=10; i<=$MAX_G_HW_MODEL; i++))
@@ -1692,7 +1695,7 @@ _EOF_
 					  aSOFTWARE_TYPE[$software_id]=0
 			 aSOFTWARE_REQUIRES_ALSA[$software_id]=1
  			  aSOFTWARE_REQUIRES_GIT[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=9486#p9486'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9486#p9486'
 
 		# - Disable for All non-RPi
 		for ((i=10; i<=$MAX_G_HW_MODEL; i++))
@@ -1776,7 +1779,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='lighttpd | sqlite  | php'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1335#p1335'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1335#p1335'
 
 		#------------------
 		software_id=82
@@ -1805,7 +1808,7 @@ _EOF_
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=-1
 			aSOFTWARE_REQUIRES_PHP[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1335#p1335'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1335#p1335'
 
 		#------------------
 		software_id=85
@@ -1824,7 +1827,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='database'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=-1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1335#p1335'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1335#p1335'
 
 		#------------------
 		software_id=88
@@ -1833,7 +1836,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='database'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=-1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1335#p1335'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1335#p1335'
 
 		#------------------
 		software_id=89
@@ -1842,7 +1845,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='webserver'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=-1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1335#p1335'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1335#p1335'
 
 		#------------------
 		software_id=90
@@ -1880,7 +1883,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='apache tomcat server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=13
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=4316#p4316'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=4316#p4316'
 	 aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1
 
 		#PiHole
@@ -1915,7 +1918,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='alternative ftp server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=15
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='?f=8&t=5&p=2820#p2820'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=2820#p2820'
 
 		#------------------
 		software_id=96
@@ -2054,7 +2057,7 @@ _EOF_
 			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=6630#p6630'
  		  aSOFTWARE_REQUIRES_RSYSLOG[$software_id]=1 #Not required, but comes in as package dep
 
-		#Disabled for ARMv8 on Jessie only: https://github.com/Fourdee/DietPi/issues/855#issuecomment-292712002
+		#Disabled for ARMv8 on Jessie only: https://github.com/MichaIng/DietPi/issues/855#issuecomment-292712002
 		(( $G_DISTRO == 3 )) && aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
 
 		#------------------
@@ -2064,7 +2067,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='web interface for controlling 3d printers'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=19
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=7958#p7958'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7958#p7958'
    aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
    			  aSOFTWARE_REQUIRES_GIT[$software_id]=1 # Required for updates
 
@@ -2457,7 +2460,7 @@ _EOF_
 		fi
 
 		#Additional software that requires VNC4server
-		#	XRDP: https://github.com/Fourdee/DietPi/issues/1727
+		#	XRDP: https://github.com/MichaIng/DietPi/issues/1727
 		software_id=28
 		if (( $G_DISTRO >= 4 && ${aSOFTWARE_INSTALL_STATE[29]} == 1 )); then
 
@@ -2559,7 +2562,7 @@ _EOF_
 
 		fi
 
-		#Software that requires Python-Pip: https://github.com/Fourdee/DietPi/issues/784
+		#Software that requires Python-Pip: https://github.com/MichaIng/DietPi/issues/784
 		software_id=130
 		if (( ${aSOFTWARE_INSTALL_STATE[99]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[118]} == 1 ||
@@ -2902,7 +2905,7 @@ _EOF_
 		mkdir -p /var/lib/dietpi/dietpi-software/installed/desktop/wallpapers
 
 		# - Copy DietPi favourite links
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/gtk/.gtk-bookmarks -O $HOME/.gtk-bookmarks
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/gtk/.gtk-bookmarks -O $HOME/.gtk-bookmarks
 
 		# - DietPi Apps to download
 		local adesktop_items=(
@@ -2930,21 +2933,21 @@ _EOF_
 		for (( i=0; i<${#adesktop_items[@]}; i++))
 		do
 
-			G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/apps/${adesktop_items[$i]} -O /usr/share/applications/${adesktop_items[$i]}
+			G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/apps/${adesktop_items[$i]} -O /usr/share/applications/${adesktop_items[$i]}
 
 		done
 
 		unset adesktop_items
 
 		# - icons
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/icons/dietpi-icon.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/dietpi-icon.png
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/icons/grey_16x16.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/grey_16x16.png
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/icons/kodi-icon.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/kodi-icon.png
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/icons/justboom.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/justboom.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/icons/dietpi-icon.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/dietpi-icon.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/icons/grey_16x16.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/grey_16x16.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/icons/kodi-icon.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/kodi-icon.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/icons/justboom.png -O /var/lib/dietpi/dietpi-software/installed/desktop/icons/justboom.png
 
 		# - Wallpapers
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/wallpapers/dietpi-logo_inverted_1080p.png -O /var/lib/dietpi/dietpi-software/installed/desktop/wallpapers/dietpi-logo_inverted_1080p.png
-		G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/wallpapers/dietpi-logo_1080p.png -O /var/lib/dietpi/dietpi-software/installed/desktop/wallpapers/dietpi-logo_1080p.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/wallpapers/dietpi-logo_inverted_1080p.png -O /var/lib/dietpi/dietpi-software/installed/desktop/wallpapers/dietpi-logo_inverted_1080p.png
+		G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/wallpapers/dietpi-logo_1080p.png -O /var/lib/dietpi/dietpi-software/installed/desktop/wallpapers/dietpi-logo_1080p.png
 
 		G_THREAD_WAIT
 
@@ -3003,11 +3006,7 @@ _EOF_
 			output=2
 
 			# - Bump up for x86
-			if (( $G_HW_MODEL == 20 || $G_HW_MODEL == 21 )); then
-
-				output=3
-
-			fi
+			(( $G_HW_ARCH == 10 )) && output=3
 
 		#Max global connections
 		elif (( $1 == 2 )); then
@@ -3090,7 +3089,7 @@ _EOF_
 		if (( $dps_index >= 0 )); then
 
 			type=$url
-			url="https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/dps_$dps_index/$type"
+			url="https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/dps_$dps_index/$type"
 
 		fi
 
@@ -3151,7 +3150,7 @@ _EOF_
 		elif [[ $type == 7z ]]; then
 
 			[[ $target ]] && target="-o$target"
-			l_message='Extracting 7zip archive' G_RUN_CMD 7za x -y $file $target
+			l_message='Extracting 7zip archive' G_RUN_CMD 7zr x -y $file $target
 
 		else
 
@@ -3168,7 +3167,7 @@ _EOF_
 	#
 	# Reference:
 	# - Adding new software to DietPi-Software
-	#   https://github.com/Fourdee/DietPi/issues/490#issuecomment-244416570
+	#   https://github.com/MichaIng/DietPi/issues/490#issuecomment-244416570
 	#
 	# Installing the software:
 	# ------------------------------------
@@ -3230,7 +3229,7 @@ _EOF_
 			G_AGI lxde upower policykit-1 firefox-esr
 			#upower policykit-1. Needed for LXDE logout menu item to show shutdown/restart ...
 
-			#RPi, revert to Debian pcmanfm install package: https://github.com/Fourdee/DietPi/issues/1558#issuecomment-390328173
+			#RPi, revert to Debian pcmanfm install package: https://github.com/MichaIng/DietPi/issues/1558#issuecomment-390328173
 			if (( $G_HW_MODEL < 10 )); then
 
 				Download_Install 'https://dietpi.com/downloads/binaries/all/pcmanfm_1.2.5-3_armhf.deb'
@@ -3326,7 +3325,7 @@ _EOF_
 
 			Banner_Installing
 
-			# Link disk cache to RAM: https://github.com/Fourdee/DietPi/issues/2396
+			# Link disk cache to RAM: https://github.com/MichaIng/DietPi/issues/2396
 			# - Remove previous disk cache dir or symlink
 			[[ -e /var/cache/samba ]] && rm -R /var/cache/samba
 			# - Pre-create RAM cache dir
@@ -3449,7 +3448,7 @@ _EOF_
 			fi
 			G_AGI "$package_list"
 
-			# - Remove mysql.service as we use mariadb.service, both cannot exist: https://github.com/Fourdee/DietPi/issues/1913#issuecomment-441343798
+			# - Remove mysql.service as we use mariadb.service, both cannot exist: https://github.com/MichaIng/DietPi/issues/1913#issuecomment-441343798
 			if [[ -f /etc/init.d/mysql ]] && (( $G_DISTRO >= 4 )); then
 
 				G_DIETPI-NOTIFY 2 'Switching from /etc/init.d/mysql to mariadb.service'
@@ -3564,7 +3563,7 @@ _EOF_
 			elif (( ${aSOFTWARE_INSTALL_STATE[84]} == 1 )); then
 
 				debconf-set-selections <<< 'phpmyadmin phpmyadmin/reconfigure-webserver multiselect lighttpd'
-				# Workaround an APT error, when installing lighttpd and phpmyadmin in the same session: https://github.com/Fourdee/DietPi/issues/316
+				# Workaround an APT error, when installing lighttpd and phpmyadmin in the same session: https://github.com/MichaIng/DietPi/issues/316
 				G_ERROR_HANDLER_NO_FAIL=1 G_AGI phpmyadmin
 				G_WHIP_MSG 'Working around Lighttpd + phpMyAdmin APT errors:\n\nYou may have seen an error during the phpMyAdmin APT installation. This occurs, when Lighttpd webserver was installed within the same session.\n
 We work around this error by running APT a second time. Please do not worry and ignore any error or failure message within this install steps. After DietPi-Software finished, Lighttpd should start up and phpMyAdmin web UI should be available as expected.'
@@ -3592,7 +3591,7 @@ We work around this error by running APT a second time. Please do not worry and
 				if (( $G_HW_ARCH == 3 )); then
 
 					# libupnp6 for net discov with upnp/avahi
-					DEPS_LIST='libupnp6 libwrap0 libmpdclient2 libao-common libao4 libasound2 libasound2-data libasyncns0 libaudiofile1 libavahi-client3 libavahi-common-data libavahi-common3 libavcodec56 libavformat56 libavresample2 libavutil54 libbinio1ldbl libcaca0 libcdio-cdda1 libcdio-paranoia1 libcdio13 libcups2 libcurl3-gnutls libdirectfb-1.2-9 libdnet libfaad2 libflac8 libfluidsynth1 libgme0 libgomp1 libgsm1 libice6 libid3tag0 libiso9660-8 libjack-jackd2-0 libjson-c2 libldb1 libmad0 libmikmod3 libmms0 libmodplug1 libmp3lame0 libmpcdec6 libmpg123-0 libnfs4 libntdb1 libogg0 libopenal-data libopenal1 libopenjpeg5 libopus0 liborc-0.4-0 libpulse0 libresid-builder0c2a libroar2 libsamplerate0 libschroedinger-1.0-0 libsdl1.2debian libshout3 libsidplay2 libsidutils0 libslp1 libsm6 libsmbclient libsndfile1 libsoxr0 libspeex1 libspeexdsp1 libsqlite3-0 libtalloc2 libtdb1 libtevent0 libtheora0 libupnp6 libva1 libvorbis0a libvorbisenc2 libvorbisfile3 libvpx1 libwavpack1 libwbclient0 libwildmidi-config libwildmidi1 libx11-6 libx11-data libx11-xcb1 libx264-142 libxau6 libxcb1 libxdmcp6 libxext6 libxi6 libxtst6 libxvidcore4 libyajl2 libzzip-0-13 mime-support python python-talloc python2.7 samba-libs x11-common file'
+					DEPS_LIST='libupnp6 libwrap0 libmpdclient2 libao-common libao4 libasound2 libasound2-data libasyncns0 libaudiofile1 libavahi-client3 libavahi-common-data libavahi-common3 libavcodec56 libavformat56 libavresample2 libavutil54 libbinio1ldbl libcaca0 libcdio-cdda1 libcdio-paranoia1 libcdio13 libcups2 libcurl3-gnutls libdirectfb-1.2-9 libdnet libfaad2 libflac8 libfluidsynth1 libgme0 libgomp1 libgsm1 libice6 libid3tag0 libiso9660-8 libjack-jackd2-0 libjson-c2 libldb1 libmad0 libmikmod3 libmms0 libmodplug1 libmp3lame0 libmpcdec6 libmpg123-0 libnfs4 libntdb1 libogg0 libopenal-data libopenal1 libopenjpeg5 libopus0 liborc-0.4-0 libpulse0 libresid-builder0c2a libroar2 libsamplerate0 libschroedinger-1.0-0 libsdl1.2debian libshout3 libsidplay2 libsidutils0 libslp1 libsm6 libsmbclient libsndfile1 libsoxr0 libspeex1 libspeexdsp1 libsqlite3-0 libtalloc2 libtdb1 libtevent0 libtheora0 libva1 libvorbis0a libvorbisenc2 libvorbisfile3 libvpx1 libwavpack1 libwbclient0 libwildmidi-config libwildmidi1 libx11-6 libx11-data libx11-xcb1 libx264-142 libxau6 libxcb1 libxdmcp6 libxext6 libxi6 libxtst6 libxvidcore4 libyajl2 libzzip-0-13 mime-support python python-talloc python2.7 samba-libs x11-common file'
 					Download_Install 'https://dietpi.com/downloads/binaries/all/mpd_0.20.18-1_armv8.deb'
 
 				else
@@ -3612,8 +3611,8 @@ We work around this error by running APT a second time. Please do not worry and
 			#Buster+
 			else
 
-				# libcdio-paranoia1 and libiso9660-8 not available, but ibcdio-paranoia2 and libiso9660-11 instead
-				# Buster repo version >= 0.20.23, thus stay with APT for now:
+				# libcdio-paranoia1, libiso9660-8 and libupnp6 not available, but ibcdio-paranoia2, libiso9660-11 and libupnp13 instead
+				# Buster repo version >= 0.21.4, thus stay with APT for now:
 				G_AGI mpd
 
 			fi
@@ -3696,7 +3695,7 @@ _EOF_
 
 			Banner_Installing
 
-			# - We must uninstall previous package for reinstall, else it will fail: https://github.com/Fourdee/DietPi/issue_comments#issuecomment-411688073
+			# - We must uninstall previous package for reinstall, else it will fail: https://github.com/MichaIng/DietPi/issue_comments#issuecomment-411688073
 			if dpkg-query -s 'fahclient' &> /dev/null; then
 
 				G_DIETPI-NOTIFY 2 'Removing previous package before installing the latest version'
@@ -3811,7 +3810,7 @@ _EOF_
 
 			Banner_Installing
 
-			# Jessie: https://github.com/Fourdee/DietPi/issues/1620#issuecomment-373086888
+			# Jessie: https://github.com/MichaIng/DietPi/issues/1620#issuecomment-373086888
 			if (( $G_DISTRO == 3 )); then
 
 				INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/libssl1.1_1.1.0f-3+deb9u1_'
@@ -3951,7 +3950,7 @@ _EOF_
 			elif (( $G_HW_ARCH == 3 )); then
 
 				INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/cava_0.6.1-1_arm64.deb'
-				# Using older binary for Odroid C2 due to: https://github.com/Fourdee/DietPi/issues/1340#issuecomment-393225267
+				# Using older binary for Odroid C2 due to: https://github.com/MichaIng/DietPi/issues/1340#issuecomment-393225267
 				if (( $G_HW_MODEL == 12 )); then
 
 					INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/cava_0.4.2_arm64.deb'
@@ -4038,7 +4037,7 @@ _EOF_
 
 			fi
 
-			# - libcurl3-gnutls required for C2. But lets apply to all: https://github.com/Fourdee/DietPi/issues/446
+			# - libcurl3-gnutls required for C2. But lets apply to all: https://github.com/MichaIng/DietPi/issues/446
 			package_list+=' libcurl3-gnutls'
 
 			# - NFS/CEC support
@@ -4052,7 +4051,7 @@ _EOF_
 
 			else
 
-				package_list+=' libnfs11 libcec4'
+				package_list+=' libnfs12 libcec4'
 
 			fi
 
@@ -4111,7 +4110,7 @@ _EOF_
 			G_BACKUP_FP $G_FP_DIETPI_USERDATA/amiberry/conf/autostart.uae
 
 			DEPS_LIST='libmpg123-0 libxml2 mpeg2dec libmpeg2-4 libsndio6.1'
-			Download_Install 'https://dietpi.com/downloads/binaries/all/amiberry_v2.24.7z' $G_FP_DIETPI_USERDATA
+			Download_Install 'https://dietpi.com/downloads/binaries/all/amiberry_v2.25.7z' $G_FP_DIETPI_USERDATA
 
 		fi
 
@@ -4126,28 +4125,27 @@ _EOF_
 
 		fi
 
-		#urbackup server
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
 
-			if (( $G_HW_ARCH == 10 )); then
-
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server_2.2.11_amd64.deb'
+			# ARMv7
+			INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server_2.3.7_armhf.deb'
 
-			elif (( $G_HW_ARCH == 2 )); then
+			# x86_64
+			if (( $G_HW_ARCH == 10 )); then
 
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server_2.2.11_armhf.deb'
+				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server_2.3.7_amd64.deb'
 
-			#ARMv8 sourcebuild
+			# ARMv8 source
 			elif (( $G_HW_ARCH == 3 )); then
 
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server-2.2.11.tar.gz'
+				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server-2.3.7.tar.gz'
 
 			fi
 
-			#ARMv8 source build
+			# ARMv8 source build
 			if (( $G_HW_ARCH == 3 )); then
 
 				DEPS_LIST='build-essential zlib1g-dev libcurl4-openssl-dev libcrypto++-dev sqlite3'
@@ -4167,7 +4165,7 @@ _EOF_
 				cd /tmp/$G_PROGRAM_NAME
 				rm -R urbackup-server-*
 
-			#Deb
+			# Deb
 			else
 
 				debconf-set-selections <<< "urbackup-server urbackup/backuppath string $G_FP_DIETPI_USERDATA/urbackup"
@@ -4229,12 +4227,11 @@ _EOF_
 
 		fi
 
-		#DELUGE
-		software_id=45
+		software_id=45 # Deluge
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
-			G_AGI deluged deluge-web deluge-webui deluge-console
+			G_AGI deluged deluge-web deluge-console
 
 		fi
 
@@ -4294,7 +4291,7 @@ _EOF_
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
 			# - Check free available memory. Increase swapfile size to prevent gravity running out of mem.
-			if (( $(free -m | grep -m1 'Mem:' | awk '{print $4}') < 512 &&
+			if (( $(free -m | mawk '/Mem:/ {print $4;exit}') < 512 &&
 				$(grep -m1 '^[[:blank:]]*AUTO_SETUP_SWAPFILE_SIZE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//') < 512 )); then
 
 				G_DIETPI-NOTIFY 2 'Increasing swapfile size to 512MB before running gravity.sh, please wait...\n'
@@ -4321,7 +4318,7 @@ _EOF_
 			G_CHECK_URL "$INSTALL_URL_ADDRESS" #full filepath below, returns --spider error :(
 			INSTALL_URL_ADDRESS=$(curl -s "$INSTALL_URL_ADDRESS" | grep -m1 'browser_download_url.*\.war"' | cut -d \" -f 4)
 
-			mkdir -p $G_FP_DIETPI_USERDATA/airsonic
+			mkdir -p $G_FP_DIETPI_USERDATA/airsonic/transcode
 			wget "$INSTALL_URL_ADDRESS" -O $G_FP_DIETPI_USERDATA/airsonic/airsonic.war
 
 		fi
@@ -4331,17 +4328,35 @@ _EOF_
 
 			Banner_Installing
 
-			#G_AGI lame #conflicts with our ffmpeg package: https://github.com/Fourdee/DietPi/issues/946#issuecomment-300738228
+			#G_AGI lame #conflicts with our ffmpeg package: https://github.com/MichaIng/DietPi/issues/946#issuecomment-300738228
 			Download_Install 'https://dietpi.com/downloads/binaries/all/subsonic-6.1.3.deb'
 
 		fi
 
-		#WEAVED
-		software_id=68
+		software_id=68 # Remot3.it (previously Weaved)
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
-			Download_Install 'https://github.com/weaved/installer/raw/master/Raspbian%20deb/1.3-07/weavedconnectd_1.3-07z1_armhf.deb'
+			INSTALL_URL_ADDRESS='https://api.github.com/repos/remoteit/installer/releases/latest'
+			G_CHECK_URL "$INSTALL_URL_ADDRESS"
+
+			# ARMv6/7
+			local arch='armhf'
+
+			# ARMv8
+			if (( $G_HW_ARCH == 3 )); then
+
+				arch='arm64'
+
+			# x86_64
+			elif (( $G_HW_ARCH == 10 )); then
+
+				arch='amd64'
+
+			fi
+
+			INSTALL_URL_ADDRESS=$(curl -s "$INSTALL_URL_ADDRESS" | grep -m1 "browser_download_url.*connectd_.*_$arch\.deb" | cut -d \" -f 4)
+			no_check_url=1 Download_Install "$INSTALL_URL_ADDRESS"
 
 		fi
 
@@ -4699,7 +4714,7 @@ _EOF_
 
 			Banner_Installing
 
-			>> /var/log/auth.log #: https://github.com/Fourdee/DietPi/issues/475#issuecomment-310873879
+			>> /var/log/auth.log #: https://github.com/MichaIng/DietPi/issues/475#issuecomment-310873879
 
 			G_AGI python3-systemd fail2ban
 
@@ -4828,7 +4843,7 @@ _EOF_
 
 			G_AGI lsb-release iptables-persistent dnsutils expect net-tools openvpn
 
-			# - Requires underpriv user: https://github.com/Fourdee/DietPi/issues/570#issuecomment-255588307
+			# - Requires underpriv user: https://github.com/MichaIng/DietPi/issues/570#issuecomment-255588307
 			useradd pivpn
 			mkdir -p /home/pivpn
 
@@ -4902,24 +4917,30 @@ _EOF_
 			# Odroids need to purge before we install, else, does not update to latest version...
 			(( $G_HW_MODEL >= 10 && $G_HW_MODEL < 20 )) && G_AGP $kernel_packages
 
-			# Since G_AGUG does not upgrade packages with changed dependencies, in case of kernel image meta packages, those need to be installed via G_AGI.
+			# Since G_AGUG does not upgrade packages with changed dependencies, in case of kernel image meta packages, those need to be installed+upgraded via G_AGI.
 			G_AGI $kernel_packages # apt-get install overrides hold state
 
-			# Add Debian "sid" repo, which contains the wireguard packages
+			# Add Debian "sid" repo, which contains the WireGuard packages
 			echo 'deb https://deb.debian.org/debian/ sid main' > /etc/apt/sources.list.d/dietpi-wireguard.list
-			# - Set "sid" priority low enough to only install packages that are not available in main repo(s)
-			echo -e 'Package: *\nPin: release n=sid\nPin-Priority: 99' > /etc/apt/preferences.d/dietpi-wireguard
+			# - Disable sid repo via priority "-1", to prevent any accidental package upgrades: https://github.com/MichaIng/DietPi/issues/2568
+			# - Enable but set sid WireGuard package priorities low enough to install only if not available in main repo(s)
+			echo -e 'Package: *\nPin: release n=sid\nPin-Priority: -1\n
+Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=sid\nPin-Priority: 99' > /etc/apt/preferences.d/dietpi-wireguard
+
+			# RPi: Install debian-archive-keyring, currently version 2018.1 from sid branch: https://packages.debian.org/de/sid/debian-archive-keyring
+			(( $G_HW_MODEL < 10 )) && Download_Install 'https://dietpi.com/downloads/binaries/rpi/debian-archive-keyring.deb'
+
 			G_AGUP
 
 			# Check for existing WireGuard install
 			local existing_install=0
 			dpkg-query -s wireguard-dkms &> /dev/null && existing_install=1
 
-			# iptables required to forward incoming VPN traffic to internet interface
+			# iptables required to forward incoming VPN traffic to local LAN/internet interface
 			# qrencode required to print client config QR code to console
 			G_AGI wireguard iptables qrencode
 
-			# If no fresh install, reconfigure to rebuild WireGuard kernel module against current kernel headers
+			# If existing install, reconfigure to rebuild WireGuard kernel module against current kernel + headers
 			(( $existing_install )) && G_RUN_CMD dpkg-reconfigure wireguard-dkms
 
 			unset kernel_packages existing_install
@@ -5142,7 +5163,7 @@ _EOF_
 			Banner_Installing
 
 			DEPS_LIST='minicom python-serial python-configobj'
-			Download_Install 'https://github.com/Fourdee/emonhub/archive/emon-pi.zip'
+			Download_Install 'https://github.com/MichaIng/emonhub/archive/emon-pi.zip'
 
 			pip install paho-mqtt pydispatcher
 
@@ -5161,14 +5182,23 @@ _EOF_
 
 		fi
 
-		#NETDATA
-		software_id=65
+		software_id=65 # Netdata
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
 
-			DEPS_LIST='zlib1g-dev'
-			Download_Install "https://dietpi.com/downloads/binaries/all/netdata_1.11.1-1_$G_HW_ARCH_DESCRIPTION.deb"
+			# Netdata v1.12 available on Debian stretch-backports and Raspbian/Debian Buster
+			# => Only install our custom package on Jessie and RPi Stretch
+			if (( $G_DISTRO < 4 || ( $G_HW_MODEL < 10 && $G_DISTRO < 5 ) )); then
+
+				DEPS_LIST='zlib1g-dev'
+				Download_Install "https://dietpi.com/downloads/binaries/all/netdata_1.11.1-1_$G_HW_ARCH_DESCRIPTION.deb"
+
+			else
+
+				G_AGI netdata
+
+			fi
 
 		fi
 
@@ -5198,28 +5228,27 @@ _EOF_
 
 			Banner_Installing
 
-			G_CHECK_URL 'https://github.com/MediaBrowser'
+			INSTALL_URL_ADDRESS='https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest'
+			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
-			#X86_64
-			if (( $G_HW_ARCH == 10 )); then
+			# ARMv7
+			local arch='armhf'
 
-				no_check_url=1 Download_Install 'https://github.com/MediaBrowser/Emby.Releases/releases/download/3.5.2.0/emby-server-deb_3.5.2.0_amd64.deb'
+			# ARMv8
+			if (( $G_HW_ARCH == 3 )); then
 
-			#ARM
-			else
+				arch='arm64'
 
-				#ARMv8
-				if (( $G_HW_ARCH == 3 )); then
+			# x86_64
+			elif (( $G_HW_ARCH == 10 )); then
 
-					dpkg --add-architecture armhf
-					G_AGUP
-					G_AGI gcc-6-base:armhf libc6:armhf libgcc1:armhf zlib1g:armhf
+				arch='amd64'
 
-				fi
+			fi
 
-				no_check_url=1 Download_Install 'https://github.com/MediaBrowser/Emby.Releases/releases/download/3.5.2.0/emby-server-deb_3.5.2.0_armhf.deb'
+			no_check_url=1 Download_Install "$(curl -s "$INSTALL_URL_ADDRESS" | grep -m1 "browser_download_url.*emby-server-deb_.*_$arch\.deb" | cut -d \" -f 4)"
 
-			fi
+			unset arch
 
 		fi
 
@@ -5297,11 +5326,11 @@ _EOF_
 
 			Banner_Installing
 
-			#check folder is online
+			# Check folder is online
 			INSTALL_URL_ADDRESS='https://github.com/hexparrot/mineos-node.git'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
-			#prereqs
+			# Pre-reqs
 			G_AGI python python3 supervisor rdiff-backup screen rsync
 
 			mkdir -p $G_FP_DIETPI_USERDATA/mineos
@@ -5312,9 +5341,12 @@ _EOF_
 			git config core.filemode false
 			chmod +x service.js mineos_console.js generate-sslcert.sh webui.js
 
-			#Install Node 8, as MineOS is currently not compatible with Node 10
+			# Install Node 8, as MineOS is currently not compatible with Node 10: https://github.com/MichaIng/DietPi/issues/1880
 			npm i -g --unsafe-perm n
-			n 8
+			# - On ARMv8 explicitly add arch info, since it is not recognized by "n": https://github.com/MichaIng/DietPi/issues/1880#issuecomment-464097174
+			local arch=''
+			(( $G_HW_ARCH == 3 )) && arch='-a arm64'
+			n $arch 8
 
 			npm i --unsafe-perm
 
@@ -5367,7 +5399,7 @@ _EOF_
 			Banner_Installing
 
 			DEPS_LIST='rtorrent screen' #mediainfo
-			# On Jessie, nginx-full is needed for SCGI module: https://github.com/Fourdee/DietPi/issues/1240
+			# On Jessie, nginx-full is needed for SCGI module: https://github.com/MichaIng/DietPi/issues/1240
 			(( $G_DISTRO < 4 && ${aSOFTWARE_INSTALL_STATE[85]} > 0 )) && DEPS_LIST+=' nginx-full'
 
 			# Get current version string
@@ -5511,7 +5543,7 @@ _EOF_
 			### Pre-reqs
 			DEPS_LIST='libfontconfig1'
 			## libjpeg8, libpng12
-			# https://github.com/Fourdee/DietPi/issues/1428#issuecomment-361099496
+			# https://github.com/MichaIng/DietPi/issues/1428#issuecomment-361099496
 			# - armv6/7
 			if (( $G_HW_ARCH == 1 || $G_HW_ARCH == 2 )); then
 
@@ -5595,7 +5627,7 @@ _EOF_
 
 				fi
 
-				# - Prevent Debian repo from replacing our chromium packages: https://github.com/Fourdee/DietPi/issues/658
+				# - Prevent Debian repo from replacing our chromium packages: https://github.com/MichaIng/DietPi/issues/658
 				apt-mark hold chromium chromedriver
 
 			fi
@@ -5622,7 +5654,7 @@ _EOF_
 
 			Banner_Installing
 
-			if (( $G_DISTRO == 3 )); then #https://github.com/Fourdee/DietPi/issues/855#issuecomment-292712002
+			if (( $G_DISTRO == 3 )); then #https://github.com/MichaIng/DietPi/issues/855#issuecomment-292712002
 
 				INSTALL_URL_ADDRESS='http://davesteele.github.io/cloudprint-service'
 
@@ -5742,7 +5774,10 @@ _EOF_
 
 			# Install pre-req yarn and "n" to downgrade to Node 8, as Node 10 is not (yet) compatible with Koel build.
 			npm i -g --unsafe-perm yarn n
-			n 8
+			# - On ARMv8 explicitly add arch info, since it is not recognized by "n": https://github.com/MichaIng/DietPi/issues/1880#issuecomment-464097174
+			local arch=''
+			(( $G_HW_ARCH == 3 )) && arch='-a arm64'
+			n $arch 8
 
 			# Download and install Composer:
 			php -r "readfile('https://getcomposer.org/installer');" > composer-setup.php
@@ -5763,7 +5798,7 @@ _EOF_
 
 			Banner_Installing
 
-			#ARMv8 binary install: https://github.com/Fourdee/DietPi/issues/1502
+			#ARMv8 binary install: https://github.com/MichaIng/DietPi/issues/1502
 			if (( $G_HW_ARCH == 3 )); then
 
 				Download_Install 'http://update.sonarr.tv/v2/develop/mono/NzbDrone.develop.tar.gz' /opt
@@ -6016,7 +6051,7 @@ If you want to update ${aSOFTWARE_WHIP_NAME[$software_id]}, please use it's inte
 
 			INSTALL_URL_ADDRESS='https://get.docker.com'
 
-			# Current workaround for faulty docker-ce repo version on RPi: https://github.com/Fourdee/DietPi/issues/2282
+			# Current workaround for faulty docker-ce repo version on RPi: https://github.com/MichaIng/DietPi/issues/2282
 			(( $G_HW_MODEL < 10 )) && echo 'Package: docker-ce
 Pin: version 5:18.09.0~3-0~raspbian-stretch
 Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
@@ -6057,8 +6092,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
 
-		#Nukkit
-		software_id=164
+		software_id=164 # Nukkit
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
@@ -6072,8 +6106,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
 
-		#GITEA
-		software_id=165
+		software_id=165 # Gitea
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
@@ -6112,8 +6145,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
 
-		#Allo Web Interface
-		software_id=159 #160 for quick reinstall
+		software_id=159 # Allo Web Interface (160 for quick reinstall)
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[160]} == 1 )); then
 
@@ -6122,38 +6154,48 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
 
-		#Gmediarender
-		software_id=163
+		software_id=163 # GMediaRender
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
 
-			INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/gmrender_1_'
-			if (( $G_HW_ARCH == 10 )); then
+			# Stretch + Jessie: Use our updated package
+			if (( $G_DISTRO < 5 )); then
 
-				INSTALL_URL_ADDRESS+='amd64.deb'
+				INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/gmrender_1_'
+				if (( $G_HW_ARCH == 10 )); then
 
-			elif (( $G_HW_ARCH == 3 )); then
+					INSTALL_URL_ADDRESS+='amd64.deb'
 
-				INSTALL_URL_ADDRESS+='arm64.deb'
+				elif (( $G_HW_ARCH == 3 )); then
 
-			elif (( $G_HW_ARCH == 2 )); then
+					INSTALL_URL_ADDRESS+='arm64.deb'
 
-				INSTALL_URL_ADDRESS+='armv7.deb'
+				elif (( $G_HW_ARCH == 2 )); then
 
-			elif (( $G_HW_ARCH == 1 )); then
+					INSTALL_URL_ADDRESS+='armv7.deb'
 
-				INSTALL_URL_ADDRESS+='armv6.deb'
+				elif (( $G_HW_ARCH == 1 )); then
 
-			fi
+					INSTALL_URL_ADDRESS+='armv6.deb'
 
-			DEPS_LIST='libupnp6 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-alsa'
-			Download_Install "$INSTALL_URL_ADDRESS"
+				fi
+
+				DEPS_LIST='libupnp6 gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly'
+				Download_Install "$INSTALL_URL_ADDRESS"
+
+			# Buster: Use the up-to-date APT repo package
+			else
+
+				G_AGI gmediarender gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly
+				# - Disable init.d service, use our systemd unit instead
+				systemctl disable gmediarender
+
+			fi
 
 		fi
 
-		#AudioPhonics Pi-SPC
-		software_id=166
+		software_id=166 # AudioPhonics Pi-SPC
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
@@ -6164,8 +6206,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
 
-		#Raspotify
-		software_id=167
+		software_id=167 # Raspotify
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
@@ -6277,7 +6318,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			Banner_Installing
 
-			# - Stretch, libssl1.0.0 no longer available: https://github.com/Fourdee/DietPi/issues/1299
+			# - Stretch, libssl1.0.0 no longer available: https://github.com/MichaIng/DietPi/issues/1299
 			if (( $G_DISTRO >= 4 )); then
 
 				INSTALL_URL_ADDRESS='https://dietpi.com/downloads/binaries/all/'
@@ -6341,8 +6382,8 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 			#Odroid XU4
 			elif (( $G_HW_MODEL == 11 )); then
 
-				DEPS_LIST='firmware-samsung xf86-video-armsoc-odroid malit628-odroid'
-				dps_index=$software_id Download_Install 'xorg_xu4.conf' /etc/X11/xorg.conf
+				G_AGI firmware-samsung xf86-video-armsoc-odroid malit628-odroid
+				#dps_index=$software_id Download_Install 'xorg_xu4.conf' /etc/X11/xorg.conf
 
 			#Odroid C1
 			elif (( $G_HW_MODEL == 10 )); then
@@ -6593,7 +6634,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 			# Remove information file
 			[[ -f /mnt/nfs_client/readme.txt ]] && rm /mnt/nfs_client/readme.txt
 
-			# "netbase" is needed for mounting NFSv3: https://github.com/Fourdee/DietPi/issues/1898#issuecomment-406247814
+			# "netbase" is needed for mounting NFSv3: https://github.com/MichaIng/DietPi/issues/1898#issuecomment-406247814
 			G_AGI nfs-common netbase
 
 		fi
@@ -6670,13 +6711,21 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			Banner_Installing
 
-			l_message='Copy /var/log skeletons to temporary storage' G_RUN_CMD /DietPi/dietpi/func/dietpi-ramlog 1
-			# Install (add tmpfs mount to fstab)
+			# Install persistent tmpfs
 			local tmpfs_max_size=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_RAMLOG_MAXSIZE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
-			sed -i '/[[:space:]]\/var\/log[[:space:]]/d' /etc/fstab
+			tmpfs_max_size=${tmpfs_max_size:=50}
+			sed -i '/[[:blank:]]\/var\/log[[:blank:]]/d' /etc/fstab
 			echo "tmpfs /var/log tmpfs defaults,size=${tmpfs_max_size}m,noatime,nodev,nosuid,mode=1777 0 0" >> /etc/fstab
+
+			# Enable DietPi-RAMdisk
 			systemctl enable dietpi-ramlog
 
+			# To assure a cleaned mountpoint we need to start RAMlog now
+			l_message='Storing /var/log metadata to disk' G_RUN_CMD /DietPi/dietpi/func/dietpi-ramlog 1
+			l_message='Cleaning /var/log mountpoint' G_RUN_CMD rm -Rf /var/log/{,.??,.[^.]}*
+			l_message='Mounting tmpfs to /var/log' G_RUN_CMD mount /var/log
+			l_message='Restoring metadata to /var/log tmpfs' G_RUN_CMD systemctl start dietpi-ramlog
+
 		fi
 
 		software_id=101
@@ -6692,7 +6741,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			Banner_Installing
 
-			#Workaround for dpkg failure on 1st install if service is already running but APT not installed: https://github.com/Fourdee/DietPi/pull/2277/#issuecomment-441460925
+			#Workaround for dpkg failure on 1st install if service is already running but APT not installed: https://github.com/MichaIng/DietPi/pull/2277/#issuecomment-441460925
 			systemctl stop rsyslog &> /dev/null
 			G_AGI rsyslog
 			systemctl start rsyslog &> /dev/null
@@ -6704,7 +6753,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			Banner_Installing
 
-			#RPi + OpenMAX HW Encoding: https://github.com/Fourdee/DietPi/issues/869
+			#RPi + OpenMAX HW Encoding: https://github.com/MichaIng/DietPi/issues/869
 			if (( $G_HW_MODEL < 10 )); then
 
 				Download_Install 'https://dietpi.com/downloads/binaries/rpi/ffmpeg_rpi.7z' ffmpeg_rpi
@@ -6726,6 +6775,8 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			Banner_Installing
 
+			local packages='ca-certificates-java openjdk-8-jre-headless openjdk-8-jdk-headless'
+
 			# On Jessie use backports repo:
 			if (( $G_DISTRO == 3 )); then
 
@@ -6735,14 +6786,14 @@ Pin: release a=jessie-backports
 Pin-Priority: 990
 _EOF_
 
-				G_AGI openjdk-8-jre-headless openjdk-8-jdk-headless -t jessie-backports
-
-			else
-
-				G_AGI openjdk-8-jre-headless openjdk-8-jdk-headless
+				packages+=' -t jessie-backports'
 
 			fi
 
+			# Workaround for ARM install issue: https://github.com/MichaIng/DietPi/issues/2524
+			apt-get install -y -qq $packages
+			G_AGI $packages
+
 		fi
 
 		software_id=9
@@ -6828,7 +6879,7 @@ _EOF_
 
 			apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 
-			#RPi's + ARMv6 only available in raspbian repo: https://github.com/Fourdee/DietPi/issues/1023
+			#RPi's + ARMv6 only available in raspbian repo: https://github.com/MichaIng/DietPi/issues/1023
 			if (( $G_HW_MODEL < 10 || $G_HW_ARCH == 1 )); then
 
 				echo "deb https://download.mono-project.com/repo/debian raspbian$G_DISTRO_NAME main" > /etc/apt/sources.list.d/mono-xamarin.list
@@ -6844,7 +6895,7 @@ _EOF_
 			G_AGUP
 
 			G_AGI mono-runtime mono-complete
-			rm /tmp/mono* &> /dev/null #https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403856446
+			rm /tmp/mono* &> /dev/null #https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403856446
 
 		fi
 
@@ -6927,7 +6978,7 @@ _EOF_
 
 			else
 
-				G_AGI unrar #https://github.com/Fourdee/DietPi/issues/176#issuecomment-240101365
+				G_AGI unrar #https://github.com/MichaIng/DietPi/issues/176#issuecomment-240101365
 
 			fi
 
@@ -7069,7 +7120,7 @@ _EOF_
 	#
 	# Reference:
 	# - Adding new software to DietPi-Software
-	#   https://github.com/Fourdee/DietPi/issues/490#issuecomment-244416570
+	#   https://github.com/MichaIng/DietPi/issues/490#issuecomment-244416570
 	#
 	# Adding post installation steps.
 	# ------------------------------------
@@ -7090,7 +7141,7 @@ _EOF_
 	#
 	#		Create_Desktop_Shared_Items
 	#
-	#		#Odroid C2, define default pulseaudio sink: https://github.com/Fourdee/DietPi/issues/415
+	#		#Odroid C2, define default pulseaudio sink: https://github.com/MichaIng/DietPi/issues/415
 	#		if (( $G_HW_MODEL == 12 )) &&
 	#			! grep -qi '^set-default-sink alsa_output.platform-odroid_hdmi.37.analog-stereo' /etc/pulse/default.pa; then
 	#
@@ -7120,14 +7171,14 @@ _EOF_
 			mkdir -p $HOME/.config/pcmanfm/LXDE
 
 			# - PCmanFM configs
-			G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm.conf -O $HOME/.config/pcmanfm/LXDE/pcmanfm.conf
-			G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm-desktopitems.conf -O $HOME/.config/pcmanfm/LXDE/desktop-items-0.conf
+			G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm.conf -O $HOME/.config/pcmanfm/LXDE/pcmanfm.conf
+			G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm-desktopitems.conf -O $HOME/.config/pcmanfm/LXDE/desktop-items-0.conf
 
 			# - Panel config
-			G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/lxde/panel -O $HOME/.config/lxpanel/LXDE/panels/panel
+			G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/panel -O $HOME/.config/lxpanel/LXDE/panels/panel
 
 			# - Openbox config
-			G_THREAD_START wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/lxde/lxde-rc.xml -O $HOME/.config/openbox/lxde-rc.xml
+			G_THREAD_START wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/lxde-rc.xml -O $HOME/.config/openbox/lxde-rc.xml
 
 			# - Remove Lxrandr Menu item (monitor configuration tool as we set res in dietpi-config)
 			[[ -f /usr/share/applications/lxrandr.desktop ]] && rm /usr/share/applications/lxrandr.desktop
@@ -7162,7 +7213,7 @@ _EOF_
 			# - file manager desktop icon
 			ln -sf /usr/share/applications/caja.desktop $HOME/Desktop/caja.desktop
 
-			#Odroid C2, define default pulseaudio sink: https://github.com/Fourdee/DietPi/issues/415
+			#Odroid C2, define default pulseaudio sink: https://github.com/MichaIng/DietPi/issues/415
 			if (( $G_HW_MODEL == 12 )); then
 
 				G_CONFIG_INJECT 'set-default-sink[[:blank:]]' 'set-default-sink alsa_output.platform-odroid_hdmi.37.analog-stereo' /etc/pulse/default.pa
@@ -7332,7 +7383,7 @@ _EOF_
 			# - Apache2 has its own PHP module
 			if (( ${aSOFTWARE_INSTALL_STATE[83]} >= 1 )); then
 
-				# https://github.com/Fourdee/DietPi/issues/1144
+				# https://github.com/MichaIng/DietPi/issues/1144
 				local php_service='/lib/systemd/system/apache2.service'
 
 			# - Nginx and Lighttpd use PHP-FPM
@@ -7373,7 +7424,7 @@ _EOF_
 
 			# - APCu
 			target_php_ini="$FP_PHP_BASE_DIR/mods-available/apcu.ini"
-			#	- apc.shm_size= requires M at end to prevent warning: https://github.com/Fourdee/DietPi/issues/218
+			#	- apc.shm_size= requires M at end to prevent warning: https://github.com/MichaIng/DietPi/issues/218
 			target_php_cachesize+='M'
 			#	- 3days TTL
 			local target_apc_ttl='259200'
@@ -7386,7 +7437,7 @@ _EOF_
 			echo -e '; DietPi PHP settngs\n; priority=99' > $target_php_ini
 
 			# - Set tmp_upload_dir to sd. Can't be /tmp as its ramdisk and limited size. Also used by ownCloud/Nextcloud uploads
-			#	- If PHP uses PrivateTmp, we must not use own subfolder: https://github.com/Fourdee/DietPi/issues/1144
+			#	- If PHP uses PrivateTmp, we must not use own subfolder: https://github.com/MichaIng/DietPi/issues/1144
 			if [[ -f $php_service ]] && grep -q '^[[:blank:]]*PrivateTmp=true' $php_service; then
 
 				local tmp_upload_dir='/var/tmp'
@@ -7406,7 +7457,7 @@ _EOF_
 			G_CONFIG_INJECT 'upload_max_filesize[[:blank:]]*=' "upload_max_filesize=$php_max_upload_size" $target_php_ini
 			#	- post_max_size
 			G_CONFIG_INJECT 'post_max_size[[:blank:]]*=' "post_max_size=$php_max_upload_size" $target_php_ini
-			#	- Nginx - Set client_max_body_size to avoid 2MB upload error: https://github.com/Fourdee/DietPi/issues/546
+			#	- Nginx - Set client_max_body_size to avoid 2MB upload error: https://github.com/MichaIng/DietPi/issues/546
 			if (( ${aSOFTWARE_INSTALL_STATE[85]} >= 1 )); then
 
 				sed -i "/client_max_body_size/c\    client_max_body_size $php_max_upload_size;" /etc/nginx/nginx.conf
@@ -7457,7 +7508,7 @@ _EOF_
 			fi
 
 			### Also for MariaDB?
-			# Optimize for reduced memory use: https://github.com/Fourdee/DietPi/issues/605#issue-188930987
+			# Optimize for reduced memory use: https://github.com/MichaIng/DietPi/issues/605#issue-188930987
 			#cat << _EOF_ > /etc/mysql/conf.d/reduce_resources.cnf
 #[mysqld]
 #key_buffer_size=8M
@@ -7799,38 +7850,36 @@ _EOF_
 				if [[ -f $datadir/dietpi-owncloud-database-backup.sql ]]; then
 
 					G_DIETPI-NOTIFY 2 'ownCloud database backup found, starting recovery...'
-					local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $config_php | awk '{print $3}' | sed "s/[',]//g")
-					local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $config_php | awk '{print $3}' | sed "s/[',]//g")
+					local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $config_php | mawk '{print $3}' | sed "s/[',]//g")
+					local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $config_php | mawk '{print $3}' | sed "s/[',]//g")
 					/DietPi/dietpi/func/create_mysql_db owncloud "$dbuser" "$dbpass"
 					mysql owncloud < "$datadir"/dietpi-owncloud-database-backup.sql
 					### Seems to be not needed anymore and can cause double entries: https://help.nextcloud.com/t/howto-change-move-data-directory-after-installation/17170/3?u=michaing
 					# Adjust database data directory entry, in case it changed due to server migration:
 					#mysql -e "update owncloud.oc_storages set id='local::$datadir/' where id rlike 'local::'"
 
-				else
+				elif ! grep -q "'installed' => true," $config_php 2>/dev/null; then
 
 					local username=$(grep -m1 '^[[:blank:]]*SOFTWARE_OWNCLOUD_NEXTCLOUD_USERNAME=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 					[[ $username ]] || username='admin'
 
 					# For MariaDB, temporary database admin user needs to be created, as 'root' uses unix_socket login, which cannot be accessed by sudo -u www-data.
 					mysql -e "grant all privileges on *.* to 'tmp_root'@'localhost' identified by '$GLOBAL_PW' with grant option"
-					if ! grep -q "'installed' => true," $config_php 2>/dev/null; then
 
-						G_ERROR_HANDLER_COMMAND='occ maintenance:install'
-						G_ERROR_HANDLER_ONERROR_FPLOGFILE='G_ERROR_HANDLER_OCC'
-						occ maintenance:install --no-interaction --database 'mysql' --database-name 'owncloud' --database-user 'tmp_root' --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$datadir" &> G_ERROR_HANDLER_OCC
-						G_ERROR_HANDLER_EXITCODE=$?
-						if (( ! $G_ERROR_HANDLER_EXITCODE )) && grep -qi 'Stack trace' G_ERROR_HANDLER_OCC; then
+					G_ERROR_HANDLER_COMMAND='occ maintenance:install'
+					G_ERROR_HANDLER_ONERROR_FPLOGFILE='G_ERROR_HANDLER_OCC'
+					occ maintenance:install --no-interaction --database 'mysql' --database-name 'owncloud' --database-user 'tmp_root' --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$datadir" &> G_ERROR_HANDLER_OCC
+					G_ERROR_HANDLER_EXITCODE=$?
+					if (( ! $G_ERROR_HANDLER_EXITCODE )) && grep -qi 'Stack trace' G_ERROR_HANDLER_OCC; then
 
-							G_ERROR_HANDLER_EXITCODE=999 # Our individual error code for unhandled exceptions
-
-						fi
-						G_ERROR_HANDLER
-						rm G_ERROR_HANDLER_OCC
-						# Remove obsolete default data dir
-						[[ $(readlink -f $datadir) != $(readlink -f /var/www/owncloud/data) ]] && rm -R /var/www/owncloud/data
+						G_ERROR_HANDLER_EXITCODE=999 # Our individual error code for unhandled exceptions
 
 					fi
+					G_ERROR_HANDLER
+
+					# Remove obsolete default data dir
+					[[ $(readlink -f $datadir) != $(readlink -f /var/www/owncloud/data) ]] && rm -R /var/www/owncloud/data
+
 					mysql -e "drop user 'tmp_root'@'localhost'"
 
 				fi
@@ -7870,7 +7919,7 @@ _EOF_
 			#	- NB: To allow wildcard expansion, do not use quotes around $redis_conf!
 			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /var/run/redis/redis-server.sock' $redis_conf
 			G_CONFIG_INJECT 'unixsocketperm[[:blank:]]' 'unixsocketperm 770' $redis_conf
-			local redis_sock=$(grep -m1 '^[[:blank:]]*unixsocket[[:blank:]]' $redis_conf | awk '{print $2}')
+			local redis_sock=$(grep -m1 '^[[:blank:]]*unixsocket[[:blank:]]' $redis_conf | mawk '{print $2}')
 			usermod -a -G redis www-data
 			G_RUN_CMD systemctl restart redis-server
 			# - Enable ownCloud to use Redis socket for transactional file locking:
@@ -8082,49 +8131,47 @@ The install script will now exit. After applying one of the the above, rerun die
 				if [[ -f $datadir/dietpi-nextcloud-database-backup.sql ]]; then
 
 					G_DIETPI-NOTIFY 2 'Nextcloud database backup found, starting recovery...'
-					local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $config_php | awk '{print $3}' | sed "s/[',]//g")
-					local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $config_php | awk '{print $3}' | sed "s/[',]//g")
+					local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $config_php | mawk '{print $3}' | sed "s/[',]//g")
+					local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $config_php | mawk '{print $3}' | sed "s/[',]//g")
 					/DietPi/dietpi/func/create_mysql_db nextcloud "$dbuser" "$dbpass"
 					mysql nextcloud < $datadir/dietpi-nextcloud-database-backup.sql
 					### Seems to be not needed anymore and can cause double entries: https://help.nextcloud.com/t/howto-change-move-data-directory-after-installation/17170/3?u=michaing
 					# Adjust database data directory entry, in case it changed due to server migration:
 					#mysql -e "update nextcloud.oc_storages set id='local::$datadir/' where id rlike 'local::'"
 
-				else
+				elif ! grep -q "'installed' => true," $config_php 2>/dev/null; then
 
 					local username=$(grep -m1 '^[[:blank:]]*SOFTWARE_OWNCLOUD_NEXTCLOUD_USERNAME=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 					[[ $username ]] || username='admin'
 
 					# For MariaDB, temporary database admin user needs to be created, as 'root' uses unix_socket login, which cannot be accessed by sudo -u www-data.
 					mysql -e "grant all privileges on *.* to 'tmp_root'@'localhost' identified by '$GLOBAL_PW' with grant option"
-					if ! grep -q "'installed' => true," $config_php 2>/dev/null; then
-
-						G_ERROR_HANDLER_COMMAND='ncc maintenance:install'
-						G_ERROR_HANDLER_ONERROR_FPLOGFILE='G_ERROR_HANDLER_NCC'
-						ncc maintenance:install --no-interaction --database 'mysql' --database-name 'nextcloud' --database-user 'tmp_root' --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$datadir" &> G_ERROR_HANDLER_NCC
-						G_ERROR_HANDLER_EXITCODE=$?
-						if (( ! G_ERROR_HANDLER_EXITCODE )) && grep -qi 'Stack trace' G_ERROR_HANDLER_NCC; then
 
-							G_ERROR_HANDLER_EXITCODE=999 # Our individual error code for unhandled exceptions
+					G_ERROR_HANDLER_COMMAND='ncc maintenance:install'
+					G_ERROR_HANDLER_ONERROR_FPLOGFILE='G_ERROR_HANDLER_NCC'
+					ncc maintenance:install --no-interaction --database 'mysql' --database-name 'nextcloud' --database-user 'tmp_root' --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$datadir" &> G_ERROR_HANDLER_NCC
+					G_ERROR_HANDLER_EXITCODE=$?
+					if (( ! G_ERROR_HANDLER_EXITCODE )) && grep -qi 'Stack trace' G_ERROR_HANDLER_NCC; then
 
-						fi
-						# Workaround Nextcloud 14.0.3 throwing an error, when data dir path contains a symlink: https://github.com/nextcloud/server/issues/12247
-						if (( $G_DISTRO > 3 )) && [[ $(readlink -f $datadir) != $datadir ]]; then
+						G_ERROR_HANDLER_EXITCODE=999 # Our individual error code for unhandled exceptions
 
-							G_ERROR_HANDLER_RESET
-							# Install with this error does not copy over skeleton
-							cp -a /var/www/nextcloud/core/skeleton/. "$datadir/$username/files"
+					fi
+					# Workaround Nextcloud 14.0.3 throwing an error, when data dir path contains a symlink: https://github.com/nextcloud/server/issues/12247
+					if (( $G_DISTRO > 3 )) && [[ $(readlink -f $datadir) != $datadir ]]; then
 
-						else
+						G_ERROR_HANDLER_RESET
+						# Install with this error does not copy over skeleton
+						cp -a /var/www/nextcloud/core/skeleton/. "$datadir/$username/files"
 
-							G_ERROR_HANDLER
-							rm G_ERROR_HANDLER_NCC
+					else
 
-						fi
-						# Remove obsolete default data dir
-						[[ $(readlink -f $datadir) != $(readlink -f /var/www/nextcloud/data) ]] && rm -R /var/www/nextcloud/data
+						G_ERROR_HANDLER
 
 					fi
+
+					# Remove obsolete default data dir
+					[[ $(readlink -f $datadir) != $(readlink -f /var/www/nextcloud/data) ]] && rm -R /var/www/nextcloud/data
+
 					mysql -e "drop user 'tmp_root'@'localhost'"
 
 				fi
@@ -8162,7 +8209,7 @@ The install script will now exit. After applying one of the the above, rerun die
 			#	- NB: To allow wildcard expansion, do not use quotes around $redis_conf!
 			GCI_PRESERVE=1 G_CONFIG_INJECT 'unixsocket[[:blank:]]' 'unixsocket /var/run/redis/redis-server.sock' $redis_conf
 			G_CONFIG_INJECT 'unixsocketperm[[:blank:]]' 'unixsocketperm 770' $redis_conf
-			local redis_sock=$(grep -m1 '^[[:blank:]]*unixsocket[[:blank:]]' $redis_conf | awk '{print $2}')
+			local redis_sock=$(grep -m1 '^[[:blank:]]*unixsocket[[:blank:]]' $redis_conf | mawk '{print $2}')
 			usermod -a -G redis www-data
 			G_RUN_CMD systemctl restart redis-server
 			# - Enable Nextloud to use Redis socket:
@@ -8181,8 +8228,7 @@ The install script will now exit. After applying one of the the above, rerun die
 
 		fi
 
-		#Nextcloud Talk
-		software_id=168
+		software_id=168 # Nextcloud Talk
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
@@ -8284,47 +8330,43 @@ NB: This port needs to be forwarded by your router and/or opened in your firewal
 
 		fi
 
-		# Transmission
-		software_id=44
+		software_id=44 # Transmission
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
-			# Remove obsolete init.d service
+			# Remove obsolete init.d service and it's environment file
 			[[ -f /etc/init.d/transmission-daemon ]] && rm /etc/init.d/transmission-daemon
+			[[ -f /etc/default/transmission-daemon ]] && rm /etc/default/transmission-daemon
 
-			# Run service as "dietpi" group: https://github.com/Fourdee/DietPi/issues/350#issuecomment-423763518
+			# Run service as "dietpi" group: https://github.com/MichaIng/DietPi/issues/350#issuecomment-423763518
 			mkdir -p /etc/systemd/system/transmission-daemon.service.d
 			echo -e '[Service]\nGroup=dietpi' > /etc/systemd/system/transmission-daemon.service.d/dietpi-group.conf
 
 			# Apply optimized settings
-			sed -i '/^}/d' /etc/transmission-daemon/settings.json
-
-			G_CONFIG_INJECT '"cache-size-mb"' '"cache-size-mb": '$(Optimize_BitTorrent 0)',' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"download-queue-size"' '"download-queue-size": '$(Optimize_BitTorrent 1)',' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"peer-limit-global"' '"peer-limit-global": '$(Optimize_BitTorrent 2)',' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"max-peers-global"' '"max-peers-global": '$(Optimize_BitTorrent 2)',' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"upload-slots-per-torrent"' '"upload-slots-per-torrent": '$(Optimize_BitTorrent 3)',' /etc/transmission-daemon/settings.json
-
-			G_CONFIG_INJECT '"port-forwarding-enabled"' '"port-forwarding-enabled": true,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"encryption"' '"encryption": 2,' /etc/transmission-daemon/settings.json
-
-			G_CONFIG_INJECT '"idle-seeding-limit"' '"idle-seeding-limit": 1,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"idle-seeding-limit-enabled"' '"idle-seeding-limit-enabled": true,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"ratio-limit"' '"ratio-limit": 1.1,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"ratio-limit-enabled"' '"ratio-limit-enabled": true,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"trash-original-torrent-files"' '"trash-original-torrent-files": true,' /etc/transmission-daemon/settings.json
-
-			G_CONFIG_INJECT '"download-dir"' '"download-dir": "'$G_FP_DIETPI_USERDATA'/downloads",' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"rpc-password"' '"rpc-password": "'"$GLOBAL_PW"'",' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"rpc-username"' '"rpc-username": "root",' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"rpc-whitelist-enabled"' '"rpc-whitelist-enabled": false,' /etc/transmission-daemon/settings.json
-			G_CONFIG_INJECT '"message-level"' '"message-level": 0,' /etc/transmission-daemon/settings.json
+			G_CONFIG_INJECT '"cache-size-mb"' '    "cache-size-mb": '$(Optimize_BitTorrent 0)',' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"download-queue-size"' '    "download-queue-size": '$(Optimize_BitTorrent 1)',' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"peer-limit-global"' '    "peer-limit-global": '$(Optimize_BitTorrent 2)',' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"max-peers-global"' '    "max-peers-global": '$(Optimize_BitTorrent 2)',' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"upload-slots-per-torrent"' '    "upload-slots-per-torrent": '$(Optimize_BitTorrent 3)',' /etc/transmission-daemon/settings.json '^\{$'
+
+			G_CONFIG_INJECT '"port-forwarding-enabled"' '    "port-forwarding-enabled": true,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"encryption"' '    "encryption": 2,' /etc/transmission-daemon/settings.json '^\{$'
+
+			G_CONFIG_INJECT '"idle-seeding-limit"' '    "idle-seeding-limit": 1,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"idle-seeding-limit-enabled"' '    "idle-seeding-limit-enabled": true,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"ratio-limit"' '    "ratio-limit": 1.1,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"ratio-limit-enabled"' '    "ratio-limit-enabled": true,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"trash-original-torrent-files"' '    "trash-original-torrent-files": true,' /etc/transmission-daemon/settings.json '^\{$'
+
+			G_CONFIG_INJECT '"download-dir"' '    "download-dir": "'$G_FP_DIETPI_USERDATA'/downloads",' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"rpc-password"' '    "rpc-password": "'"$GLOBAL_PW"'",' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"rpc-username"' '    "rpc-username": "root",' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"rpc-whitelist-enabled"' '    "rpc-whitelist-enabled": false,' /etc/transmission-daemon/settings.json '^\{$'
+			G_CONFIG_INJECT '"message-level"' '    "message-level": 0,' /etc/transmission-daemon/settings.json '^\{$'
 
 			# To allow access for download managers and media software, files need to be created with 77X permissions.
-			G_CONFIG_INJECT '\"umask\":' '    "umask": 7,' /etc/transmission-daemon/settings.json
-
-			echo '}' >> /etc/transmission-daemon/settings.json
+			G_CONFIG_INJECT '"umask"' '    "umask": 7,' /etc/transmission-daemon/settings.json '^\{$'
 
 		fi
 
@@ -8394,7 +8436,9 @@ Documentation=file:///usr/share/doc/mpd/user-manual.html
 After=network.target sound.target
 
 [Service]
-#User=mpd # Forks its own process under user set in /etc/mpd.conf (mpd)
+User=mpd
+#Group=dietpi # Do not change, use system assigned groups, requires both dietpi and audio groups
+PermissionsStartOnly=true
 RuntimeDirectory=/var/run/mpd
 ExecStartPre=$(command -v mkdir) -p /var/run/mpd
 ExecStartPre=$(command -v chown) -R mpd:dietpi /var/run/mpd
@@ -8446,7 +8490,7 @@ _EOF_
 				G_CONFIG_INJECT 'audio_output_format "' "audio_output_format \"$target_rate:$target_bitdepth:2\"" /etc/mpd.conf
 
 				# - Set SOXR quality
-				#	All RPi's can handle SOXR VH @ 192khz 32bit: https://github.com/Fourdee/DietPi/issues/581#issuecomment-256643079
+				#	All RPi's can handle SOXR VH @ 192khz 32bit: https://github.com/MichaIng/DietPi/issues/581#issuecomment-256643079
 				G_CONFIG_INJECT 'samplerate_converter "' 'samplerate_converter "soxr very high"' /etc/mpd.conf #highest
 
 			fi
@@ -8634,7 +8678,7 @@ ExecStart=/usr/local/bin/node-red -u $G_FP_DIETPI_USERDATA/node-red
 WantedBy=multi-user.target
 _EOF_
 
-			#Symlink to home dir: https://github.com/Fourdee/DietPi/issues/1256
+			#Symlink to home dir: https://github.com/MichaIng/DietPi/issues/1256
 			ln -sf $G_FP_DIETPI_USERDATA/node-red $HOME/.node-red
 
 		fi
@@ -8723,7 +8767,7 @@ _EOF_
 			fi
 
 			# - Adjust user group and home dir
-			usermod -a -G dietpi -d $G_FP_DIETPI_USERDATA/mopidy mopidy
+			usermod -a -G dietpi,audio -d $G_FP_DIETPI_USERDATA/mopidy mopidy
 
 			# - Adjust systemd unit to match new group and do not pre-create obsolete cache dir
 			mkdir -p /etc/systemd/system/mopidy.service.d
@@ -8752,7 +8796,7 @@ _EOF_
 			#Create .desktop SymLinks
 			mkdir -p $HOME/Desktop
 			[[ -f /usr/share/applications/kodi.desktop ]] && rm /usr/share/applications/kodi.desktop
-			G_RUN_CMD wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/apps/kodi.desktop -O /usr/share/applications/kodi.desktop
+			G_RUN_CMD wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/apps/kodi.desktop -O /usr/share/applications/kodi.desktop
 			ln -sf /usr/share/applications/kodi.desktop $HOME/Desktop/kodi.desktop
 
 		fi
@@ -8878,7 +8922,7 @@ _EOF_
 			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/hdf
 			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/cd
 
-			#Uae4arm does not support browsing symlinks (https://github.com/Fourdee/DietPi/issues/474#issuecomment-242973839)
+			#Uae4arm does not support browsing symlinks (https://github.com/MichaIng/DietPi/issues/474#issuecomment-242973839)
 			#	So we need to change config file default paths to actual userdata location:
 			local fp_userdata_actual=$(readlink $G_FP_DIETPI_USERDATA) # Only returns a value if symlink exists (eg: off SDcard)
 			if [[ -n $fp_userdata_actual ]]; then
@@ -8963,7 +9007,7 @@ _EOF_
 			#Create .Desktop SymLinks
 			mkdir -p $HOME/Desktop
 			rm /usr/share/applications/opentyrian.desktop &> /dev/null
-			G_RUN_CMD wget https://raw.githubusercontent.com/Fourdee/DietPi/$G_GITBRANCH/.conf/desktop/apps/opentyrian.desktop -O /usr/share/applications/opentyrian.desktop
+			G_RUN_CMD wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/apps/opentyrian.desktop -O /usr/share/applications/opentyrian.desktop
 			ln -s /usr/share/applications/opentyrian.desktop $HOME/Desktop/opentyrian.desktop
 
 		fi
@@ -9018,82 +9062,90 @@ _EOF_
 
 		fi
 
-		#Deluge
-		software_id=45
+		software_id=45 # Deluge
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
-			useradd -rM deluge -G dietpi -s /usr/sbin/nologin
+			usercmd='useradd -r'
+			getent passwd debian-deluged &> /dev/null && usercmd='usermod'
+			$usercmd debian-deluged -G dietpi -d $G_FP_DIETPI_USERDATA/deluge -s /usr/sbin/nologin
 
 			mkdir -p $G_FP_DIETPI_USERDATA/deluge/.config/deluge
+			chown -R debian-deluged:debian-deluged $G_FP_DIETPI_USERDATA/deluge
+			mkdir -p /var/log/deluged
+			chown -R debian-deluged /var/log/deluged
 
-			> /var/log/deluged.log
-			> /var/log/deluge-web.log
-
+			# https://git.deluge-torrent.org/deluge/tree/packaging/systemd/deluged.service
 			cat << _EOF_ > /etc/systemd/system/deluged.service
 [Unit]
-Description=Deluged (DietPi)
+Description=Deluge Daemon (DietPi)
+Documentation=man:deluged
 
 [Service]
-Type=simple
-User=deluge
+User=debian-deluged
 Group=dietpi
-UMask=002
-Environment=USER=deluge HOME=$G_FP_DIETPI_USERDATA/deluge
-ExecStart=$(command -v deluged) -d -l /var/log/deluged.log -L warning
+UMask=007
+ExecStart=$(command -v deluged) -d -l /var/log/deluged/daemon.log -L warning
+Restart=on-failure
+TimeoutStopSec=300
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
 
+			# https://git.deluge-torrent.org/deluge/tree/packaging/systemd/deluge-web.service
 			cat << _EOF_ > /etc/systemd/system/deluge-web.service
 [Unit]
-Description=Deluge-web (DietPi)
+Description=Deluge Web UI (DietPi)
+Documentation=man:deluge-web
 
 [Service]
-# forking causes systemd-tty-ask-password-agent hang
-Type=simple
-User=deluge
-Group=dietpi
-Environment=USER=deluge HOME=$G_FP_DIETPI_USERDATA/deluge
-ExecStart=$(command -v deluge-web) -l /var/log/deluge-web.log -L warning
+User=debian-deluged
+UMask=027
+ExecStart=$(command -v deluge-web) -l /var/log/deluged/web.log -L warning
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
 
-			#Generate deluge default config
-			deluged
-			killall -w deluged
+			# Add web.log to logrotate config
+			if [[ -f /etc/logrotate.d/deluged ]] && ! grep -q 'web.log' /etc/logrotate.d/deluged; then
 
-			#Copy DietPi configs
-			G_BACKUP_FP $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf $G_FP_DIETPI_USERDATA/deluge/.config/deluge/web.conf
-			dps_index=$software_id Download_Install 'deluge.conf' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
-			dps_index=$software_id Download_Install 'deluge_web.conf' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/web.conf
+				echo -e "\n$(</etc/logrotate.d/deluged)" >> /etc/logrotate.d/deluged
+				sed -i '1,1s/daemon.log/web.log/' /etc/logrotate.d/deluged
 
-			# - Enable service run:
-			G_CONFIG_INJECT 'ENABLE_DELUGED=' 'ENABLE_DELUGED=1' /etc/default/deluged
+			fi
 
-			#Set remote access login details
-			cat << _EOF_ > $G_FP_DIETPI_USERDATA/deluge/.config/deluge/auth
-root:$GLOBAL_PW:10
-_EOF_
+			# Adjust config files only, if not yet existent
+			if [[ ! -f $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf ]]; then
+
+				# Copy DietPi configs
+				dps_index=$software_id Download_Install 'deluge.conf' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				dps_index=$software_id Download_Install 'deluge_web.conf' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/web.conf
 
-			#Apply Optimized settings
-			# - Cache size is in steps of 16 KiB. (Cachesize * 16 = total KiB)
-			local deluge_cache_size=$(( $(echo -e "scale=0; $(Optimize_BitTorrent 0) * 1024 / 16" | bc -l ) ))
-			sed -i '/"cache_size": /c\ "cache_size": '"$deluge_cache_size"',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				# Set remote access login details
+				echo "root:$GLOBAL_PW:10" > $G_FP_DIETPI_USERDATA/deluge/.config/deluge/auth
 
-			sed -i '/"max_active_limit": /c\ "max_active_limit": '"$(Optimize_BitTorrent 1)"',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
-			sed -i '/"max_active_downloading": /c\ "max_active_downloading": '"$(Optimize_BitTorrent 1)"',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
-			sed -i '/"max_connections_global": /c\ "max_connections_global": '"$(Optimize_BitTorrent 2)"',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
-			sed -i '/"max_upload_slots_global": /c\ "max_upload_slots_global": '"$(Optimize_BitTorrent 3)"',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				# Apply optimised settings
+				# - Cache size is in steps of 16 KiB. (Cachesize * 16 = total KiB)
+				sed -i '/"cache_size": /c\ "cache_size": '$(( $(Optimize_BitTorrent 0) * 1024 / 16 ))',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				sed -i '/"max_active_limit": /c\ "max_active_limit": '$(Optimize_BitTorrent 1)',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				sed -i '/"max_active_downloading": /c\ "max_active_downloading": '$(Optimize_BitTorrent 1)',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				sed -i '/"max_connections_global": /c\ "max_connections_global": '$(Optimize_BitTorrent 2)',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+				sed -i '/"max_upload_slots_global": /c\ "max_upload_slots_global": '$(Optimize_BitTorrent 3)',' $G_FP_DIETPI_USERDATA/deluge/.config/deluge/core.conf
+
+			fi
+
+			# Remove init.d service leftovers, installed by Debian APT package
+			[[ -f /etc/init.d/deluged ]] && rm /etc/init.d/deluged
+			[[ -f /etc/default/deluged ]] && rm /etc/default/deluged
+			[[ -d /var/lib/deluged ]] && rm -R /var/lib/deluged
 
 		fi
 
-		#Webmin
-		software_id=115
+		software_id=115 # Webmin
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
@@ -9156,7 +9208,7 @@ Do you want to enable the Pi-hole blocking page?'; then
 			# - Run Gravity
 			pihole -g
 
-			# - Generate web interface PW: https://github.com/Fourdee/DietPi/issues/662
+			# - Generate web interface PW: https://github.com/MichaIng/DietPi/issues/662
 			pihole -a -p "$GLOBAL_PW"
 			G_WHIP_MSG "DietPi has changed the Pi-hole web interface password to:\n - $GLOBAL_PW\n\nPlease use this password when logging into the web interface:\n - http://$(sed -n 4p /DietPi/dietpi/.network)/admin\n\nThis password can be changed, please see pihole binary for info:\n - pihole --help"
 
@@ -9182,7 +9234,6 @@ Description=Airsonic Media Server (DietPi)
 After=remote-fs.target network.target
 
 [Service]
-Type=simple
 User=airsonic
 Group=dietpi
 WorkingDirectory=$G_FP_DIETPI_USERDATA/airsonic
@@ -9366,7 +9417,7 @@ _EOF_
 
 			#Remove bundled service
 			systemctl stop logitechmediaserver &> /dev/null
-			killall -w squeezeboxserver &> /dev/null #provided service may not wait for exit, kill: https://github.com/Fourdee/DietPi/issues/1613#issuecomment-372787574
+			killall -w squeezeboxserver &> /dev/null #provided service may not wait for exit, kill: https://github.com/MichaIng/DietPi/issues/1613#issuecomment-372787574
 
 			update-rc.d logitechmediaserver remove &> /dev/null
 			rm /etc/init.d/logitechmediaserver &> /dev/null
@@ -9830,7 +9881,7 @@ _EOF_
 			#Build Server certs/keys
 			chmod -R +x /etc/openvpn/easy-rsa
 			cd /etc/openvpn/easy-rsa
-			# - https://github.com/Fourdee/DietPi/issues/1450#issuecomment-362608574
+			# - https://github.com/MichaIng/DietPi/issues/1450#issuecomment-362608574
 			(( $G_DISTRO >= 4 )) && cp -a openssl-1.0.0.cnf openssl.cnf
 
 			. ./vars
@@ -9921,8 +9972,9 @@ _EOF_
 			# - and /boot partition
 			cp /etc/openvpn/easy-rsa/keys/DietPi_OpenVPN_Client.ovpn /boot/
 
-			#enable ipv4 forwarding
-			sed -i '/net.ipv4.ip_forward=/c\net.ipv4.ip_forward=1' /etc/sysctl.conf
+			#Enable IP forwarding
+			echo -e 'net.ipv4.ip_forward=1\nnet.ipv6.conf.all.forwarding=1\nnet.ipv6.conf.default.forwarding=1' > /etc/sysctl.d/dietpi-openvpn.conf
+			sysctl net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 net.ipv6.conf.default.forwarding=1
 
 			#Web Fowarding (Setup IPtables, must also be run during boot)
 			#iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o "$(sed -n 3p /DietPi/dietpi/.network)" -j MASQUERADE
@@ -10013,30 +10065,41 @@ NB: This port needs to be forwarded by your router and/or opened in your firewal
 				# - Server config
 				[[ -f wg0.conf ]] || cat << _EOF_ > wg0.conf
 [Interface]
-Address = 10.8.0.1/24
+Address = 10.9.0.1/24
 PrivateKey = $(<server_private.key)
 ListenPort = $port
 
 PostUp = iptables -A FORWARD -i %i -j ACCEPT; iptables -t nat -A POSTROUTING -o \$(sed -n 3p /DietPi/dietpi/.network) -j MASQUERADE
 PostDown = iptables -D FORWARD -i %i -j ACCEPT; iptables -t nat -D POSTROUTING -o \$(sed -n 3p /DietPi/dietpi/.network) -j MASQUERADE
 
+# Client 1
 [Peer]
 PublicKey = $(<client_public.key)
-AllowedIPs = 10.8.0.0/24
+AllowedIPs = 10.9.0.2/32
+
+# Client 2
+#[Peer]
+#PublicKey = XXXX
+#AllowedIPs = 10.9.0.3/32
 _EOF_
 
 				# - Server local network IP
 				local server_ip=$(sed -n 4p /DietPi/dietpi/.network)
 
+				# - Server DNS nameserver
+				local server_dns=$(mawk '/nameserver/ {print $2;exit}' /etc/resolv.conf)
+				#	Replace "127.0.0.1"/"localhost" loopback entries by server wg0 IP: https://github.com/MichaIng/DietPi/issues/2482
+				server_dns=${server_dns//127.0.0.1/10.9.0.1}
+				server_dns=${server_dns//localhost/10.9.0.1}
+
 				# - Client config
 				[[ -f wg0-client.conf ]] || cat << _EOF_ > wg0-client.conf
 [Interface]
-# The address must be unique for each client, use "10.8.0.3/24" for the second client and so on.
-Address = 10.8.0.2/24
+Address = 10.9.0.2/24
 PrivateKey = $(<client_private.key)
 
 # Comment the following to preserve the clients default DNS server, or force a desired one.
-DNS = $(awk '/nameserver/ {print $2;exit}' /etc/resolv.conf)
+DNS = $server_dns
 
 # Kill switch: Uncomment the following, if the client should stop any network traffic, when disconnected from the VPN server
 # NB: This requires "iptables" to be installed, thus will most likely not work on mobile phones.
@@ -10058,7 +10121,7 @@ Endpoint = $domain:$port
 #PersistentKeepalive = 25
 _EOF_
 
-				# - Enable IPv4 + IPv6 forwarding
+				# - Enable IP forwarding
 				(( $module_active )) && sysctl net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 net.ipv6.conf.default.forwarding=1
 				#	persistent
 				echo -e 'net.ipv4.ip_forward=1\nnet.ipv6.conf.all.forwarding=1\nnet.ipv6.conf.default.forwarding=1' > /etc/sysctl.d/dietpi-wireguard.conf
@@ -10183,9 +10246,9 @@ _EOF_
 DAEMON_CONF="/etc/hostapd/hostapd.conf"
 _EOF_
 
-			# - Enable IPv4 forwarding
-			sed -i "/net.ipv4.ip_forward=/c\net.ipv4.ip_forward=1" /etc/sysctl.conf
-			echo 1 > /proc/sys/net/ipv4/ip_forward
+			# - Enable IP forwarding
+			echo -e 'net.ipv4.ip_forward=1\nnet.ipv6.conf.all.forwarding=1\nnet.ipv6.conf.default.forwarding=1' > /etc/sysctl.d/dietpi-wifihotspot.conf
+			sysctl net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 net.ipv6.conf.default.forwarding=1
 
 			# - Apply iptables
 			iptables -t nat -A POSTROUTING -o eth$eth_index -j MASQUERADE
@@ -10476,39 +10539,43 @@ _EOF_
 
 		fi
 
-		#NETDATA
-		software_id=65
+		software_id=65 # Netdata
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
-			# - Service
-			dps_index=$software_id Download_Install 'netdata.service' /etc/systemd/system/netdata.service
-			#	Workaround for Jessie
-			if (( $G_DISTRO < 4 )); then
+			# Only required for our custom package, leave defaults for Debian APT package otherwise
+			if (( $G_DISTRO < 4 || ( $G_HW_MODEL < 10 && $G_DISTRO < 5 ) )); then
 
-				sed -i '\#ExecStartPre=/bin/chown -R netdata:netdata /var/run/netdata#d' /etc/systemd/system/netdata.service
-				sed -Ei '\#ProtectKernel(Modules|Tunables)=no#d' /etc/systemd/system/netdata.service
+				# - Service
+				dps_index=$software_id Download_Install 'netdata.service' /etc/systemd/system/netdata.service
+				#	Workaround for Jessie
+				if (( $G_DISTRO < 4 )); then
 
-			fi
+					sed -i '\#ExecStartPre=/bin/chown -R netdata:netdata /var/run/netdata#d' /etc/systemd/system/netdata.service
+					sed -Ei '\#ProtectKernel(Modules|Tunables)=no#d' /etc/systemd/system/netdata.service
 
-			# - User
-			local usercmd='useradd -r'
-			getent passwd netdata &> /dev/null && usercmd='usermod'
-			$usercmd netdata -s /usr/sbin/nologin -d /var/lib/netdata
+				fi
 
-			# - Permissions: https://docs.netdata.cloud/docs/netdata-security/#netdata-directories
-			#	R/O
-			chown -R root:netdata /etc/netdata /usr/lib/netdata /usr/libexec/netdata /usr/share/netdata
-			chmod -R 0750 /etc/netdata /usr/lib/netdata /usr/libexec/netdata /usr/share/netdata
-			#	apps.plugin requires root privileges to read disk I/O
-			chmod 4750 /usr/libexec/netdata/plugins.d/apps.plugin
-			#	R/W
-			chown -R netdata:netdata /var/cache/netdata /var/lib/netdata /var/log/netdata
-			chmod -R 0770 /var/cache/netdata /var/lib/netdata /var/log/netdata
+				# - User
+				local usercmd='useradd -r'
+				getent passwd netdata &> /dev/null && usercmd='usermod'
+				$usercmd netdata -s /usr/sbin/nologin -d /var/lib/netdata
 
-			#	Required: https://github.com/Fourdee/DietPi/issues/2336#issuecomment-450196178
-			chown -R netdata:netdata /usr/share/netdata/web
+				# - Permissions: https://docs.netdata.cloud/docs/netdata-security/#netdata-directories
+				#	R/O
+				chown -R root:netdata /etc/netdata /usr/lib/netdata /usr/libexec/netdata /usr/share/netdata
+				chmod -R 0750 /etc/netdata /usr/lib/netdata /usr/libexec/netdata /usr/share/netdata
+				#	apps.plugin requires root privileges to read disk I/O
+				chmod 4750 /usr/libexec/netdata/plugins.d/apps.plugin
+				#	R/W
+				chown -R netdata:netdata /var/cache/netdata /var/lib/netdata /var/log/netdata
+				chmod -R 0770 /var/cache/netdata /var/lib/netdata /var/log/netdata
+
+				#	Required: https://github.com/MichaIng/DietPi/issues/2336#issuecomment-450196178
+				chown -R netdata:netdata /usr/share/netdata/web
+
+			fi
 
 		fi
 
@@ -10606,7 +10673,7 @@ location = /.well-known/caldav {
 			Download_Test_Media
 
 			# For all ARM devices:
-			# - en_US.UTF-8 must be installed and the default locale on system. This is for SBC installs using dev2day repo: https://github.com/Fourdee/DietPi/issues/116#issuecomment-222195911
+			# - en_US.UTF-8 must be installed and the default locale on system. This is for SBC installs using dev2day repo: https://github.com/MichaIng/DietPi/issues/116#issuecomment-222195911
 			if (( $G_HW_ARCH < 10 )) && ! locale | grep -q 'en_US.UTF-8'; then
 
 				G_WHIP_MSG 'Plex Media Server requires en_US.UTF-8 locale to be installed and set to default, else, Plex will not start.\n\nThe installer will now change your locale to: en_US.UTF-8'
@@ -10614,7 +10681,7 @@ location = /.well-known/caldav {
 
 			fi
 
-			# Run service as "dietpi" group: https://github.com/Fourdee/DietPi/issues/350#issuecomment-423763518
+			# Run service as "dietpi" group: https://github.com/MichaIng/DietPi/issues/350#issuecomment-423763518
 			mkdir -p /etc/systemd/system/plexmediaserver.service.d
 			echo -e '[Service]\nGroup=dietpi' > /etc/systemd/system/plexmediaserver.service.d/dietpi-group.conf
 
@@ -10821,7 +10888,7 @@ DynDNS\Service=0
 DynDNS\Username=
 DynDNS\Password=
 DynDNS\DomainName=changeme.dyndns.org
-WebUI\Password_ha1=@ByteArray($(echo -ne "$GLOBAL_PW" | md5sum | awk '{print $1}'))
+WebUI\Password_ha1=@ByteArray($(echo -n "$GLOBAL_PW" | md5sum | mawk '{print $1}'))
 
 [LegalNotice]
 Accepted=true
@@ -10831,7 +10898,7 @@ enabled=false
 program=
 _EOF_
 
-			#Jessie WebUI\Password_ha1 breaks login with m5dsum generated pw, revert to default 'adminadmin': https://github.com/Fourdee/DietPi/issues/1499#issuecomment-364769146
+			#Jessie WebUI\Password_ha1 breaks login with m5dsum generated pw, revert to default 'adminadmin': https://github.com/MichaIng/DietPi/issues/1499#issuecomment-364769146
 			(( $G_DISTRO == 3 )) && sed -i '/Password_ha1=/d' $HOME/.config/qBittorrent/qBittorrent.conf
 
 			# - service
@@ -11106,22 +11173,18 @@ _EOF_
 
 			G_BACKUP_FP /var/lib/dietpi/dietpi-software/installed/aria2.conf
 			cat << _EOF_ > /var/lib/dietpi/dietpi-software/installed/aria2.conf
-# host is where aria2c is running on
-host=localhost
-dir=$G_FP_DIETPI_USERDATA/$FOLDER_DOWNLOADS
-
-# cleanup_policy
-cleanup-policy=clean_got
-cleanup-percent=90%
-
 # The fallowing options are aria2c options as usual aria2.conf file
 # https://aria2.github.io/manual/en/html/aria2c.html
 
+# Download directory
+dir=$G_FP_DIETPI_USERDATA/$FOLDER_DOWNLOADS
+
 # RPC Options
 enable-rpc=true
 rpc-listen-all=true
 rpc-listen-port=6800
 rpc-secret=$GLOBAL_PW
+rpc-allow-origin-all=true
 pause=false
 
 # General Options
@@ -11133,6 +11196,9 @@ continue=true
 check-integrity=true
 max-concurrent-downloads=$(Optimize_BitTorrent 1)
 max-connection-per-server=$(Optimize_BitTorrent 1)
+# Bandwidth limits: https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-max-overall-upload-limit
+max-overall-download-limit=0
+max-overall-upload-limit=0
 max-file-not-found=3
 max-tries=5
 retry-wait=60
@@ -11148,21 +11214,10 @@ max-download-limit=0
 seed-ratio=0.1
 seed-time=0
 
-metalink-servers=$(Optimize_BitTorrent 2)
 allow-overwrite=false
 always-resume=true
 auto-file-renaming=false
 file-allocation=none
-
-[limit-options]
-max-concurrent-downloads=$(Optimize_BitTorrent 1)
-max-overall-download-limit=1000K
-max-overall-upload-limit=100K
-
-[unlimit-options]
-max-concurrent-downloads=$(Optimize_BitTorrent 1)
-max-overall-download-limit=0
-max-overall-upload-limit=0
 _EOF_
 
 			cat << _EOF_ > /etc/systemd/system/aria2.service
@@ -11233,18 +11288,17 @@ _EOF_
 
 		fi
 
-		#Urbackup server
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
 			mkdir -p $G_FP_DIETPI_USERDATA/urbackup/urbackup_tmp_files
 
-			#As we have /tmp mounted to RAM, change tmp locations
+			# As we have /tmp mounted to RAM, change tmp locations
 			sed -i '/DAEMON_TMPDIR=/c\DAEMON_TMPDIR="/var/tmp"' /etc/default/urbackupsrv
 
-			#https://github.com/Fourdee/DietPi/issues/545#issuecomment-252419739
+			# https://github.com/MichaIng/DietPi/issues/545#issuecomment-252419739
 			#sqlite3 /usr/local/var/urbackup/backup_server_settings.db "UPDATE settings SET value = '/mnt/dietpi_userdata/urbackup/' WHERE key = 'backupfolder'"
 
 		fi
@@ -11334,7 +11388,7 @@ _EOF_
 				#	OpenGL
 				#if (( $G_HW_MODEL >= 2 )); then
 
-					# Hangs xinit: https://github.com/Fourdee/DietPi/issues/834
+					# Hangs xinit: https://github.com/MichaIng/DietPi/issues/834
 					#/DietPi/dietpi/func/dietpi-set_hardware rpi-opengl vc4-kms-v3d
 
 				#fi
@@ -11366,11 +11420,11 @@ _EOF_
 			#	* for RPi Stretch due to chromium-browser.desktop
 			ln -sf /usr/share/applications/chromium*.desktop $HOME/Desktop/chromium.desktop &> /dev/null
 
-			# - Autostart run script for Kiosk mode, based on @AYapejian https://github.com/Fourdee/DietPi/issues/1737#issue-318697621
+			# - Autostart run script for Kiosk mode, based on @AYapejian https://github.com/MichaIng/DietPi/issues/1737#issue-318697621
 
 			cat << _EOF_ > /var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh
 #!/bin/bash
-#Autostart run script for Kiosk mode, based on @AYapejian https://github.com/Fourdee/DietPi/issues/1737#issue-318697621
+#Autostart run script for Kiosk mode, based on @AYapejian https://github.com/MichaIng/DietPi/issues/1737#issue-318697621
 # - Please see $HOME/.chromium-browser.init (and /etc/chromium.d/custom_flags) for additional egl/gl init options
 
 # Command line switches https://peter.sh/experiments/chromium-command-line-switches/
@@ -11445,7 +11499,7 @@ _EOF_
 			sed -i '/ENABLE=/c\ENABLE=true' /etc/default/icecast2
 
 			#Darkice
-			local input_device_index=$(arecord -l | grep -m1 'card' | awk '{print $2}' | sed 's/://')
+			local input_device_index=$(arecord -l | mawk '/card/ {print $2;exit}' | sed 's/://')
 
 			cat << _EOF_ > /etc/darkice.cfg
 [general]
@@ -11672,7 +11726,7 @@ _EOF_
 
 			G_CONFIG_INJECT 'permissions =' 'permissions = "0775"' /etc/sabnzbd/sabnzbd.ini
 
-			# - Install language packs: https://github.com/Fourdee/DietPi/issues/1917#issue-340631943
+			# - Install language packs: https://github.com/MichaIng/DietPi/issues/1917#issue-340631943
 			cd /etc/sabnzbd
 			G_RUN_CMD python tools/make_mo.py
 			cd $HOME
@@ -11945,7 +11999,7 @@ _EOF_
 			sed -i "/ControlUsername=/c\ControlUsername=admin" $G_FP_DIETPI_USERDATA/nzbget/nzbget.conf
 			sed -i "/ControlPassword=/c\ControlPassword=$GLOBAL_PW" $G_FP_DIETPI_USERDATA/nzbget/nzbget.conf
 
-			# - Umask: https://github.com/Fourdee/DietPi/issues/1999
+			# - Umask: https://github.com/MichaIng/DietPi/issues/1999
 			sed -i "/UMask=/c\UMask=0002" $G_FP_DIETPI_USERDATA/nzbget/nzbget.conf
 
 			#	Optimizations
@@ -12115,7 +12169,7 @@ _EOF_
 
 			Banner_Configuration
 
-			#Set docker service to 'simple': https://github.com/Fourdee/DietPi/issues/2238#issuecomment-439474766
+			#Set docker service to 'simple': https://github.com/MichaIng/DietPi/issues/2238#issuecomment-439474766
 			mkdir -p /lib/systemd/system/docker.service.d
 			echo -e '[Service]\nType=simple' > /lib/systemd/system/docker.service.d/dietpi-simple.conf
 
@@ -12186,20 +12240,18 @@ _EOF_
 
 		fi
 
-		#GITEA Config
-		software_id=165
+		software_id=165	# Gitea
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
-			# - service
+			# - Service
 			cat << _EOF_ > /etc/systemd/system/gitea.service
 
 [Unit]
 Description=Gitea (DietPi)
 
 [Service]
-Type=simple
 User=dietpi
 WorkingDirectory=$G_FP_DIETPI_USERDATA/gitea/gitea-repositories
 ExecStart=$G_FP_DIETPI_USERDATA/gitea/gitea web
@@ -12213,14 +12265,14 @@ _EOF_
 			mkdir -p /var/log/gitea
 			chown -R dietpi:dietpi /var/log/gitea
 
-			# - sqldb
+			# - Database
 			/DietPi/dietpi/func/create_mysql_db gitea gitea "$GLOBAL_PW"
 
 		fi
 
 
 		#Allo Config
-		software_id=159 #160 for quick reinstall/update
+		software_id=159 # 160 for quick reinstall/update
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[160]} == 1 )); then
 
@@ -12305,24 +12357,32 @@ _EOF_
 
 		fi
 
-		#Gmediarender
-		software_id=163
+		software_id=163 # GMediaRender
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
-			useradd -rm gmrender -G dietpi,audio -s /usr/sbin/nologin
+			# Create/Edit user
+			local usercmd='useradd -rm'
+			getent passwd gmrender &> /dev/null && usercmd='usermod'
+			$usercmd gmrender -G dietpi,audio -s /usr/sbin/nologin
 
+			# Pre-create log file
+			>> /var/log/gmrender.log
+			chown gmrender:dietpi /var/log/gmrender.log
+
+			# Create systemd unit
 			cat << _EOF_ > /etc/systemd/system/gmrender.service
 [Unit]
-Description=GMrender (DietPi)
-After=network.target
+Description=GMediaRender (DietPi)
+After=network.target dietpi-boot.service
 
 [Service]
-Type=simple
 User=gmrender
 Group=dietpi
-ExecStart=$(command -v gmediarender) -u "$(sed -n 5p /DietPi/dietpi/.hw_model)" -f "$(cat /etc/hostname)" --gstout-audiodevice=sysdefault --gstout-initial-volume-db=-1 --logfile=/var/log/gmrender.log
+ExecStartPre=!$(command -v touch) /var/log/gmrender.log
+ExecStartPre=!$(command -v chown) gmrender:dietpi /var/log/gmrender.log
+ExecStart=/bin/dash -c 'gmediarender -u "$(sed -n 5p /DietPi/dietpi/.hw_model)" -f "$(</etc/hostname)" --gstout-audiodevice=sysdefault --gstout-initial-volume-db=-1 --logfile=/var/log/gmrender.log -I "\$(sed -n 4p /DietPi/dietpi/.network)"'
 
 [Install]
 WantedBy=multi-user.target
@@ -12330,8 +12390,7 @@ _EOF_
 
 		fi
 
-		#AudioPhonics Pi-SPC
-		software_id=166
+		software_id=166 # AudioPhonics Pi-SPC
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
@@ -12579,7 +12638,7 @@ _EOF_
 
 		USBDRIVE=0
 
-		FP_DIETPI_DEDICATED_USBDRIVE=$(df -P | grep -m1 '^/dev/sda1' | awk '{print $6}')
+		FP_DIETPI_DEDICATED_USBDRIVE=$(df -P | mawk '/^\/dev\/sda1/ {print $6;exit}')
 
 		#Only enable if mounted
 		if [[ $FP_DIETPI_DEDICATED_USBDRIVE ]] &&
@@ -12603,7 +12662,7 @@ _EOF_
 			apt-mark unhold pcmanfm #RPi
 
 			Banner_Uninstalling
-			G_AGP lxde $(dpkg --get-selections lxde-* | awk '{print $1}') upower policykit-1 firefox-esr
+			G_AGP lxde $(dpkg --get-selections lxde-* | mawk '{print $1}') upower policykit-1 firefox-esr
 
 		fi
 
@@ -12661,7 +12720,7 @@ _EOF_
 			Banner_Uninstalling
 			G_AGP transmission-daemon
 			[[ -f /etc/systemd/system/transmission-daemon.service ]] && rm /etc/systemd/system/transmission-daemon.service # pre v6.17
-			[[ -d /etc/systemd/system/transmission-daemon.service.d ]] && rm /etc/systemd/system/transmission-daemon.service.d # post v6.17
+			[[ -d /etc/systemd/system/transmission-daemon.service.d ]] && rm -R /etc/systemd/system/transmission-daemon.service.d # post v6.17
 
 		fi
 
@@ -12678,10 +12737,10 @@ _EOF_
 			rm /etc/nginx/sites-dietpi/dietpi-owncloud.conf 2> /dev/null
 			G_WHIP_MSG "DietPi will perform an automated backup of your ownCloud database and installation directory, which will be stored inside your ownCloud data directory.\n\nThe data directory won't be removed. So you can recover your whole ownCloud instance any time later.\n\nRemove the data directory manually, if you don't need it anymore."
 			# Drop MariaDB users and database
-			local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" /var/www/owncloud/config/config.php | awk '{print $3}' | sed 's/,//')
-			local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" /var/www/owncloud/config/config.php | awk '{print $3}' | sed 's/,//')
+			local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" /var/www/owncloud/config/config.php | mawk '{print $3}' | sed 's/,//')
+			local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" /var/www/owncloud/config/config.php | mawk '{print $3}' | sed 's/,//')
 			# - Find datadir for backups
-			local datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" /var/www/owncloud/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+			local datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" /var/www/owncloud/config/config.php | mawk '{print $3}' | sed "s/[',]//g")
 			[[ $datadir ]] || datadir=$G_FP_DIETPI_USERDATA/owncloud_data
 			systemctl start $MARIADB_SERVICE
 			mysql -e "drop user $dbuser@$dbhost"
@@ -12737,10 +12796,10 @@ _EOF_
 			rm /etc/lighttpd/conf-available/99-dietpi-nextcloud.conf 2> /dev/null
 			G_WHIP_MSG "DietPi will perform an automated backup of your Nextcloud database and installation directory, which will be stored inside your Nextcloud data directory.\n\nThe data directory won't be removed. So you can recover your whole Nextcloud instance any time later.\n\nRemove the data directory manually, if you don't need it anymore."
 			# Drop MariaDB users and database
-			local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed 's/,//')
-			local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed 's/,//')
+			local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" /var/www/nextcloud/config/config.php | mawk '{print $3}' | sed 's/,//')
+			local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" /var/www/nextcloud/config/config.php | mawk '{print $3}' | sed 's/,//')
 			# - Find datadir for backups
-			local datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+			local datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" /var/www/nextcloud/config/config.php | mawk '{print $3}' | sed "s/[',]//g")
 			[[ $datadir ]] || datadir=$G_FP_DIETPI_USERDATA/nextcloud_data
 			systemctl start $MARIADB_SERVICE
 			mysql -e "drop user $dbuser@$dbhost"
@@ -12781,7 +12840,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP nginx $(dpkg --get-selections nginx-* | awk '{print $1}')
+			G_AGP nginx $(dpkg --get-selections nginx-* | mawk '{print $1}')
 
 		fi
 
@@ -12820,7 +12879,7 @@ _EOF_
 			Banner_Uninstalling
 			rm $FP_PHP_BASE_DIR/fpm/pool.d/www.conf 2> /dev/null
 			rm $FP_PHP_BASE_DIR/mods-available/dietpi.ini 2> /dev/null
-			G_AGP $(dpkg --get-selections | grep -E '(php[0-9]?\.?[0-9]?-*|libapache2-mod-php*)' | awk '{print $1}')
+			G_AGP $(dpkg --get-selections | grep -E '(php[0-9]?\.?[0-9]?-*|libapache2-mod-php*)' | mawk '{print $1}')
 			rm /var/www/phpinfo.php
 			rm /var/www/apc.php
 			rm /var/www/opcache.php
@@ -12885,7 +12944,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			#apt-mark auto libavformat57 libupnp6 libao-common libao4 libasound2 libasound2-data libasyncns0 libaudiofile1 libavahi-client3 libavahi-common-data libavahi-common3 libavcodec56 libavformat56 libavresample2 libavutil54 libbinio1ldbl libcaca0 libcdio-cdda1 libcdio-paranoia1 libcdio13 libcups2 libcurl3-gnutls libdirectfb-1.2-9 libdnet libfaad2 libflac8 libfluidsynth1 libgme0 libgomp1 libgsm1 libice6 libid3tag0 libiso9660-8 libjack-jackd2-0 libjson-c2 libldb1 libmad0 libmikmod3 libmms0 libmodplug1 libmp3lame0 libmpcdec6 libmpg123-0 libnfs4 libntdb1 libogg0 libopenal-data libopenal1 libopenjpeg5 libopus0 liborc-0.4-0 libpulse0 libresid-builder0c2a libroar2 libsamplerate0 libschroedinger-1.0-0 libsdl1.2debian libshout3 libsidplay2 libsidutils0 libslp1 libsm6 libsmbclient libsndfile1 libsoxr0 libspeex1 libspeexdsp1 libsqlite3-0 libtalloc2 libtdb1 libtevent0 libtheora0 libupnp6 libva1 libvorbis0a libvorbisenc2 libvorbisfile3 libvpx1 libwavpack1 libwbclient0 libwildmidi-config libwildmidi1 libx11-6 libx11-data libx11-xcb1 libx264-142 libxau6 libxcb1 libxdmcp6 libxext6 libxi6 libxtst6 libxvidcore4 libyajl2 libzzip-0-13 mime-support python python-talloc python2.7 samba-libs x11-common file &> /dev/null
+			#apt-mark auto libavformat57 libupnp6 libao-common libao4 libasound2 libasound2-data libasyncns0 libaudiofile1 libavahi-client3 libavahi-common-data libavahi-common3 libavcodec56 libavformat56 libavresample2 libavutil54 libbinio1ldbl libcaca0 libcdio-cdda1 libcdio-paranoia1 libcdio13 libcups2 libcurl3-gnutls libdirectfb-1.2-9 libdnet libfaad2 libflac8 libfluidsynth1 libgme0 libgomp1 libgsm1 libice6 libid3tag0 libiso9660-8 libjack-jackd2-0 libjson-c2 libldb1 libmad0 libmikmod3 libmms0 libmodplug1 libmp3lame0 libmpcdec6 libmpg123-0 libnfs4 libntdb1 libogg0 libopenal-data libopenal1 libopenjpeg5 libopus0 liborc-0.4-0 libpulse0 libresid-builder0c2a libroar2 libsamplerate0 libschroedinger-1.0-0 libsdl1.2debian libshout3 libsidplay2 libsidutils0 libslp1 libsm6 libsmbclient libsndfile1 libsoxr0 libspeex1 libspeexdsp1 libsqlite3-0 libtalloc2 libtdb1 libtevent0 libtheora0 libva1 libvorbis0a libvorbisenc2 libvorbisfile3 libvpx1 libwavpack1 libwbclient0 libwildmidi-config libwildmidi1 libx11-6 libx11-data libx11-xcb1 libx264-142 libxau6 libxcb1 libxdmcp6 libxext6 libxi6 libxtst6 libxvidcore4 libyajl2 libzzip-0-13 mime-support python python-talloc python2.7 samba-libs x11-common file &> /dev/null
 			apt-mark unhold mpd 1> /dev/null
 			G_AGP mpd libmpdclient2
 			getent passwd mpd &> /dev/null && userdel -rf mpd
@@ -13362,12 +13421,11 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP deluged deluge-web deluge-webui deluge-console
-			rm /etc/systemd/system/deluged.service
-			rm /etc/systemd/system/deluge-web.service
-			rm -R $G_FP_DIETPI_USERDATA/deluge
-
-			userdel -rf deluge
+			G_AGP deluged deluge-web deluge-console
+			userdel -rf debian-deluged
+			[[ -f /etc/systemd/system/deluged.service ]] && rm /etc/systemd/system/deluged.service
+			[[ -f /etc/systemd/system/deluge-web.service ]] && rm /etc/systemd/system/deluge-web.service
+			[[ -d $G_FP_DIETPI_USERDATA/deluge ]] && rm -R $G_FP_DIETPI_USERDATA/deluge
 
 		fi
 
@@ -13487,13 +13545,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			# <= v150 (weaved)
-			rm -R /etc/weaved
-			rm -R $HOME/weaved_software
-			rm $HOME/weaved_setup.bin
-
-			# Remot3.it
-			G_AGP weavedconnectd
+			G_AGP connectd weavedconnectd # pre-v6.22
 
 		fi
 
@@ -13577,7 +13629,7 @@ _EOF_
 			(( ${aSOFTWARE_INSTALL_STATE[120]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP tightvncserver $(dpkg --get-selections tigervnc-* | awk '{print $1}') vnc4server x11vnc realvnc-vnc-server
+			G_AGP tightvncserver $(dpkg --get-selections tigervnc-* | mawk '{print $1}') vnc4server x11vnc realvnc-vnc-server
 
 			rm /etc/systemd/system/vncserver.service
 			rm /etc/init.d/vncserver
@@ -13638,12 +13690,13 @@ _EOF_
 
 		fi
 
-		software_id=97
+		software_id=97 # OpenVPN server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
 			G_AGP openvpn
 			[[ -d /etc/openvpn ]] && rm -R /etc/openvpn
+			[[ -f /etc/sysctl.d/dietpi-openvpn.conf ]] && rm /etc/sysctl.d/dietpi-openvpn.conf
 
 		fi
 
@@ -13653,7 +13706,7 @@ _EOF_
 			Banner_Uninstalling
 			G_AGP wireguard*
 			[[ -d /etc/wireguard ]] && rm -R /etc/wireguard
-			[[ -f /etc/apt/sources.d/dietpi-wireguard.list ]] && rm /etc/apt/sources.d/dietpi-wireguard.list
+			[[ -f /etc/apt/sources.list.d/dietpi-wireguard.list ]] && rm /etc/apt/sources.list.d/dietpi-wireguard.list
 			[[ -f /etc/apt/preferences.d/dietpi-wireguard ]] && rm /etc/apt/preferences.d/dietpi-wireguard
 			[[ -f /etc/sysctl.d/dietpi-wireguard.conf ]] && rm /etc/sysctl.d/dietpi-wireguard.conf
 
@@ -13743,6 +13796,9 @@ _EOF_
 			rm /usr/sbin/hostapd &> /dev/null
 			rm /usr/sbin/hostapd_cli &> /dev/null
 
+			# IP forwarding
+			[[ -f /etc/sysctl.d/dietpi-wifihotspot.conf ]] && rm /etc/sysctl.d/dietpi-wifihotspot.conf
+
 			#Set Wlan back to inactive and ready for use with dietpi-config.
 			local wifi_index=$(sed -n 2p /DietPi/dietpi/.network)
 
@@ -13776,7 +13832,7 @@ _EOF_
 			Banner_Uninstalling
 			#apt-mark auto libssl1.0.0 openssl libsoxr0 libavahi-client3 libtool libconfig9 libpopt0 libdaemon0 &> /dev/null
 			# No package is installed anymore, files are directly extracted into places, need to remove them manually?
-			# https://github.com/Fourdee/DietPi/blob/testing/dietpi/dietpi-software#L5968
+			# https://github.com/MichaIng/DietPi/blob/testing/dietpi/dietpi-software#L5968
 			#G_AGP shairport-sync
 			rm /lib/systemd/system/shairport-sync.service /usr/local/bin/shairport-sync /usr/local/etc/shairport-sync.conf* /usr/local/share/man/man7/shairport-sync.7.gz &> /dev/null
 			userdel -rf shairport-sync
@@ -13854,23 +13910,21 @@ _EOF_
 
 		fi
 
-		software_id=65
+		software_id=65 # Netdata
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
 			#apt-mark auto zlib1g-dev &> /dev/null
 
-			#all
-			[[ -f /etc/systemd/system/netdata.service ]] && rm /etc/systemd/system/netdata.service
+			# 1.2.0+
+			G_AGP netdata
 
+			# Pre v6.22 || Raspbian Stretch + All Jessie
+			[[ -f /etc/systemd/system/netdata.service ]] && rm /etc/systemd/system/netdata.service
 			getent passwd netdata &> /dev/null && userdel netdata
 
-			#1.2.0+
-			G_AGP netdata
-
-			#1.0.0
+			# 1.0.0
 			[[ -f /usr/sbin/netdata ]] && rm /usr/sbin/netdata
-
 			[[ -d /etc/netdata ]] && rm -R /etc/netdata
 			[[ -d /usr/lib/netdata ]] && rm -R /usr/lib/netdata
 			[[ -d /usr/share/netdata ]] && rm -R /usr/share/netdata
@@ -13920,7 +13974,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP $(dpkg --get-selections plexmediaserver* | awk '{print $1}')
+			G_AGP $(dpkg --get-selections plexmediaserver* | mawk '{print $1}')
 			[[ -d /var/lib/plexmediaserver ]] && rm -R /var/lib/plexmediaserver
 			[[ -f etc/apt/sources.list.d/plex.list ]] && rm /etc/apt/sources.list.d/plex.list && G_AGUP
 			[[ -d /etc/systemd/system/plexmediaserver.service.d ]] && rm -R /etc/systemd/system/plexmediaserver.service.d # post v6.17
@@ -14075,7 +14129,7 @@ _EOF_
 			rm /var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh
 			rm $HOME/.chromium-browser.init
 
-			G_AGP $(dpkg --get-selections chromium* | awk '{print $1}') chromedriver # chromedriver: Jessie only
+			G_AGP $(dpkg --get-selections chromium* | mawk '{print $1}') chromedriver # chromedriver: Jessie only
 
 		fi
 
@@ -14097,18 +14151,18 @@ _EOF_
 
 		fi
 
-		software_id=165
+		software_id=165 # Gitea
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			# Delete systemd files
-			rm /etc/systemd/system/gitea.service
+			# Remove systemd unit
+			[[ -f /etc/systemd/system/gitea.service ]] && rm /etc/systemd/system/gitea.service
 
 			# Delete data
-			rm -R $G_FP_DIETPI_USERDATA/gitea
-			rm -R /var/log/gitea
+			[[ -d $G_FP_DIETPI_USERDATA/gitea ]] && rm -R $G_FP_DIETPI_USERDATA/gitea
+			[[ -d /var/log/gitea ]] && rm -R /var/log/gitea
 
-			# drop/delete database
+			# Drop/delete database
 			systemctl start $MARIADB_SERVICE
 			mysqladmin drop gitea -f
 			mysql -e "drop user 'gitea'@'localhost'"
@@ -14132,7 +14186,7 @@ _EOF_
 
 			Banner_Uninstalling
 			G_AGP raspotify
-			rm /etc/apt/sources.list.d/raspotify.list
+			[[ -f /etc/apt/sources.list.d/raspotify.list ]] && rm /etc/apt/sources.list.d/raspotify.list
 			G_AGUP
 
 		fi
@@ -14214,7 +14268,7 @@ _EOF_
 			# Remove default unused folder
 			[[ -d /var/lib/docker ]] && rm -R /var/lib/docker
 
-			# Faulty "docker-ce" package version fix; This can be removed after repo got an update: https://github.com/Fourdee/DietPi/issues/2282
+			# Faulty "docker-ce" package version fix; This can be removed after repo got an update: https://github.com/MichaIng/DietPi/issues/2282
 			[[ -f /etc/apt/preferences.d/dietpi-docker_fix ]] && rm /etc/apt/preferences.d/dietpi-docker_fix
 
 		fi
@@ -14224,10 +14278,10 @@ _EOF_
 
 			Banner_Uninstalling
 			# Remove Service file
-			rm /etc/systemd/system/nukkit.service
+			[[ -f /etc/systemd/system/nukkit.service ]] && rm /etc/systemd/system/nukkit.service
 
-			# remove nukkit java file/folder
-			rm -r /usr/local/bin/nukkit
+			# Remove nukkit java file/folder
+			[[ -e /usr/local/bin/nukkit ]] && rm -R /usr/local/bin/nukkit
 
 		fi
 
@@ -14236,10 +14290,10 @@ _EOF_
 
 			Banner_Uninstalling
 			#apt-mark auto libupnp6 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-alsa &> /dev/null
-			G_AGP gmrender
-			rm /etc/systemd/system/gmrender.service
+			G_AGP gmrender gmediarender
+			[[ -f /etc/systemd/system/gmrender.service ]] && rm /etc/systemd/system/gmrender.service
 
-			userdel -rf gmrender
+			getent passwd gmrender &> /dev/null && userdel -rf gmrender
 
 		fi
 
@@ -14424,11 +14478,7 @@ _EOF_
 
 			Banner_Uninstalling
 			# This also removes OpenSSH server. So lets check OpenSSH server isn't installed before hand.
-			if dpkg --get-selections | grep -qi 'openssh-server'; then
-
-				G_AGP openssh-client
-
-			fi
+			dpkg-query -s 'openssh-server' &> /dev/null || G_AGP openssh-client
 
 		fi
 
@@ -14445,20 +14495,20 @@ _EOF_
 
 		fi
 
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
 			G_AGP urbackup-server
 
-			#+sourcebuild
-			rm /etc/systemd/system/urbackupsrv.service
-			rm /etc/default/urbackupsrv
-			rm /etc/logrotate.d/urbackupsrv
-			rm /usr/sbin/urbackupsrv
-			rm /usr/bin/urbackup_snapshot_helper
-			rm /usr/bin/urbackupsrv
-			rm -R /usr/share/urbackup
+			# +sourcebuild
+			[[ -f /etc/systemd/system/urbackupsrv.service ]] && rm /etc/systemd/system/urbackupsrv.service
+			[[ -f /etc/default/urbackupsrv ]] && rm /etc/default/urbackupsrv
+			[[ -f /etc/logrotate.d/urbackupsrv ]] && rm /etc/logrotate.d/urbackupsrv
+			[[ -f /usr/sbin/urbackupsrv ]] && rm /usr/sbin/urbackupsrv
+			[[ -f /usr/bin/urbackup_snapshot_helper ]] && rm /usr/bin/urbackup_snapshot_helper
+			[[ -f /usr/bin/urbackupsrv ]] && rm /usr/bin/urbackupsrv
+			[[ -d /usr/share/urbackup ]] && rm -R /usr/share/urbackup
 
 		fi
 
@@ -14532,7 +14582,7 @@ _EOF_
 
 			Banner_Uninstalling
 
-			apt-mark auto $(dpkg --get-selections default-jre* default-jdk* openjdk-* | awk '{print $1}') ca-certificates-java
+			apt-mark auto $(dpkg --get-selections default-jre* default-jdk* openjdk-* | mawk '{print $1}') ca-certificates-java
 			[[ -f /etc/apt/preferences.d/99-dietpi-openjdk-8-jdk ]] && rm /etc/apt/preferences.d/99-dietpi-openjdk-8-jdk
 
 		fi
@@ -14541,7 +14591,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP $(dpkg --get-selections dropbear* | awk '{print $1}') # Stretch: dropbear-initramfs dropbear-run
+			G_AGP $(dpkg --get-selections dropbear* | mawk '{print $1}') # Stretch: dropbear-initramfs dropbear-run
 
 			# Required on Jessie only, since ECDSA key is not created on install automatically, thus not removed on uninstall
 			[[ -d /etc/dropbear ]] && rm -R /etc/dropbear
@@ -14552,54 +14602,50 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP $(dpkg --get-selections openssh-* | awk '{print $1}')
+			G_AGP $(dpkg --get-selections openssh-* | mawk '{print $1}')
 
 			# This also clears OpenSSH client
 			aSOFTWARE_INSTALL_STATE[0]=0
 
 		fi
 
-		software_id=103
+		software_id=103 # DietPi-RAMlog
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
 
-			sed -i '/\/var\/log/c\#\/var\/log DietPi-RAMlog disabled' /etc/fstab
+			sed -i '/[[:blank:]]\/var\/log[[:blank:]]/d' /etc/fstab
 
-			# - Boot service to allow dietpi-ramlog to start and copy skeletons back to /var/log, then finally disable ramlog
 			cat << _EOF_ > /etc/systemd/system/dietpi-ramlog_disable.service
 [Unit]
-Description=DietPi - Boot service to allow dietpi-ramlog to start and copy skeletons back to /var/log, then finally disable ramlog
+Description=DietPi-RAMlog_disable | Disables DietPi-RAMlog after it has restored log metadata back to /var/log
 After=dietpi-ramlog.service dietpi-ramdisk.service
 Requires=dietpi-ramdisk.service
-Before=dietpi-boot.service rsyslog.service syslog.service
+Before=dietpi-preboot.service rsyslog.service syslog.service
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
 StandardOutput=tty
 ExecStart=/bin/bash -c '/var/lib/dietpi/dietpi-ramlog/disable.sh &> /var/tmp/dietpi/logs/dietpi-ramlog_disable_debug.log'
 
 [Install]
 WantedBy=local-fs.target
 _EOF_
-
 			systemctl daemon-reload
 			systemctl enable dietpi-ramlog_disable
 
+			mkdir -p /var/lib/dietpi/dietpi-ramlog
 			cat << _EOF_ > /var/lib/dietpi/dietpi-ramlog/disable.sh
 #!/bin/bash
 {
 	systemctl stop dietpi-ramlog
 	systemctl disable dietpi-ramlog
-	rm -R /var/tmp/dietpi/logs/dietpi-ramlog_store/*
+	rm -R /var/tmp/dietpi/logs/dietpi-ramlog_store
 	systemctl disable dietpi-ramlog_disable
 	rm /etc/systemd/system/dietpi-ramlog_disable.service
-	systemctl daemon-reload
 	rm /var/lib/dietpi/dietpi-ramlog/disable.sh
 }
 _EOF_
-
 			chmod +x /var/lib/dietpi/dietpi-ramlog/disable.sh
 
 		fi
@@ -14683,7 +14729,7 @@ _EOF_
 
 		#Check if we need to clear DietPi choices
 		local fp_temp='.dietpi-uninstall_dpkg'
-		dpkg --get-selections | awk '{print $1}' > $fp_temp
+		dpkg --get-selections | mawk '{print $1}' > $fp_temp
 		if ! grep -q '^openssh-server' $fp_temp &&
 			! grep -q '^dropbear' $fp_temp; then
 
@@ -14700,7 +14746,7 @@ _EOF_
 
 		fi
 
-		if grep -q '#/var/log' /etc/fstab &&
+		if ! grep -q '[[:blank:]]/var/log[[:blank:]]' /etc/fstab &&
 			! grep -q '^rsyslog' $fp_temp &&
 			! grep -q '^logrotate' $fp_temp; then
 
@@ -14726,13 +14772,13 @@ _EOF_
 	Run_Installations(){
 
 		#------------------------------------------------------------
-		#Prevent continue if Network or NTPD is not completed: https://github.com/Fourdee/DietPi/issues/786
+		#Prevent continue if Network or NTPD is not completed: https://github.com/MichaIng/DietPi/issues/786
 		Check_Internet_and_NTPD
 		#------------------------------------------------------------
 		#Disable powersaving on main screen during installation
 		setterm -blank 0 -powersave off 2> /dev/null
 		#------------------------------------------------------------
-		# Unmask all services: https://github.com/Fourdee/DietPi/issues/1320
+		# Unmask all services: https://github.com/MichaIng/DietPi/issues/1320
 		DISABLE_SERVICES_START=1 /DietPi/dietpi/dietpi-services unmask all
 		# Stop services
 		/DietPi/dietpi/dietpi-services stop
@@ -14941,7 +14987,7 @@ _EOF_
 
 				fi
 
-			done <<< "$(grep '^[[:blank:]]*AUTO_SETUP_INSTALL_SOFTWARE_ID=' /DietPi/dietpi.txt | awk '{print $1}' | sed 's/[^0-9]*//g')"
+			done <<< "$(grep '^[[:blank:]]*AUTO_SETUP_INSTALL_SOFTWARE_ID=' /DietPi/dietpi.txt | mawk '{print $1}' | sed 's/[^0-9]*//g')"
 
 		fi
 
@@ -15345,7 +15391,7 @@ Once $G_PROGRAM_NAME has finished installation, simply run 'dietpi-drive_manager
 
 			fi
 
-			#Gogs: Requires OpenSSH for ssh-keygen binary: https://github.com/Fourdee/DietPi/issues/442
+			#Gogs: Requires OpenSSH for ssh-keygen binary: https://github.com/MichaIng/DietPi/issues/442
 			if (( ${aSOFTWARE_INSTALL_STATE[49]} == 1 && $INDEX_SSHSERVER_TARGET != -2 )); then
 
 				if G_WHIP_YESNO "Gogs requires OpenSSH server to function.\n\nIf you continue, OpenSSH will be selected for install on your system. OpenSSH will also replace Dropbear (if currently installed).\n
@@ -15378,7 +15424,7 @@ TLDR: You do NOT need to select a webserver stack for installation with DietPi.
 
 			done
 
-			#RPiCamInterface - warn user of locking out camera: https://github.com/Fourdee/DietPi/issues/249
+			#RPiCamInterface - warn user of locking out camera: https://github.com/MichaIng/DietPi/issues/249
 			if (( ${aSOFTWARE_INSTALL_STATE[59]} == 1 )); then
 
 				G_WHIP_MSG 'RPi Cam Control Interface will automatically start and activate the camera during boot. This will prevent other programs (eg: raspistill) from using the camera.\n
@@ -16166,6 +16212,8 @@ NB: You can use dietpi-software at a later date, to install optimized software f
 					#exit menu system
 					TARGETMENUID=-1
 
+					DISABLE_REBOOT=1
+
 					#Enable installation start flag
 					GOSTARTINSTALL=1
 
@@ -16399,7 +16447,7 @@ NB: You can use dietpi-software at a later date, to install optimized software f
 
 			# - Disable serial?
 			#	must be enabled for the following:
-			#	XU4: https://github.com/Fourdee/DietPi/issues/2038#issuecomment-416089875
+			#	XU4: https://github.com/MichaIng/DietPi/issues/2038#issuecomment-416089875
 			#	RockPro64: Fails to boot into kernel without serial enabled
 			#	NanoPi Neo Air: Required for end users/debugging/setting up WiFi without automation
 			if (( $(grep -m1 '^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=' /DietPi/dietpi.txt | sed 's/^.*=//') == 1 &&
@@ -16415,7 +16463,7 @@ NB: You can use dietpi-software at a later date, to install optimized software f
 
 		fi
 
-		# Prevent continue if no Network or NTPD is not completed: https://github.com/Fourdee/DietPi/issues/786
+		# Prevent continue if no Network or NTPD is not completed: https://github.com/MichaIng/DietPi/issues/786
 		Check_Internet_and_NTPD
 
 		# - Apply 1st run automation
diff --git a/dietpi/dietpi-survey b/dietpi/dietpi-survey
index c08250f101..d6bafceb69 100644
--- a/dietpi/dietpi-survey
+++ b/dietpi/dietpi-survey
@@ -23,23 +23,20 @@
 	# $(sed -n 5p /DietPi/dietpi/.hw_model).txt
 	#////////////////////////////////////
 
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 	. /DietPi/dietpi/func/dietpi-globals
 	G_PROGRAM_NAME='DietPi-Survey'
 	G_CHECK_ROOT_USER
 	G_INIT
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 
 	EXIT_CODE=1 # 1=failed to send survey, 0=survey sent, 2=opted out and sent
 
-	#Grab Input (valid interger)
-	INPUT=0
-	disable_error=1 G_CHECK_VALIDINT $1 && INPUT=$1
+	# Grab Input (valid interger)
+	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1 || INPUT=0
 
-	#Force opted in, for automated installations by default
-	OPTED_IN=1 #1=yes | 0=no and purge data
-	SURVEY_SENTCOUNT=0
-	SURVEY_VERSION=6
+	# Force opted in for automated installations by default
+	OPTED_IN=1 # 1=yes | 0=no and purge data
 
 	DIETPI_VERSION="$G_DIETPI_VERSION_CORE.$G_DIETPI_VERSION_SUB"
 	UNIQUE_ID=$(sed -n 5p /DietPi/dietpi/.hw_model)
@@ -50,44 +47,33 @@
 	SFTP_PASS='upload2dietpi'
 
 	FP_SETTINGS='/DietPi/dietpi/.dietpi-survey'
-	Write_Settings(){
-
-		cat << _EOF_ > $FP_SETTINGS
-$OPTED_IN
-$SURVEY_SENTCOUNT
-_EOF_
-
-	}
-
+	Write_Settings(){ echo $OPTED_IN > $FP_SETTINGS; }
 	Read_Settings(){
 
-		OPTED_IN=$(sed -n 1p $FP_SETTINGS)
-		# Force interactive mode, if invalid opt value is found:
-		(( OPTED_IN < 0 || OPTED_IN > 1 )) && INPUT=0
-		SURVEY_SENTCOUNT=$(sed -n 2p $FP_SETTINGS)
+		OPTED_IN=$(<$FP_SETTINGS)
+		# Force interactive mode if invalid opt value is found
+		[[ $OPTED_IN == [01] ]] || INPUT=0
 
 	}
 
 	Generate_File(){
 
 		# Current Git user/branch
-		# - For privacy reasons, replace all non-official (Fourdee) branches with "custom"
+		# - For privacy reasons, replace all non-official (MichaIng) branches with "custom"
 		local gitbranch="$G_GITOWNER/$G_GITBRANCH"
-		[[ $G_GITOWNER != 'Fourdee' ]] && gitbranch='custom'
+		[[ $G_GITOWNER != 'MichaIng' ]] && gitbranch='custom'
 
 		# Prevent empty strings, occurred in rare cases
 		local network_interface='NONE'
-		[[ -f /DietPi/dietpi/.network ]] && network_interface="$(sed -n 3p /DietPi/dietpi/.network)"
+		[[ -f /DietPi/dietpi/.network ]] && network_interface=$(sed -n 3p /DietPi/dietpi/.network)
 		local autostart_index=0
 		[[ -f /DietPi/dietpi/.dietpi-autostart_index ]] && autostart_index=$(</DietPi/dietpi/.dietpi-autostart_index)
 
 		cat << _EOF_ > $UPLOAD_FILENAME
 #!/bin/bash
 # -------------------------
-((aSURVEY_VERSION[$SURVEY_VERSION]++))
-# -------------------------
-((aSURVEY_SENTCOUNT[$((SURVEY_SENTCOUNT+1))]++))
 ((aDIETPI_VERSION[$DIETPI_VERSION]++))
+# -------------------------
 ((aGIT_BRANCH[$gitbranch]++))
 ((aDEVICE_NAME[$G_HW_MODEL_DESCRIPTION]++))
 ((aCPU_ARCH[$G_HW_ARCH_DESCRIPTION]++))
@@ -137,7 +123,7 @@ _EOF_
 
 		local info_failure_msg='Failed to connect to SFTP server. Please try again later. If problems persist, please report this issue to the DietPi dev team (forum or GitHub repo).'
 
-		#Check if we have a working internet connection beforehand
+		# Check if we have a working internet connection beforehand
 		G_USER_INPUTS=0 G_ERROR_HANDLER_INFO_ONLY=1 G_CHECK_URL "$SFTP_ADDR"
 		if (( $G_ERROR_HANDLER_EXITCODE_RETURN == 0 )); then
 
@@ -152,7 +138,7 @@ _EOF_
 
 			fi
 
-			#Upload to server
+			# Upload to server
 			curl --connect-timeout 8 --retry 1 --retry-delay 4 -sT "$UPLOAD_FILENAME" sftp://"$SFTP_USER":"$SFTP_PASS"@"$SFTP_ADDR"/survey/
 			if (( $? )); then
 
@@ -164,8 +150,6 @@ _EOF_
 
 				EXIT_CODE=0
 				G_DIETPI-NOTIFY 0 'Successfully sent survey data'
-				# Increase sent count
-				((SURVEY_SENTCOUNT++))
 
 			# Successful upload + opted out + interactive
 			elif (( ! $INPUT )); then
@@ -190,19 +174,19 @@ _EOF_
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
 
-	#Read data from .dietpi-survey file
+	# Read data from .dietpi-survey file
 	if [[ -f $FP_SETTINGS ]]; then
 
 		Read_Settings
 
-	#Force interactive user choice, if no settings file found = no choice made yet
+	# Force interactive user choice, if no settings file found = no choice made yet
 	elif (( $G_USER_INPUTS )); then
 
 		INPUT=0
 
 	fi
 
-	#Input mode: Send survey if opted in or empty file if opted out
+	# Input mode: Send survey if opted in or empty file if opted out
 	if (( $INPUT == 1 )); then
 
 		Generate_File
@@ -221,7 +205,7 @@ _EOF_
 
 		)
 
-		G_WHIP_MENU "DietPi-Survey would like to collect anonymous statistics about your hardware, DietPi software and settings. \
+		if G_WHIP_MENU "DietPi-Survey would like to collect anonymous statistics about your hardware, DietPi software and settings. \
 This allows us to focus development based on popularity. NO private data will be collected and NO ONE can identify you based on the data. \
 The data is sent via secured connection to our SFTP server and is stored there unreadable to the public upload user. \
 If you agree, your uploaded data will be automatically updated on every DietPi-Update and DietPi-Software usage. \
@@ -230,8 +214,7 @@ The current survey statistics can be reviewed at: https://dietpi.com/survey
 Your personal upload file would look like this:
 $(<$UPLOAD_FILENAME)
 
-Would you like to join DietPi-Survey?"
-		if (( ! $? )); then
+Would you like to join DietPi-Survey?"; then
 
 			OPTED_IN=$G_WHIP_RETURNED_VALUE
 			Send_File
diff --git a/dietpi/dietpi-sync b/dietpi/dietpi-sync
index cc20958b1d..138477a1c2 100644
--- a/dietpi/dietpi-sync
+++ b/dietpi/dietpi-sync
@@ -25,7 +25,7 @@
 	G_INIT
 	#Import DietPi-Globals ---------------------------------------------------------------
 
-	#Restart rsync service, if stopped during DietPi-Sync run: https://github.com/Fourdee/DietPi/issues/1869
+	#Restart rsync service, if stopped during DietPi-Sync run: https://github.com/MichaIng/DietPi/issues/1869
 	SERVICE_CONTROL=0
 	G_EXIT_CUSTOM(){ (( $SERVICE_CONTROL )) && G_RUN_CMD systemctl start rsync; }
 
@@ -43,8 +43,9 @@
 	FP_FILTER_INCLUDE_EXCLUDE='.dietpi-sync_include_exclude'
 	FP_USER_FILTER_INCLUDE_EXCLUDE='/DietPi/dietpi/.dietpi-sync_inc_exc'
 	FP_LOG='.dietpi-sync.log'
-	FP_SOURCE='/mnt/Source'
-	FP_TARGET='/mnt/Target'
+	FP_LOG_ALT='/var/tmp/dietpi/logs/dietpi-sync.log'
+	FP_SOURCE='/mnt/source'
+	FP_TARGET='/mnt/target'
 
 	#Extra settings
 	SYNC_DELETE_MODE=0
@@ -91,118 +92,143 @@ _EOF_
 
 	}
 
-	Banner_Start(){
-
-		local mode='Sync'
-		(( ${SYNC_DRY_RUN:=0} )) && mode='Dry Run'
-
-		G_DIETPI-NOTIFY 3 "$G_PROGRAM_NAME" "$mode"
-
-	}
-
 	Run_Sync(){
 
-		Banner_Start
-
-		#Stop rsync service: https://github.com/Fourdee/DietPi/issues/1869
+		#Stop rsync service: https://github.com/MichaIng/DietPi/issues/1869
 		if systemctl is-active rsync &> /dev/null; then
 
 			SERVICE_CONTROL=1
 			G_RUN_CMD systemctl stop rsync
 
 		fi
-		killall -qw rsync
 
-		#Pre-create target dir to check R/W access
+		#Pre-create target dir, which also checks R/W access
                 # - Remove previous mkdir log
-		[[ -f /var/log/dietpi-sync.log ]] && rm /var/log/dietpi-sync.log
+		[[ -f $FP_LOG_ALT ]] && rm $FP_LOG_ALT
 		mkdir -p "$FP_TARGET" &> $FP_LOG
 
 		#Error: Dir not found
 		if [[ ! -d $FP_TARGET ]]; then
 
 			G_WHIP_MSG "[FAILED] Unable to pre-create target directory: $FP_TARGET\n\n\"mkdir\" reported the following error:\n$(<$FP_LOG)"
+			# We cannot log to target dir, use $FP_LOG_ALT instead
 			echo "$(date +"%d-%m-%Y_%T") [FAILED] Unable to pre-create target directory: $FP_TARGET" >> $FP_LOG
-			mv $FP_LOG /var/log/dietpi-sync.log
+			mv $FP_LOG $FP_LOG_ALT
 
-		#Error: Rsync is already running
+		#Error: Empty source dir
+		elif [[ ! $(ls -A "$FP_SOURCE") ]]; then
+			
+			G_WHIP_MSG "[FAILED] The chosen source directory is empty: $FP_SOURCE\n\nPlease check it's path and in case verify that it's mount is active."
+			# Log to target dir directly, preserve previous rsync log
+			echo "$(date +"%d-%m-%Y_%T") [FAILED] The chosen source directory is empty: $FP_SOURCE" >> "$FP_TARGET/$FP_LOG"
+
+		#Error: Rsync still running
 		elif pgrep '[r]sync' &> /dev/null; then
 
-			G_WHIP_MSG '[FAILED] Rsync is already running and failed to stop gracefully'
-			# Add info to target log location directly, preserve previous rsync log
+			G_WHIP_MSG '[FAILED] Rsync is already running and failed to stop gracefully\n\nPlease check active rsync processes e.g. via "htop" and finish or kill them.'
+			# Log to target dir directly, preserve previous rsync log
 			echo "$(date +"%d-%m-%Y_%T") [FAILED] Rsync is already running and failed to stop gracefully" >> "$FP_TARGET/$FP_LOG"
 
-		#Start sync
+		#Start sync, beginning with dry run
 		else
 
 			#Generate Exclude/Include lists
 			Create_Filter_Include_Exclude
 
 			#Rsync options
-			local rsync_options="-aHP4h --info=name0 --info=progress2 --delete-excluded --exclude-from=$FP_FILTER_INCLUDE_EXCLUDE --log-file=$FP_LOG"
+			local rsync_options="-aHP4 --info=name0 --info=progress2 --exclude-from=$FP_FILTER_INCLUDE_EXCLUDE --log-file=$FP_LOG"
 			# - Delete mode?
-			(( $SYNC_DELETE_MODE )) && rsync_options+=' --delete'
+			(( $SYNC_DELETE_MODE )) && rsync_options+=' --delete --delete-excluded'
 
-			#Dry Run and verify enough space, in case if real sync
+			#Dry run
+			G_DIETPI-NOTIFY 3 $G_PROGRAM_NAME "Dry run $FP_SOURCE > $FP_TARGET"
 			rsync --dry-run --stats $rsync_options "$FP_SOURCE"/ "$FP_TARGET"/ > .dietpi-sync_result
 			EXIT_CODE=$?
-			if ! (( $SYNC_DRY_RUN || $EXIT_CODE )); then
+			if (( ! $EXIT_CODE )); then
 
-				# - NB: working in KiB until end MiB conversion, as, don't like using long long int, and, KiB should offer a good end result.
-				local old_backup_size=$(du -ks "$FP_TARGET" | mawk '{print $1}')
-				local new_backup_size=$(( $(grep -m1 'Total file size' .dietpi-sync_result | sed 's/[^0-9]*//g') / 1024 ))
-				local total_file_count=$(( $(mawk '/Number of files/ {print $6;exit}' .dietpi-sync_result | sed 's/[^0-9]*//g') ))
-				local total_folder_count=$(( $(mawk '/Number of files/ {print $8;exit}' .dietpi-sync_result | sed 's/[^0-9]*//g') ))
+				# Free space check
+				# - NB: Working in KiB until end MiB conversion, as, don't like using long long int, and, KiB should offer a good end result.
+				local old_backup_size=$(du -ks "$FP_TARGET" | mawk '{print $1}') # Actual disk space usage
+				local new_backup_size=$(( $(grep -m1 '^Total file size:' .dietpi-sync_result | sed 's/[^0-9]*//g') / 1024 + 1 )) # Theoretical, data size only
+				# - NB: Number of files $4 includes files + dirs + links.
+				#	Actually, we don't want to count links, as they don't use block sizes.
+				#	But scraping files + dirs is too much effort, as the output format depends on their existence.
+				local total_file_count=$(mawk '/^Number of files:/ {print $4;exit}' .dietpi-sync_result | sed 's/[^0-9]*//g')
 				local target_fs_blocksize=$(stat -fc %s "$FP_TARGET")
-				new_backup_size=$(( $new_backup_size + ( $total_file_count + $total_folder_count ) * $target_fs_blocksize / 1024 ))
+				new_backup_size=$(( $new_backup_size + $total_file_count * $target_fs_blocksize / 1024 + 1 )) # Add one block size to each file as worst case result
 				local end_result=$(( ( $new_backup_size - $old_backup_size ) / 1024 + 1 ))
 
+				local menu_test="[  OK  ] Dry run completed (NO changes made):\n - $FP_SOURCE > $FP_TARGET"
+				G_WHIP_DEFAULT_ITEM='Sync'
 				if ! G_CHECK_FREESPACE "$FP_TARGET" $end_result; then
 
-					G_WHIP_BUTTON_OK_TEXT='Ignore'
-					G_WHIP_BUTTON_CANCEL_TEXT='Exit'
-					if ! G_WHIP_YESNO 'The system sync target location appears to have insufficient free space to successfully finish the backup.
-However, this check is a rough estimation in reasonable time, thus it could be marginally incorrect.\n
-Would you like to override this warning and continue with the backup?'; then
+					if (( $INPUT == 1 )); then
 
-						echo "$(date +"%d-%m-%Y_%T") [FAILED] Insufficient free space" >> $FP_LOG
-						mv $FP_LOG "$FP_TARGET"/
+						echo "$(date +"%d-%m-%Y_%T") [FAILED] Insufficient free space" >> "$FP_TARGET/$FP_LOG"
 						return 1
 
+					else
+
+						menu_test="[WARNING] Insufficient free space\n - $FP_SOURCE > $FP_TARGET\n
+The target location appears to have insufficient free space to successfully finish the sync. However, this check is a rough estimate in reasonable time and may be slightly incorrect.\n
+Continue only if you know what you are doing and after checking the log!"
+						G_WHIP_DEFAULT_ITEM='Cancel'
+
 					fi
 
 				fi
 
-				#Real sync
-				G_DIETPI-NOTIFY 2 "Sync | $FP_SOURCE > $FP_TARGET: in progress, please wait..."
-				# - Clear log file from space check
-				> $FP_LOG
-				rsync $rsync_options "$FP_SOURCE"/ "$FP_TARGET"/
-				EXIT_CODE=$?
+				while :
+				do
 
-			fi
+					G_WHIP_MENU_ARRAY=(
 
-			G_DIETPI-NOTIFY -1 $EXIT_CODE "$G_PROGRAM_NAME"
+						'Sync' ': Continue with real sync'
+						'Log' ': View log file for details'
+						'Cancel' ': Abort sync, no changes will be made'
 
-			if (( ! $EXIT_CODE )); then
+					)
 
-				if (( ! $SYNC_DRY_RUN )); then
+					G_WHIP_MENU "$menu_test\n\n$(sed -n 4,9p .dietpi-sync_result)"
 
-					echo "$(date +"%d-%m-%Y_%T") [  OK  ] Sync completed" >> $FP_LOG
-					G_WHIP_MSG "[  OK  ] Sync completed:\n - $FP_SOURCE > $FP_TARGET"
+					if [[ $G_WHIP_RETURNED_VALUE == 'Log' ]]; then
 
-				else
+						G_WHIP_VIEWFILE $FP_LOG
+						G_WHIP_DEFAULT_ITEM='Log'
 
-					echo "$(date +"%d-%m-%Y_%T") [  OK  ] Dry run completed" >> $FP_LOG
-					G_WHIP_MSG "[  OK  ] Dry Run Sync completed (NO modifications):\n - $FP_SOURCE > $FP_TARGET"
+					elif [[ $G_WHIP_RETURNED_VALUE == 'Sync' || $INPUT == 1 ]]; then
 
-				fi
+						break
 
-			else
+					else
+
+						return
+
+					fi
+
+				done
+
+				#Sync
+				G_DIETPI-NOTIFY 3 $G_PROGRAM_NAME "Sync $FP_SOURCE > $FP_TARGET"
+				# - Clear log file from dry run
+				> $FP_LOG
+				rsync $rsync_options "$FP_SOURCE"/ "$FP_TARGET"/
+				EXIT_CODE=$?
+
+			fi
+
+			G_DIETPI-NOTIFY -1 $EXIT_CODE $G_PROGRAM_NAME
+
+			if (( $EXIT_CODE )); then
 
 				echo "$(date +"%d-%m-%Y_%T") [FAILED] Please see the log file for more information: $FP_TARGET/$FP_LOG" >> $FP_LOG
 				G_WHIP_MSG "[FAILED] $FP_SOURCE > $FP_TARGET\n\nYou will given an option to view the logfile on the next screen. Please check it for information and/or errors."
 
+			else
+
+				echo "$(date +"%d-%m-%Y_%T") [  OK  ] Sync completed" >> $FP_LOG
+				G_WHIP_MSG "[  OK  ] Sync completed:\n - $FP_SOURCE > $FP_TARGET"
+
 			fi
 
 			log=1 G_WHIP_VIEWFILE $FP_LOG
@@ -218,7 +244,7 @@ Would you like to override this warning and continue with the backup?'; then
 		if [[ $samba_mount_out ]]; then
 
 			samba_mount_available=1
-			samba_mount_text=$(mawk '{print "Size: "$2"B | Available: "$4"B"}' <<< $samba_mount_out)
+			samba_mount_text=$(mawk '{print "Size: "$2"iB | Available: "$4"iB"}' <<< $samba_mount_out)
 
 		fi
 
@@ -230,8 +256,8 @@ Would you like to override this warning and continue with the backup?'; then
 	Write_Settings_File(){
 
 		cat << _EOF_ > $FP_SETTINGS
-FP_SOURCE=$FP_SOURCE
-FP_TARGET=$FP_TARGET
+FP_SOURCE='$FP_SOURCE'
+FP_TARGET='$FP_TARGET'
 SYNC_DELETE_MODE=$SYNC_DELETE_MODE
 SYNC_CRONDAILY=$SYNC_CRONDAILY
 _EOF_
@@ -249,6 +275,7 @@ _EOF_
 	SYNC_CRONDAILY_TEXT=''
 
 	#TARGETMENUID=0
+	MENU_LASTITEM_MAIN=''
 	Menu_Main(){
 
 		SYNC_MODE_TEXT='[Off]'
@@ -261,9 +288,9 @@ _EOF_
 
 			local sync_last_status=$(tail -1 "$FP_TARGET/$FP_LOG")
 
-		elif [[ -f /var/log/dietpi-sync.log ]]; then
+		elif [[ -f $FP_LOG_ALT ]]; then
 
-			local sync_last_status=$(tail -1 /var/log/dietpi-sync.log)
+			local sync_last_status=$(tail -1 $FP_LOG_ALT)
 
 		else
 
@@ -276,18 +303,20 @@ _EOF_
 			'' '●─ Info '
 			'Help' ": What does $G_PROGRAM_NAME do?"
 			'' '●─ Options '
-			'Source Location' ': Change the Source directory.'
-			'Target Location' ': Change the Target directory.'
-			"Delete Mode" ": $SYNC_MODE_TEXT"
-			"Sync: Daily" ": $SYNC_CRONDAILY_TEXT"
+			'Source Location' ": [$FP_SOURCE]"
+			'Target Location' ": [$FP_TARGET]"
+			'Delete Mode' ": $SYNC_MODE_TEXT"
+			'Daily Sync' ": $SYNC_CRONDAILY_TEXT"
 			'' '●─ Run '
-			'Sync: Dry Run' ': Run a test Sync without modifying any data.'
-			'Sync: Now' ': Sync the Source location to the Target location.'
+			'Dry run + Sync' ': Sync from Source to Target (Dry run included!)'
 
 		)
 
+		G_WHIP_DEFAULT_ITEM=$MENU_LASTITEM_MAIN
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
-		if G_WHIP_MENU "Source location:\n  $FP_SOURCE\n\nTarget location:\n  $FP_TARGET\n\nLast sync status:\n  $sync_last_status"; then
+		if G_WHIP_MENU "Last sync status:\n  $sync_last_status"; then
+
+			MENU_LASTITEM_MAIN=$G_WHIP_RETURNED_VALUE
 
 			case "$G_WHIP_RETURNED_VALUE" in
 
@@ -307,8 +336,9 @@ _EOF_
 
 					G_WHIP_MSG 'DietPi-Sync is a program that allows you to duplicate a directory from one location (Source) to another (Target).\n
 For example: If we want to duplicate (sync) the data on our external USB HDD to another location, we simply select the USB HDD as the source, then, select a target location.
-The target location can be anything from a networked samba fileserver, or even a FTP server.\n
-If you would like to test a sync without modifiying any data, simply select Dry Run.\n\nMore information:\n - https://dietpi.com/phpbb/viewtopic.php?p=256#p256'
+The target location can be anything from a networked samba fileserver, or even an FTP server.\n
+Each sync includes a leading dry run, after which you can check the expected result before deciding if you want to continue with the actual sync.\n
+More information:\n - https://dietpi.com/phpbb/viewtopic.php?p=256#p256'
 
 				;;
 
@@ -318,31 +348,15 @@ If you would like to test a sync without modifiying any data, simply select Dry
 
 				;;
 
-				'Sync: Daily')
+				'Daily Sync')
 
 					Menu_Set_CronDaily
 
 				;;
 
-				'Sync: Dry Run')
-
-					if G_WHIP_YESNO "Start dry run sync?\n\nSource location:\n$FP_SOURCE/*\n\nTarget location:\n$FP_TARGET/*\n
-This is a Dry Run for testing. No data will be modified.\n\nDo you wish to continue?"; then
+				'Dry run + Sync')
 
-						SYNC_DRY_RUN=1 Run_Sync
-
-					fi
-
-				;;
-
-				'Sync: Now')
-
-					if G_WHIP_YESNO "Start sync?\n\nSource location:\n$FP_SOURCE/*\n\nTarget location:\n$FP_TARGET/*\n
-A copy of all the files and folders inside your Source location, will be created at the Target location.\n\nDo you wish to continue?"; then
-
-						SYNC_DRY_RUN=0 Run_Sync
-
-					fi
+					Run_Sync
 
 				;;
 
@@ -364,14 +378,15 @@ A copy of all the files and folders inside your Source location, will be created
 	}
 
 	#TARGETMENUID=1 (Target) && TARGETMENUID=2 (Source)
+	MENU_LASTITEM_SET_DIRS=''
 	Menu_Set_Directories(){
 
-		local current_directory="$FP_TARGET"
+		local current_directory=$FP_TARGET
 		local current_mode_text='Target'
 		local whip_description_text="Please select the $current_mode_text location.\nA copy of all the files and folders in the Source location will be created here.\n\nCurrent $current_mode_text location:\n$current_directory"
 		if (( $TARGETMENUID == 2 )); then
 
-			current_directory="$FP_SOURCE"
+			current_directory=$FP_SOURCE
 			current_mode_text='Source'
 			whip_description_text="Please select the $current_mode_text location.\nA copy of all the files and folder in this Source location, will be created at the Target location.\n\nCurrent $current_mode_text location:\n$current_directory"
 
@@ -391,29 +406,34 @@ A copy of all the files and folders inside your Source location, will be created
 
 		)
 
+		G_WHIP_DEFAULT_ITEM=$MENU_LASTITEM_SET_DIRS
 		G_WHIP_BUTTON_CANCEL_TEXT='Back'
 		if G_WHIP_MENU "$whip_description_text"; then
 
+			MENU_LASTITEM_SET_DIRS=$G_WHIP_RETURNED_VALUE
+
 			case "$G_WHIP_RETURNED_VALUE" in
 
 				'List')
 
-					/DietPi/dietpi/dietpi-drive_manager 1
+					if /DietPi/dietpi/dietpi-drive_manager 1; then
 
-					local return_value=$(</tmp/dietpi-drive_manager_selmnt)
-					[[ $return_value == '/' ]] && return_value='/mnt'
+						local return_value=$(</tmp/dietpi-drive_manager_selmnt)
+						[[ $return_value == '/' ]] && return_value='/mnt'
 
-					if (( $TARGETMENUID == 2 )); then
+						if (( $TARGETMENUID == 2 )); then
 
-						FP_SOURCE="$return_value"
+							FP_SOURCE=$return_value
 
-					else
+						else
 
-						FP_TARGET="$return_value/dietpi-sync"
+							FP_TARGET="$return_value/dietpi-sync"
 
-					fi
+						fi
 
-					TARGETMENUID=0
+						TARGETMENUID=0
+
+					fi
 
 				;;
 
@@ -433,7 +453,7 @@ A copy of all the files and folders inside your Source location, will be created
 
 						else
 
-							FP_TARGET=$fp_samba_mount/dietpi-sync
+							FP_TARGET="$fp_samba_mount/dietpi-sync"
 
 						fi
 
@@ -467,14 +487,13 @@ A copy of all the files and folders inside your Source location, will be created
 
 		)
 
-		G_WHIP_DEFAULT_ITEM="$SYNC_MODE_TEXT"
+		G_WHIP_DEFAULT_ITEM=$SYNC_MODE_TEXT
 		if G_WHIP_MENU 'Please select the Sync delete mode.\n
 [Off]: (safe)\nIf files and folders exist in the Target location, that are not in the Source, they will be left alone.\n
 [On]: (WARNING, if in doubt, DO NOT enable)\nAn exact copy of the Source location will be created at the Target location.
 If files are in the Target location that do not exist in the Source, they will be DELETED.'; then
 
-			SYNC_DELETE_MODE=0
-			[[ $G_WHIP_RETURNED_VALUE == '[On]' ]] && SYNC_DELETE_MODE=1
+			[[ $G_WHIP_RETURNED_VALUE == '[On]' ]] && SYNC_DELETE_MODE=1 || SYNC_DELETE_MODE=0
 
 		fi
 
@@ -484,18 +503,17 @@ If files are in the Target location that do not exist in the Source, they will b
 
 		G_WHIP_MENU_ARRAY=(
 
-			'[Off]' ': Manual sync'
+			'[Off]' ': Manual sync only'
 			'[On]' ': Automatically sync once a day'
 
 		)
 
-		G_WHIP_DEFAULT_ITEM="$SYNC_CRONDAILY_TEXT"
+		G_WHIP_DEFAULT_ITEM=$SYNC_CRONDAILY_TEXT
 		if G_WHIP_MENU '[Off]:\nThe user must manually sync using dietpi-sync.\n
-[On]:\nA cron job will be created that automatically runs dietpi-sync, once a day.\n
-(NOTICE):\nBefore enabling this feature, please run a test sync (Dry Run) to verify what will happen.'; then
+[On]:\nA cron job will automatically run dietpi-sync, once a day.\n
+(NOTICE):\nWhen using this feature, please run a manual sync and check the dry run log to verify what will happen.'; then
 
-			SYNC_CRONDAILY=0
-			[[ $G_WHIP_RETURNED_VALUE == '[On]' ]] && SYNC_CRONDAILY=1
+			[[ $G_WHIP_RETURNED_VALUE == '[On]' ]] && SYNC_CRONDAILY=1 || SYNC_CRONDAILY=0
 
 		fi
 
@@ -510,7 +528,7 @@ If files are in the Target location that do not exist in the Source, they will b
 		(( $TARGETMENUID == 2 )) && mode='source'
 		local fp_mode="FP_${mode^^}"
 		G_WHIP_DEFAULT_ITEM=${!fp_mode}
-		local text="Please enter a new file path for the $mode directory.\neg: /mnt/$mode"
+		local text="Please enter the full path to the desired $mode directory.\n\n - eg: /mnt/$mode"
 
 		while :
 		do
@@ -542,7 +560,7 @@ If files are in the Target location that do not exist in the Source, they will b
 
 			fi
 
-			G_WHIP_DEFAULT_ITEM="$G_WHIP_RETURNED_VALUE"
+			G_WHIP_DEFAULT_ITEM=$G_WHIP_RETURNED_VALUE
 
 		done
 
@@ -584,7 +602,7 @@ _EOF_
 	Read_Settings_File
 
 	#-----------------------------------------------------------------------------
-	#Run Sync
+	#Run sync
 	if (( $INPUT == 1 )); then
 
 		Run_Sync
@@ -597,13 +615,13 @@ _EOF_
 
 			printf '\ec' # clear current terminal screen
 
-			if (( $TARGETMENUID == 0 )); then
+			if (( $TARGETMENUID == 1 || $TARGETMENUID == 2 )); then
 
-				Menu_Main
+				Menu_Set_Directories
 
-			elif (( $TARGETMENUID == 1 || $TARGETMENUID == 2 )); then
+			else
 
-				Menu_Set_Directories
+				Menu_Main
 
 			fi
 
diff --git a/dietpi/dietpi-update b/dietpi/dietpi-update
index bd335d78e2..ba6ee6ca0a 100644
--- a/dietpi/dietpi-update
+++ b/dietpi/dietpi-update
@@ -47,7 +47,7 @@
 	RUN_UPDATE=0
 
 	GITOWNER_TARGET=$(grep -m1 '^[[:blank:]]*DEV_GITOWNER=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
-	GITOWNER_TARGET=${GITOWNER_TARGET:-Fourdee}
+	GITOWNER_TARGET=${GITOWNER_TARGET:-MichaIng}
 	GITBRANCH_TARGET=$(grep -m1 '^[[:blank:]]*DEV_GITBRANCH=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 	GITBRANCH_TARGET=${GITBRANCH_TARGET:-master}
 
@@ -74,28 +74,28 @@
 	}
 
 	URL_MIRROR_INDEX=0
-	URL_MIRROR_SERVERVERSION=(
+	aURL_MIRROR_SERVERVERSION=(
 
 		"https://raw.githubusercontent.com/$GITOWNER_TARGET/DietPi/$GITBRANCH_TARGET/dietpi/server_version-6"
 		"https://dietpi.com/downloads/dietpi-update_mirror/$GITBRANCH_TARGET/server_version-6"
 
 	)
 
-	URL_MIRROR_PREPATCH=(
+	aURL_MIRROR_PREPATCH=(
 
 		"https://raw.githubusercontent.com/$GITOWNER_TARGET/DietPi/$GITBRANCH_TARGET/dietpi/pre-patch_file"
 		"https://dietpi.com/downloads/dietpi-update_mirror/$GITBRANCH_TARGET/pre-patch_file"
 
 	)
 
-	URL_MIRROR_ZIP=(
+	aURL_MIRROR_ZIP=(
 
 		"https://github.com/$GITOWNER_TARGET/DietPi/archive/$GITBRANCH_TARGET.zip"
 		"https://dietpi.com/downloads/dietpi-update_mirror/$GITBRANCH_TARGET/DietPi-$GITBRANCH_TARGET.zip"
 
 	)
 
-	URL_MIRROR_CHANGELOG=(
+	aURL_MIRROR_CHANGELOG=(
 
 		"https://raw.githubusercontent.com/$GITOWNER_TARGET/DietPi/$GITBRANCH_TARGET/CHANGELOG.txt"
 		"https://dietpi.com/downloads/dietpi-update_mirror/$GITBRANCH_TARGET/CHANGELOG.txt"
@@ -105,11 +105,11 @@
 	Get_Server_Version(){
 
 		# Get server version file
-		for ((i=0; i<${#URL_MIRROR_SERVERVERSION[@]}; i++))
+		for i in ${!aURL_MIRROR_SERVERVERSION[@]}
 		do
 
-			G_DIETPI-NOTIFY 2 "Checking mirror: ${URL_MIRROR_SERVERVERSION[$i]}"
-			if curl -sL "${URL_MIRROR_SERVERVERSION[$i]}" > server_version; then
+			G_DIETPI-NOTIFY 2 "Checking mirror: ${aURL_MIRROR_SERVERVERSION[$i]}"
+			if curl -sL "${aURL_MIRROR_SERVERVERSION[$i]}" > server_version; then
 
 				# Get server version info
 				COREVERSION_SERVER=$(sed -n 1p server_version)
@@ -122,7 +122,7 @@
 					disable_error=1 G_CHECK_VALIDINT "$RCVERSION_SERVER"; then
 
 					SERVER_ONLINE=1
-					G_DIETPI-NOTIFY 0 "Using update server: ${URL_MIRROR_SERVERVERSION[$i]}"
+					G_DIETPI-NOTIFY 0 "Using update server: ${aURL_MIRROR_SERVERVERSION[$i]}"
 					URL_MIRROR_INDEX=$i
 					INFO_VERSIONS_UPDATE
 					break
@@ -135,7 +135,7 @@
 
 			else
 
-				G_DIETPI-NOTIFY 2 "No response from: ${URL_MIRROR_SERVERVERSION[$i]} ($(<server_version))"
+				G_DIETPI-NOTIFY 2 "No response from: ${aURL_MIRROR_SERVERVERSION[$i]} ($(<server_version))"
 
 			fi
 
@@ -186,18 +186,18 @@
 
 		if (( ! $CHANGELOG_DOWNLOADED )); then
 
-			for ((i=0; i<${#URL_MIRROR_CHANGELOG[@]}; i++))
+			for i in ${!aURL_MIRROR_CHANGELOG[@]}
 			do
 
-				G_DIETPI-NOTIFY 2 "Checking mirror: ${URL_MIRROR_CHANGELOG[$i]}"
-				if wget "${URL_MIRROR_CHANGELOG[$i]}" -O $fp_changelog; then
+				G_DIETPI-NOTIFY 2 "Checking mirror: ${aURL_MIRROR_CHANGELOG[$i]}"
+				if wget "${aURL_MIRROR_CHANGELOG[$i]}" -O $fp_changelog; then
 
 					CHANGELOG_DOWNLOADED=1
 					break
 
 				else
 
-					G_DIETPI-NOTIFY 2 "No response from: ${URL_MIRROR_CHANGELOG[$i]}"
+					G_DIETPI-NOTIFY 2 "No response from: ${aURL_MIRROR_CHANGELOG[$i]}"
 
 				fi
 
@@ -314,7 +314,7 @@ Do you wish to continue and update DietPi to v$COREVERSION_SERVER.$SUBVERSION_SE
 	Run_Update(){
 
 		# Applying pre-patch
-		G_RUN_CMD wget "${URL_MIRROR_PREPATCH[$URL_MIRROR_INDEX]}" -O pre-patch_file
+		G_RUN_CMD wget "${aURL_MIRROR_PREPATCH[$URL_MIRROR_INDEX]}" -O pre-patch_file
 		chmod +x pre-patch_file
 		if ! ./pre-patch_file $G_DIETPI_VERSION_SUB; then
 
@@ -328,18 +328,17 @@ Do you wish to continue and update DietPi to v$COREVERSION_SERVER.$SUBVERSION_SE
 		G_AGUG
 
 		# Git clone Zip method (no need to install Git)
-		if curl -kL "${URL_MIRROR_ZIP[$URL_MIRROR_INDEX]}" > update.zip; then
+		if curl -kL "${aURL_MIRROR_ZIP[$URL_MIRROR_INDEX]}" > update.zip; then
 
 			l_message='Unpack update archive' G_RUN_CMD unzip update.zip
 			rm update.zip
 
 			# Remove files from Git that are not to be updated on client
-			rm -R DietPi-"$GITBRANCH_TARGET"/dietpi/.??*
 			rm DietPi-"$GITBRANCH_TARGET"/dietpi/server_version*
 			rm DietPi-"$GITBRANCH_TARGET"/dietpi/pre-patch_file
 
 			# Remove old code before updating, so we dont need to patch for removals
-			#	:https://github.com/Fourdee/DietPi/issues/905#issuecomment-298241622
+			#	:https://github.com/MichaIng/DietPi/issues/905#issuecomment-298241622
 			#rm -R /DietPi/dietpi/{func,misc,dietpi-*}
 
 			l_message='Copy DietPi core files to RAMdisk' G_RUN_CMD cp -Rf DietPi-"$GITBRANCH_TARGET"/dietpi /DietPi/
@@ -402,14 +401,13 @@ Do you wish to continue and update DietPi to v$COREVERSION_SERVER.$SUBVERSION_SE
 
 	}
 
-	Apply_1st_Run_Update_Sucess(){
+	Apply_1st_Run_Update_Success(){
 
 		# - 1st run setup
 		(( $G_DIETPI_INSTALL_STAGE < 2 )) && echo 1 > /DietPi/dietpi/.install_stage
 
 	}
 
-
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
@@ -490,7 +488,7 @@ Please download the latest DietPi image:\n - https://dietpi.com/#download\n\n -
 			G_DIETPI-NOTIFY 2 "$INFO_SERVER_VERSION"
 			G_DIETPI-NOTIFY 0 'No updates required, your DietPi installation is up to date.\n'
 
-			Apply_1st_Run_Update_Sucess
+			Apply_1st_Run_Update_Success
 
 		fi
 
@@ -507,8 +505,8 @@ Please download the latest DietPi image:\n - https://dietpi.com/#download\n\n -
 			# Run update and patcher
 			[[ -f $FP_LOG ]] && rm $FP_LOG
 
-			# Run_Update: https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403866204
-			# - Pre-estimate and override terminal size variables, since they cannot be estimated, if STOUT and STERR are redirected: https://github.com/Fourdee/DietPi/issues/2105
+			# Run_Update: https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403866204
+			# - Pre-estimate and override terminal size variables, since they cannot be estimated, if STOUT and STERR are redirected: https://github.com/MichaIng/DietPi/issues/2105
 			export G_WHIP_SIZE_X_OVERRIDE=$(tput cols)
 			export G_WHIP_SIZE_Y_OVERRIDE=$(tput lines)
 			Run_Update > >(tee $FP_TMP_LOG) 2>&1
@@ -525,34 +523,16 @@ Please download the latest DietPi image:\n - https://dietpi.com/#download\n\n -
 			G_DIETPI-NOTIFY 2 "$INFO_CURRENT_VERSION"
 			G_DIETPI-NOTIFY 2 "$INFO_SERVER_VERSION"
 
-			local do_reboot=0
-
 			# - 1st run setup
-			if (( $G_DIETPI_INSTALL_STAGE < 2 )); then
-
-				Apply_1st_Run_Update_Sucess
-
-				G_WHIP_MSG 'DietPi has been updated to the latest version.\n\nThe system will now reboot. Once completed, simply login to resume DietPi Setup.\n\nPress Enter to Continue.'
-				do_reboot=1
-
-			# - Reboot prompt, if system is already installed
-			else
+			Apply_1st_Run_Update_Success
 
-				G_WHIP_YESNO "[  OK  ] Update applied\n
-Current version: $INFO_CURRENT_VERSION\n
-A system reboot is required to finalise the update. Would you like to reboot the system now?" && do_reboot=1
-
-			fi
-
-			# Failsafe: Restart RAMdisk + sync to disk
-			# - https://github.com/Fourdee/DietPi/issues/2473#issuecomment-458874222
+			# Failsafe: Store RAMdisk to disk which includes "sync"
+			# - https://github.com/MichaIng/DietPi/issues/2473#issuecomment-458874222
 			# - https://dietpi.com/phpbb/viewtopic.php?f=9&t=2591
-			G_RUN_CMD systemctl restart dietpi-ramdisk
-			sync
-
-			(( $do_reboot )) && reboot
+			l_message='Syncing new DietPi scripts to disk' G_RUN_CMD /DietPi/dietpi/func/dietpi-ramdisk 1
+			> /DietPi/.ramdisk
 
-			/DietPi/dietpi/dietpi-services restart
+			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-services restart
 
 		fi
 
diff --git a/dietpi/func/dietpi-banner b/dietpi/func/dietpi-banner
index 823f17b423..defb25240f 100644
--- a/dietpi/func/dietpi-banner
+++ b/dietpi/func/dietpi-banner
@@ -17,28 +17,20 @@
 	# - dietpi-banner 1 = top section and credits + clear
 	#////////////////////////////////////
 
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 	. /DietPi/dietpi/func/dietpi-globals
 	G_PROGRAM_NAME='DietPi-Banner'
 	G_INIT
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 
 	INPUT=0
-	if disable_error=1 G_CHECK_VALIDINT $1; then
-
-		INPUT=$1
-
-	fi
+	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1
 
 	#/////////////////////////////////////////////////////////////////////////////////////
-	#Globals
+	# Globals
 	#/////////////////////////////////////////////////////////////////////////////////////
 	DIETPI_VERSION="$G_DIETPI_VERSION_CORE.$G_DIETPI_VERSION_SUB.$G_DIETPI_VERSION_RC"
-	if [[ $G_GITBRANCH != 'master' ]]; then
-
-		DIETPI_VERSION+=" ($G_GITBRANCH)"
-
-	fi
+	[[ $G_GITBRANCH != 'master' ]] && DIETPI_VERSION+=" ($G_GITBRANCH)"
 
 	IMAGE_ADDITIONAL_CREDITS=$(sed -n 8p /DietPi/dietpi/.hw_model)
 
@@ -53,11 +45,11 @@
 	}
 
 	UPDATE_AVAILABLE=0
-	UPDATE_AVAILABLE_VERSION='' #-1 = image required, other value=latest version
+	UPDATE_AVAILABLE_VERSION='' # -1 = image required, other value = latest version
 
 	Obtain_Update_Available(){
 
-		#Update Available
+		# Update Available
 		if [[ -f '/DietPi/dietpi/.update_available' ]]; then
 
 			UPDATE_AVAILABLE=1
@@ -75,12 +67,8 @@
 
 	IPAddress_Print(){
 
-		#Try to re-obtain IP if missing
-		if [[ -z $IP_ADDRESS ]]; then
-
-			Update_Ip_Address
-
-		fi
+		# Try to re-obtain IP if missing
+		[[ $IP_ADDRESS ]] || Update_Ip_Address
 
 		echo -e " \e[1m$IP_ADAPTER\e[0m \e[90m| $IP_ADDRESS\e[0m\n \e[38;5;154m────────────────────────────────────────────────\e[0m"
 
@@ -93,23 +81,23 @@
 
 	Banner_TopText_Extras(){
 
-		#Update Available
+		# Update Available
 		if (( $UPDATE_AVAILABLE )); then
 
 			if [[ $UPDATE_AVAILABLE_VERSION == '-1' ]]; then
 
-				TEXT_TOP="\e[90m| \e[1;33mImage available\e[0m"
+				TEXT_TOP='\e[90m| \e[1;33mImage available\e[0m'
 
 			else
 
-				TEXT_TOP="\e[90m| \e[1;33mUpdate available\e[0m"
+				TEXT_TOP='\e[90m| \e[1;33mUpdate available\e[0m'
 
 			fi
 
-		#Use TEXT_TOP for storing helpful info
+		# Use TEXT_TOP for storing helpful info
 		else
 
-			#Helpful mode
+			# Helpful mode
 			TEXT_TOP="\e[90m| $(date +"%a %x - %R")\e[0m"
 
 		fi
@@ -117,31 +105,24 @@
 
 	Banner_Dietpi(){
 
-		if (( $INPUT == 1 )); then
-
-			printf '\ec' # clear current terminal screen
-
-		fi
+		(( $INPUT == 1 )) && printf '\ec' # clear current terminal screen
 
 		echo -e " \e[38;5;154m────────────────────────────────────────────────\e[0m\n \e[1mDietPi\e[0m $TEXT_TOP\n \e[38;5;154m────────────────────────────────────────────────\e[0m"
 		Hardware_Model_Print
 		IPAddress_Print
+
 	}
 
 	Credits_Print(){
 
-		echo -e "\e[90m DietPi Team     : Daniel Knight (founder), MichaIng, K-Plan\e[0m"
+		echo -e '\e[90m DietPi Team     : MichaIng (lead), Daniel Knight (founder)\e[0m'
 
 		local fp_prep_info='/DietPi/dietpi/.prep_info'
 		if [[ -f $fp_prep_info ]]; then
 
-			local image_creator="$(sed -n 1p $fp_prep_info)"
-			local preimage_name="$(sed -n 2p $fp_prep_info)"
-			if [[ $image_creator == '0' ]]; then
-
-				image_creator='DietPi Core Team'
-
-			fi
+			local image_creator=$(sed -n 1p $fp_prep_info)
+			local preimage_name=$(sed -n 2p $fp_prep_info)
+			[[ $image_creator == '0' ]] && image_creator='DietPi Core Team'
 
 			echo -e "\e[90m Image           : $image_creator (pre-image: $preimage_name)\e[0m"
 
@@ -153,23 +134,19 @@
  Patreon Legends : PINE64 community
  Donate          : https://DietPi.com/#donate'
 
-		if [[ $IMAGE_ADDITIONAL_CREDITS ]]; then
-
-			echo -e "\n\ Device image possible thanks to: $IMAGE_ADDITIONAL_CREDITS"
-
-		fi
+		[[ $IMAGE_ADDITIONAL_CREDITS ]] && echo -e "\n\ Device image possible thanks to: $IMAGE_ADDITIONAL_CREDITS"
 
-		echo -e " DietPi Hosting  : Powered by https://MyVirtualServer.com\e[0m"
-		echo -e "\n\e[1m dietpi-launcher\e[0m  = All the DietPi programs in one place."
-		echo -e "\e[1m dietpi-config\e[0m    = Feature rich configuration tool for your device."
-		echo -e "\e[1m dietpi-software\e[0m  = Select optimized software for installation."
+		echo -e ' DietPi Hosting  : Powered by https://MyVirtualServer.com\e[0m\n
+\e[1m dietpi-launcher\e[0m  = All the DietPi programs in one place.
+\e[1m dietpi-config\e[0m    = Feature rich configuration tool for your device.
+\e[1m dietpi-software\e[0m  = Select optimized software for installation.'
 
-		#Update available?
+		# Update available?
 		if (( $UPDATE_AVAILABLE )); then
 
 			if [[ $UPDATE_AVAILABLE_VERSION = '-1' ]]; then
 
-				echo -e "\n\e[1;31m Updated DietPi image is available, please download it:\e[0m\n https://dietpi.com/download\n"
+				echo -e '\n\e[1;31m Updated DietPi image is available, please download it:\e[0m\n https://dietpi.com/download\n'
 
 			else
 
@@ -179,8 +156,8 @@
 
 		fi
 
-		echo -e "\e[1m htop\e[0m             = Resource monitor."
-		echo -e "\e[1m cpu\e[0m              = Shows CPU information and stats.\n"
+		echo -e '\e[1m htop\e[0m             = Resource monitor.
+\e[1m cpu\e[0m              = Shows CPU information and stats.\n'
 
 	}
 
diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index 5711aacc20..fae7f640c3 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -10,7 +10,7 @@
 	#
 	# Info:
 	# - Provides/Exports shared/global DietPi variables/functions for current bash session and other scripts
-	# - CRITICAL, use local index variables in for/while loops, or unset them afterwards, else havoc: https://github.com/Fourdee/DietPi/issues/1454
+	# - CRITICAL, use local index variables in for/while loops, or unset them afterwards, else havoc: https://github.com/MichaIng/DietPi/issues/1454
 	# - Sourced/Loaded in interactive bash sessions: /etc/bashrc.d/dietpi-login.sh
 	# - Sourced/Loaded as start of all DietPi script, except those listed below
 	#
@@ -23,7 +23,7 @@
 	#////////////////////////////////////
 
 	#-----------------------------------------------------------------------------------
-	# Exit script for unsupported terminal and set dumb: https://github.com/Fourdee/DietPi/issues/1703#issue-314330405
+	# Exit script for unsupported terminal and set dumb: https://github.com/MichaIng/DietPi/issues/1703#issue-314330405
 	if [[ -z $TERM || $TERM == 'unknown' ]]; then
 
 		export TERM='dumb'
@@ -57,23 +57,15 @@
 
 	#DietPi First-Run Stage | -2 = PREP_SYSTEM/Unknown | -1 = first boot | 0 = 1st run dietpi-update | 1 = 1st run dietpi-software | 2 = completed | 10 = Pre-installed image, converts to 2 during 1st boot
 	G_DIETPI_INSTALL_STAGE=-2
-	if [[ -f '/DietPi/dietpi/.install_stage' ]]; then
-
-		G_DIETPI_INSTALL_STAGE=$(</DietPi/dietpi/.install_stage)
-
-	fi
+	[[ -f '/DietPi/dietpi/.install_stage' ]] && G_DIETPI_INSTALL_STAGE=$(</DietPi/dietpi/.install_stage)
 
 	#DietPi Versions/Branch
 	G_GITBRANCH=${G_GITBRANCH:-master}
-	G_GITOWNER=${G_GITOWNER:-Fourdee}
+	G_GITOWNER=${G_GITOWNER:-MichaIng}
 	G_DIETPI_VERSION_CORE=${G_DIETPI_VERSION_CORE:-6}
-	G_DIETPI_VERSION_SUB=${G_DIETPI_VERSION_SUB:-20}
+	G_DIETPI_VERSION_SUB=${G_DIETPI_VERSION_SUB:-22}
 	G_DIETPI_VERSION_RC=${G_DIETPI_VERSION_RC:-0}
-	if [[ -f '/DietPi/dietpi/.version' && $(sed -n 1p /DietPi/dietpi/.version) == '#!/bin/bash' ]]; then
-
-		. /DietPi/dietpi/.version
-
-	fi
+	[[ -f '/DietPi/dietpi/.version' && $(sed -n 1p /DietPi/dietpi/.version) == '#!/bin/bash' ]] && . /DietPi/dietpi/.version
 
 	G_VERSIONDB_SAVE(){
 
@@ -135,10 +127,11 @@ _EOF_
 
 	#INIT functions for originating script
 	# - Stuff we can't init in main globals/funcs due to /etc/bashrc.d/ load into current session.
-	G_INIT_ALLOW_CONCURRENT=${G_INIT_ALLOW_CONCURRENT:-0}
-	G_INIT_WAIT_CONCURRENT=${G_INIT_WAIT_CONCURRENT:-5}
 	G_INIT(){
 
+		G_INIT_ALLOW_CONCURRENT=${G_INIT_ALLOW_CONCURRENT:-0}
+		G_INIT_WAIT_CONCURRENT=${G_INIT_WAIT_CONCURRENT:-5}
+
 		# Check for concurrent execution
 		if (( ! $G_INIT_ALLOW_CONCURRENT )); then
 
@@ -157,14 +150,14 @@ _EOF_
 				else
 
 					G_WHIP_BUTTON_OK_TEXT='Retry'
-					if ! G_WHIP_YESNO "WARNING: Concurrent execution of $G_PROGRAM_NAME detected.\n
+					if ! G_WHIP_YESNO "WARNING: Concurrent execution of $G_PROGRAM_NAME detected\n
 Please check if one of the following applies:
  - This script already runs on another terminal/SSH session.
  - Currently a cron or systemd background job executes the script.
  - You started this script from within another DietPi program, causing a loop.\n
 Please assure that the concurrent execution has finished, before retrying, otherwise cancel this instance.\n
 The following info might help:
-$(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
+$(ps f -eo pid,user,tty,cmd | grep -i '[d]ietpi')"; then
 
 						G_DIETPI-NOTIFY 1 "Canceled $G_PROGRAM_NAME due to concurrent execution"
 						exit 1
@@ -222,7 +215,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 		}
 		trap 'G_EXIT' EXIT
 
-		# Ensure we are in script working dir or users home dir, if available: https://github.com/Fourdee/DietPi/issues/905#issuecomment-298223705
+		# Ensure we are in script working dir or users home dir, if available: https://github.com/MichaIng/DietPi/issues/905#issuecomment-298223705
 		if [[ $G_PROGRAM_NAME ]] && mkdir -p /tmp/$G_PROGRAM_NAME && cd /tmp/$G_PROGRAM_NAME; then
 
 			(( $G_DEBUG == 1 )) && G_DIETPI-NOTIFY 2 "Entered scripts working directory: /tmp/$G_PROGRAM_NAME"
@@ -302,7 +295,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 			local i=0
 			for (( i=$1; i<${#ainput_string[@]}; i++ )); do
 
-				output_string+="${ainput_string[$i]}"
+				output_string+=${ainput_string[$i]}
 
 			done
 			echo -ne "$output_string\e[0m"
@@ -373,7 +366,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 				}
 
 				# Calculate the amount of output lines and in case move cursor up for correct animation and to allow cleaning the whole output.
-				local input_string="$*"
+				local input_string=$@
 				local output_lines=0
 				(( output_lines=(${#input_string}+6)/$(tput cols) ))
 				(( $output_lines )) && tput cuu $output_lines
@@ -437,7 +430,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 				else
 
-					local status_subfunction="$HIERARCHY"
+					local status_subfunction=$HIERARCHY
 
 				fi
 				output_string+="$bracket_l\e[33m SUB$status_subfunction$bracket_r $2 > "
@@ -465,7 +458,6 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 	}
 
-	G_CHECK_ROOT_USER_VERIFIED=${G_CHECK_ROOT_USER_VERIFIED:-0} #only check once for each session
 	#	$1 = mode
 	#	- 0 = Exit all linked scripts (kill all)
 	#	- 1 = Kill current script only, excluding the shell.
@@ -476,9 +468,9 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 			if (( $UID )); then
 
 				local input=0
-				disable_error=1 G_CHECK_VALIDINT $1 && input=$1
+				disable_error=1 G_CHECK_VALIDINT "$1" && input=$1
 
-				G_DIETPI-NOTIFY 1 'Root privileges required. Please run the command with "G_SUDO", or, "sudo -i".'
+				G_DIETPI-NOTIFY 1 'Root privileges required. Please run the command with "G_SUDO", or, "sudo -s".'
 
 				if (( $input == 0 )); then
 
@@ -501,7 +493,6 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 	}
 
-	G_CHECK_ROOTFS_RW_VERIFIED=${G_CHECK_ROOTFS_RW_VERIFIED:-0} #only check once for each session
 	G_CHECK_ROOTFS_RW(){
 
 		if [[ $G_CHECK_ROOTFS_RW_VERIFIED != 1 ]]; then
@@ -527,15 +518,11 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 	# Alias defines
 	#-----------------------------------------------------------------------------------
 	#DietPi scripts, moved from /etc/bash.bashrc
-	# - Sudo command, that ensures profile.d is reloaded (ensures ENV with our globals)
-	G_SUDO(){
-
-		sudo -i $@
-
-	}
+	# - Sudo command, that ensures DietPi-Globals with G_* commands are loaded
+	G_SUDO(){ sudo -s . /DietPi/dietpi/func/dietpi-globals && $@; }
 
 	# - DietPi programs
-	alias sudo='sudo ' # https://github.com/Fourdee/DietPi/issues/424
+	alias sudo='sudo ' # https://github.com/MichaIng/DietPi/issues/424
 	alias dietpi-process_tool='/DietPi/dietpi/dietpi-process_tool'
 	alias dietpi-letsencrypt='/DietPi/dietpi/dietpi-letsencrypt'
 	alias dietpi-autostart='/DietPi/dietpi/dietpi-autostart'
@@ -629,11 +616,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		#Update backtitle
 		WHIP_BACKTITLE="$G_PROGRAM_NAME | $G_HW_MODEL_DESCRIPTION"
-		if [[ -r '/DietPi/dietpi/.network' ]]; then
-
-			WHIP_BACKTITLE+=" | IP: $(sed -n 4p /DietPi/dietpi/.network)"
-
-		fi
+		[[ -r '/DietPi/dietpi/.network' ]] && WHIP_BACKTITLE+=" | IP: $(sed -n 4p /DietPi/dietpi/.network)"
 
 		#Automaticaly set size of whiptail box and contents
 		local input_mode=$1
@@ -841,7 +824,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 	# - Display a whip message
 	G_WHIP_MSG(){
 
-		WHIP_MESSAGE=("$@")
+		WHIP_MESSAGE=$@
 
 		if (( $G_USER_INPUTS )); then
 
@@ -862,7 +845,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 	# - Display a whip message inside a scrollbox
 	G_WHIP_SCROLLBOX(){
 
-		WHIP_MESSAGE=("$@")
+		WHIP_MESSAGE=$@
 
 		if (( $G_USER_INPUTS )); then
 
@@ -888,7 +871,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		if (( $G_USER_INPUTS )); then
 
-			WHIP_MESSAGE=("$@")
+			WHIP_MESSAGE=$@
 			G_WHIP_INIT 0
 			local option_default_no='--defaultno'
 			[[ ${G_WHIP_DEFAULT_ITEM,,} == 'yes' || ${G_WHIP_DEFAULT_ITEM,,} == 'ok' ]] && option_default_no=''
@@ -912,7 +895,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		if (( $G_USER_INPUTS )); then
 
-			WHIP_MESSAGE=("$@")
+			WHIP_MESSAGE=$@
 			G_WHIP_INIT 0
 			G_WHIP_RETURNED_VALUE=$(whiptail --title "$G_PROGRAM_NAME" --inputbox "$WHIP_MESSAGE" --ok-button "$G_WHIP_BUTTON_OK_TEXT" --cancel-button "$G_WHIP_BUTTON_CANCEL_TEXT" --default-item "$G_WHIP_DEFAULT_ITEM" --backtitle "$WHIP_BACKTITLE" $WHIP_SIZE_Y $WHIP_SIZE_X "$G_WHIP_DEFAULT_ITEM" 3>&1 1>&2 2>&3; echo $? > /tmp/.G_WHIP_INPUTBOX_RESULT)
 			result=$(</tmp/.G_WHIP_INPUTBOX_RESULT)
@@ -941,7 +924,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		if (( $G_USER_INPUTS )); then
 
-			WHIP_MESSAGE=("$@")
+			WHIP_MESSAGE=$@
 			G_WHIP_INIT 0
 
 			while :
@@ -951,7 +934,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 				local password_1=$(whiptail --title "$G_PROGRAM_NAME" --passwordbox 'Please enter the new password again:' --ok-button "$G_WHIP_BUTTON_OK_TEXT" --nocancel --backtitle "$WHIP_BACKTITLE" $WHIP_SIZE_Y $WHIP_SIZE_X 3>&1 1>&2 2>&3)
 				if [[ $password_0 && $password_0 == "$password_1" ]]; then
 
-					result="$password_0"
+					result=$password_0
 					return_value=0
 					break
 
@@ -980,7 +963,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		if (( $G_USER_INPUTS )); then
 
-			WHIP_MESSAGE=("$@")
+			WHIP_MESSAGE=$@
 			G_WHIP_INIT 1
 			G_WHIP_RETURNED_VALUE=$(whiptail --title "$G_PROGRAM_NAME" --menu "$WHIP_MESSAGE" --default-item "$G_WHIP_DEFAULT_ITEM" --ok-button "$G_WHIP_BUTTON_OK_TEXT" --cancel-button "$G_WHIP_BUTTON_CANCEL_TEXT" --backtitle "$WHIP_BACKTITLE" $WHIP_SIZE_Y $WHIP_SIZE_X $WHIP_SIZE_Z "${G_WHIP_MENU_ARRAY[@]}" 3>&1 1>&2 2>&3; echo $? > /tmp/.WHIP_MENU_RESULT)
 			result=$(</tmp/.WHIP_MENU_RESULT)
@@ -1003,7 +986,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 		if (( $G_USER_INPUTS )); then
 
-			WHIP_MESSAGE=("$@")
+			WHIP_MESSAGE=$@
 			G_WHIP_INIT 2
 			G_WHIP_RETURNED_VALUE=$(whiptail --title "$G_PROGRAM_NAME" --checklist "$WHIP_MESSAGE" --separate-output --default-item "$G_WHIP_DEFAULT_ITEM" --ok-button "$G_WHIP_BUTTON_OK_TEXT" --cancel-button "$G_WHIP_BUTTON_CANCEL_TEXT" --backtitle "$WHIP_BACKTITLE" $WHIP_SIZE_Y $WHIP_SIZE_X $WHIP_SIZE_Z "${G_WHIP_CHECKLIST_ARRAY[@]}" 3>&1 1>&2 2>&3; echo $? > /tmp/.WHIP_CHECKLIST_RESULT)
 			G_WHIP_RETURNED_VALUE=$(echo -e "$G_WHIP_RETURNED_VALUE" | tr '\n' ' ')
@@ -1062,7 +1045,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 	#-----------------------------------------------------------------------------------
 	# DietPi Error Handler
-	# https://github.com/Fourdee/DietPi/issues/1311#issuecomment-353716344
+	# https://github.com/MichaIng/DietPi/issues/1311#issuecomment-353716344
 	#-----------------------------------------------------------------------------------
 	G_ERROR_HANDLER_EXITCODE=0					#input value to use with G_ERROR_HANDLER
 	G_ERROR_HANDLER_EXITCODE_RETURN=0			#Same as above, but not destroyed during G_ERROR_HANDLER_RESET, allowing us to return it in funcs
@@ -1107,7 +1090,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 	#	Usage: G_RUN_CMD dothis
 	G_ERROR_HANDLER(){
 
-		[[ $l_message ]] || local l_message="$G_ERROR_HANDLER_COMMAND"
+		[[ $l_message ]] || local l_message=$G_ERROR_HANDLER_COMMAND
 
 		#Ok
 		(( $G_ERROR_HANDLER_NO_FAIL )) && G_ERROR_HANDLER_EXITCODE=0
@@ -1135,9 +1118,9 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 			local preimage_name='n/a'
 			if [[ -r '/DietPi/dietpi/.prep_info' ]]; then
 
-				image_creator="$(sed -n 1p /DietPi/dietpi/.prep_info)"
+				image_creator=$(sed -n 1p /DietPi/dietpi/.prep_info)
 				[[ $image_creator == 0 ]] && image_creator='DietPi Core Team'
-				preimage_name="$(sed -n 2p /DietPi/dietpi/.prep_info)"
+				preimage_name=$(sed -n 2p /DietPi/dietpi/.prep_info)
 
 			fi
 
@@ -1164,7 +1147,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 
 				else
 
-					whip_msg+="$G_ERROR_HANDLER_COMMAND"
+					whip_msg+=$G_ERROR_HANDLER_COMMAND
 
 				fi
 
@@ -1177,7 +1160,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 				#	Display optional logfile?
 				if [[ $G_ERROR_HANDLER_ONERROR_FPLOGFILE ]]; then
 
-					whip_msg+="$print_logfile_info"
+					whip_msg+=$print_logfile_info
 					whip_msg+='\n\n'
 
 				fi
@@ -1185,14 +1168,14 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 				#	Display "please report to dietpi", if its one of our programs
 				if [[ $G_PROGRAM_NAME && ! $G_ERROR_HANDLER_INFO_ONLY ]]; then
 
-					whip_msg+="$print_report_to_dietpi_info"
+					whip_msg+=$print_report_to_dietpi_info
 
 				fi
 
 				if (( $G_ERROR_HANDLER_ONERROR_EXIT )); then
 
 					whip_msg+='\n\n'
-					whip_msg+="$print_unable_to_continue"
+					whip_msg+=$print_unable_to_continue
 
 				fi
 
@@ -1239,7 +1222,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 						elif [[ $choice == 'Send report' ]]; then
 
 							send_bugreport=1
-							bugreport_id="$(sed -n 5p /DietPi/dietpi/.hw_model)"
+							bugreport_id=$(sed -n 5p /DietPi/dietpi/.hw_model)
 
 						fi
 
@@ -1267,7 +1250,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i [d]ietpi)"; then
 \e[41m
 --------------------------------------------------------------------
 - DietPi has encounted an error, and, is unable to continue        -
-- Please create a ticket: https://github.com/Fourdee/DietPi/issues -
+- Please create a ticket: https://github.com/MichaIng/DietPi/issues -
 - Copy and paste the BLUE lines below, into the ticket             -
 --------------------------------------------------------------------
 \e[0m
@@ -1353,7 +1336,7 @@ $print_logfile_info
 	}
 
 	#Run a command and send the output through the error handler. Allows for command used info, and log output/view when an error occurs
-	#	NB: This command does not support inputs with redirects. For file creation, use G_FILE_EXISTS afterwards to check it exists: https://github.com/Fourdee/DietPi/issues/1311#issuecomment-354541417
+	#	NB: This command does not support inputs with redirects. For file creation, use G_FILE_EXISTS afterwards to check it exists: https://github.com/MichaIng/DietPi/issues/1311#issuecomment-354541417
 	#	NB: automatically error handled (G_ERROR_HANDLER)
 	#	$@ = input command
 	#	eg: G_RUN_CMD mkdir /never/gonna/work
@@ -1361,13 +1344,13 @@ $print_logfile_info
 
 		G_CHECK_ROOT_USER 1
 
-		G_ERROR_HANDLER_COMMAND="$@"
+		G_ERROR_HANDLER_COMMAND=$@
 
 		G_ERROR_HANDLER_RETRY=1
 		while (( $G_ERROR_HANDLER_RETRY ))
 		do
 
-			[[ $l_message ]] || local l_message="$G_ERROR_HANDLER_COMMAND"
+			[[ $l_message ]] || local l_message=$G_ERROR_HANDLER_COMMAND
 			G_DIETPI-NOTIFY -2 "$l_message"
 
 			$G_ERROR_HANDLER_COMMAND &> /tmp/G_ERROR_HANDLER_COMMAND
@@ -1376,7 +1359,7 @@ $print_logfile_info
 
 			G_ERROR_HANDLER
 
-			rm /tmp/G_ERROR_HANDLER_COMMAND &> /dev/null
+			[[ -f /tmp/G_ERROR_HANDLER_COMMAND ]] && rm /tmp/G_ERROR_HANDLER_COMMAND
 
 		done
 
@@ -1390,7 +1373,7 @@ $print_logfile_info
 	#	Prompts user to configure network if $G_USER_INPUTS=1
 	G_CHECK_URL(){
 
-		local string="$@"
+		local string=$@
 		local timeout=${timeout:-5}
 		local retry_max=${retry_max:-3}
 		local optional_cmd_inputs=${optional_cmd_inputs:-}
@@ -1508,7 +1491,7 @@ $print_logfile_info
 	#Checks if a file/folder exists
 	G_FILE_EXISTS(){
 
-		G_ERROR_HANDLER_COMMAND="$@"
+		G_ERROR_HANDLER_COMMAND=$@
 
 		G_DIETPI-NOTIFY -2 "Checking for existance: $G_ERROR_HANDLER_COMMAND"
 
@@ -1533,7 +1516,7 @@ $print_logfile_info
 
 		echo -e "$string" > /tmp/G_ERROR_HANDLER_COMMAND
 		G_ERROR_HANDLER_ONERROR_FPLOGFILE='/tmp/G_ERROR_HANDLER_COMMAND'
-		G_ERROR_HANDLER_COMMAND="$string"
+		G_ERROR_HANDLER_COMMAND=$string
 
 		G_ERROR_HANDLER
 
@@ -1552,33 +1535,23 @@ $print_logfile_info
 
 		G_CHECK_ROOT_USER 1
 
-		local string="$@"
-		local force_options=''
-
-		if (( $G_DISTRO >= 4 )); then
-
-			force_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages --allow-unauthenticated'
-
-		else
-
-			force_options='--force-yes'
-
-		fi
+		local string=$@
+		local options=''
+		(( $G_DISTRO >= 4 )) && options='--allow-change-held-packages'
 
 		G_ERROR_HANDLER_RETRY=1
 		while (( $G_ERROR_HANDLER_RETRY ))
 		do
 
-			G_ERROR_HANDLER_COMMAND="G_AGI: $string"
+			G_ERROR_HANDLER_COMMAND="G_AGI $string"
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
 			#-qq can add a slight period of appearing nothing is happening, lets inform user
-			G_DIETPI-NOTIFY 0 "APT installation for: \e[33m$string\e[0m, please wait..."
+			G_DIETPI-NOTIFY 2 "\e[0mAPT installation for: \e[33m$string\e[0m, please wait..."
 
 			echo -ne '\e[90m'
-			DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $force_options $string 2>&1 | tee $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -qq $options install $string 2>&1 | tee $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1594,19 +1567,15 @@ $print_logfile_info
 
 		G_CHECK_ROOT_USER 1
 
-		local string=( "$@" )
+		local string=$@
 		local options=''
-		if (( $G_DISTRO >= 4 )); then
-
-			options+=' --allow-change-held-packages'
-
-		fi
+		(( $G_DISTRO >= 4 )) && options='--allow-change-held-packages'
 
 		G_ERROR_HANDLER_RETRY=1
 		while (( $G_ERROR_HANDLER_RETRY ))
 		do
 
-			G_ERROR_HANDLER_COMMAND="G_AGP: ${string[@]}"
+			G_ERROR_HANDLER_COMMAND="G_AGP $string"
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
 			# - Remove non-matching packages from string, which are not installed, to prevent failures.
@@ -1618,10 +1587,10 @@ $print_logfile_info
 			local packages_to_remove=''
 			dpkg --get-selections > $fp_temp
 			local i=0
-			for i in "${string[@]}"; do
+			for i in $string; do
 
 				if grep -qi "^$i[[:space:]|:]" $fp_temp ||
-					{ echo -e $i | grep -qi '*' && grep -qi "^$i" $fp_temp; }; then #wildcard check
+					{ grep -qi '*' <<< $i && grep -qi "^$i" $fp_temp; }; then #wildcard check
 
 					packages_to_remove+="$i "
 					G_DIETPI-NOTIFY 2 "Install verified: $i"
@@ -1633,17 +1602,15 @@ $print_logfile_info
 				fi
 
 			done
-
 			rm $fp_temp
 			unset string #habbit :)
 
 			if [[ $packages_to_remove ]]; then
 
-				G_DIETPI-NOTIFY 0 "APT removal for: \e[33m$packages_to_remove\e[0m, please wait..."
+				G_DIETPI-NOTIFY 2 "\e[0mAPT removal for: \e[33m$packages_to_remove\e[0m, please wait..."
 				echo -ne '\e[90m'
-				DEBIAN_FRONTEND=noninteractive apt-get purge -y $packages_to_remove $options 2>&1 | tee $G_FP_LOG_APT
+				DEBIAN_FRONTEND=noninteractive apt-get -qq $options purge $packages_to_remove 2>&1 | tee $G_FP_LOG_APT
 				G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-				echo -e '\e[0m'
 
 			else
 
@@ -1672,12 +1639,11 @@ $print_logfile_info
 			G_ERROR_HANDLER_COMMAND='G_AGA'
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
-			G_DIETPI-NOTIFY 0 'APT autoremove + purge, please wait...'
+			G_DIETPI-NOTIFY 2 '\e[0mAPT autoremove + purge, please wait...'
 
 			echo -ne '\e[90m'
-			DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y 2>&1 | tee $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -qq --purge autoremove 2>&1 | tee $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1700,12 +1666,11 @@ $print_logfile_info
 			G_ERROR_HANDLER_COMMAND='G_AGF'
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
-			G_DIETPI-NOTIFY 0 'APT fix, please wait...'
+			G_DIETPI-NOTIFY 2 '\e[0mAPT fix, please wait...'
 
 			echo -ne '\e[90m'
-			DEBIAN_FRONTEND=noninteractive apt-get install -f -y 2>&1 | tee $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -qq -f install 2>&1 | tee $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1728,13 +1693,12 @@ $print_logfile_info
 			G_ERROR_HANDLER_COMMAND='G_AGUP'
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
-			G_DIETPI-NOTIFY 0 'APT update, please wait...'
+			G_DIETPI-NOTIFY 2 '\e[0mAPT update, please wait...'
 
 			echo -ne '\e[90m'
 			DEBIAN_FRONTEND=noninteractive apt-get clean 2>&1 | tee $G_FP_LOG_APT
-			DEBIAN_FRONTEND=noninteractive apt-get update 2>&1 | tee -a $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -q update 2>&1 | tee -a $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1757,19 +1721,11 @@ $print_logfile_info
 			G_ERROR_HANDLER_COMMAND='G_AGUG'
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
-			G_DIETPI-NOTIFY 0 'APT upgrade, please wait...'
-
-			local options=''
-			if (( $G_DISTRO >= 4 )); then
-
-				options='--allow-unauthenticated'
-
-			fi
+			G_DIETPI-NOTIFY 2 '\e[0mAPT upgrade, please wait...'
 
 			echo -ne '\e[90m'
-			DEBIAN_FRONTEND=noninteractive apt-get upgrade -y $options 2>&1 | tee $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade 2>&1 | tee $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1785,6 +1741,9 @@ $print_logfile_info
 
 		G_CHECK_ROOT_USER 1
 
+		local options=''
+		(( $G_DISTRO >= 4 )) && options='--allow-change-held-packages'
+
 		G_ERROR_HANDLER_RETRY=1
 		while (( $G_ERROR_HANDLER_RETRY ))
 		do
@@ -1792,22 +1751,11 @@ $print_logfile_info
 			G_ERROR_HANDLER_COMMAND='G_AGDUG'
 			G_ERROR_HANDLER_ONERROR_FPLOGFILE=$G_FP_LOG_APT
 
-			if (( $G_DISTRO >= 4 )); then
-
-				force_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages --allow-unauthenticated'
-
-			else
-
-				force_options='--force-yes'
-
-			fi
-
-			G_DIETPI-NOTIFY 0 'APT dist-upgrade, please wait...'
+			G_DIETPI-NOTIFY 2 '\e[0mAPT dist-upgrade, please wait...'
 
 			echo -ne '\e[90m'
-			DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y $force_options 2>&1 | tee $G_FP_LOG_APT
+			DEBIAN_FRONTEND=noninteractive apt-get -qq $options dist-upgrade 2>&1 | tee $G_FP_LOG_APT
 			G_ERROR_HANDLER_EXITCODE=${PIPESTATUS[0]}
-			echo -e '\e[0m'
 
 			G_ERROR_HANDLER
 
@@ -1826,40 +1774,36 @@ $print_logfile_info
 
 		local fp_temp='/tmp/.G_AG_CHECK_INSTALL_PREREQ'
 		local exit_code=0
-		local string=( "$@" )
+		local string=$@
 		local packages_to_install=''
 
-		G_DIETPI-NOTIFY 0 "Checking for pre-req APT packages: \e[33m${string[*]}"
+		G_DIETPI-NOTIFY 2 "Checking for pre-req APT packages: \e[33m$string"
 
 		dpkg --get-selections > $fp_temp
 		local i=0
-		for i in "${string[@]}"; do
+		for i in $string; do
 
 			if ! grep -qi "^$i[[:space:]]" $fp_temp; then
 
-				G_DIETPI-NOTIFY 2 "Flagged for installation: $i"
+				G_DIETPI-NOTIFY 2 "Flagged for installation: \e[33m$i"
 				packages_to_install+=" $i"
 
 			fi
 
 		done
+		rm $fp_temp
 
 		if [[ $packages_to_install ]]; then
 
-			G_DIETPI-NOTIFY -2 'Installing pre-req APT packages'
 			G_AGI $packages_to_install
 			exit_code=$?
 
 		else
 
-			G_DIETPI-NOTIFY 2 'Pre-req APT packages are installed'
+			G_DIETPI-NOTIFY 2 'Pre-req APT packages were already installed'
 
 		fi
 
-		#G_AGI now handles the error
-
-		rm $fp_temp
-
 		return $exit_code
 
 	}
@@ -1921,23 +1865,8 @@ $print_logfile_info
 
 				fi
 
-				# - Boards that provide 2 digit output
-				#	Pine
-				#	NanoPi M2
-				#	H3 3.x
-				#	H2+ 3.x
-				if (( $G_HW_MODEL == 40 ||
-					$G_HW_MODEL == 61 ||
-					( $G_HW_CPUID == 1 && $(uname -r | grep -ci -m1 '^3.') ) ||
-					( $G_HW_MODEL == 32 && $(uname -r | grep -ci -m1 '^3.') ) )); then
-
-					echo 'Do nothing' &> /dev/null
-
-				else
-
-					cpu_temp_current=$(mawk '{print $1/1000}' <<< "$cpu_temp_current" | xargs printf "%0.0f")
-
-				fi
+				# - 2/5 digit output?
+				(( $cpu_temp_current >= 150 )) && cpu_temp_current=$(mawk '{print $1/1000}' <<< "$cpu_temp_current" | xargs printf "%0.0f")
 
 				# - Native PC + possibily others, due to vast sensors /sys/class/thermal/thermal_zone[0-9], all of which we are unsure is CPU, check for possible invalid entries and set N/A
 				#	EG: Z83 = 0, also seen some results as a minus value
@@ -1988,7 +1917,7 @@ $print_logfile_info
 	G_CHECK_FREESPACE(){
 
 		local return_value=1
-		local input_path="$1"
+		local input_path=$1
 		local input_required_space=$2
 		local available_space=$(df -mP $input_path | sed -n 2p | mawk '{print $4}')
 		local string_output="Free space check: path=$input_path | available=$available_space MB | required=$input_required_space MB"
@@ -2093,7 +2022,7 @@ $print_logfile_info
 		if [[ -L $G_FP_DIETPI_USERDATA ]]; then
 
 			# - Check psyhical location exists and is mounted
-			fp_actual="$(readlink $G_FP_DIETPI_USERDATA)"
+			fp_actual=$(readlink -f $G_FP_DIETPI_USERDATA)
 			if ! df -P $fp_actual &> /dev/null; then
 
 				return_value=1
@@ -2195,11 +2124,7 @@ $print_logfile_info
 	#Not yet compatible with dietpi global commands. single bash commands only with no error handling.
 	G_THREADING_ENABLED=${G_THREADING_ENABLED:-1}
 	G_THREAD_COUNT=${G_THREAD_COUNT:--1}
-	if [[ -z $G_THREAD_COMMAND ]]; then
-
-		G_THREAD_COMMAND=()
-
-	fi
+	[[ $G_THREAD_COMMAND ]] || G_THREAD_COMMAND=()
 
 	G_THREAD_START(){
 
@@ -2234,7 +2159,7 @@ $print_logfile_info
 
 		# fi
 
-		while true
+		while :
 		do
 
 			local thread_active=0
@@ -2293,17 +2218,6 @@ $print_logfile_info
 
 	}
 
-	#Escape chars to prevent expansion and return value
-	G_ESCAPE_EXPANSION(){
-
-		local input="${@//\\/\\\\}"; input="${input//./\\.}"; input="${input//+/\\+}"; input="${input//\*/\\\*}"; input="${input//\?/\\\?}"; input="${input//[/\\[}"
-		input="${input//\(/\\\(}"; input="${input//\{/\\\{}"; input="${input//^/\\^}"; input="${input//&/\\&}"; input="${input//$/\\$}"; input="${input//|/\\|}"
-		input="${input//\`/\\\`}"
-
-		echo "$input"
-
-	}
-
 	#-----------------------------------------------------------------------------------
 	# DEV tools (Not for public use! All mine! :D)
 	#-----------------------------------------------------------------------------------
@@ -2363,13 +2277,12 @@ $print_logfile_info
 	G_CONFIG_INJECT(){
 
 		[[ $G_PROGRAM_NAME ]] || local G_PROGRAM_NAME='G_CONFIG_INJECT'
-		local pattern="${1//\//\\\/}"
-		# local setting="$(G_ESCAPE_EXPANSION $2)"
-		local setting="${2//\\/\\\\}"; setting="${setting//./\\.}"; setting="${setting//+/\\+}"; setting="${setting//\*/\\\*}"; setting="${setting//\?/\\\?}"; setting="${setting//[/\\[}"
-		setting="${setting//\(/\\\(}"; setting="${setting//\{/\\\{}"; setting="${setting//^/\\^}"; setting="${setting//&/\\&}"; setting="${setting//$/\\$}"; setting="${setting//|/\\|}"; setting="${setting//\//\\\/}"
-		[[ $GCI_NEWLINE == 1 ]] && setting="${setting//\\\\n/\\n}"
-		local file="$3"
-		local after="${4//\//\\\/}"
+		local pattern=${1//\//\\\/}
+		local setting=${2//\\/\\\\}; setting=${setting//./\\.}; setting=${setting//+/\\+}; setting=${setting//\*/\\\*}; setting=${setting//\?/\\\?}; setting=${setting//[/\\[}
+		setting=${setting//\(/\\\(}; setting=${setting//\{/\\\{}; setting=${setting//^/\\^}; setting=${setting//&/\\&}; setting=${setting//$/\\$}; setting=${setting//|/\\|}; setting=${setting//\//\\\/}
+		[[ $GCI_NEWLINE == 1 ]] && setting=${setting//\\\\n/\\n}
+		local file=$3
+		local after=${4//\//\\\/}
 		local error=''
 
 		syntax_error(){
diff --git a/dietpi/func/dietpi-logclear b/dietpi/func/dietpi-logclear
index 6115ba42ae..2bf25e7d30 100644
--- a/dietpi/func/dietpi-logclear
+++ b/dietpi/func/dietpi-logclear
@@ -166,7 +166,7 @@
 
 						G_DIETPI-NOTIFY 2 'PiHole logs have been changed, restarting, please wait...'
 						systemctl stop pihole-FTL
-						# Handle dnsmasq only, if enabled (+installed), otherwise assume FTLDNS, which would be broken by dnsmasq start: https://github.com/Fourdee/DietPi/issues/1696
+						# Handle dnsmasq only, if enabled (+installed), otherwise assume FTLDNS, which would be broken by dnsmasq start: https://github.com/MichaIng/DietPi/issues/1696
 						systemctl is-enabled dnsmasq 2> /dev/null | grep -q '^enabled$' && systemctl stop dnsmasq
 						systemctl stop resolvconf
 						sleep 1
diff --git a/dietpi/func/dietpi-obtain_hw_model b/dietpi/func/dietpi-obtain_hw_model
index 07cd446273..22d2e4b5c0 100644
--- a/dietpi/func/dietpi-obtain_hw_model
+++ b/dietpi/func/dietpi-obtain_hw_model
@@ -106,7 +106,7 @@
 	#Set locale for all scripts, prevents incorrect scraping
 	export LANG=en_GB.UTF-8
 	export LC_ALL=en_GB.UTF-8
-	#Ensure we are in /tmp dir: https://github.com/Fourdee/DietPi/issues/2050#issuecomment-419901350
+	#Ensure we are in /tmp dir: https://github.com/MichaIng/DietPi/issues/2050#issuecomment-419901350
 	cd /tmp
 	#-----------------------------------------------------------------------------------
 	#Import DietPi-Globals ---------------------------------------------------------------
diff --git a/dietpi/func/dietpi-ramdisk b/dietpi/func/dietpi-ramdisk
index 83c155f938..a5214e9112 100644
--- a/dietpi/func/dietpi-ramdisk
+++ b/dietpi/func/dietpi-ramdisk
@@ -9,24 +9,23 @@
 	#////////////////////////////////////
 	#
 	# Info:
-	# - Copies dietpi files from /boot to /DietPi (RAM)
-	# - /DietPi is mounted as tmpfs (RAMdisk)
-	# - This allows us to vastly reduce filesystem IO across DietPi.
-	# - Creates a file when active (/DietPi/.ramdisk)
+	# - $FP_RAM is mounted as tmpfs (RAMdisk) before this script runs.
+	# - When booting this script copies DietPi from $FP_DISK to $FP_RAM and creates an active flag file: $FP_RAM/.ramdisk
+	# - This allows us to vastly reduce filesystem I/O and increase performance across DietPi.
+	# - When shutting down this script stores DietPi from $FP_RAM back to $FP_DISK and removes the flag file.
 	#
 	# Usage:
-	# - /DietPi/dietpi/func/dietpi-ramdisk 0		= Copy from /boot (disk) to /DietPi (RAM)
-	# - /DietPi/dietpi/func/dietpi-ramdisk 1		= Copy from /DietPi (RAM) to /boot (disk)
+	# - /DietPi/dietpi/func/dietpi-ramdisk 0	= Copy from $FP_DISK to $FP_RAM
+	# - /DietPi/dietpi/func/dietpi-ramdisk 1	= Store from $FP_RAM to $FP_DISK
 	#////////////////////////////////////
 
 	#-----------------------------------------------------------------------------------
-	#. /DietPi/dietpi/func/dietpi-globals	# Not compatible until dietpi-preboot.service and overkill for the purpose of this script.
-	#export LC_ALL=en_GB.UTF-8		# Not needed, as we do not parse any external command and "date" is allowed to be in user locale format.
-	#cd $HOME				# "cd: HOME not set" error and not needed, since we do not create any tmp files.
+	#. /DietPi/dietpi/func/dietpi-globals	# Not compatible until DietPi-PreBoot has finished and overkill for the purpose of this script.
+	#export LC_ALL=en_GB.UTF-8		# Not required, as we do not parse any external command and "date" is allowed to be in user locale format.
+	#cd $HOME				# Not required, as we do not create any tmp files and produces and: "cd: HOME not set"
 	#-----------------------------------------------------------------------------------
 
-	INPUT=0
-	[[ $1 =~ ^-?[0-9]+$ ]] && INPUT=$1
+	[[ $1 =~ ^-?[0-9]+$ ]] && INPUT=$1 || INPUT=-1
 
 	EXIT_CODE=0
 
@@ -48,99 +47,98 @@
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
 
-	# Start: Copy to RAM
+	# Startup phase: Copy to RAM
 	if (( $INPUT == 0 )); then
 
-		echo "$(date) | $PROGRAM_NAME: Starting..."
+		echo "$(date) | $PROGRAM_NAME: Copying DietPi to RAM..."
 
 		if [[ ! -f $FP_RAM'/.ramdisk' ]]; then
 
-			# - Failsafe: Recreate /DietPi
-			[[ -d $FP_RAM ]] && rm -R $FP_RAM
-			mkdir -p $FP_RAM
+			# - Failsafe: Assure empty $FP_RAM
+			[[ -d $FP_RAM ]] && rm -Rf $FP_RAM/{,.??,.[^.]}* || mkdir -p $FP_RAM || EXIT_CODE=1
 
 			# - Copy array of /boot/* files to RAM (config/ini etc)
-			for ((i=0; i<${#aFILE_BOOT_INI[@]}; i++))
+			for i in ${aFILE_BOOT_INI[@]}
 			do
 
-				if [[ -f $FP_DISK/${aFILE_BOOT_INI[$i]} ]]; then
+				if [[ -f $FP_DISK/$i ]]; then
 
-					cp $FP_DISK/${aFILE_BOOT_INI[$i]} $FP_RAM/
+					cp $FP_DISK/$i $FP_RAM/ || EXIT_CODE=1
 
-					# - Convert line endings to Unix from DOS. Prevents various issues where users modify file on another system, then save with DOS line endings: https://github.com/Fourdee/DietPi/issues/390
-					sed -i $'s/\r$//' $FP_RAM/${aFILE_BOOT_INI[$i]}
+					# - Convert line endings to Unix from DOS. Prevents various issues where users modify file on another system, then save with DOS line endings: https://github.com/MichaIng/DietPi/issues/390
+					sed -i $'s/\r$//' $FP_RAM/$i || EXIT_CODE=1
 
 				fi
 
 			done
 
-			# - Copy to RAM
-			cp -Rf $FP_DISK/dietpi $FP_RAM/
+			# - Copy DietPi to RAM
+			cp -Rf $FP_DISK/dietpi $FP_RAM/ || EXIT_CODE=1
 
-			# - Set DietPi user + exec
-			#chown -R dietpi:dietpi $FP_RAM # Unless we can find a way to prevent file permissions being changed after root modifies them, no point in having this.
-			chmod -R +x $FP_RAM
+			# - Set exec permissions
+			chmod -R +x $FP_RAM || EXIT_CODE=1
 
 			# - Generate active flag
-			> $FP_RAM/.ramdisk
+			> $FP_RAM/.ramdisk || EXIT_CODE=1
 
-			echo "$(date) | $PROGRAM_NAME: Completed"
+			if (( $EXIT_CODE )); then
+
+				echo "$(date) | $PROGRAM_NAME: [ERROR] An issue occurred while copying DietPi to RAM."
+
+			else
+
+				echo "$(date) | $PROGRAM_NAME: Copied DietPi to RAM."
+
+			fi
 
 		else
 
-			echo "$(date) | $PROGRAM_NAME: Already running. Aborting..."
+			echo "$(date) | $PROGRAM_NAME: DietPi is already in RAM. Aborting..."
 
 		fi
 
-	#Stop: Copy everything back to DISK
+	# Shutdown phase: Store to disk
 	elif (( $INPUT == 1 )); then
 
-		echo "$(date) | $PROGRAM_NAME: Stopping..."
+		echo "$(date) | $PROGRAM_NAME: Storing DietPi to disk..."
 
 		if [[ -f $FP_RAM'/.ramdisk' ]]; then
 
-			if [[ ! -f $FP_RAM'/dietpi/boot' ]]; then # Only copy back if file exists (in-case "DietPi-RAMdisk: Already running" occured during start): https://github.com/Fourdee/DietPi/issues/719#issuecomment-276101472
-
-				echo "$(date) | $PROGRAM_NAME: [ERROR] $FP_RAM/dietpi/boot is missing. Aborting..."
-				EXIT_CODE=1
+			# - Remove old DietPi form disk before storing new DietPi from RAM
+			#rm -R $FP_DISK/dietpi # Skip this to prevent unrecoverable removal of DietPi in case of error while copying to RAM
 
-			else
+			# - Store DietPi to disk
+			cp -Rf $FP_RAM/* $FP_DISK/ || EXIT_CODE=1
 
-				# - Remove all of DietPi files and folders from disk
-				#rm -R $FP_DISK/dietpi # https://github.com/Fourdee/DietPi/issues/905#issuecomment-298241622
+			# - Remove active flag
+			rm $FP_RAM/.ramdisk || EXIT_CODE=1
 
-				# - Copy DietPi to disk with files from RAM
-				cp -Rf $FP_RAM/* /boot/
+			# - Failsafe due to "async": Force sync NOW!
+			sync
 
-				# - Remove active flag
-				rm $FP_RAM/.ramdisk
+			if (( $EXIT_CODE )); then
 
-				# - Remove update available status (refreshed during reboot)
-				rm $FP_DISK/dietpi/.update_available &> /dev/null
+				echo "$(date) | $PROGRAM_NAME: [ERROR] An issue occurred while storing DietPi to RAM."
 
-				# - Sync changes to disk NOW
-				sync
+			else
 
-				echo "$(date) | $PROGRAM_NAME: Completed"
+				echo "$(date) | $PROGRAM_NAME: Stored DietPi to disk."
 
 			fi
 
 		else
 
-			echo "$(date) | $PROGRAM_NAME: Is not currently running. Aborting..."
+			echo "$(date) | $PROGRAM_NAME: DietPi is not in RAM. Aborting..."
 
 		fi
 
 	else
 
-		echo "$(date) | $PROGRAM_NAME: Unknown argument: $INPUT. Aborting..."
+		echo "$(date) | $PROGRAM_NAME: [ERROR] Unknown input argument: $INPUT. Aborting..."
 		EXIT_CODE=1
 
 	fi
 
-	#-----------------------------------------------------------------------------------
-	#delete[]
-	unset aFILE_BOOT_INI
 	#-----------------------------------------------------------------------------------
 	exit $EXIT_CODE
 	#-----------------------------------------------------------------------------------
diff --git a/dietpi/func/dietpi-set_dphys-swapfile b/dietpi/func/dietpi-set_dphys-swapfile
index 7c60b0680b..778f3a8463 100644
--- a/dietpi/func/dietpi-set_dphys-swapfile
+++ b/dietpi/func/dietpi-set_dphys-swapfile
@@ -53,7 +53,7 @@
 
 	Update_Tmp(){
 
-		#Set /tmp to 50% of RAM+SWAP: https://github.com/Fourdee/DietPi/issues/1027#issuecomment-369373082
+		#Set /tmp to 50% of RAM+SWAP: https://github.com/MichaIng/DietPi/issues/1027#issuecomment-369373082
 		local mem_total=$(free -m | mawk '/Mem:/ {print $2;exit}')
 		local swap_size=$(free -m | mawk '/Swap:/ {print $2;exit}')
 		local tmp_target_size="$(( ( $mem_total + $swap_size ) / 2 ))M"
diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware
index fbb0eabd85..95e5a84ac8 100644
--- a/dietpi/func/dietpi-set_hardware
+++ b/dietpi/func/dietpi-set_hardware
@@ -563,6 +563,7 @@ _EOF_
 			cat << _EOF_ > /etc/systemd/system/ethtool_force_speed.service
 [Unit]
 Description=ethtool force speed (DietPi)
+Wants=network-online.target
 After=network-online.target
 
 [Service]
@@ -757,7 +758,7 @@ _EOF_
 			# - Swap input axis
 			sed -i '/"SwapAxes"/c\        Option  "SwapAxes"      "1"' /etc/X11/xorg.conf.d/99-waveshare32_calibration.conf
 
-			# - Move fb0 xorg.conf out the way: https://github.com/Fourdee/DietPi/issues/767
+			# - Move fb0 xorg.conf out the way: https://github.com/MichaIng/DietPi/issues/767
 			mv /usr/share/X11/xorg.conf.d/99-fbturbo.conf /usr/share/X11/99-fbturbo.conf
 
 		#Odroids
@@ -831,7 +832,7 @@ _EOF_
 			#sed -i '/^[[:blank:]]*dtparam=i2c_arm=/c\dtparam=i2c_arm=on' $FP_RPI_CONFIG
 			#sed -i '/^[[:blank:]]*dtparam=spi=/c\dtparam=spi=on' $FP_RPI_CONFIG
 
-			# - Move fb0 xorg.conf back: https://github.com/Fourdee/DietPi/issues/767
+			# - Move fb0 xorg.conf back: https://github.com/MichaIng/DietPi/issues/767
 			[[ -f /usr/share/X11/99-fbturbo.conf ]] && mv /usr/share/X11/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 
 		#Odroids
@@ -857,7 +858,7 @@ _EOF_
 
 		G_CONFIG_INJECT 'spi_s3c64xx' 'spi_s3c64xx' /etc/modules
 		G_CONFIG_INJECT 'fbtft_device' 'fbtft_device' /etc/modules
-		echo 'fbtft_device' >> /etc/modules #XU4 4.9 workaround: https://github.com/Fourdee/DietPi/issues/926#issuecomment-299480918
+		echo 'fbtft_device' >> /etc/modules #XU4 4.9 workaround: https://github.com/MichaIng/DietPi/issues/926#issuecomment-299480918
 
 	}
 
@@ -942,7 +943,7 @@ _EOF_
 		# - C1/2
 		else
 
-			# Detect correct control files: https://github.com/Fourdee/DietPi/issues/2256
+			# Detect correct control files: https://github.com/MichaIng/DietPi/issues/2256
 			local fp_control='/sys/devices/platform/pwm-ctrl'
 			[[ -e '/sys/devices/pwm-ctrl/enable0' ]] && fp_control='/sys/devices/pwm-ctrl'
 
@@ -1113,6 +1114,14 @@ _EOF_
 		# - Enable
 		elif [[ $INPUT_DEVICE_VALUE == 'enable' ]]; then
 
+			#	+ RPi
+			#	Serial console must be disabled: https://github.com/MichaIng/DietPi/issues/2607#issuecomment-470523194
+			if (( $G_HW_MODEL < 10 )); then
+
+				INPUT_DEVICE_VALUE='disable' Serial_Main
+
+			fi
+
 			#Pre-Reqs
 			G_AG_CHECK_INSTALL_PREREQ bluetooth bluez-firmware
 			(( $G_HW_MODEL < 10 )) && G_AG_CHECK_INSTALL_PREREQ pi-bluetooth
@@ -1136,8 +1145,8 @@ _EOF_
 			systemctl enable bluetooth 2> /dev/null
 			G_RUN_CMD systemctl start bluetooth
 
-			#	+ RPi / Asus TB
-			if (( $G_HW_MODEL < 10 || $G_HW_MODEL == 52 )); then
+			#	+ RPi
+			if (( $G_HW_MODEL < 10 )); then
 
 				systemctl enable hciuart
 				G_RUN_CMD systemctl start hciuart
@@ -1337,7 +1346,7 @@ _EOF_
 			# - Had to up the delay from 3 seconds to 8 seconds on WPA2-Enterprise, otherwise still get device not found error.
 			sleep 8
 
-			# + RPi 3+, unlock scan+wifi https://github.com/Fourdee/DietPi/issues/1627
+			# + RPi 3+, unlock scan+wifi https://github.com/MichaIng/DietPi/issues/1627
 			rfkill unblock wifi &> /dev/null
 
 			#Update our networking file (refresh active wlan index)
@@ -1421,14 +1430,14 @@ _EOF_
 				systemctl unmask serial-getty@ttyAMA$i 2> /dev/null
 				systemctl unmask serial-getty@ttySAC$i 2> /dev/null
 				systemctl unmask serial-getty@ttyS$i 2> /dev/null
-				#systemctl unmask serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/Fourdee/DietPi/issues/1829#issuecomment-398302497
+				#systemctl unmask serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/MichaIng/DietPi/issues/1829#issuecomment-398302497
 
 
 				# - Enable v6.2-
 				systemctl enable serial-getty@ttyAMA$i 2> /dev/null
 				systemctl enable serial-getty@ttySAC$i 2> /dev/null
 				systemctl enable serial-getty@ttyS$i 2> /dev/null
-				#systemctl enable serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/Fourdee/DietPi/issues/1829#issuecomment-398302497
+				#systemctl enable serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/MichaIng/DietPi/issues/1829#issuecomment-398302497
 
 				# - Allow root login for known TTY's not in /etc/securetty by default
 				#	NanoPC-T4
@@ -1491,12 +1500,12 @@ _EOF_
 				systemctl disable serial-getty@ttyAMA$i 2> /dev/null
 				systemctl disable serial-getty@ttySAC$i 2> /dev/null
 				systemctl disable serial-getty@ttyS$i 2> /dev/null
-				#systemctl disable serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/Fourdee/DietPi/issues/1829#issuecomment-398302497
+				#systemctl disable serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/MichaIng/DietPi/issues/1829#issuecomment-398302497
 
 				systemctl mask serial-getty@ttyAMA$i 2> /dev/null
 				systemctl mask serial-getty@ttySAC$i 2> /dev/null
 				systemctl mask serial-getty@ttyS$i 2> /dev/null
-				#systemctl mask serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/Fourdee/DietPi/issues/1829#issuecomment-398302497
+				#systemctl mask serial-getty@ttyFIQ$i 2> /dev/null #:https://github.com/MichaIng/DietPi/issues/1829#issuecomment-398302497
 
 			done
 
@@ -1558,20 +1567,20 @@ _EOF_
 		G_AG_CHECK_INSTALL_PREREQ alsa-utils
 
 		#	Intel sound firmware
-		if grep 'vendor_id' /proc/cpuinfo | grep -qi 'intel'; then
+		if grep -qi 'vendor_id.*intel' /proc/cpuinfo; then
 
 			G_AG_CHECK_INSTALL_PREREQ firmware-intel-sound
 
 		fi
 
 		#HW specific
-		# - RPI
+		# - RPi
 		if (( $G_HW_MODEL < 10 )); then
 
 			Soundcard_Reset_RPi
 
 		# - Odroid
-		elif (( $G_HW_MODEL >= 10 && $G_HW_MODEL < 20 )); then
+		elif (( $G_HW_MODEL < 20 )); then
 
 			Soundcard_Reset_Odroid
 
@@ -1590,24 +1599,26 @@ _EOF_
 
 			Soundcard_Reset_BPi_Pro
 
-		#Sparky SBC
+		# - Sparky SBC
 		elif (( $G_HW_MODEL == 70 )); then
 
 			Soundcard_Reset_SparkySBC
 
-		#ASUS
+		# - ASUS TB
 		elif (( $G_HW_MODEL == 52 )); then
 
 			Soundcard_Reset_Asus
 
 		fi
 
+		systemctl daemon-reload
+
 	}
 
 	Soundcard_Reset_RPi(){
 
 		# - Add dtparam=audio=off
-		#	as of 4.4 kernel: https://github.com/Fourdee/DietPi/issues/327
+		#	as of 4.4 kernel: https://github.com/MichaIng/DietPi/issues/327
 		G_CONFIG_INJECT 'dtparam=audio=' 'dtparam=audio=off' $FP_RPI_CONFIG
 
 		# - Remove known soundcard dtoverlays
@@ -1622,18 +1633,22 @@ _EOF_
 		sed -i '/^[[:blank:]]*dtoverlay=googlevoicehat-soundcard/d' $FP_RPI_CONFIG
 		sed -i '/^[[:blank:]]*dtoverlay=applepi/d' $FP_RPI_CONFIG
 
-		# - Remove i2s maps
+		# - Remove I2C maps
 		sed -i '/^[[:blank:]]*dtoverlay=i2s-mmap/d' $FP_RPI_CONFIG
 		sed -i '/^[[:blank:]]*dtparam=i2s=/d' $FP_RPI_CONFIG
 
-		#	onboard blacklist module
+		# - Blacklist onboard module
 		echo 'blacklist snd-bcm2835' > /etc/modprobe.d/rpi-bcm2708.conf
 
 		# - Disable forced analogue out
-		systemctl disable rpi-bcm2835_forced_3.5mm &> /dev/null
-		[[ -f /etc/systemd/system/rpi-bcm2835_forced_3.5mm.service ]] && rm /etc/systemd/system/rpi-bcm2835_forced_3.5mm.service
-		systemctl daemon-reload
-		#	Return Auto
+		if [[ -f /etc/systemd/system/rpi-bcm2835_forced_3.5mm.service ]]; then
+
+			systemctl disable rpi-bcm2835_forced_3.5mm
+			rm /etc/systemd/system/rpi-bcm2835_forced_3.5mm.service
+
+		fi
+
+		# - Return Auto
 		amixer -c 0 cset numid=3 0 &> /dev/null
 
 	}
@@ -1653,8 +1668,8 @@ _EOF_
 
 		if [[ -f '/etc/systemd/system/odroid-hifishield2.service' ]]; then
 
+			systemctl disable odroid-hifishield2
 			rm /etc/systemd/system/odroid-hifishield2.service
-			systemctl daemon-reload
 
 		fi
 
@@ -1701,7 +1716,7 @@ _EOF_
 
 	Soundcard_Reset_BPi_Pro(){
 
-		#3.5mm: https://github.com/Fourdee/DietPi/issues/732#issuecomment-275915919
+		#3.5mm: https://github.com/MichaIng/DietPi/issues/732#issuecomment-275915919
 		SOUNDCARD_TARGET_CARD=0
 
 		amixer sset 'Left Mixer Left DAC' off
@@ -1727,8 +1742,8 @@ _EOF_
 
 			ALSA_EQ_ENABLED=1
 
-			# - remove -eq from string so it doesn't get sent as a dtoverlay= on rpi and dietpi.txt entry
-			INPUT_DEVICE_VALUE=$(echo -e "$INPUT_DEVICE_VALUE" | sed 's/-eq//g')
+			# - Remove -eq from string so it doesn't get sent as a dtoverlay= on rpi and dietpi.txt entry
+			INPUT_DEVICE_VALUE=${INPUT_DEVICE_VALUE%-eq}
 
 		fi
 
@@ -1773,16 +1788,16 @@ _EOF_
 
 						cat << _EOF_ > /var/lib/dietpi/postboot.d/sparky_unmute.sh
 #!/bin/bash
-for x in \`amixer controls | grep layback\`
+for x in \$(amixer controls | grep layback)
 do
 
-    amixer cset "\${x}" 100% &> /dev/null
+    amixer cset "\$x" 100% &> /dev/null
 
 done
 alsactl store &> /dev/null
 _EOF_
 
-					#https://github.com/Fourdee/DietPi/issues/2101
+					#https://github.com/MichaIng/DietPi/issues/2101
 					elif (( $G_HW_MODEL == 12 )); then
 
 						cat << _EOF_ > /var/lib/dietpi/postboot.d/c2_smp.sh
@@ -1988,7 +2003,9 @@ _EOF_
 					local old_firmware=$(ls /lib/modules/)
 					local rpi_firmware='raspberrypi-bootloader raspberrypi-kernel libraspberrypi-bin libraspberrypi0'
 					G_AGUP
-					G_AGI $rpi_firmware raspberrypi-kernel-headers make
+					# - gcc version needs to match "cat /proc/version", currently 4.9.3 on raspberrypi.org Stretch repo
+					# - This makes the build process currently incompatible with Raspbian Buster: gcc-4.9 => v4.9.4
+					G_AGI $rpi_firmware raspberrypi-kernel-headers make gcc-4.9
 					apt-mark unhold $rpi_firmware # Should be not required, since we did that on v6.20 patch, but better be failsafe
 
 					if [[ $old_firmware != $(ls /lib/modules/) ]]; then
@@ -2000,19 +2017,23 @@ Once rebooted, please rerun dietpi-config > Audio Options. Re-select the sound c
 
 					fi
 
+					# - /lib/modules/$(uname -r)/source expected, but only .../build included in headers package currently
+					# - A symlink does the job: https://github.com/notro/rpi-source/blob/master/rpi-source#L340-L341
+					[[ -e /lib/modules/$(uname -r)/source ]] || ln -s /lib/modules/$(uname -r)/build /lib/modules/$(uname -r)/source
+
 					# - Build dtoverlay
 					mkdir -p i-sabre-k2m_build
 					cd i-sabre-k2m_build
-					install_url_address='https://dietpi.com/downloads/sourcebuild/I-Sabre-K2M.7z'
+					install_url_address='https://dietpi.com/downloads/sourcebuild/I-Sabre-K2M.7z' # https://github.com/SatoruKawase/I-Sabre-K2M
 					G_CHECK_URL "$install_url_address"
 					wget "$install_url_address" -O package.7z
-					7z x -y package.7z
+					7zr x -y package.7z
 					rm package.7z
 
-					G_RUN_CMD make
-					G_RUN_CMD make modules_install
-					G_RUN_CMD make dtbs
-					G_RUN_CMD make install_dtbo
+					G_RUN_CMD make CC=gcc-4.9
+					G_RUN_CMD make CC=gcc-4.9 modules_install
+					G_RUN_CMD make CC=gcc-4.9 dtbs
+					G_RUN_CMD make CC=gcc-4.9 install_dtbo
 
 					cd /tmp/$G_PROGRAM_NAME
 					rm -R i-sabre-k2m_build
diff --git a/dietpi/func/dietpi-set_software b/dietpi/func/dietpi-set_software
index e1919c7ea8..3fcab5f7b1 100644
--- a/dietpi/func/dietpi-set_software
+++ b/dietpi/func/dietpi-set_software
@@ -13,16 +13,16 @@
 	#
 	FP_SCRIPT='/DietPi/dietpi/func/dietpi-set_software'
 	AVAIABLE_COMMANDS="
-Available commands
-$FP_SCRIPT			locale					en_GB.UTF-8 / any other UTF-8 locale
-$FP_SCRIPT			allo					eth_dhcp / eth_static
-$FP_SCRIPT			useradd					X=create user with name X and default permissions, using global DietPi password (dietpi)
-$FP_SCRIPT			userdel					X=delete user with name X
-$FP_SCRIPT			apt-mirror				url / default
-$FP_SCRIPT			ntpd-mode				[0-4] configures time sync mode (eg: daily/hourly/daemon)
-$FP_SCRIPT			verify_dietpi.txt		Verifies dietpi.txt entries, adds missing entries if required
-$FP_SCRIPT			passwords				NULL=Prompt user to change DietPi related passwords | X=optional set X as global password for future dietpi-software installations and \"root\" + \"dietpi\" login passwords.
-$FP_SCRIPT			setpermissions			Applies required filesystem permissions to DietPi specific content, and, DietPi userdata directory for software installs
+Available commands:
+$FP_SCRIPT	locale			en_GB.UTF-8 / any other UTF-8 locale
+$FP_SCRIPT	allo			eth_dhcp / eth_static
+$FP_SCRIPT	useradd			X=create user with name X and default permissions, using global DietPi password (dietpi)
+$FP_SCRIPT	userdel			X=delete user with name X
+$FP_SCRIPT	apt-mirror		url / default
+$FP_SCRIPT	ntpd-mode		[0-4] configures time sync mode (eg: daily/hourly/daemon)
+$FP_SCRIPT	verify_dietpi.txt	Verifies dietpi.txt entries, adds missing entries if required
+$FP_SCRIPT	passwords		NULL=Prompt user to change DietPi related passwords | X=optional set X as global password for future dietpi-software installations and \"root\" + \"dietpi\" login passwords.
+$FP_SCRIPT	setpermissions		Applies required filesystem permissions to DietPi specific content, and, DietPi userdata directory for software installs
 "
 	#////////////////////////////////////
 
@@ -49,7 +49,7 @@ $FP_SCRIPT			setpermissions			Applies required filesystem permissions to DietPi
 
 		EXIT_CODE=1
 		G_DIETPI-NOTIFY 2 "Unknown input name ($INPUT_MODE_NAME). Nothing has been applied."
-		echo -e "$AVAIABLE_COMMANDS"
+		echo "$AVAIABLE_COMMANDS"
 
 	}
 
@@ -57,7 +57,7 @@ $FP_SCRIPT			setpermissions			Applies required filesystem permissions to DietPi
 
 		EXIT_CODE=1
 		G_DIETPI-NOTIFY 2 "Unknown input value ($INPUT_MODE_VALUE). Nothing has been applied."
-		echo -e "$AVAIABLE_COMMANDS"
+		echo "$AVAIABLE_COMMANDS"
 
 	}
 
@@ -71,12 +71,8 @@ $FP_SCRIPT			setpermissions			Applies required filesystem permissions to DietPi
 
 			echo "$INPUT_MODE_VALUE UTF-8" > /etc/locale.gen
 
-			# - Add en_GB.UTF-8 back in, if its not the default
-			if [[ $INPUT_MODE_VALUE != 'en_GB.UTF-8' ]]; then
-
-				echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen
-
-			fi
+			# - Add en_GB.UTF-8 back in, if not chosen, as DietPi scripts require it
+			[[ $INPUT_MODE_VALUE != 'en_GB.UTF-8' ]] && echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen
 
 			# - Remove exisiting settings that will break dpkg-reconfigure
 			[[ -f /etc/default/locale ]] && rm /etc/default/locale
@@ -132,9 +128,6 @@ $FP_SCRIPT			setpermissions			Applies required filesystem permissions to DietPi
 
 				echo "deb https://archive.raspberrypi.org/debian/ $G_DISTRO_NAME main ui" > /etc/apt/sources.list.d/raspi.list
 
-				# Highest available raspi.list distro is currently Stretch, working good enough for testing purposes with Raspbian Buster:
-				(( $G_DISTRO > 4 )) && sed -i "s/$G_DISTRO_NAME/stretch/" /etc/apt/sources.list.d/raspi.list
-
 				#	Update dietpi.txt entry
 				G_CONFIG_INJECT 'CONFIG_APT_RASPBIAN_MIRROR=' "CONFIG_APT_RASPBIAN_MIRROR=$INPUT_MODE_VALUE" /DietPi/dietpi.txt
 
@@ -148,15 +141,15 @@ deb https://deb.debian.org/debian-security/ $G_DISTRO_NAME/updates main contrib
 deb $INPUT_MODE_VALUE $G_DISTRO_NAME-backports main contrib non-free
 _EOF_
 
-				#	Jessie, switch deb.debian.org to http: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-351830101
+				#	Jessie, switch deb.debian.org to http: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-351830101
 				if (( $G_DISTRO < 4 )); then
 
 					sed -i 's/https:/http:/g' /etc/apt/sources.list
 
-					# - ARM64 packages no longer available: https://github.com/Fourdee/DietPi/issues/1915
+					# - ARM64 packages no longer available: https://github.com/MichaIng/DietPi/issues/1915
 					(( $G_HW_ARCH == 3 )) && sed -i '/debian-security/d' /etc/apt/sources.list
 
-				#	Buster, remove backports: https://github.com/Fourdee/DietPi/issues/1285#issuecomment-351830101
+				#	Buster, remove backports: https://github.com/MichaIng/DietPi/issues/1285#issuecomment-351830101
 				elif (( $G_DISTRO > 4 )); then
 
 					sed -i '/backports/d' /etc/apt/sources.list
@@ -301,7 +294,7 @@ _EOF_
 	#/////////////////////////////////////////////////////////////////////////////////////
 	Setpermissions_Main(){
 
-		# - Failsafe, assure /var/tmp 777 permissions: https://github.com/Fourdee/DietPi/issues/1144#issuecomment-425758727
+		# - Failsafe, assure /var/tmp 777 permissions: https://github.com/MichaIng/DietPi/issues/1144#issuecomment-425758727
 		chmod 777 /var/tmp
 
 		# - DietPi-Software secure global_pw encrypted
@@ -364,12 +357,12 @@ _EOF_
 		chown -R www-data:www-data $G_FP_DIETPI_USERDATA/rpicam
 		chown -R www-data:www-data $G_FP_DIETPI_USERDATA/pydio_data
 
-		local datadir="$(grep -m1 '^[[:blank:]]*SOFTWARE_OWNCLOUD_DATADIR=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
-		[[ -z $datadir ]] && datadir="$G_FP_DIETPI_USERDATA/owncloud_data"
+		local datadir=$(grep -m1 '^[[:blank:]]*SOFTWARE_OWNCLOUD_DATADIR=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
+		[[ $datadir ]] || datadir="$G_FP_DIETPI_USERDATA/owncloud_data"
 		chown -R www-data:www-data "$datadir"
 
-		datadir="$(grep -m1 '^[[:blank:]]*SOFTWARE_NEXTCLOUD_DATADIR=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
-		[[ -z $datadir ]] && datadir="$G_FP_DIETPI_USERDATA/nextcloud_data"
+		datadir=$(grep -m1 '^[[:blank:]]*SOFTWARE_NEXTCLOUD_DATADIR=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
+		[[ $datadir ]] || datadir="$G_FP_DIETPI_USERDATA/nextcloud_data"
 		chown -R www-data:www-data "$datadir"
 
 		# - Home Assistant Permissions
@@ -447,8 +440,8 @@ _EOF_
 		chown -R plexpy:dietpi $G_FP_DIETPI_USERDATA/plexpy
 
 		# - Deluge
-		chown -R deluge:dietpi $G_FP_DIETPI_USERDATA/deluge
-		chown deluge:dietpi /var/log/deluged.log /var/log/deluge-web.log
+		chown -R debian-deluged:debian-deluged $G_FP_DIETPI_USERDATA/deluge
+		chown -R debian-deluged /var/log/deluged
 
 		# - Jackett
 		chown -R jackett:jackett /opt/jackett
@@ -470,6 +463,15 @@ _EOF_
 		# - Blynk
 		chown -R blynk:dietpi $G_FP_DIETPI_USERDATA/blynk
 
+		# - Pi-hole
+		#	- NB: Git requies special permissions to allow "pihole -up".
+		if [[ -d /var/www/html/pihole ]]; then
+
+			cd /var/www/html/admin && git reset --hard HEAD
+			cd /tmp/$G_PROGRAM_NAME
+
+		fi
+
 	}
 
 	#/////////////////////////////////////////////////////////////////////////////////////
@@ -560,7 +562,7 @@ _EOF_
 		local gitbranch=$(grep -m1 '^[[:blank:]]*DEV_GITBRANCH=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 		[[ $gitbranch ]] || gitbranch='master'
 
-		INSTALL_URL="https://raw.githubusercontent.com/Fourdee/DietPi/$gitbranch/dietpi.txt"
+		INSTALL_URL="https://raw.githubusercontent.com/MichaIng/DietPi/$gitbranch/dietpi.txt"
 		G_CHECK_URL "$INSTALL_URL"
 		if (( ! $? )); then
 
@@ -576,8 +578,8 @@ _EOF_
 
 				if [[ $entry ]]; then
 
-					value="${entry#*=}"  #*=X
-					entry="${entry%%=*}" #X=*
+					value=${entry#*=}  #*=X
+					entry=${entry%%=*} #X=*
 
 					# - Patch new entry if required
 					if ! grep -qi "^[[:blank:]]*$entry=" /DietPi/dietpi.txt; then
@@ -614,8 +616,8 @@ _EOF_
 		#Automation/input mode, set and then apply input password to both dietpi-software and root/dietpi user passwords.
 		if [[ $INPUT_MODE_VALUE ]]; then
 
-			pw_dietpi_software="$INPUT_MODE_VALUE"
-			pw_root_dietpi_users="$INPUT_MODE_VALUE"
+			pw_dietpi_software=$INPUT_MODE_VALUE
+			pw_root_dietpi_users=$INPUT_MODE_VALUE
 
 		#Prompt to change
 		else
@@ -626,7 +628,7 @@ NB: This password will be saved and encrypted within /var/lib/dietpi/dietpi-soft
 			if (( ! $? )); then
 
 				G_WHIP_PASSWORD "Please enter a new global password:\nNB: The following characters are not supported \$|\\\"'"
-				pw_dietpi_software="$result"
+				pw_dietpi_software=$result
 				unset result
 
 			fi
@@ -637,7 +639,7 @@ It is highly recommended to change this password, ideally, it should be differen
 			if (( ! $? )); then
 
 				G_WHIP_PASSWORD 'Please enter a new unix user password:'
-				pw_root_dietpi_users="$result"
+				pw_root_dietpi_users=$result
 				unset result
 
 			fi
@@ -650,8 +652,12 @@ It is highly recommended to change this password, ideally, it should be differen
 			# - Nullify automated PW
 			G_CONFIG_INJECT 'AUTO_SETUP_GLOBAL_PASSWORD=' 'AUTO_SETUP_GLOBAL_PASSWORD=Password has been encrypted and secured on rootFS' /DietPi/dietpi.txt
 
-			mkdir -p /var/lib/dietpi/dietpi-software #should already exist, failsafe
-			echo -e "$pw_dietpi_software" | openssl enc -base64 -e -aes-256-cbc -nosalt -pass pass:DietPiRocks! > /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin
+			mkdir -p /var/lib/dietpi/dietpi-software # Should already exist, failsafe
+
+			# - Use new "pbkdf2" function on Buster to resolve warning about deprecated key derivation used: https://github.com/MichaIng/DietPi/issues/2213
+			local pbkdf2=''
+			(( $G_DISTRO > 4 )) && pbkdf2='-iter 10000'
+			openssl enc -e -a -aes-256-cbc $pbkdf2 -salt -pass pass:'DietPiRocks!' -out /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin <<< $pw_dietpi_software
 
 			Setpermissions_Main &> /dev/null
 
@@ -668,9 +674,6 @@ It is highly recommended to change this password, ideally, it should be differen
 
 		fi
 
-		unset pw_dietpi_software
-		unset pw_root_dietpi_users
-
 	}
 
 	#/////////////////////////////////////////////////////////////////////////////////////
diff --git a/dietpi/func/obtain_network_details b/dietpi/func/obtain_network_details
index 6e1d940203..27dcce9f4c 100644
--- a/dietpi/func/obtain_network_details
+++ b/dietpi/func/obtain_network_details
@@ -10,25 +10,21 @@
 	#////////////////////////////////////
 	#
 	# Info:
+	# - Location: /{DietPi,boot}/dietpi/func/obtain_network_details
 	# - Attempts to find the 1st available index numbers for eth[0-9] and wlan[0-9] devices
 	# - Obtains the active network adapter (eth, then wlan).
-	# - Saves the above data to $FP_NETFILE for use systemwide
+	# - Saves the above data to $FP_NETFILE for use system-wide
 	#
-	# $FP_NETFILE line1
-	# - eth index
-	# $FP_NETFILE line2
-	# - wlan index
-	# $FP_NETFILE line3
-	# - Active adapter name (eg: eth0)
-	# $FP_NETFILE line4
-	# - IP address
+	# line1: eth index
+	# line2: wlan index
+	# line3: Active adapter name (eg: eth0)
+	# line4: Active IP address
+	# line5: ETH_IP=<eth ip>
+	# line6: WLAN_IP=<wlan ip>
 	#////////////////////////////////////
 
-	#Import DietPi-Globals ---------------------------------------------------------------
-	. /DietPi/dietpi/func/dietpi-globals
-	G_PROGRAM_NAME='DietPi-Obtain_network_details'
-	G_INIT
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Exit, if already running
+	pgrep 'obtain_network_details' &> /dev/null && exit
 
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Global
@@ -36,61 +32,74 @@
 
 	FP_NETFILE='/DietPi/dietpi/.network'
 
-	ETH_INDEX=0
-	WLAN_INDEX=0
-
-	ACTIVE_DEVICE='NONE'
+	ETH_INDEX=''
+	WLAN_INDEX=''
+	ACTIVE_DEVICE=''
+	ACTIVE_IP=''
 	ETH_IP=''
 	WLAN_IP=''
-	IP_ADDRESS='Use dietpi-config to setup a connection'
 
-	DEV_MAX=9
-	Scrape_IP(){
+	Scan(){
 
-		#ETH
-		for (( i=0; i<=$DEV_MAX; i++ ))
+		# ETH
+		local eth_dev='' eth_index='' eth_out='' eth_ip=''
+		for i in /sys/class/net/eth*
 		do
 
-			if ETH_IP=$(ip -o a s eth$i 2>/dev/null); then
+			# Check if any eth dev exists
+			[[ -e $i ]] || break
 
-				ETH_INDEX=$i
-				ETH_IP=${ETH_IP#*inet* }
-				ETH_IP=${ETH_IP%%/*}
-				if [[ $ETH_IP ]]; then
+			# Get dev name and index, assign not yet if lower index found
+			eth_dev=${i#*net/}
+			eth_index=${eth_dev#eth}
+			[[ $ETH_INDEX ]] || ETH_INDEX=$eth_index
 
-					ACTIVE_DEVICE="eth$ETH_INDEX"
-					IP_ADDRESS=$ETH_IP
-					break
+			# Get and check IP, assign not yet if lower index IP found
+			eth_out=$(ip a s $eth_dev 2>/dev/null) || continue
+			eth_ip=${eth_out#*inet* }
+			eth_ip=${eth_ip%%/*}
+			[[ $eth_ip ]] || continue
+			[[ $ETH_IP ]] || { ETH_IP=$eth_ip; ETH_INDEX=$eth_index; }
 
-				fi
+			# Check connection state
+			[[ $eth_out =~ [[:blank:]]UP[[:blank:]] ]] || continue
 
-			fi
+			# Assign active dev info
+			ETH_INDEX=$eth_index
+			ETH_IP=$eth_ip
+			ACTIVE_DEVICE=$eth_dev
+			ACTIVE_IP=$ETH_IP
+			break
 
 		done
 
-		#WLAN
-		for (( i=0; i<=$DEV_MAX; i++ ))
+		# WLAN
+		local wlan_dev='' wlan_index='' wlan_out='' wlan_ip=''
+		for i in /sys/class/net/wlan*
 		do
 
-			if WLAN_IP=$(ip -o a s wlan$i 2>/dev/null); then
-
-				WLAN_INDEX=$i
-				WLAN_IP=${WLAN_IP#*inet* }
-				WLAN_IP=${WLAN_IP%%/*}
-				if [[ $WLAN_IP ]]; then
-
-					if [[ ! $ETH_IP ]]; then
-
-						ACTIVE_DEVICE="wlan$WLAN_INDEX"
-						IP_ADDRESS=$WLAN_IP
+			[[ -e $i ]] || break
 
-					fi
+			# Get dev name and index, assign not yet if lower index found
+			wlan_dev=${i#*net/}
+			wlan_index=${wlan_dev#wlan}
+			[[ $WLAN_INDEX ]] || WLAN_INDEX=$wlan_index
 
-					break
+			# Get and check IP, assign not yet if lower index IP found
+			wlan_out=$(ip a s $wlan_dev 2>/dev/null) || continue
+			wlan_ip=${wlan_out#*inet* }
+			wlan_ip=${wlan_ip%%/*}
+			[[ $wlan_ip ]] || continue
+			[[ $WLAN_IP ]] || { WLAN_IP=$wlan_ip; WLAN_INDEX=$wlan_index; }
 
-				fi
+			# Check connection state
+			[[ $wlan_out =~ [[:blank:]]UP[[:blank:]] ]] || continue
 
-			fi
+			# Assign active dev info if none (eth) assigned yet
+			WLAN_INDEX=$wlan_index
+			WLAN_IP=$wlan_ip
+			[[ $ACTIVE_DEVICE ]] || { ACTIVE_DEVICE=$wlan_dev; ACTIVE_IP=$WLAN_IP; }
+			break
 
 		done
 
@@ -99,19 +108,19 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
-	Scrape_IP
+	Scan
 	#-----------------------------------------------------------------------------------
-	#Output to file
+	# Write to file
 	cat << _EOF_ > $FP_NETFILE
-$ETH_INDEX
-$WLAN_INDEX
-$ACTIVE_DEVICE
-$IP_ADDRESS
+${ETH_INDEX:-0}
+${WLAN_INDEX:-0}
+${ACTIVE_DEVICE:-NONE}
+${ACTIVE_IP:-Use dietpi-config to setup a connection}
 ETH_IP=$ETH_IP
 WLAN_IP=$WLAN_IP
 _EOF_
 
-	#Assure that non-root user can read file:
+	# Assure that non-root user can write file
 	(( $UID )) || chmod 666 $FP_NETFILE
 
 	#-----------------------------------------------------------------------------------
diff --git a/dietpi/func/run_ntpd b/dietpi/func/run_ntpd
index 26f4a59907..a940058508 100644
--- a/dietpi/func/run_ntpd
+++ b/dietpi/func/run_ntpd
@@ -19,18 +19,18 @@
 
 	#Import DietPi-Globals ---------------------------------------------------------------
 	. /DietPi/dietpi/func/dietpi-globals
+	G_PROGRAM_NAME='DietPi-Run_NTPD'
 	G_CHECK_ROOT_USER
-	G_PROGRAM_NAME='DietPi-Run_ntpd'
 	G_INIT
 	#Import DietPi-Globals ---------------------------------------------------------------
 
 	INPUT=0
-	disable_error=1 G_CHECK_VALIDINT $1 && INPUT=$1
+	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1
 
 	EXIT_CODE=1
 	FP_EXIT_CODE='/DietPi/dietpi/.timesync_exit_status'
 
-	NTP_UPDATE_MODE=$(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^.*=//')
+	#NTP_UPDATE_MODE=$(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//') # Do not run doubled
 	MAX_LOOPS_CHECK=${MAX_LOOPS_CHECK:-60} #*2 = seconds
 
 	Update_NTPD(){
@@ -39,7 +39,7 @@
 		while (( $EXIT_CODE == 1 ))
 		do
 
-			NTP_UPDATE_MODE=$(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^.*=//')
+			NTP_UPDATE_MODE=$(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 
 			#systemd-timesyncd
 			if (( $NTP_UPDATE_MODE >= 1 && $NTP_UPDATE_MODE <= 4 )); then
@@ -81,9 +81,8 @@
 							)
 
 							G_WHIP_BUTTON_CANCEL_TEXT='Retry'
-							G_WHIP_MENU 'Network time sync has not yet completed, or, failed to update.\nTo prevent issues with outdated system time during installations, please select an option below.\n
-NB: We highly recommend choosing "Retry" first. Failing that, "NTP mirror" then "NTP mode".\n"Override" is a last resort and may cause follow-up issues due to incorrect system clock time.'
-							if (( ! $? )); then
+							if G_WHIP_MENU 'Network time sync has not yet completed, or, failed to update.\nTo prevent issues with outdated system time during installations, please select an option below.\n
+NB: We highly recommend choosing "Retry" first. Failing that, "NTP mirror" then "NTP mode".\n"Override" is a last resort and may cause follow-up issues due to incorrect system clock time.'; then
 
 								if [[ $G_WHIP_RETURNED_VALUE == 'NTP mirror' ]]; then
 
@@ -130,7 +129,7 @@ NB: We highly recommend choosing "Retry" first. Failing that, "NTP mirror" then
 
 		done
 
-		# - log status of completion, prevent software installs: https://github.com/Fourdee/DietPi/issues/786
+		# - log status of completion, prevent software installs: https://github.com/MichaIng/DietPi/issues/786
 		echo $EXIT_CODE > $FP_EXIT_CODE
 
 	}
@@ -141,7 +140,7 @@ NB: We highly recommend choosing "Retry" first. Failing that, "NTP mirror" then
 	#Reset and force new sync?
 	if (( $INPUT == 1 )); then
 
-		rm $FP_EXIT_CODE &> /dev/null
+		[[ -f $FP_EXIT_CODE ]] && rm $FP_EXIT_CODE
 
 	fi
 
@@ -158,7 +157,7 @@ NB: We highly recommend choosing "Retry" first. Failing that, "NTP mirror" then
 
 	#return status
 	G_DIETPI-NOTIFY -1 $EXIT_CODE 'NTPD: time sync |'
-	if (( $EXIT_CODE != 0 )); then
+	if (( $EXIT_CODE )); then
 
 		if (( $NTP_UPDATE_MODE >= 1 && $NTP_UPDATE_MODE <= 4 )); then
 
diff --git a/dietpi/login b/dietpi/login
deleted file mode 100644
index e8d9fcff0e..0000000000
--- a/dietpi/login
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/bin/bash
-{
-	#////////////////////////////////////
-	# DietPi Login Script
-	#
-	#////////////////////////////////////
-	# Created by Daniel Knight / daniel.knight@dietpi.com / dietpi.com
-	#
-	#////////////////////////////////////
-	#
-	# Info:
-	# - filename /DietPi/dietpi/login
-	# - activates on login /etc/bashrc.d/dietpi-login.sh
-	#////////////////////////////////////
-
-	#Precaution: Wait for DietPi Ramdisk to finish
-	until [[ -f /DietPi/.ramdisk ]]
-	do
-
-		G_DIETPI-NOTIFY 2 'Waiting for DietPi-RAMDISK to finish mounting DietPi to RAM...'
-		sleep 1
-
-	done
-
-	#Import DietPi-Globals ---------------------------------------------------------------
-	. /DietPi/dietpi/func/dietpi-globals
-	G_PROGRAM_NAME='DietPi-Login'
-	#G_INIT
-	##Import DietPi-Globals ---------------------------------------------------------------
-
-	#/////////////////////////////////////////////////////////////////////////////////////
-	#Globals
-	#/////////////////////////////////////////////////////////////////////////////////////
-	FP_DIETPI_FIRSTRUNSETUP_LOG='/var/tmp/dietpi/logs/dietpi-firstrun-setup.log'
-	FP_TMP_DIETPI_FIRSTRUNSETUP_LOG='/tmp/dietpi-firstrun-setup.log'
-
-	#/////////////////////////////////////////////////////////////////////////////////////
-	#DietPi-Autostart
-	#/////////////////////////////////////////////////////////////////////////////////////
-	AUTO_START_INDEX=0
-	[[ -f /DietPi/dietpi/.dietpi-autostart_index ]] && AUTO_START_INDEX=$(</DietPi/dietpi/.dietpi-autostart_index)
-
-	#Autoboot
-	Run_AutoStart(){
-
-		#Do we have a valid screen for autoboot?
-		local screen_valid=0
-		[[ ! $DISPLAY && $(tty) == '/dev/tty1' ]] && screen_valid=1
-
-		#Boot to specific Program
-		if (( $screen_valid )); then
-
-			#Wait for postboot
-			local max_seconds=15
-			local current_seconds=1
-			until systemctl status dietpi-postboot | grep -qi 'exited'
-			do
-
-				G_DIETPI-NOTIFY 2 "Waiting for DietPi-Postboot to finish ($current_seconds/$max_seconds)"
-				sleep 1
-				((current_seconds++))
-
-				#max loop limit
-				(( $current_seconds >= $max_seconds )) && break
-
-			done
-
-			#Kodi
-			if (( $AUTO_START_INDEX == 1 )); then
-
-				/DietPi/dietpi/misc/start_kodi
-
-			#Desktop (LXDE/MATE etc)
-			elif (( $AUTO_START_INDEX == 2 )); then
-
-				clear
-				if (( $G_HW_MODEL == 11 )); then
-
-					sleep 5 && startx &
-
-				else
-
-					startx
-
-				fi
-
-			#RetroPie/Emulation station
-			elif (( $AUTO_START_INDEX == 3 )); then
-
-				#emulationstation - can no longer be run as root
-				/opt/retropie/supplementary/emulationstation/emulationstation.sh
-
-			#OpenTyrian
-			elif (( $AUTO_START_INDEX == 4 )); then
-
-				/usr/local/games/opentyrian/run
-
-			#DietPi-Cloudshell
-			elif (( $AUTO_START_INDEX == 5 )); then
-
-				#Launch DietPi-Cloudshell
-				setterm --blank 0 --powersave off --cursor off
-				systemctl start dietpi-cloudshell
-
-			#Amiberry standard boot
-			elif (( $AUTO_START_INDEX == 8 )); then
-
-				systemctl start amiberry
-
-			#DXX-Rebirth
-			elif (( $AUTO_START_INDEX == 9 )); then
-
-				$G_FP_DIETPI_USERDATA/dxx-rebirth/run.sh
-
-			#CAVA
-			elif (( $AUTO_START_INDEX == 10 )); then
-
-				# wait for MPD fifo to start
-				sleep 4
-
-				setterm --blank 0 --powersave off
-				cava
-
-			#Chromium
-			elif (( $AUTO_START_INDEX == 11 )); then
-
-				/var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh
-
-			#LightDM
-			elif (( $AUTO_START_INDEX == 16 )); then
-
-				/usr/sbin/lightdm
-
-			fi
-
-		fi
-
-	}
-
-	Run_First_Update_Setup(){
-
-		/DietPi/dietpi/func/dietpi-banner 0
-		local automated_setup=0
-
-		until (( $G_DIETPI_INSTALL_STAGE == 2 ))
-		do
-
-			# - Automated?
-			if grep -qi '^[[:blank:]]*AUTO_SETUP_AUTOMATED=1' /DietPi/dietpi.txt; then
-
-				automated_setup=1
-				#	Set non-interactive shell, if automated installation (as .bashrc run via STDIN check is interactive)
-				export G_USER_INPUTS=0
-
-			fi
-
-			# - 1st run dietpi-update
-			if (( $G_DIETPI_INSTALL_STAGE == 0 )); then
-
-				#	Check internet
-				optional_cmd_inputs='--no-check-certificate' G_CHECK_URL "$(grep -m1 '^[[:blank:]]*deb ' /etc/apt/sources.list | awk '{print $2}')" # Will exit on failure here then prompt user to configure network
-
-				#	Check NTP synced
-				/DietPi/dietpi/func/run_ntpd
-
-				#	Show GPL license
-				if [[ -f /var/lib/dietpi/license.txt ]]; then
-
-					G_WHIP_VIEWFILE /var/lib/dietpi/license.txt
-					rm /var/lib/dietpi/license.txt
-
-				fi
-
-				/DietPi/dietpi/dietpi-update 1 #Sets G_DIETPI_INSTALL_STAGE=1
-
-			# - 1st run dietpi-software installs
-			elif (( $G_DIETPI_INSTALL_STAGE == 1 )); then
-
-				#	Wait for DietPi-Software if already running, else run it
-				local run_dietpi_software=1
-				while pgrep 'dietpi-software' &> /dev/null
-				do
-
-					run_dietpi_software=0
-
-					# - Automated
-					if (( $automated_setup )); then
-
-						G_DIETPI-NOTIFY 2 'DietPi is currently installing and configuring your system. Please wait for this to complete, check back later.'
-
-					else
-
-						G_DIETPI-NOTIFY 2 'DietPi-Software is already running on another terminal/screen. Please complete or exit, before continuing.'
-
-					fi
-
-					sleep 2
-
-				done
-
-				#	Start DietPi-Software
-				if (( $run_dietpi_software )); then
-
-					/DietPi/dietpi/dietpi-software | tee $FP_TMP_DIETPI_FIRSTRUNSETUP_LOG #Sets G_DIETPI_INSTALL_STAGE=2
-					mv $FP_TMP_DIETPI_FIRSTRUNSETUP_LOG $FP_DIETPI_FIRSTRUNSETUP_LOG
-
-				fi
-
-			fi
-
-			# - reset to auto detection
-			unset G_USER_INPUTS
-
-		done
-
-	}
-
-	#/////////////////////////////////////////////////////////////////////////////////////
-	# Main Loop
-	#/////////////////////////////////////////////////////////////////////////////////////
-
-	#Update network details for banner IP address.
-	/DietPi/dietpi/func/obtain_network_details
-
-	#----------------------------------------------------------------
-	#Normal Login
-	if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
-
-		/DietPi/dietpi/func/dietpi-banner 1
-
-		(( $AUTO_START_INDEX > 0 )) && Run_AutoStart
-
-	#----------------------------------------------------------------
-	#Run DietPi-Update/DietPi-Software (1st run setup) (G_DIETPI_INSTALL_STAGE=0/1)
-	elif (( $G_DIETPI_INSTALL_STAGE >= 0 )); then
-
-		Run_First_Update_Setup
-
-	#----------------------------------------------------------------
-	#DietPi finishing up bootloader.
-	elif (( $G_DIETPI_INSTALL_STAGE == -1 )); then
-
-		/DietPi/dietpi/func/dietpi-banner 0
-		echo -e ' >> DietPi System prep is nearly completed: \n Please run /DietPi/dietpi/login after a few seconds.'
-
-	#----------------------------------------------------------------
-	#DietPi running filesystem prep
-	else
-
-		/DietPi/dietpi/func/dietpi-banner 0
-		echo -e ' >> Filesystem prep has not yet completed: \n Please wait for the system to reboot.'
-
-	fi
-
-	#-----------------------------------------------------------------------------------
-	exit
-	#-----------------------------------------------------------------------------------
-}
diff --git a/dietpi/misc/dietpi-nordvpn b/dietpi/misc/dietpi-nordvpn
index b9ce207832..e03808127d 100644
--- a/dietpi/misc/dietpi-nordvpn
+++ b/dietpi/misc/dietpi-nordvpn
@@ -30,6 +30,7 @@
 	NORDVPN_SERVER=''
 	PROTOCOL='udp'
 
+	NET_DEV='tun0'
 	NORDVPN_CONNECTED=0
 	MAX_WAIT_FOR_CONNECTION=5
 
@@ -61,7 +62,7 @@
 		NORDVPN_CONNECTED=0
 		local status=1
 		#if systemctl status dietpi-nordvpn | grep -qi 'initialization sequence completed'; then
-		if ip r | grep -q 'tun0'; then
+		if ip r | grep -q $NET_DEV; then
 
 			status=0
 			NORDVPN_CONNECTED=1
@@ -161,7 +162,34 @@ _EOF_
 		local text_status='Status:\n'
 		if Check_Connected; then
 
-			text_status+=" - Connected to $NORDVPN_SERVER"
+			text_status+=" - Connected : $NORDVPN_SERVER\n"
+
+			local net_rx_byte=0
+			local net_tx_byte=0
+			local net_rx_mb='N/A'
+			local net_tx_mb='N/A'
+
+			if [[ -f /sys/class/net/$NET_DEV/statistics/rx_bytes && -f /sys/class/net/$NET_DEV/statistics/tx_bytes ]]; then
+
+				net_rx_byte=$(</sys/class/net/$NET_DEV/statistics/rx_bytes)
+				net_tx_byte=$(</sys/class/net/$NET_DEV/statistics/tx_bytes)
+				net_rx_mb='Unknown'
+				if disable_error=1 G_CHECK_VALIDINT $net_rx_byte && (( $net_rx_byte > 0 )); then
+
+					net_rx_mb="$(( $net_rx_byte / 1024 / 1024 ))MB"
+
+				fi
+
+				net_tx_mb='Unknown'
+				if disable_error=1 G_CHECK_VALIDINT $net_tx_byte && (( $net_tx_byte > 0 )); then
+
+					net_tx_mb="$(( $net_tx_byte / 1024 / 1024 ))MB"
+
+				fi
+
+			fi
+
+			text_status+=" - Usage     : Sent = $net_tx_mb | Recieved = $net_rx_mb"
 
 		else
 
diff --git a/dietpi/misc/start_kodi b/dietpi/misc/start_kodi
index c157fd6864..f7e508348c 100644
--- a/dietpi/misc/start_kodi
+++ b/dietpi/misc/start_kodi
@@ -17,8 +17,8 @@
 	# - /DietPi/dietpi/misc/start_kodi
 	#////////////////////////////////////
 	#Import DietPi-Globals ---------------------------------------------------------------
-	. /DietPi/dietpi/func/dietpi-globals
-	G_PROGRAM_NAME='DietPi-Start_kodi'
+	# G_HW_MODEL required only
+	G_HW_MODEL=$(sed -n 1p /DietPi/dietpi/.hw_model)
 	##Import DietPi-Globals ---------------------------------------------------------------
 
 	#/////////////////////////////////////////////////////////////////////////////////////
@@ -35,9 +35,9 @@
 	else
 
 		#From Desktop
-		if [ "$DISPLAY" ]; then
+		if [[ $DISPLAY ]]; then
 
-			#C2 fix for stuttering and laggy audio: https://github.com/Fourdee/DietPi/issues/399#issuecomment-229413994
+			#C2 fix for stuttering and laggy audio: https://github.com/MichaIng/DietPi/issues/399#issuecomment-229413994
 			if (( $G_HW_MODEL == 12 )); then
 
 				killall -w xcompmgr
@@ -57,7 +57,6 @@
 	fi
 
 	#-----------------------------------------------------------------------------------
-	#exit
 	exit
 	#-----------------------------------------------------------------------------------
-}
\ No newline at end of file
+}
diff --git a/dietpi/patch_file b/dietpi/patch_file
index 171c4723e8..0e9e8dbe5e 100644
--- a/dietpi/patch_file
+++ b/dietpi/patch_file
@@ -95,8 +95,8 @@
 		else
 
 			echo 0 > /DietPi/dietpi/.install_stage
-			G_RUN_CMD systemctl restart dietpi-ramdisk
-			sync
+			l_message='Syncing new DietPi scripts to disk' G_RUN_CMD /DietPi/dietpi/func/dietpi-ramdisk 1
+			> /DietPi/.ramdisk
 			G_WHIP_MSG 'A system reboot is required to apply the new G_DIETPI_INSTALL_STAGE system. Once the system has rebooted, please login to continue setup.'
 			sleep 3 # Sleep to assure sync has finished in case of G_USER_INPUTS=0
 			reboot
@@ -128,11 +128,11 @@
 			sed -i '/#DietPi Additions/Q' /etc/bash.bashrc
 			#-------------------------------------------------------------------------------
 			#Fix doubled and renamed config files:
-			#https://github.com/Fourdee/DietPi/commit/68148cec6b49afc787deca638456e1c4689e1cab#diff-8370b86e635383d521462994afe04a2d
+			#https://github.com/MichaIng/DietPi/commit/68148cec6b49afc787deca638456e1c4689e1cab#diff-8370b86e635383d521462994afe04a2d
 			[[ -f /etc/apt/apt.conf.d/99force-ipv ]] && rm /etc/apt/apt.conf.d/99force-ipv
 			[[ -f /etc/sysctl.d/97-dietpi.conf ]] && rm /etc/sysctl.d/97-dietpi.conf
 			#-------------------------------------------------------------------------------
-			#Core_ENV update: https://github.com/Fourdee/DietPi/pull/1419
+			#Core_ENV update: https://github.com/MichaIng/DietPi/pull/1419
 			#	consoleblank disable x86_64
 			if [[ -f /etc/default/grub ]]; then
 
@@ -151,16 +151,16 @@
 
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	Kodi: https://github.com/Fourdee/DietPi/issues/1428
-			#	Fail2Ban: https://github.com/Fourdee/DietPi/issues/1431
-			#	Tonido: https://github.com/Fourdee/DietPi/issues/1432
+			#	Kodi: https://github.com/MichaIng/DietPi/issues/1428
+			#	Fail2Ban: https://github.com/MichaIng/DietPi/issues/1431
+			#	Tonido: https://github.com/MichaIng/DietPi/issues/1432
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 31 73 134
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 1 )); then
 
 			#-------------------------------------------------------------------------------
-			#locale rework/reset: https://github.com/Fourdee/DietPi/issues/1430#issuecomment-364763302
+			#locale rework/reset: https://github.com/MichaIng/DietPi/issues/1430#issuecomment-364763302
 			[[ -f /etc/environment ]] && mv /etc/environment /mnt/dietpi_userdata/environment.bak
 			> /etc/environment
 
@@ -168,36 +168,16 @@
 
 			G_WHIP_MSG 'Notice (locale):\n\nTo resolve broken locales, they have been reset to "en_GB.UTF-8".\n\nIf you had a different locale configured on this system, please use "dietpi-config" at a later date to re-configure.\n\nIn relation to that, DietPi does not use "/etc/environment" anymore, thus it is cleaned. In case you manually edited it, a backup was created: /mnt/dietpi_userdata/environment.bak'
 			#------------------------------------------------------------------------------
-			#Removed control from DietPi-Services: https://github.com/Fourdee/DietPi/issues/1501
+			#Removed control from DietPi-Services: https://github.com/MichaIng/DietPi/issues/1501
 			systemctl enable dnsmasq &> /dev/null
 			systemctl enable openvpn &> /dev/null
 			systemctl start dnsmasq &> /dev/null
 			systemctl start openvpn &> /dev/null
 			#-------------------------------------------------------------------------------
-			#CertBot fixes: https://github.com/Fourdee/DietPi/issues/734#issuecomment-361774084
-			# - "/DietPi/dietpi/dietpi-letsencrypt 1" will run on v6.2 -> v6.3, avoid double execution!
-			if [[ -f /etc/letsencrypt/live/*/cert.pem ]] && (( $G_DISTRO > 3 )); then
-
-				if grep -q '^aSOFTWARE_INSTALL_STATE\[83\]=2' /DietPi/dietpi/.installed; then
-
-					certbot renew --force-renewal -a webroot -w /var/www/ -i apache
-
-				elif grep -q '^aSOFTWARE_INSTALL_STATE\[85\]=2' /DietPi/dietpi/.installed; then
-
-					certbot renew --force-renewal -a webroot -w /var/www/ -i nginx
-
-				elif grep -q '^aSOFTWARE_INSTALL_STATE\[158\]=2' /DietPi/dietpi/.installed; then
-
-					certbot renew --force-renewal --preferred-challenges http
-
-				fi
-
-			fi
-			#-------------------------------------------------------------------------------
 			#https://dietpi.com/phpbb/viewtopic.php?f=11&t=2772&p=10646#p10646
-			rm /etc/apt/sources.list.d/openmediavault.list &> /dev/null
+			[[ -f /etc/apt/sources.list.d/openmediavault.list ]] && rm /etc/apt/sources.list.d/openmediavault.list
 			#-------------------------------------------------------------------------------
-			#DietPi-Software removals: https://github.com/Fourdee/DietPi/issues/1491
+			#DietPi-Software removals: https://github.com/MichaIng/DietPi/issues/1491
 			if [[ -f /DietPi/dietpi/.installed ]]; then
 
 				sed -i '/^aSOFTWARE_INSTALL_STATE\[100\]=/c\aSOFTWARE_INSTALL_STATE\[100\]=0' /DietPi/dietpi/.installed #grashopper (now pijuice)
@@ -211,9 +191,8 @@
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Nodered lacks homedir, create it: https://github.com/Fourdee/DietPi/issues/1446#issuecomment-366370800
-			if grep -qi '^nodered:' /etc/passwd &&
-				[[ ! -d /home/nodered ]]; then
+			#Nodered lacks homedir, create it: https://github.com/MichaIng/DietPi/issues/1446#issuecomment-366370800
+			if getent passwd nodered &> /dev/null && [[ ! -d /home/nodered ]]; then
 
 				mkdir -p /home/nodered
 				chown -R nodered:nodered /home/nodered
@@ -221,25 +200,26 @@
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	# => v6.20 NetData 1.9
+			# v6.20	NetData 1.9
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 2 )); then
 
 			#-------------------------------------------------------------------------------
-			#Switch from rc.local to own postboot script: https://github.com/Fourdee/DietPi/issues/1376
+			#Switch from rc.local to own postboot script: https://github.com/MichaIng/DietPi/issues/1376
 			G_WHIP_MSG 'DietPi will not use "/etc/rc.local" for its own scripts anymore.\n\nHowever, in case you manually added something, we safe a backup to "/mnt/dietpi_userdata/rc.local.bak", from where you can copy & paste back to the cleaned "/etc/rc.local".\n\nIt will work as before.'
 			[[ -f /etc/rc.local ]] && mv /etc/rc.local /mnt/dietpi_userdata/rc.local.bak
 			cat << _EOF_ > /etc/rc.local
 #!/bin/sh -e
 #
+# rc.local
 #
 # This script is executed at the end of each multiuser runlevel.
 # Make sure that the script will "exit 0" on success or any other
 # value on error.
 #
-# In order to disable this script please use systemd to control the service:
-# systemctl disable rc-local.service
+# In order to enable or disable this script just change the execution
+# bits.
 #
 # By default this script does nothing.
 
@@ -247,22 +227,6 @@ exit 0
 _EOF_
 			chmod +x /etc/rc.local
 
-			cat << _EOF_ > /etc/systemd/system/rc-local.service
-[Unit]
-Description=rc.local backwards compatibility
-After=dietpi-boot.service
-
-[Service]
-Type=idle
-RemainAfterExit=yes
-ExecStart=/etc/rc.local
-StandardOutput=tty
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-
-			systemctl enable rc-local.service
 			systemctl enable dietpi-postboot
 
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[168\]=2' /DietPi/dietpi/.installed; then
@@ -286,11 +250,11 @@ _EOF_
 			G_DIETPI-NOTIFY 2 'Reducing getty count and resource usage:'
 			systemctl mask getty-static
 			#-------------------------------------------------------------------------------
-			# - Meveric, update repo to use our EU mirror: https://github.com/Fourdee/DietPi/issues/1519#issuecomment-368234302
+			# - Meveric, update repo to use our EU mirror: https://github.com/MichaIng/DietPi/issues/1519#issuecomment-368234302
 			sed -i 's@https://oph.mdrjr.net/meveric@http://fuzon.co.uk/meveric@' /etc/apt/sources.list.d/meveric* &> /dev/null
 			#-------------------------------------------------------------------------------
-			#Remove any existing apt recommends settings, before applying ours: https://github.com/Fourdee/DietPi/issues/1482#issuecomment-368031044
-			rm /etc/apt/apt.conf.d/*recommends* &> /dev/null
+			#Remove any existing apt recommends settings, before applying ours: https://github.com/MichaIng/DietPi/issues/1482#issuecomment-368031044
+			rm -f /etc/apt/apt.conf.d/*recommends*
 
 			G_ERROR_HANDLER_COMMAND='/etc/apt/apt.conf.d/99-dietpi-norecommends'
 			cat << _EOF_ > $G_ERROR_HANDLER_COMMAND
@@ -303,22 +267,22 @@ _EOF_
 			G_ERROR_HANDLER
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	# => v6.5 Shairport-sync 3.1.7
+			# v6.5	Shairport-sync 3.1.7
 			# 	RPi Cam
-			#	Aria2 for .conf addition: https://github.com/Fourdee/DietPi/issues/1575#issuecomment-370248708
-			#	# => v6.18 Sonarr/Radarr: https://github.com/Fourdee/DietPi/issues/1566#issuecomment-369334473
+			#	Aria2 for .conf addition: https://github.com/MichaIng/DietPi/issues/1575#issuecomment-370248708
+			# v6.18	Sonarr/Radarr: https://github.com/MichaIng/DietPi/issues/1566#issuecomment-369334473
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
 				# - RPi cam pre-patch
-				mv /var/www/dietpicam /var/www/rpicam &> /dev/null
-				mv $G_FP_DIETPI_USERDATA/dietpicam $G_FP_DIETPI_USERDATA/rpicam &> /dev/null
-				rm /var/www/rpicam/media &> /dev/null
+				[[ -d /var/www/dietpicam ]] && mv /var/www/dietpicam /var/www/rpicam
+				[[ -d $G_FP_DIETPI_USERDATA/dietpicam ]] && mv $G_FP_DIETPI_USERDATA/dietpicam $G_FP_DIETPI_USERDATA/rpicam
+				[[ -e /var/www/rpicam/media ]] && rm /var/www/rpicam/media
 
 				/DietPi/dietpi/dietpi-software reinstall 59 132
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Add certificate combining for Lighttpd to CertBot auto renewal: https://github.com/Fourdee/DietPi/pull/1553
+			#Add certificate combining for Lighttpd to CertBot auto renewal: https://github.com/MichaIng/DietPi/pull/1553
 			if [[ -f /DietPi/dietpi/.dietpi-letsencrypt ]]; then
 
 				# - Switch Minio to new certbot.service.d/ hook:
@@ -342,13 +306,13 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#GNU key management required for some APT installs via additional repos: https://github.com/Fourdee/DietPi/issues/1388
+			#GNU key management required for some APT installs via additional repos: https://github.com/MichaIng/DietPi/issues/1388
 			G_AGI dirmngr
 			#-------------------------------------------------------------------------------
-			# Odroids FFmpeg decendency fix: https://github.com/Fourdee/DietPi/issues/1556#issuecomment-369463910
+			# Odroids FFmpeg decendency fix: https://github.com/MichaIng/DietPi/issues/1556#issuecomment-369463910
 			if (( $G_HW_MODEL > 9 && $G_HW_MODEL < 15 )); then
 
-				rm /etc/apt/preferences.d/meveric*
+				rm -f /etc/apt/preferences.d/meveric*
 				cat << _EOF_ > /etc/apt/preferences.d/backports
 Package: *
 Pin: release a=jessie-backports
@@ -363,8 +327,8 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			# Subsonic 5 replaced with Airsonic: https://github.com/Fourdee/DietPi/issues/1585
-			sed -i '/^aSOFTWARE_INSTALL_STATE\[33\]=/c\aSOFTWARE_INSTALL_STATE\[33\]=0' /DietPi/dietpi/.installed &> /dev/null
+			# Subsonic 5 replaced with Airsonic: https://github.com/MichaIng/DietPi/issues/1585
+			(( $G_DIETPI_INSTALL_STAGE == 2 )) && sed -i '/^aSOFTWARE_INSTALL_STATE\[33\]=/c\aSOFTWARE_INSTALL_STATE\[33\]=0' /DietPi/dietpi/.installed
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 3 )); then
@@ -373,7 +337,7 @@ _EOF_
 			#Service updates: https://dietpi.com/phpbb/viewtopic.php?f=11&t=1148&p=11322#p11322
 			$(command -v mkdir) -p /var/tmp/dietpi/logs
 			#-------------------------------------------------------------------------------
-			#Fix microcode installation based on image creation CPU instead of image target CPU: https://github.com/Fourdee/DietPi/pull/1596
+			#Fix microcode installation based on image creation CPU instead of image target CPU: https://github.com/MichaIng/DietPi/pull/1596
 			if (( $G_HW_ARCH == 10 )); then
 
 				if grep -qi 'vendor_id.*intel' /proc/cpuinfo; then
@@ -394,22 +358,15 @@ _EOF_
 			#	UrBackupServer
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 111
 			#-------------------------------------------------------------------------------
-			#Cron minutely support: https://github.com/Fourdee/DietPi/pull/1578
+			#Cron minutely support: https://github.com/MichaIng/DietPi/pull/1578
 			mkdir -p /etc/cron.minutely
-
-			if ! grep -qi 'cron.minutely' /etc/crontab; then
-
-				cat << _EOF_ >> /etc/crontab
-#*/0 * * * *   root    cd / && run-parts --report /etc/cron.minutely
-_EOF_
-
-			fi
+			grep -q 'cron\.minutely' /etc/crontab || echo '#*/0 * * * * root cd / && run-parts --report /etc/cron.minutely' >> /etc/crontab
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 4 )); then
 
 			#-------------------------------------------------------------------------------
-			#Removal of dphys-swapfile, switch to our own swapfile control system: https://github.com/Fourdee/DietPi/issues/1602
+			#Removal of dphys-swapfile, switch to our own swapfile control system: https://github.com/MichaIng/DietPi/issues/1602
 			sed -i '/[[:space:]]dphys-swapfile[[:space:]]/d' /etc/fstab
 			local swap_size=0
 			local swap_location='/var/swap'
@@ -423,18 +380,18 @@ _EOF_
 			sed -i "/^[[:blank:]]*AUTO_SETUP_SWAPFILE_SIZE=/c\AUTO_SETUP_SWAPFILE_SIZE=$swap_size" /DietPi/dietpi.txt
 			sed -i "/^[[:blank:]]*AUTO_SETUP_SWAPFILE_LOCATION=/c\AUTO_SETUP_SWAPFILE_LOCATION=$swap_location" /DietPi/dietpi.txt
 
-			#Re-Apply swap to set /tmp tmpfs size: https://github.com/Fourdee/DietPi/issues/1027#issuecomment-369435049
-			# + Force auto swapfile size https://github.com/Fourdee/DietPi/issues/1593#issuecomment-371516418
+			#Re-Apply swap to set /tmp tmpfs size: https://github.com/MichaIng/DietPi/issues/1027#issuecomment-369435049
+			# + Force auto swapfile size https://github.com/MichaIng/DietPi/issues/1593#issuecomment-371516418
 			/DietPi/dietpi/func/dietpi-set_dphys-swapfile 1
 
 			G_AGP dphys-swapfile
 			#-------------------------------------------------------------------------------
 			#Reinstalls
-			#	# => v6.20 Shairport-sync: https://github.com/Fourdee/DietPi/issues/1620#issuecomment-373086888
+			# v6.20	Shairport-sync: https://github.com/MichaIng/DietPi/issues/1620#issuecomment-373086888
 			#	Squeezebox server:
-			#	# => v6.20 AmiBerry 2.18: https://github.com/Fourdee/DietPi/issues/1410#issuecomment-374060452
-			#	Mopidy: https://github.com/Fourdee/DietPi/issues/1625
-			#	# => v6.17 MPD: https://github.com/Fourdee/DietPi/issues/1614
+			# v6.20	AmiBerry 2.18: https://github.com/MichaIng/DietPi/issues/1410#issuecomment-374060452
+			#	Mopidy: https://github.com/MichaIng/DietPi/issues/1625
+			# v6.17	MPD: https://github.com/MichaIng/DietPi/issues/1614
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
 				killall -qw squeezeboxserver
@@ -452,23 +409,21 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#sudoers and sysctl adjustments moved to *.d/ files: https://github.com/Fourdee/DietPi/pull/1635
-			cat << _EOF_ > /etc/sudoers.d/dietpi
-dietpi ALL=NOPASSWD: ALL
-_EOF_
+			#sudoers and sysctl adjustments moved to *.d/ files: https://github.com/MichaIng/DietPi/pull/1635
+			echo 'dietpi ALL=NOPASSWD: ALL' > /etc/sudoers.d/dietpi
 			sed -i '/dietpi/d' /etc/sudoers
 			#Our config must not start with '99-' to assure priority higher than '99-sysctl.conf'
 			# - New config is installed automatically via v6.9 update system.
 			[[ -f /etc/sysctl.d/99-dietpi.conf ]] && rm /etc/sysctl.d/99-dietpi.conf
 			#-------------------------------------------------------------------------------
-			# - RPi resolve gettext error: https://github.com/Fourdee/DietPi/issues/1631#issuecomment-373965406
-			rm /etc/profile.d/wifi-country.sh &> /dev/null
+			# - RPi resolve gettext error: https://github.com/MichaIng/DietPi/issues/1631#issuecomment-373965406
+			[[ -f /etc/profile.d/wifi-country.sh ]] && rm /etc/profile.d/wifi-country.sh
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 5 )); then
 
 			#-------------------------------------------------------------------------------
-			#RPi APT mirror fix: https://github.com/Fourdee/DietPi/issues/1659
+			#RPi APT mirror fix: https://github.com/MichaIng/DietPi/issues/1659
 			if (( $G_HW_MODEL < 10 )); then
 
 				G_AGDUG
@@ -477,10 +432,10 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Remove minutely running "make_nas_processes_faster" cron job, present on images with preinstalled OMV: https://github.com/Fourdee/DietPi/issues/1654
-			rm /etc/cron.d/make_nas_processes_faster &> /dev/null
+			#Remove minutely running "make_nas_processes_faster" cron job, present on images with preinstalled OMV: https://github.com/MichaIng/DietPi/issues/1654
+			[[ -f /etc/cron.d/make_nas_processes_faster ]] && rm /etc/cron.d/make_nas_processes_faster
 			#-------------------------------------------------------------------------------
-			#Add Dropbear ecdsa and dss host keys, if missing: https://github.com/Fourdee/DietPi/issues/1670
+			#Add Dropbear ecdsa and dss host keys, if missing: https://github.com/MichaIng/DietPi/issues/1670
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[104\]=2' /DietPi/dietpi/.installed; then
 
 				[[ -f /etc/dropbear/dropbear_ecdsa_host_key ]] || dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key &> /dev/null
@@ -488,7 +443,7 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Reinstall firmware-misc-nonfree by default (ralink): https://github.com/Fourdee/DietPi/issues/1675
+			#Reinstall firmware-misc-nonfree by default (ralink): https://github.com/MichaIng/DietPi/issues/1675
 			if dpkg-query -s wpasupplicant &> /dev/null; then
 
 				if (( $G_DISTRO == 3 )); then
@@ -511,85 +466,50 @@ _EOF_
 		elif (( $G_DIETPI_VERSION_SUB == 6 )); then
 
 			#-------------------------------------------------------------------------------
-			#Add nodered (if installed) to gpio group: https://github.com/Fourdee/DietPi/issues/1687
-			usermod -a -G gpio nodered &> /dev/null
+			#Add nodered (if installed) to gpio group: https://github.com/MichaIng/DietPi/issues/1687
+			getent passwd nodered &> /dev/null && usermod -a -G gpio nodered
 			#-------------------------------------------------------------------------------
-			#Deluge systemd service update: https://github.com/Fourdee/DietPi/issues/1658
-			# + Service fix for in v6.6 https://github.com/Fourdee/DietPi/issues/1689#issuecomment-379024795
-			if [[ -f /var/lib/dietpi/dietpi-software/services/deluge.service ||
-				-f /etc/systemd/system/deluged.service ]]; then
-
-				#New services
-				cat << _EOF_ > /etc/systemd/system/deluged.service
-[Unit]
-Description=DietPi Deluged Service
-
-[Service]
-Type=simple
-ExecStart=$(command -v deluged) -d -l /var/log/deluged.log -L warning
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-
-				cat << _EOF_ > /etc/systemd/system/deluge-web.service
-[Unit]
-Description=DietPi Deluge-web Service
-
-[Service]
-Type=simple #forking causes systemd-tty-ask-password-agent hang
-ExecStart=$(command -v deluge-web) -l /var/log/deluge-web.log -L warning
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-
-				/DietPi/dietpi/dietpi-services dietpi_controlled
-
-				[[ -f /var/lib/dietpi/dietpi-software/services/deluge.service ]] && rm /var/lib/dietpi/dietpi-software/services/deluge.service
-
-				# - Enable service run:
-				G_CONFIG_INJECT 'ENABLE_DELUGED=' 'ENABLE_DELUGED=1' /etc/default/deluged
-
-			fi
+			#Deluge systemd service update: https://github.com/MichaIng/DietPi/issues/1658
+			# + Service fix for in v6.6 https://github.com/MichaIng/DietPi/issues/1689#issuecomment-379024795
+			# => Fixed with reinstall on v6.21 => v6.22
+			[[ -f /var/lib/dietpi/dietpi-software/services/deluge.service ]] && rm /var/lib/dietpi/dietpi-software/services/deluge.service
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 7 )); then
 
 			#-------------------------------------------------------------------------------
 			#Uninstalls:
-			#	Removal of fbset on new installs: https://github.com/Fourdee/DietPi/issues/1716
+			#	Removal of fbset on new installs: https://github.com/MichaIng/DietPi/issues/1716
 			(( $G_DIETPI_INSTALL_STAGE == 0 )) && apt-mark auto fbset
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	XRDP: https://github.com/Fourdee/DietPi/issues/1727#issuecomment-383858979
-			#	# => v6.20 AmiBerry 2.19: https://github.com/Fourdee/DietPi/issues/1707
+			#	XRDP: https://github.com/MichaIng/DietPi/issues/1727#issuecomment-383858979
+			# v6.20	AmiBerry 2.19: https://github.com/MichaIng/DietPi/issues/1707
 			#	Pi-SPC
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 29 166
 			#-------------------------------------------------------------------------------
-			#Pi-hole: Enable FTLDNS support by removing pihole-FTL from DietPi control: https://github.com/Fourdee/DietPi/pull/1714
+			#Pi-hole: Enable FTLDNS support by removing pihole-FTL from DietPi control: https://github.com/MichaIng/DietPi/pull/1714
 			systemctl enable pihole-FTL 2> /dev/null
 			#-------------------------------------------------------------------------------
-			#Remove allo Piano firmware, if not chosen as soundcard, to allow installation on demand: https://github.com/Fourdee/DietPi/issues/1656
-			if ( (( $G_HW_MODEL < 10 )) && ! grep -q 'allo-piano-dac' /DietPi/config.txt ) ||
-				( (( $G_HW_MODEL == 70 )) && ! grep -q 'allo-piano-dac' /etc/modules ); then
+			#Remove allo Piano firmware, if not chosen as soundcard, to allow installation on demand: https://github.com/MichaIng/DietPi/issues/1656
+			if { (( $G_HW_MODEL < 10 )) && ! grep -q 'allo-piano-dac' /DietPi/config.txt; } ||
+				{ (( $G_HW_MODEL == 70 )) && ! grep -q 'allo-piano-dac' /etc/modules; }; then
 
-				rm -R /lib/firmware/allo &> /dev/null
+				[[ -d /lib/firmware/allo ]] && rm -R /lib/firmware/allo
 
 			fi
 			#-------------------------------------------------------------------------------
-			#RPi add FB depth 16: https://github.com/Fourdee/DietPi/issues/1716
-			if (( $G_HW_MODEL < 10 )) &&
-				! grep -q 'framebuffer_depth=' /DietPi/config.txt; then
+			#RPi add FB depth 16: https://github.com/MichaIng/DietPi/issues/1716
+			if (( $G_HW_MODEL < 10 )) && ! grep -q 'framebuffer_depth=' /DietPi/config.txt; then
 
 				echo -e "\n#framebuffer_depth=16" >> /DietPi/config.txt
 
 			fi
 			#-------------------------------------------------------------------------------
-			#RPi UART: https://github.com/Fourdee/DietPi/issues/1759
+			#RPi UART: https://github.com/MichaIng/DietPi/issues/1759
 			if [[ -f /DietPi/config.txt ]]; then
 
-				local serial_state=$(grep -m1 '^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=' /DietPi/dietpi.txt | sed 's/^.*=//')
+				local serial_state=$(grep -m1 '^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 				G_CONFIG_INJECT 'enable_uart=' "enable_uart=$serial_state" /DietPi/config.txt
 
 			fi
@@ -603,11 +523,10 @@ _EOF_
 			#-------------------------------------------------------------------------------
 			#Verify v6.8+ .dietpi-process_tool file format, else remove it (recreated)
 			if [[ -f '/DietPi/dietpi/.dietpi-process_tool' ]] &&
-				! grep -qm1 '^aname_save' /DietPi/dietpi/.dietpi-process_tool; then
+				! grep -q '^aname_save' /DietPi/dietpi/.dietpi-process_tool; then
 
 				G_DIETPI-NOTIFY 2 'Detected invalid .dietpi-process_tool save file. It has been reset to support updated v6.8 DietPi-Process_Tool codebase'
-				rm /DietPi/dietpi/.dietpi-process_tool
-				rm /boot/dietpi/.dietpi-process_tool
+				rm /{DietPi,boot}/dietpi/.dietpi-process_tool
 
 			fi
 			#-------------------------------------------------------------------------------
@@ -617,22 +536,21 @@ _EOF_
 
 			G_AGP ntp
 			sed -i '/^aSOFTWARE_INSTALL_STATE\[106\]=/c\aSOFTWARE_INSTALL_STATE\[106\]=0' /DietPi/dietpi/.installed &> /dev/null
-			/DietPi/dietpi/func/dietpi-set_software ntpd-mode $(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^.*=//')
+			/DietPi/dietpi/func/dietpi-set_software ntpd-mode $(grep -m1 '^[[:blank:]]*CONFIG_NTP_MODE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 			systemctl daemon-reload
 			/DietPi/dietpi/func/run_ntpd
 			#-------------------------------------------------------------------------------
 			#Move DietPi globals and login scripts into new /etc/bashrc.d location to load on all interactive shells:
 			mkdir -p /etc/bashrc.d
-			G_CONFIG_INJECT '.*/etc/bashrc\.d/.*' 'for i in /etc/bashrc.d/*.sh; do [ -r "$i" ] && . $i; done' /etc/bash.bashrc
-			sed -i '/\/DietPi/d' /root/.bashrc #should already be removed, failsafe start clean
-			for i in /home/*/.bashrc; do sed -i '/\/DietPi/d' $i; done #should already be removed, failsafe start clean
-			rm /etc/profile.d/99-dietpi* &> /dev/null
+			# => v6.22 #G_CONFIG_INJECT '.*/etc/bashrc\.d/.*' 'for i in /etc/bashrc.d/*.sh; do [ -r "$i" ] && . $i; done' /etc/bash.bashrc
+			for i in /{root,home/*}/.bashrc; do [[ -f $i ]] && sed -i '/\/DietPi/d' $i; done #should already be removed, failsafe start clean
+			rm -f /etc/profile.d/99-dietpi*
 			# - Enable bash-completion for non-login shells:
 			#	- NB: It is called twice on login shells then, but breaks directly if called already once.
-			ln -sf /etc/profile.d/bash_completion.sh /etc/bashrc.d/dietpi-bash_completion.sh
+			[[ -f /etc/profile.d/bash_completion.sh ]] && ln -sf /etc/profile.d/bash_completion.sh /etc/bashrc.d/dietpi-bash_completion.sh
 			#-------------------------------------------------------------------------------
 			#Sparky unmute fix (re: @sudeep)
-			#	v2: https://github.com/Fourdee/DietPi/pull/1779
+			#	v2: https://github.com/MichaIng/DietPi/pull/1779
 			if (( $G_HW_MODEL == 70 )) && grep -qi 'CONFIG_SOUNDCARD=usb-dac' /DietPi/dietpi.txt; then
 
 				cat << _EOF_ > /var/lib/dietpi/postboot.d/sparky_unmute.sh
@@ -649,27 +567,27 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls
-			#	RPi (apply to all) LXDE missing icons under pcmanfm reinstall: https://github.com/Fourdee/DietPi/issues/1558#issuecomment-390328173
-			#	# => v6.12 AirSonic
+			#	RPi (apply to all) LXDE missing icons under pcmanfm reinstall: https://github.com/MichaIng/DietPi/issues/1558#issuecomment-390328173
+			# v6.12	AirSonic
 			#	SubSonic
 			#	Cava
 			#	CloudPrint
-			#	TightVNC/VNC4/RealVNC: https://github.com/Fourdee/DietPi/pull/1798#issuecomment-392594878
-			#	# => v6.19 Xserver: https://github.com/Fourdee/DietPi/issues/1823
+			#	TightVNC/VNC4/RealVNC: https://github.com/MichaIng/DietPi/pull/1798#issuecomment-392594878
+			# v6.19	Xserver: https://github.com/MichaIng/DietPi/issues/1823
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 23 27 28 34 119 120 137
 			#-------------------------------------------------------------------------------
-			#Initially allow non-root users to obtain network details as well: https://github.com/Fourdee/DietPi/commit/15c0d495c33d3091e219c87bb2d09a22f8d27e9c
+			#Initially allow non-root users to obtain network details as well: https://github.com/MichaIng/DietPi/commit/15c0d495c33d3091e219c87bb2d09a22f8d27e9c
 			chmod -f 666 /{DietPi,boot}/dietpi/.network
 			#-------------------------------------------------------------------------------
-			#Re-Run set uid for sudo: https://github.com/Fourdee/DietPi/issues/794#issuecomment-392335392
+			#Re-Run set uid for sudo: https://github.com/MichaIng/DietPi/issues/794#issuecomment-392335392
 			chmod 4755 $(command -v sudo)
 			#-------------------------------------------------------------------------------
-			#Removal due to changed file locations: https://github.com/Fourdee/DietPi/pull/1802
+			#Removal due to changed file locations: https://github.com/MichaIng/DietPi/pull/1802
 			rm -f /{DietPi,boot}/dietpi/func/dietpi-set_core_environment
 			rm -f /{DietPi,boot}/dietpi/conf/cron.daily_dietpi
 			rm -f /{DietPi,boot}/dietpi/conf/cron.hourly_dietpi
-			rm /var/lib/dietpi/fs_partition_resize.sh &> /dev/null
-			rm /var/lib/dietpi/dietpi-software/services/kill-ssh-user-sessions-before-network.sh &> /dev/null
+			[[ -f /var/lib/dietpi/fs_partition_resize.sh ]] && rm /var/lib/dietpi/fs_partition_resize.sh
+			[[ -f /var/lib/dietpi/dietpi-software/services/kill-ssh-user-sessions-before-network.sh ]] && rm /var/lib/dietpi/dietpi-software/services/kill-ssh-user-sessions-before-network.sh
 			#-------------------------------------------------------------------------------
 			#Offer to change global and unix user passwords to make users aware of the existance or "dietpi" and how the dietpi.txt password is used.
 			#	If already installed only, else, dietpi-software will handle this on first run, after the update
@@ -678,14 +596,9 @@ _EOF_
 		elif (( $G_DIETPI_VERSION_SUB == 9 )); then
 
 			#-------------------------------------------------------------------------------
-			#Switch to IP commands, removal of net-tools: https://github.com/Fourdee/DietPi/pull/1839
-			# - Only apply, if HomeAssistant is not installed, as it depends on net-tools: https://github.com/Fourdee/DietPi/issues/1911
-			if [[ -f '/DietPi/dietpi/.installed' ]] &&
-				grep -q '^aSOFTWARE_INSTALL_STATE\[157\]=2' /DietPi/dietpi/.installed; then
-
-				echo 'HA installed, avoid net-tools removal' &> /dev/null
-
-			else
+			#Switch to IP commands, removal of net-tools: https://github.com/MichaIng/DietPi/pull/1839
+			# - Only apply, if HomeAssistant is not installed, as it depends on net-tools: https://github.com/MichaIng/DietPi/issues/1911
+			if ! [[ -f '/DietPi/dietpi/.installed' ]] || ! grep -q '^aSOFTWARE_INSTALL_STATE\[157\]=2' /DietPi/dietpi/.installed; then
 
 				G_AGP net-tools
 				G_WHIP_MSG '"net-tools" package is no longer required for DietPi systems and has been flagged as such in APT. "ifconfig" can be replaced with "ip a", or, you can reinstall "net-tools" package as needed.'
@@ -693,17 +606,17 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls
-			#	# => v6.19 GMrender: https://dietpi.com/phpbb/viewtopic.php?f=11&t=3900&p=12985#p12985
-			# 	# => v6.19 Xserver (ASUSTB GPU)
+			# v6.19	GMrender: https://dietpi.com/phpbb/viewtopic.php?f=11&t=3900&p=12985#p12985
+			# v6.19	Xserver (ASUSTB GPU)
 			#-------------------------------------------------------------------------------
-			#DietPi-Backup rewrite, no longer supports older backups: https://github.com/Fourdee/DietPi/issues/1851
+			#DietPi-Backup rewrite, no longer supports older backups: https://github.com/MichaIng/DietPi/issues/1851
 			if [[ -f '/DietPi/dietpi/.dietpi-backup_settings' ]]; then
 
 				G_WHIP_MSG 'DietPi-Backup has been re-written to improve support for custom include/exclude options. It also removes the option for userdata backups, as this is now included by default.\n\nNB: Existing backups are no longer supported and cannot be restored. We highly recommend removing the older backup (eg: "rm -R /mnt/dietpi-backup"), then, create a new backup.'
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Fix Apache2 logging to "/error.log" instead of "/var/log/apache2/error.log": https://github.com/Fourdee/DietPi/commit/c991bd7dc579dbdc7c239e4c887b0962fa204006
+			#Fix Apache2 logging to "/error.log" instead of "/var/log/apache2/error.log": https://github.com/MichaIng/DietPi/commit/c991bd7dc579dbdc7c239e4c887b0962fa204006
 			if [[ -d /etc/apache2/sites-available ]]; then
 
 				for vhost in /etc/apache2/sites-available/*.conf
@@ -715,15 +628,15 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Disable "initial_turbo" option for RPi within config.txt, as it currently prevents CPU throttle down: https://github.com/Fourdee/DietPi/issues/1836
+			#Disable "initial_turbo" option for RPi within config.txt, as it currently prevents CPU throttle down: https://github.com/MichaIng/DietPi/issues/1836
 			if [[ -f /DietPi/config.txt ]] && grep -q '^[[:blank:]]*initial_turbo' /DietPi/config.txt; then
 
 				sed -i '/^[[:blank:]]*initial_turbo/d' /DietPi/config.txt
-				echo -e '\n# Initial turbo currently leads to CPU not being throttled down by CPU governor: https://github.com/Fourdee/DietPi/issues/1836\n#initial_turbo=20' >> /DietPi/config.txt
+				echo -e '\n# Initial turbo currently leads to CPU not being throttled down by CPU governor: https://github.com/MichaIng/DietPi/issues/1836\n#initial_turbo=20' >> /DietPi/config.txt
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Remove config.txt for non-RPi devices: https://github.com/Fourdee/DietPi/pull/1863
+			#Remove config.txt for non-RPi devices: https://github.com/MichaIng/DietPi/pull/1863
 			(( $G_HW_MODEL >= 10 )) && rm -f /{DietPi,boot}/config.txt
 			#-------------------------------------------------------------------------------
 			#Removal of NTP from dietpi-software
@@ -768,28 +681,28 @@ _EOF_
 
 			#-------------------------------------------------------------------------------
 			#Software removals:
-			#	JRiver: https://github.com/Fourdee/DietPi/issues/1080#issuecomment-403489246
+			#	JRiver: https://github.com/MichaIng/DietPi/issues/1080#issuecomment-403489246
 			sed -i '/^aSOFTWARE_INSTALL_STATE\[148\]=/c\aSOFTWARE_INSTALL_STATE\[148\]=0' /DietPi/dietpi/.installed &> /dev/null
 			#-------------------------------------------------------------------------------
-			#ASUS TB WiFi: https://github.com/Fourdee/DietPi/issues/1760
+			#ASUS TB WiFi: https://github.com/MichaIng/DietPi/issues/1760
 			(( $G_HW_MODEL == 52 )) && G_CONFIG_INJECT '8723bs' '8723bs' /etc/modules
 			#-------------------------------------------------------------------------------
 			#Software reinstalls:
-			#	https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403421942
+			#	https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403421942
 			#	Items which run as own user:
 			#	YMPD
-			#	# => v6.17 MPD
+			# v6.17 MPD
 			#	minidlna
 			#	AirSonic
-			#	# => v6.18 Sonarr
-			#	# => v6.18 Radarr
+			# v6.18 Sonarr
+			# v6.18 Radarr
 			#	NZBget
-			#	# => v6.18 RoonBridge
+			# v6.18 RoonBridge
 			#	RoonServer
-			#	# => v6.19 GMrender
-			#	# => v6.15 PlexPy
+			# v6.19 GMrender
+			# v6.15 PlexPy
 			#	Koel
-			#	# => v6.18 O!MPD: https://github.com/Fourdee/DietPi/issues/1934#issuecomment-406059462
+			# v6.18 O!MPD: https://github.com/MichaIng/DietPi/issues/1934#issuecomment-406059462
 			#	 - NO REINSTALL: due to many changes, or, too much risk for existing user settings, fresh installs only
 			#		CubeRite
 			#		qBitTorrent
@@ -846,15 +759,15 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			# - ARM64 packages no longer available: https://github.com/Fourdee/DietPi/issues/1915
+			# - ARM64 packages no longer available: https://github.com/MichaIng/DietPi/issues/1915
 			(( $G_DISTRO < 4 && $G_HW_ARCH == 3 )) && sed -i '/debian-security/d' /etc/apt/sources.list
 			#-------------------------------------------------------------------------------
-			#Fix Xserver uninstall issus by not purging dependencies, but leaving them for autoremove: https://github.com/Fourdee/DietPi/pull/1930/files
+			#Fix Xserver uninstall issus by not purging dependencies, but leaving them for autoremove: https://github.com/MichaIng/DietPi/pull/1930/files
 			local dpkg_list=$(dpkg --get-selections)
 			grep -q '^xinit[[:space:]]' <<< "$dpkg_list" && apt-mark auto xauth x11-common
 			grep -q '^mesa-utils-extra[[:space:]]' <<< "$dpkg_list" && apt-mark auto libgles2-mesa
 			#-------------------------------------------------------------------------------
-			#Reinstall net-tools as dependency, if HomeAssistant is installed. Thanks to @lupa18 for reporting this: https://github.com/Fourdee/DietPi/issues/1911
+			#Reinstall net-tools as dependency, if HomeAssistant is installed. Thanks to @lupa18 for reporting this: https://github.com/MichaIng/DietPi/issues/1911
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[157\]=2' /DietPi/dietpi/.installed; then
 
 				G_AGI net-tools
@@ -864,11 +777,11 @@ _EOF_
 			#Removal of CurlFTPFS from dietpi-software
 			sed -i '/^aSOFTWARE_INSTALL_STATE\[2\]=/c\aSOFTWARE_INSTALL_STATE\[2\]=0' /DietPi/dietpi/.installed &> /dev/null
 			#-------------------------------------------------------------------------------
-			#/var/lib/dietpi/dietpi-ramlog/storage moved to /var/tmp/dietpi/logs/dietpi-ramlog_store https://github.com/Fourdee/DietPi/pull/1919
+			#/var/lib/dietpi/dietpi-ramlog/storage moved to /var/tmp/dietpi/logs/dietpi-ramlog_store https://github.com/MichaIng/DietPi/pull/1919
 			#automatically generated during ramlog, remove old location only
-			rm -R /var/lib/dietpi/dietpi-ramlog/storage &> /dev/null
+			[[ -d /var/lib/dietpi/dietpi-ramlog/storage ]] && rm -R /var/lib/dietpi/dietpi-ramlog/storage
 			#-------------------------------------------------------------------------------
-			#Reinstall "netbase", in case of installed NFS client and/or server, to reenable NFSv3 support: https://github.com/Fourdee/DietPi/issues/1898
+			#Reinstall "netbase", in case of installed NFS client and/or server, to reenable NFSv3 support: https://github.com/MichaIng/DietPi/issues/1898
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
 				if grep -q '^aSOFTWARE_INSTALL_STATE\[109\]=2' /DietPi/dietpi/.installed ||
@@ -884,7 +797,7 @@ _EOF_
 		elif (( $G_DIETPI_VERSION_SUB == 12 )); then
 
 			#-------------------------------------------------------------------------------
-			#Move Koel from /var/www to /mnt/dietpi_userdata: https://github.com/Fourdee/DietPi/pull/1954
+			#Move Koel from /var/www to /mnt/dietpi_userdata: https://github.com/MichaIng/DietPi/pull/1954
 			if [[ -d '/var/www/koel' ]]; then
 
 				G_RUN_CMD mv /var/www/koel $G_FP_DIETPI_USERDATA/koel
@@ -894,7 +807,7 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Mask systemd-logind as new default, if libpam-systemd is not installed: https://github.com/Fourdee/DietPi/issues/1767
+			#Mask systemd-logind as new default, if libpam-systemd is not installed: https://github.com/MichaIng/DietPi/issues/1767
 			if ! dpkg-query -s 'libpam-systemd' &> /dev/null; then
 
 				systemctl stop systemd-logind &> /dev/null
@@ -911,7 +824,7 @@ _EOF_
 			grep -q 'ntfs' <<< $fs_list || apt-mark auto ntfs-3g
 			grep -q 'hfs' <<< $fs_list || apt-mark auto hfsplus
 			#-------------------------------------------------------------------------------
-			#Pine 64, WiFi module: https://github.com/Fourdee/DietPi/issues/1995#issuecomment-410931618
+			#Pine 64, WiFi module: https://github.com/MichaIng/DietPi/issues/1995#issuecomment-410931618
 			(( $G_HW_MODEL == 40 )) && G_CONFIG_INJECT '8723bs' '8723bs' /etc/modules
 			#-------------------------------------------------------------------------------
 			#Autoremove all marked packages during all patches with a single final call
@@ -923,7 +836,7 @@ _EOF_
 			if [[ -f $fp_old ]]; then
 
 				# - generate the new file, if not done already
-				[[ ! -f $fp_new ]] && /DietPi/dietpi/dietpi-services stop cron
+				[[ -f $fp_new ]] || /DietPi/dietpi/dietpi-services stop cron
 
 				# - Transfer existing entries over
 				while read line
@@ -939,22 +852,22 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			# - NZBget Umask: https://github.com/Fourdee/DietPi/issues/1999
-			# - qBitTorrent: https://github.com/Fourdee/DietPi/issues/1957
+			# - NZBget Umask: https://github.com/MichaIng/DietPi/issues/1999
+			# - qBitTorrent: https://github.com/MichaIng/DietPi/issues/1957
 			if [[ -f $G_FP_DIETPI_USERDATA/nzbget/nzbget.conf ]]; then
 
 				G_CONFIG_INJECT 'UMask=' 'UMask=0002' $G_FP_DIETPI_USERDATA/nzbget/nzbget.conf
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Assure absence of dhcpcd5, if dhclient (isc-dhcp-client) is active: https://github.com/Fourdee/DietPi/issues/1560#issuecomment-370136642
+			#Assure absence of dhcpcd5, if dhclient (isc-dhcp-client) is active: https://github.com/MichaIng/DietPi/issues/1560#issuecomment-370136642
 			pgrep 'dhclient' &> /dev/null && G_AGP dhcpcd5
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 13 )); then
 
 			#-------------------------------------------------------------------------------
-			#Encrypt and secure GLOBAL_PW used by DietPi-Software: https://github.com/Fourdee/DietPi/issues/2021
+			#Encrypt and secure GLOBAL_PW used by DietPi-Software: https://github.com/MichaIng/DietPi/issues/2021
 			if [[ ! -r '/var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin' ]]; then
 
 				local pw_dietpi_software=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_GLOBAL_PASSWORD=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
@@ -963,8 +876,12 @@ _EOF_
 
 				G_CONFIG_INJECT 'AUTO_SETUP_GLOBAL_PASSWORD=' 'AUTO_SETUP_GLOBAL_PASSWORD=Password has been encrypted and secured on rootFS' /DietPi/dietpi.txt
 
-				mkdir -p /var/lib/dietpi/dietpi-software #should already exist, failsafe
-				echo "$pw_dietpi_software" | openssl enc -base64 -e -aes-256-cbc -nosalt -pass pass:DietPiRocks! > /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin
+				mkdir -p /var/lib/dietpi/dietpi-software # Should already exist, failsafe
+
+				# - Use new "pbkdf2" function on Buster to resolve warning about deprecated key derivation used: https://github.com/MichaIng/DietPi/issues/2213
+				local pbkdf2=''
+				(( $G_DISTRO > 4 )) && pbkdf2='-iter 10000'
+				openssl enc -e -a -aes-256-cbc $pbkdf2 -salt -pass pass:'DietPiRocks!' -out /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin <<< $pw_dietpi_software
 
 				unset pw_dietpi_software
 
@@ -974,7 +891,7 @@ _EOF_
 			#BruteFIR removal
 			sed -i '/^aSOFTWARE_INSTALL_STATE\[38\]=/c\aSOFTWARE_INSTALL_STATE\[38\]=0' /DietPi/dietpi/.installed &> /dev/null
 			#-------------------------------------------------------------------------------
-			# - Recreate machine-id: https://github.com/Fourdee/DietPi/issues/2015
+			# - Recreate machine-id: https://github.com/MichaIng/DietPi/issues/2015
 			rm /etc/machine-id &> /dev/null
 			rm /var/lib/dbus/machine-id &> /dev/null
 			systemd-machine-id-setup
@@ -1000,10 +917,10 @@ _EOF_
 		elif (( $G_DIETPI_VERSION_SUB == 14 )); then
 
 			#-------------------------------------------------------------------------------
-			#Reinstall fake-hwclock: https://github.com/Fourdee/DietPi/issues/2035#issuecomment-416345155
+			#Reinstall fake-hwclock: https://github.com/MichaIng/DietPi/issues/2035#issuecomment-416345155
 			G_AGI fake-hwclock
 			#-------------------------------------------------------------------------------
-			#Disable net offload for devices which are prone to stability issues with it enabled (@carlosedp): https://github.com/Fourdee/DietPi/issues/2028#issue-352323603
+			#Disable net offload for devices which are prone to stability issues with it enabled (@carlosedp): https://github.com/MichaIng/DietPi/issues/2028#issue-352323603
 			for file in /etc/network/if-up.d/*
 			do
 
@@ -1027,8 +944,8 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	# => v6.17 MPD: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451
-			# 	PlexPy: https://github.com/Fourdee/DietPi/issues/2047
+			# v6.17 MPD: https://github.com/MichaIng/DietPi/issues/2032#issuecomment-415559451
+			# 	PlexPy: https://github.com/MichaIng/DietPi/issues/2047
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 146
 			#-------------------------------------------------------------------------------
 			#Update DietPi-Sync save file to new format
@@ -1045,13 +962,13 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Preboot script addition
-			systemctl enable dietpi-preboot.service
+			systemctl enable dietpi-preboot
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 15 )); then
 
 			#-------------------------------------------------------------------------------
-			#Move to new WiFi cred array system and db store: https://github.com/Fourdee/DietPi/issues/368
+			#Move to new WiFi cred array system and db store: https://github.com/MichaIng/DietPi/issues/368
 			if [[ ! -f /var/lib/dietpi/dietpi-wifi.db ]]; then
 
 				cat << _EOF_ > /var/lib/dietpi/dietpi-wifi.db
@@ -1074,15 +991,15 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Fix rare WiFi interface start issue: https://github.com/Fourdee/DietPi/issues/2074
+			#Fix rare WiFi interface start issue: https://github.com/MichaIng/DietPi/issues/2074
 			sed -i '\|^[[:blank:]]ifconfig "$IFACE" up$|c\\t/sbin/ip link set dev "$IFACE" up' /etc/network/if-pre-up.d/wireless-tools &> /dev/null
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 16 )); then
 
 			#-------------------------------------------------------------------------------
-			#Survey/BugReport SFTP uploads, add cert for access: https://github.com/Fourdee/DietPi/issues/2022
-			# - Switch to "ssh.dietpi.com" die to Cloudflare: https://github.com/Fourdee/DietPi/issues/2022
+			#Survey/BugReport SFTP uploads, add cert for access: https://github.com/MichaIng/DietPi/issues/2022
+			# - Switch to "ssh.dietpi.com" die to Cloudflare: https://github.com/MichaIng/DietPi/issues/2022
 			#	- On v6.15 this was missing in PREP, thus images created meanwhile, so redo with v6.17 patch:
 			mkdir -p /root/.ssh
 			>> /root/.ssh/known_hosts
@@ -1090,7 +1007,7 @@ _EOF_
 			sed -i '/^185.101.93.93/d' /root/.ssh/known_hosts
 			G_CONFIG_INJECT 'ssh.dietpi.com[[:blank:]]' 'ssh.dietpi.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE6aw3r6aOEqendNu376iiCHr9tGBIWPgfrLkzjXjEsHGyVSUFNnZt6pftrDeK7UX+qX4FxOwQlugG4fymOHbimRCFiv6cf7VpYg1Ednquq9TLb7/cIIbX8a6AuRmX4fjdGuqwmBq3OG7ZksFcYEFKt5U4mAJIaL8hXiM2iXjgY02LqiQY/QWATsHI4ie9ZOnwrQE+Rr6mASN1BVFuIgyHIbwX54jsFSnZ/7CdBMkuAd9B8JkxppWVYpYIFHE9oWNfjh/epdK8yv9Oo6r0w5Rb+4qaAc5g+RAaknHeV6Gp75d2lxBdCm5XknKKbGma2+/DfoE8WZTSgzXrYcRlStYN' /root/.ssh/known_hosts
 			#-------------------------------------------------------------------------------
-			#Rock64, remove HW accell config, as its not currently functional: https://github.com/Fourdee/DietPi/issues/2086
+			#Rock64, remove HW accell config, as its not currently functional: https://github.com/MichaIng/DietPi/issues/2086
 			(( $G_HW_MODEL == 43 )) && rm /etc/X11/xorg.conf.d/20-armsoc.conf &> /dev/null
 			#-------------------------------------------------------------------------------
 			# - Convert and remove old dietpi.txt entry (this includes the comment):
@@ -1101,7 +1018,7 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Update IPv6 handling: https://github.com/Fourdee/DietPi/issues/2027
+			#Update IPv6 handling: https://github.com/MichaIng/DietPi/issues/2027
 			# - Advice user to re-enable IPv6 on kernel level
 			if [[ ! -d /proc/sys/net/ipv6 ]]; then
 
@@ -1163,11 +1080,11 @@ We strongly recommend you select "0 : Re-enable IPv6 on kernel level". By doing
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	# => v6.20 MPD
-			#	# => v6.19 Chromium: Update kiosk mode autostart script: https://github.com/Fourdee/DietPi/issues/2158
+			# v6.20 MPD
+			# v6.19 Chromium: Update kiosk mode autostart script: https://github.com/MichaIng/DietPi/issues/2158
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
-				#Run Transmission and Plex Media Server as "dietpi" group: https://github.com/Fourdee/DietPi/issues/2067#issuecomment-427579779
+				#Run Transmission and Plex Media Server as "dietpi" group: https://github.com/MichaIng/DietPi/issues/2067#issuecomment-427579779
 				if grep -q '^aSOFTWARE_INSTALL_STATE\[44\]=2' /DietPi/dietpi/.installed; then
 
 					mkdir -p /etc/systemd/system/transmission-daemon.service.d
@@ -1184,7 +1101,7 @@ We strongly recommend you select "0 : Re-enable IPv6 on kernel level". By doing
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Now part of rootfs: https://github.com/Fourdee/DietPi/issues/2103
+			#Now part of rootfs: https://github.com/MichaIng/DietPi/issues/2103
 			chmod +x /var/lib/dietpi/services/dietpi-wifi-monitor.sh
 			#-------------------------------------------------------------------------------
 			#Sparky SBC update USB network script:
@@ -1197,14 +1114,12 @@ Description=Sparky auto detect and set onboard ETH/USB ETH
 After=network.target networking.service
 
 [Service]
-Type=simple
 RemainAfterExit=yes
-ExecStart=/bin/bash -c '/usr/local/bin/sparky_eth_controller.sh'
+ExecStart=/usr/local/bin/sparky_eth_controller.sh
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
-
 				systemctl enable sparky_eth_controller.service
 
 				cat << _EOF_ > /usr/local/bin/sparky_eth_controller.sh
@@ -1215,30 +1130,27 @@ sleep 20
 if ip a | grep -qi 'eth1'; then
 
 	echo 'blacklist ethernet' > /etc/modprobe.d/disable_sparkysbc_ethernet.conf
-	rm /etc/udev/rules.d/70-persistent-net.rules &> /dev/null
-	rm /etc/udev/rules.d/70-persistant-net.rules &> /dev/null
+	rm /etc/udev/rules.d/70-persist{e,a}nt-net.rules &> /dev/null
 	reboot
 
 # - Enable onboard ETH if no adapter found
 elif ! ip a | grep -qi 'eth0'; then
 
 	rm /etc/modprobe.d/disable_sparkysbc_ethernet.conf &> /dev/null
-	rm /etc/udev/rules.d/70-persistent-net.rules &> /dev/null
-	rm /etc/udev/rules.d/70-persistant-net.rules &> /dev/null
+	rm /etc/udev/rules.d/70-persist{e,a}nt-net.rules &> /dev/null
 	reboot
 
 fi
 _EOF_
-
 				chmod +x /usr/local/bin/sparky_eth_controller.sh
 
 			fi
 			systemctl daemon-reload
 			#-------------------------------------------------------------------------------
-			#Failsafe, assure /var/tmp 777 permissions: https://github.com/Fourdee/DietPi/issues/1144#issuecomment-425758727
+			#Failsafe, assure /var/tmp 777 permissions: https://github.com/MichaIng/DietPi/issues/1144#issuecomment-425758727
 			chmod 777 /var/tmp
 			#-------------------------------------------------------------------------------
-			#Remove obsolete EMR patch file and redo removal of obsolete script files, as they were not removed from disk: https://github.com/Fourdee/DietPi/pull/2123#issuecomment-428121908
+			#Remove obsolete EMR patch file and redo removal of obsolete script files, as they were not removed from disk: https://github.com/MichaIng/DietPi/pull/2123#issuecomment-428121908
 			for i in /DietPi/dietpi /boot/dietpi
 			do
 
@@ -1254,14 +1166,14 @@ _EOF_
 
 			done
 			#-------------------------------------------------------------------------------
-			#Remove www-data under sudo without PW: https://github.com/Fourdee/DietPi/issues/2121
+			#Remove www-data under sudo without PW: https://github.com/MichaIng/DietPi/issues/2121
 			sed -i '/^www-data ALL=NOPASSWD: ALL/d' /etc/sudoers
 			#-------------------------------------------------------------------------------
 
 		elif (( $G_DIETPI_VERSION_SUB == 17 )); then
 
 			#-------------------------------------------------------------------------------
-			# - Remove mysql.service as we use mariadb.service, both cannot exist: https://github.com/Fourdee/DietPi/issues/1913#issuecomment-441343798
+			# - Remove mysql.service as we use mariadb.service, both cannot exist: https://github.com/MichaIng/DietPi/issues/1913#issuecomment-441343798
 			if [[ -f /etc/init.d/mysql ]] && (( $G_DISTRO >= 4 )); then
 
 				G_DIETPI-NOTIFY 2 'Switching from /etc/init.d/mysql to mariadb.service'
@@ -1275,7 +1187,7 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Workarounds
-			# - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/Fourdee/DietPi/issues/2225
+			# - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/MichaIng/DietPi/issues/2225
 			if (( $G_HW_MODEL == 62 )) && dmesg | grep -qi 'NanoPi Fire3'; then
 
 				chvt 2
@@ -1287,15 +1199,15 @@ _EOF_
 			fi
 			#-------------------------------------------------------------------------------
 			#Reinstalls:
-			#	OMPD: https://github.com/Fourdee/DietPi/issues/2156#issue-372201367
-			#	MyMPD: https://github.com/Fourdee/DietPi/issues/2156#issue-372201367
+			#	OMPD: https://github.com/MichaIng/DietPi/issues/2156#issue-372201367
+			#	MyMPD: https://github.com/MichaIng/DietPi/issues/2156#issue-372201367
 			#	RoonBridge: https://community.roonlabs.com/t/dietpi-allo-units-not-getting-the-roonbridge-b167-update-from-b164/52503/10?u=dan_knight
-			#	Radarr/lidarr/sonarr/jacket: https://github.com/Fourdee/DietPi/issues/2219
-			#	Mosquitto: https://github.com/Fourdee/DietPi/issues/2243#issuecomment-439492463
+			#	Radarr/lidarr/sonarr/jacket: https://github.com/MichaIng/DietPi/issues/2219
+			#	Mosquitto: https://github.com/MichaIng/DietPi/issues/2243#issuecomment-439492463
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
 				/DietPi/dietpi/dietpi-software reinstall 106 121 123 129 144 145 147 148
-				# - Switch to "mariadb" systemd service on Stretch+: https://github.com/Fourdee/DietPi/pull/2196
+				# - Switch to "mariadb" systemd service on Stretch+: https://github.com/MichaIng/DietPi/pull/2196
 				if (( $G_DISTRO > 3 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[88\]=2' /DietPi/dietpi/.installed; then
 
 					G_WHIP_MSG '[ INFO ] Switch from "mysql" to "mariadb" service\n
@@ -1306,14 +1218,14 @@ You will not face any practical differences, since both services start the same
 
 			fi
 			#-------------------------------------------------------------------------------
-			#systemd-logind required for shutdown options: https://github.com/Fourdee/DietPi/issues/2155#issuecomment-437702869
+			#systemd-logind required for shutdown options: https://github.com/MichaIng/DietPi/issues/2155#issuecomment-437702869
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[31\]=2' /DietPi/dietpi/.installed; then
 
 				systemctl unmask systemd-logind
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Patch Odroid LCD: https://github.com/Fourdee/DietPi/issues/2256
+			#Patch Odroid LCD: https://github.com/MichaIng/DietPi/issues/2256
 			if [[ -f /etc/systemd/system/odroid-lcd35.service ]]; then
 
 				/DietPi/dietpi/func/dietpi-set_hardware lcdpanel odroid-lcd35
@@ -1367,7 +1279,7 @@ You will not face any practical differences, since both services start the same
 
 			unset afp_config_remove
 			#-------------------------------------------------------------------------------
-			#conf renaming: https://github.com/Fourdee/DietPi/pull/2312/files
+			#conf renaming: https://github.com/MichaIng/DietPi/pull/2312/files
 			# - Apache
 			if [[ -f /etc/apache2/sites-available/owncloud.conf ]]; then
 
@@ -1419,11 +1331,11 @@ You will not face any practical differences, since both services start the same
 			systemctl daemon-reload
 			#-------------------------------------------------------------------------------
 			# - Reinstalls
-			#	Chromium: https://github.com/Fourdee/DietPi/issues/2298
-			#	Allo GUI: https://github.com/Fourdee/DietPi/issues/2305
+			#	Chromium: https://github.com/MichaIng/DietPi/issues/2298
+			#	Allo GUI: https://github.com/MichaIng/DietPi/issues/2305
 			#	GMrender: Due to Allo GUI service enable failure.
 			#	Xorg: XU4 conf
-			#	Pydio: https://github.com/Fourdee/DietPi/issues/2308
+			#	Pydio: https://github.com/MichaIng/DietPi/issues/2308
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && /DietPi/dietpi/dietpi-software reinstall 6 48 113 160 163
 			#-------------------------------------------------------------------------------
 
@@ -1465,11 +1377,11 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Apply Nginx vhost patch: https://github.com/Fourdee/DietPi/pull/2327
+			#Apply Nginx vhost patch: https://github.com/MichaIng/DietPi/pull/2327
 			#	- Moved from v6.18 => v6.19 patch for users, which update directly from v6.19.5 to v6.20
 			grep -q 'include /etc/nginx/sites-dietpi/\*\.config;' /etc/nginx/sites-available/default &> /dev/null && G_CONFIG_INJECT 'include /etc/nginx/sites-dietpi/\*\.config;' 'include /etc/nginx/sites-dietpi/*.conf;' /etc/nginx/sites-available/default
 			#-------------------------------------------------------------------------------
-			#Migrate Blynk to new dir structure: https://github.com/Fourdee/DietPi/issues/2322
+			#Migrate Blynk to new dir structure: https://github.com/MichaIng/DietPi/issues/2322
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[131\]=2' /DietPi/dietpi/.installed &&
 				[[ -d $G_FP_DIETPI_USERDATA/blynk && ! -d $G_FP_DIETPI_USERDATA/blynk/data ]]; then
 
@@ -1482,24 +1394,24 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Grafana: Remove obsolete x86_64 APT source, reinstall below to apply official repo: https://github.com/Fourdee/DietPi/issues/2449
+			#Grafana: Remove obsolete x86_64 APT source, reinstall below to apply official repo: https://github.com/MichaIng/DietPi/issues/2449
 			rm -f /etc/apt/sources.list.d/grafana*.list
 			#-------------------------------------------------------------------------------
 			# - Reinstalls
 			#	Blynk: Apply new run user, update binary (jar)
-			#	Deluge: https://github.com/Fourdee/DietPi/issues/2339
-			#	Netdata: https://github.com/Fourdee/DietPi/pull/2337
-			#	NAA Daemon: https://github.com/Fourdee/DietPi/issues/2387#issue-395321320
-			#	MPD: https://github.com/Fourdee/DietPi/issues/2377
-			#	Samba: https://github.com/Fourdee/DietPi/issues/2396#issuecomment-451701569
+			# v6.22	Deluge: https://github.com/MichaIng/DietPi/issues/2339
+			#	Netdata: https://github.com/MichaIng/DietPi/pull/2337
+			#	NAA Daemon: https://github.com/MichaIng/DietPi/issues/2387#issue-395321320
+			#	MPD: https://github.com/MichaIng/DietPi/issues/2377
+			#	Samba: https://github.com/MichaIng/DietPi/issues/2396#issuecomment-451701569
 			#	Amiberry 2.24
-			#	Shairport Sync: https://github.com/Fourdee/DietPi/issues/2439
-			#	Grafana: https://github.com/Fourdee/DietPi/issues/2449
+			#	Shairport Sync: https://github.com/MichaIng/DietPi/issues/2439
+			#	Grafana: https://github.com/MichaIng/DietPi/issues/2449
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
-				/DietPi/dietpi/dietpi-software reinstall 37 45 65 77 108 124 128 131
+				/DietPi/dietpi/dietpi-software reinstall 37 65 77 108 124 128 131
 
-				# - Samba: Link disk cache to RAM: https://github.com/Fourdee/DietPi/issues/2396
+				# - Samba: Link disk cache to RAM: https://github.com/MichaIng/DietPi/issues/2396
 				if grep -q '^aSOFTWARE_INSTALL_STATE\[96\]=2' /DietPi/dietpi/.installed; then
 
 					[[ -e /var/cache/samba ]] && rm -R /var/cache/samba
@@ -1511,7 +1423,7 @@ _EOF_
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Docker fix on RPi due to faulty current "docker-ce" repo version: https://github.com/Fourdee/DietPi/issues/2282
+			#Docker fix on RPi due to faulty current "docker-ce" repo version: https://github.com/MichaIng/DietPi/issues/2282
 			local dpkg_out=''
 			if (( $G_HW_MODEL < 10 )) && dpkg_out=$(dpkg-query -s 'docker-ce' 2>&1); then
 
@@ -1530,27 +1442,27 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 			fi
 			#-------------------------------------------------------------------------------
 			#DietPi file renaming/removal:
-			# - autologin.conf: https://github.com/Fourdee/DietPi/pull/2343
+			# - autologin.conf: https://github.com/MichaIng/DietPi/pull/2343
 			[[ -f /etc/systemd/system/getty@tty1.service.d/autologin.conf ]] && mv /etc/systemd/system/getty@tty1.service.d/autologin.conf /etc/systemd/system/getty@tty1.service.d/dietpi-autologin.conf
-			# - README.md: https://github.com/Fourdee/DietPi/pull/2341
+			# - README.md: https://github.com/MichaIng/DietPi/pull/2341
 			[[ -f /boot/README.md ]] && mv /boot/README.md /boot/dietpi-README.md
-			# - kill-ssh-user-sessions-before-network: https://github.com/Fourdee/DietPi/pull/2357/commits/c8eb15c169cfaba69fec0b3e631e2241e0bdb7d5
+			# - kill-ssh-user-sessions-before-network: https://github.com/MichaIng/DietPi/pull/2357/commits/c8eb15c169cfaba69fec0b3e631e2241e0bdb7d5
 			systemctl disable kill-ssh-user-sessions-before-network 2> /dev/null
 			[[ -f /etc/systemd/system/kill-ssh-user-sessions-before-network.service ]] && rm /etc/systemd/system/kill-ssh-user-sessions-before-network.service
 			[[ -f /var/lib/dietpi/services/kill-ssh-user-sessions-before-network.sh ]] && rm /var/lib/dietpi/services/kill-ssh-user-sessions-before-network.sh
 			systemctl daemon-reload
 			systemctl enable dietpi-kill_ssh
-			# - dietpi-unsupported_terminal.sh: https://github.com/Fourdee/DietPi/issues/2347
+			# - dietpi-unsupported_terminal.sh: https://github.com/MichaIng/DietPi/issues/2347
 			[[ -f /etc/profile.d/dietpi-unsupported_terminal.sh ]] && rm /etc/profile.d/dietpi-unsupported_terminal.sh
 			# - Possible leftover from PREP:
 			rm -f /{DietPi,boot}/dietpi/pre-patch_file
-			# - dietpi/conf removal from RAMdisk: https://github.com/Fourdee/DietPi/pull/2393
+			# - dietpi/conf removal from RAMdisk: https://github.com/MichaIng/DietPi/pull/2393
 			rm -Rf /{DietPi,boot}/dietpi/conf
 			#-------------------------------------------------------------------------------
-			#.dietpi-autostart_index removal, if zero: https://github.com/Fourdee/DietPi/pull/2343
+			#.dietpi-autostart_index removal, if zero: https://github.com/MichaIng/DietPi/pull/2343
 			[[ -f /DietPi/dietpi/.dietpi-autostart_index ]] && (( $(</DietPi/dietpi/.dietpi-autostart_index) == 0 )) && rm -f /{DietPi,boot}/dietpi/.dietpi-autostart_index
 			#-------------------------------------------------------------------------------
-			#Resolve networking service order cycle on Jessie: https://github.com/Fourdee/DietPi/pull/2357#issuecomment-448276505
+			#Resolve networking service order cycle on Jessie: https://github.com/MichaIng/DietPi/pull/2357#issuecomment-448276505
 			if (( $G_DISTRO < 4 )); then
 
 				G_USER_INPUTS=0 G_CONFIG_INJECT '#[[:blank:]]*Default-Start:' '# Default-Start:     1 2 3 4 5' /etc/init.d/networking '### BEGIN INIT INFO'
@@ -1559,15 +1471,15 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Disable coturn logging for existing installs: https://github.com/Fourdee/DietPi/pull/2333
+			#Disable coturn logging for existing installs: https://github.com/MichaIng/DietPi/pull/2333
 			(( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[168\]=2' /DietPi/dietpi/.installed && G_CONFIG_INJECT 'DAEMON_ARGS=' "DAEMON_ARGS='-c /etc/turnserver.conf -o -l stdout --no-stdout-log --simple-log'" /etc/default/coturn
 			#-------------------------------------------------------------------------------
-			#Remove nofail and x-systemd.automount option from /boot mount: https://github.com/Fourdee/DietPi/pull/2357#issuecomment-449177715
+			#Remove nofail and x-systemd.automount option from /boot mount: https://github.com/MichaIng/DietPi/pull/2357#issuecomment-449177715
 			sed -i '\|[[:blank:]]/boot[[:blank:]]|s|,x-systemd.automount||' /etc/fstab
 			sed -i '\|[[:blank:]]/boot[[:blank:]]|s|,nofail||' /etc/fstab
 			systemctl daemon-reload
 			#-------------------------------------------------------------------------------
-			#Re-enable owncloud/Nextcloud Apache configs, to fix faulty v6.19 installs: https://github.com/Fourdee/DietPi/pull/2361/commits/e33ca150cf29a4f278f5df2defc495053700a91e
+			#Re-enable owncloud/Nextcloud Apache configs, to fix faulty v6.19 installs: https://github.com/MichaIng/DietPi/pull/2361/commits/e33ca150cf29a4f278f5df2defc495053700a91e
 			[[ -f /etc/apache2/sites-available/dietpi-owncloud.conf ]] && a2ensite dietpi-owncloud
 			[[ -f /etc/apache2/sites-available/dietpi-nextcloud.conf ]] && a2ensite dietpi-nextcloud
 			#-------------------------------------------------------------------------------
@@ -1584,12 +1496,12 @@ Also have a look at "Sonarr", another alternative TV show manager, available for
 
 			fi
 			#-------------------------------------------------------------------------------
-			#Remove obsolete flags: https://github.com/Fourdee/DietPi/pull/2398#issuecomment-452398770
+			#Remove obsolete flags: https://github.com/MichaIng/DietPi/pull/2398#issuecomment-452398770
 			[[ -f /var/lib/dietpi/.G_RPI_UPDATE ]] && rm /var/lib/dietpi/.G_RPI_UPDATE
-			#https://github.com/Fourdee/DietPi/pull/2407/commits/5b7ad8bddc9dd5ffe89a2614615eb936333c8d41
+			#https://github.com/MichaIng/DietPi/pull/2407/commits/5b7ad8bddc9dd5ffe89a2614615eb936333c8d41
 			[[ -f /var/lib/dietpi/.compiled_i-sabre-k2m ]] && rm /var/lib/dietpi/.compiled_i-sabre-k2m
 			#-------------------------------------------------------------------------------
-			#RPi changes: https://github.com/Fourdee/DietPi/pull/2402
+			#RPi changes: https://github.com/MichaIng/DietPi/pull/2402
 			if (( $G_HW_MODEL < 10 )); then
 
 				# - Remove/Replace obsolete config.txt settings
@@ -1622,7 +1534,7 @@ Also have a look at "Sonarr", another alternative TV show manager, available for
 			#Buster: "systemd" does not depend on "procps" anymore, thus we need to set it manually installed, simply applied on all distro versions.
 			G_AGI procps
 			#-------------------------------------------------------------------------------
-			#Remove wireless-power setting from /etc/network/interfaces, if not supported by adapter/firmware: https://github.com/Fourdee/DietPi/issues/2198
+			#Remove wireless-power setting from /etc/network/interfaces, if not supported by adapter/firmware: https://github.com/MichaIng/DietPi/issues/2198
 			iwconfig wlan$(sed -n 2p /DietPi/dietpi/.network) power off &> /dev/null || sed -i '/^wireless-power/d' /etc/network/interfaces
 			#-------------------------------------------------------------------------------
 			#Grafana port change
@@ -1644,12 +1556,171 @@ Also have a look at "Sonarr", another alternative TV show manager, available for
 			fi
 			#-------------------------------------------------------------------------------
 
+		elif (( $G_DIETPI_VERSION_SUB == 21 )); then
+
+			#-------------------------------------------------------------------------------
+			#Redo our /etc/bash.bashrc entry, user confirmed 4 entries: https://github.com/MichaIng/DietPi/issues/2529
+			sed -i '\#for i in /etc/bashrc#d' /etc/bash.bashrc
+			G_CONFIG_INJECT '.*/etc/bashrc\.d/.*' 'for i in /etc/bashrc.d/*.sh; do [ -r "$i" ] && . $i; done' /etc/bash.bashrc
+			#-------------------------------------------------------------------------------
+			#Mopidy fix: https://github.com/MichaIng/DietPi/issues/2536
+			getent passwd mopidy &> /dev/null && usermod -a -G dietpi,audio -d $G_FP_DIETPI_USERDATA/mopidy mopidy
+			#-------------------------------------------------------------------------------
+			#Remove obsolete workaround for archive.raspberrypi.org repo on Buster: https://github.com/MichaIng/DietPi/issues/1286#issuecomment-463856159
+			(( $G_DISTRO == 5 && $G_HW_MODEL < 10 )) && sed -i 's/stretch/buster/g' /etc/apt/sources.list.d/raspi.list
+			#-------------------------------------------------------------------------------
+			#Removed dependency on "p7zip-full", use "7zr" (p7zip) instead: https://github.com/MichaIng/DietPi/pull/2559
+			G_AGI p7zip
+			if dpkg-query -s p7zip-full &> /dev/null &&
+				! G_WHIP_BUTTON_OK_TEXT='Yes' G_WHIP_BUTTON_CANCEL_TEXT='No' G_WHIP_YESNO '[QUESTION] Do you want to keep "p7zip-full"?\n
+DietPi does not require the "p7zip-full" package anymore but just "p7zip" instead.
+- "p7zip" provides the lightweight standalone "7zr" command to handle 7zip archives only.
+- "p7zip-full" additionally provides the "7z" and "7za" commands which can handle other archive types as well.
+  However, DietPi internally uses "unzip", "tar" and "unrar" to handle those.\n
+Do you still want to keep "p7zip-full"?'; then
+
+				apt-mark auto p7zip-full
+				G_AGA
+
+			fi
+			#-------------------------------------------------------------------------------
+			#Fix Pi-hole permissions to allow "pihole -up"
+			if [[ -d /var/www/html/pihole ]]; then
+
+				cd /var/www/html/admin && git reset --hard HEAD
+				cd /tmp/$G_PROGRAM_NAME
+
+			fi
+			#-------------------------------------------------------------------------------
+			#WireGuard: Harden "sid" repo handling and on RPi, catch up on installing the Debian keyring: https://github.com/MichaIng/DietPi/pull/2571
+			if [[ -f /etc/apt/preferences.d/dietpi-wireguard ]]; then
+
+				if (( $G_HW_MODEL < 10 )); then
+
+					wget https://dietpi.com/downloads/binaries/rpi/debian-archive-keyring.deb
+					dpkg -i debian-archive-keyring.deb
+					rm debian-archive-keyring.deb
+
+				fi
+
+				echo -e 'Package: *\nPin: release n=sid\nPin-Priority: -1\n
+Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=sid\nPin-Priority: 99' > /etc/apt/preferences.d/dietpi-wireguard
+
+			fi
+			#-------------------------------------------------------------------------------
+			#MPD: Fix permissions issue: https://github.com/MichaIng/DietPi/issues/2462
+			if [[ -f /etc/mpd/mpd.conf ]]; then
+
+				sed -Ei '/^(user|group)[[:blank:]]/d' /etc/mpd/mpd.conf
+				sed -i '/^Group=/d' /lib/systemd/system/mpd.service
+				G_CONFIG_INJECT 'User=' 'User=mpd' /lib/systemd/system/mpd.service '\[Service\]'
+				G_CONFIG_INJECT 'PermissionsStartOnly=' 'PermissionsStartOnly=true' /lib/systemd/system/mpd.service '^User=mpd'
+				usermod -a -G audio,dietpi mpd
+				systemctl daemon-reload
+				systemctl restart mpd
+
+			fi
+			#-------------------------------------------------------------------------------
+			#Transfer project and lead over to Micha (legend!) :)  #: https://github.com/MichaIng/DietPi/issues/2589#issue-413925061
+			grep -q '^[[:blank:]]*DEV_GITOWNER=Fourdee' /DietPi/dietpi.txt && G_CONFIG_INJECT 'DEV_GITOWNER=' 'DEV_GITOWNER=MichaIng' /DietPi/dietpi.txt
+			grep -q '^[[:blank:]]*G_GITOWNER=Fourdee' /DietPi/dietpi/.version && G_CONFIG_INJECT 'G_GITOWNER=' 'G_GITOWNER=MichaIng' /DietPi/dietpi/.version
+			#-------------------------------------------------------------------------------
+			#Fix rc-local.service from old images to match new systemd-rc-local-generator: https://github.com/MichaIng/DietPi/issues/2566
+			systemctl disable rc-local &> /dev/null
+			systemctl disable rc.local &> /dev/null
+			grep -q 'dietpi' /lib/systemd/system/rc-local.service && cat << _EOF_ > /lib/systemd/system/rc-local.service
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# This unit gets pulled automatically into multi-user.target by
+# systemd-rc-local-generator if /etc/rc.local is executable.
+[Unit]
+Description=/etc/rc.local Compatibility
+ConditionFileIsExecutable=/etc/rc.local
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/etc/rc.local start
+TimeoutSec=0
+RemainAfterExit=yes
+GuessMainPID=no
+_EOF_
+			systemctl daemon-reload
+			#-------------------------------------------------------------------------------
+			#Remove obsolete DietPi-Sync log: https://github.com/MichaIng/DietPi/pull/2606
+			[[ -f /var/log/dietpi-sync.log ]] && rm /var/log/dietpi-sync.log
+			#-------------------------------------------------------------------------------
+			#XU4, use Meveric's xorg.conf which detects 3.x and 4.x kernel configuration requirments:
+			if (( $G_HW_MODEL == 11 )); then
+
+				local fp_file='/etc/X11/xorg.conf'
+				if [[ -f $fp_file ]]; then #already installed
+
+					rm $fp_file
+					G_AGI --reinstall firmware-samsung xf86-video-armsoc-odroid malit628-odroid
+
+				fi
+
+			fi
+			#-------------------------------------------------------------------------------
+			#DietPi-Survey: Remove survey sent count from settings file: https://github.com/MichaIng/DietPi/pull/2626
+			if [[ -f /DietPi/dietpi/.dietpi-survey ]]; then
+
+				local survey_opted_in=$(sed -n 1p /DietPi/dietpi/.dietpi-survey)
+				echo $survey_opted_in > /DietPi/dietpi/.dietpi-survey
+
+			fi
+			#-------------------------------------------------------------------------------
+			#Reinstalls
+			#	Amiberry 2.25: https://github.com/MichaIng/DietPi/issues/2599
+			#	Deluge: Patch according to installer rework: https://github.com/MichaIng/DietPi/pull/2594
+			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
+
+				local reinstall_indices='108'
+
+				if grep -q '^aSOFTWARE_INSTALL_STATE\[45\]=2' /DietPi/dietpi/.installed &&
+					getent passwd deluge &> /dev/null; then # Only do this once, regardless of re-patches
+
+					reinstall_indices+=' 45'
+
+					G_AGP deluge-webui
+					[[ -e ~deluge ]] && mv ~deluge $G_DIETPI_USERDATA/deluge_home_backup
+					userdel -rf deluge
+					rm -Rf /{root,home/*}/.config/deluge
+					mkdir -p /var/log/deluged
+					[[ -f /var/log/deluged.log ]] && mv /var/log/deluged.log /var/log/deluged/daemon.log
+					[[ -f /var/log/deluge-web.log ]] && mv /var/log/deluge-web.log /var/log/deluged/web.log
+
+					G_WHIP_MSG '[ INFO ] Deluge rework\n
+Our Deluge installer has been reworked to match Debian APT package defaults and official documentations. This also resolves an issue when attempting to access "deluge-console".
+- It runs now as user "debian-deluged".
+- The user "deluge" has been removed, its home directory has been backed up to:
+    /mnt/dietpi_userdata/deluge_home_backup
+  in case it existed.
+- Logs have been moved to /var/log/deluged/daemon.log|web.log.
+- Apart from that, all your settings and data have been preserved.\n
+NB: When accessing "deluge-console" you need to do that as user "debian-deluged":
+    sudo -u debian-deluged deluge-console'
+
+				fi
+
+				/DietPi/dietpi/dietpi-software reinstall $reinstall_indices
+
+			fi
+			#-------------------------------------------------------------------------------
+
+
 		fi
 
 		#-------------------------------------------------------------------------------
 		#NB: All if statements must contain at least one command. Prevents bash having a hissy fit :)
 		#	The fastest dummy command is ":", which really does nothing ;).
-		#NBB: Avoid multiple reinstalls of same software ID. Check last column of table: https://github.com/Fourdee/DietPi/wiki/DietPi-Software-list
+		#NBB: Avoid multiple reinstalls of same software ID. Check last column of table: https://github.com/MichaIng/DietPi/wiki/DietPi-Software-list
 		#-------------------------------------------------------------------------------
 
 	}
diff --git a/dietpi/postboot b/dietpi/postboot
index 152f71aff5..43c2e96f47 100644
--- a/dietpi/postboot
+++ b/dietpi/postboot
@@ -23,25 +23,25 @@
 	# Regular boot
 	if (( $(</DietPi/dietpi/.install_stage) == 2 )); then
 
-		# - Check for DietPi updates, if chosen
+		# - Check for DietPi updates if chosen
 		if grep -qi '^[[:blank:]]*CONFIG_CHECK_DIETPI_UPDATES=1' /DietPi/dietpi.txt; then
 
 			/DietPi/dietpi/dietpi-update 2 &> /dev/null &
 
 		fi
 
-		# - Start dietpi-services
+		# - Start DietPi controlled services
 		/DietPi/dietpi/dietpi-services start
 
 	fi
 
-	# Execute users custom boot scripts
+	# Execute optional boot scripts
 	for f in /var/lib/dietpi/postboot.d/*
 	do
 
 		if [[ -f $f ]]; then
 
-			echo "DietPi-PostBoot | Running user script: $f"
+			echo "DietPi-PostBoot | Running user script: ${f##*/}"
 			chmod +x $f
 			$f
 
@@ -49,10 +49,14 @@
 
 	done
 
-	# Print DietPi login banner
-	echo -e '\n'
-	/DietPi/dietpi/func/dietpi-banner 0
-	echo -e ' Default Login:\n Username = root\n Password = dietpi\n\n Please login to continue\n'
+	# Print DietPi login banner if no autologin selected
+	if [[ ! -f /etc/systemd/system/getty@tty1.service.d/dietpi-autologin.conf ]]; then
+
+		echo -e '\n'
+		/DietPi/dietpi/func/dietpi-banner 0
+		echo -e ' Default Login:\n Username = root\n Password = dietpi\n\n Please login to continue\n'
+
+	fi
 
 	#-----------------------------------------------------------------------------------
 	exit
diff --git a/dietpi/pre-patch_file b/dietpi/pre-patch_file
index 44bff64745..b989df3e66 100644
--- a/dietpi/pre-patch_file
+++ b/dietpi/pre-patch_file
@@ -52,16 +52,26 @@
 
 		fi
 		#-------------------------------------------------------------------------------
-		# Pre-patch 2: https://github.com/Fourdee/DietPi/pull/2490
+		# Pre-patch 2: https://github.com/MichaIng/DietPi/pull/2490
 		if (( $G_DIETPI_VERSION_SUB < 21 )) && [[ -f /etc/mysql/mariadb.conf.d/99-dietpi-4byte.cnf ]] &&
 			grep -qi 'buster' /etc/os-release; then
 
-			echo -e '\e[90m[\e[0m \e[33mWARN\e[0m \e[90m]\e[0m Pre-patch 2 | Patch /etc/mysql/mariadb.conf.d/99-dietpi-4byte.cnf for MariaDB v10.3/Buster support'
+			echo -e '\e[90m[\e[0m \e[33mWARN\e[0m \e[90m]\e[0m Pre-patch 2 | Patching /etc/mysql/mariadb.conf.d/99-dietpi-4byte.cnf for MariaDB v10.3/Buster support'
 			sed -i '/innodb_large_prefix/d' /etc/mysql/mariadb.conf.d/99-dietpi-4byte.cnf || { EXIT_CODE=2; break; }
 			sed -i '/innodb_file_format/d' /etc/mysql/mariadb.conf.d/99-dietpi-4byte.cnf || { EXIT_CODE=2; break; }
 
 		fi	
 		#-------------------------------------------------------------------------------
+		# Pre-patch 3: https://github.com/MichaIng/DietPi/issues/2213
+		if (( $G_DIETPI_VERSION_SUB < 22 )) &&
+			GLOBAL_PW=$(openssl enc -d -a -aes-256-cbc -nosalt -pass pass:'DietPiRocks!' -in /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin 2> /dev/null); then
+
+			echo -e '\e[90m[\e[0m \e[33mWARN\e[0m \e[90m]\e[0m Pre-patch 3 | Storing global DietPi-Software password with enhanced security'
+			grep -qi 'buster' /etc/os-release && pbkdf2='-iter 10000' || pbkdf2=''
+			openssl enc -e -a -aes-256-cbc $pbkdf2 -salt -pass pass:'DietPiRocks!' -out /var/lib/dietpi/dietpi-software/.GLOBAL_PW.bin <<< $GLOBAL_PW || { EXIT_CODE=3; break; }
+
+		fi
+		#-------------------------------------------------------------------------------
 		# Finished
 		echo -e '\e[90m[\e[0m  \e[32mOK\e[0m  \e[90m]\e[0m Successfully applied critical pre-patches\n'
 		break
diff --git a/dietpi/preboot b/dietpi/preboot
index 6e39320bc7..089a1bb280 100644
--- a/dietpi/preboot
+++ b/dietpi/preboot
@@ -26,11 +26,8 @@
 
 	RPi_Set_Clock_Speeds(){
 
-		#If no overclocking is set. set values to current (used in dietpi-config as reference for overclocking / current values)
-		if ! grep -q '^[[:blank:]]*over_voltage=' /DietPi/config.txt &&
-			! grep -q '^[[:blank:]]*arm_freq=' /DietPi/config.txt &&
-			! grep -q '^[[:blank:]]*core_freq=' /DietPi/config.txt &&
-			! grep -q '^[[:blank:]]*sdram_freq=' /DietPi/config.txt; then
+		# If no manual overclock settings have been applied by user, set non/safe overclocking values as commented defaults
+		if ! grep -qE '^[[:blank:]]*(over_voltage|(arm|core|gpu|sdram)_freq)=' /DietPi/config.txt; then
 
 			#Zero
 			if [[ ${G_HW_MODEL_DESCRIPTION,,} == *'zero'* ]]; then
@@ -40,7 +37,7 @@
 				sed -i '/core_freq=/c\#core_freq=400' /DietPi/config.txt
 				sed -i '/sdram_freq=/c\#sdram_freq=450' /DietPi/config.txt
 
-			#RPi v1 - Set safe clock
+			#RPi v1 - Apply safe overclock mode
 			elif (( $G_HW_MODEL < 2 )); then
 
 				G_CONFIG_INJECT 'over_voltage=' 'over_voltage=2' /DietPi/config.txt
@@ -61,7 +58,7 @@
 
 				sed -i '/over_voltage=/c\#over_voltage=0' /DietPi/config.txt
 				sed -i '/core_freq=/c\#core_freq=400' /DietPi/config.txt
-				G_CONFIG_INJECT '/temp_limit=' 'temp_limit=75' /DietPi/config.txt # https://github.com/Fourdee/DietPi/issues/356
+				G_CONFIG_INJECT '/temp_limit=' 'temp_limit=75' /DietPi/config.txt # https://github.com/MichaIng/DietPi/issues/356
 				sed -i '/arm_freq=/c\#arm_freq=1400' /DietPi/config.txt
 				sed -i '/sdram_freq=/c\#sdram_freq=500' /DietPi/config.txt
 
@@ -70,7 +67,7 @@
 
 				sed -i '/over_voltage=/c\#over_voltage=0' /DietPi/config.txt
 				sed -i '/core_freq=/c\#core_freq=400' /DietPi/config.txt
-				G_CONFIG_INJECT '/temp_limit=' 'temp_limit=75' /DietPi/config.txt # https://github.com/Fourdee/DietPi/issues/356
+				G_CONFIG_INJECT '/temp_limit=' 'temp_limit=75' /DietPi/config.txt # https://github.com/MichaIng/DietPi/issues/356
 				sed -i '/arm_freq=/c\#arm_freq=1200' /DietPi/config.txt
 				sed -i '/sdram_freq=/c\#sdram_freq=450' /DietPi/config.txt
 
@@ -89,7 +86,7 @@
 		/DietPi/dietpi/func/dietpi-set_dphys-swapfile $(grep -m1 '^[[:blank:]]*AUTO_SETUP_SWAPFILE_SIZE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//') "$(grep -m1 '^[[:blank:]]*AUTO_SETUP_SWAPFILE_LOCATION=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
 
 		# - Apply Timezone
-		local autoinstall_timezone="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_TIMEZONE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )"
+		local autoinstall_timezone=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_TIMEZONE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )
 		if [[ $autoinstall_timezone != $(</etc/timezone) ]]; then
 
 			G_DIETPI-NOTIFY 2 "Setting Timezone $autoinstall_timezone. Please wait..."
@@ -101,7 +98,7 @@
 		fi
 
 		# - Apply Language (Locale)
-		local autoinstall_language="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_LOCALE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )"
+		local autoinstall_language=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_LOCALE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )
 		if ! locale | grep -qE "(LANG|LC_ALL)=[\'\"]?$autoinstall_language[\'\"]?" ||
 			! locale -a | grep -q 'en_GB.UTF-8'; then
 
@@ -116,7 +113,7 @@
 		fi
 
 		# - Apply Keyboard
-		local autoinstall_keyboard="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_KEYBOARD_LAYOUT=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )"
+		local autoinstall_keyboard=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_KEYBOARD_LAYOUT=' /DietPi/dietpi.txt | sed 's/^[^=]*=//' )
 		if ! grep -q "XKBLAYOUT=\"$autoinstall_keyboard\"" /etc/default/keyboard; then
 
 			G_DIETPI-NOTIFY 2 "Setting Keyboard $autoinstall_keyboard. Please wait..."
@@ -149,7 +146,7 @@
 		fi
 
 		# - Set root password?
-		local root_password="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_GLOBAL_PASSWORD=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
+		local root_password=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_GLOBAL_PASSWORD=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 		if [[ $root_password ]]; then
 
 			chpasswd <<< "root:$root_password"
@@ -177,7 +174,7 @@
 
 		fi
 
-		# - Recreate machine-id: https://github.com/Fourdee/DietPi/issues/2015
+		# - Recreate machine-id: https://github.com/MichaIng/DietPi/issues/2015
 		[[ -f /etc/machine-id ]] && rm /etc/machine-id
 		[[ -f /var/lib/dbus/machine-id ]] && rm /var/lib/dbus/machine-id
 		systemd-machine-id-setup
@@ -198,10 +195,10 @@
 		local wifi_enabled=$(grep -ci -m1 '^[[:blank:]]*AUTO_SETUP_NET_WIFI_ENABLED=1' /DietPi/dietpi.txt)
 
 		local use_static=$(grep -ci -m1 '^[[:blank:]]*AUTO_SETUP_NET_USESTATIC=1' /DietPi/dietpi.txt)
-		local static_ip="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_IP=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
-		local static_mask="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_MASK=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
-		local static_gateway="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_GATEWAY=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
-		local static_dns="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_DNS=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
+		local static_ip=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_IP=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
+		local static_mask=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_MASK=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
+		local static_gateway=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_GATEWAY=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
+		local static_dns=$(grep -m1 '^[[:blank:]]*AUTO_SETUP_NET_STATIC_DNS=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')
 
 		#	WiFi
 		if (( $wifi_enabled )); then
diff --git a/dietpi/server_version-6 b/dietpi/server_version-6
index 40a5bc26c6..6537feb98a 100644
--- a/dietpi/server_version-6
+++ b/dietpi/server_version-6
@@ -1,3 +1,3 @@
 6
-21
-1
+22
+0
diff --git a/rootfs/etc/bashrc.d/dietpi-login.sh b/rootfs/etc/bashrc.d/dietpi-login.sh
index 3d8fbbcaa4..18e76501c1 100644
--- a/rootfs/etc/bashrc.d/dietpi-login.sh
+++ b/rootfs/etc/bashrc.d/dietpi-login.sh
@@ -4,4 +4,4 @@
 . /DietPi/dietpi/func/dietpi-globals
 
 # login scripts and banner
-/DietPi/dietpi/login
+/DietPi/dietpi/dietpi-login
diff --git a/rootfs/etc/bashrc.d/dietpi-posix-set-locale.sh b/rootfs/etc/bashrc.d/dietpi-posix-set-locale.sh
index a3537916b6..3490c140a4 100644
--- a/rootfs/etc/bashrc.d/dietpi-posix-set-locale.sh
+++ b/rootfs/etc/bashrc.d/dietpi-posix-set-locale.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Workaround, if SSH client overrides locale with "POSIX" fallback: https://github.com/Fourdee/DietPi/issues/1540#issuecomment-367066178
+# Workaround, if SSH client overrides locale with "POSIX" fallback: https://github.com/MichaIng/DietPi/issues/1540#issuecomment-367066178
 if [[ $(locale) =~ 'POSIX' ]]; then
 
 	CURRENT_LOCALE="$(grep -m1 '^[[:blank:]]*AUTO_SETUP_LOCALE=' /DietPi/dietpi.txt | sed 's/^[^=]*=//')"
diff --git a/rootfs/etc/bashrc.d/dietpi-unsupported_terminal.sh b/rootfs/etc/bashrc.d/dietpi-unsupported_terminal.sh
index 760f9ad9a1..c9f4cd85c7 100644
--- a/rootfs/etc/bashrc.d/dietpi-unsupported_terminal.sh
+++ b/rootfs/etc/bashrc.d/dietpi-unsupported_terminal.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Workaround for SSH client passing an unsupported $TERM string: https://github.com/Fourdee/DietPi/issues/2034
+# Workaround for SSH client passing an unsupported $TERM string: https://github.com/MichaIng/DietPi/issues/2034
 if [[ $SSH_TTY ]] && ! toe -a | grep -q "^$TERM[[:blank:]]"; then
 
 	TERM_old="$TERM"
diff --git a/rootfs/etc/network/if-up.d/dietpi-disable_offload b/rootfs/etc/network/if-up.d/dietpi-disable_offload
index 91861b58a0..a39ab33085 100644
--- a/rootfs/etc/network/if-up.d/dietpi-disable_offload
+++ b/rootfs/etc/network/if-up.d/dietpi-disable_offload
@@ -5,7 +5,7 @@
 	#
 	#////////////////////////////////////
 	# Created by Daniel Knight
-	# Based on original fix & code by @carlosedp: https://github.com/Fourdee/DietPi/issues/2028#issue-352323603
+	# Based on original fix & code by @carlosedp: https://github.com/MichaIng/DietPi/issues/2028#issue-352323603
 	#
 	#////////////////////////////////////
 	#
diff --git a/rootfs/etc/systemd/system/dietpi-boot.service b/rootfs/etc/systemd/system/dietpi-boot.service
index a0c8804dc7..e90a1b3bb5 100644
--- a/rootfs/etc/systemd/system/dietpi-boot.service
+++ b/rootfs/etc/systemd/system/dietpi-boot.service
@@ -3,7 +3,7 @@ Description=DietPi-Boot
 # Order 3
 Requires=dietpi-preboot.service
 After=dietpi-preboot.service network.target networking.service
-Before=getty@tty1.service getty.target
+Before=getty-pre.target getty@tty1.service getty.target ssh.service dropbear.service
 
 [Service]
 Type=oneshot
diff --git a/rootfs/etc/systemd/system/dietpi-fs_partition_resize.service b/rootfs/etc/systemd/system/dietpi-fs_partition_resize.service
index 572445179c..74830cb128 100644
--- a/rootfs/etc/systemd/system/dietpi-fs_partition_resize.service
+++ b/rootfs/etc/systemd/system/dietpi-fs_partition_resize.service
@@ -8,7 +8,6 @@ Before=var-swap.swap swap.target local-fs-pre.target
 
 [Service]
 Type=oneshot
-RemainAfterExit=no
 StandardOutput=tty
 ExecStartPre=/bin/mkdir -p /var/tmp/dietpi/logs
 ExecStart=/bin/bash -c '/var/lib/dietpi/services/fs_partition_resize.sh 2>&1 | tee /var/tmp/dietpi/logs/fs_partition_resize.log'
diff --git a/rootfs/etc/systemd/system/dietpi-postboot.service b/rootfs/etc/systemd/system/dietpi-postboot.service
index 30c7672188..204dc67008 100644
--- a/rootfs/etc/systemd/system/dietpi-postboot.service
+++ b/rootfs/etc/systemd/system/dietpi-postboot.service
@@ -2,7 +2,7 @@
 Description=DietPi-PostBoot
 # Order 4
 Requires=dietpi-boot.service
-After=dietpi-boot.service multi-user.target
+After=dietpi-boot.service
 
 [Service]
 Type=idle
diff --git a/rootfs/etc/systemd/system/dietpi-wifi-monitor.service b/rootfs/etc/systemd/system/dietpi-wifi-monitor.service
index 63abfe5403..1cba3633d0 100644
--- a/rootfs/etc/systemd/system/dietpi-wifi-monitor.service
+++ b/rootfs/etc/systemd/system/dietpi-wifi-monitor.service
@@ -2,6 +2,7 @@
 [Unit]
 Description=DietPi-WiFi-Monitor
 Requires=dietpi-ramdisk.service
+Wants=network-online.target
 After=dietpi-boot.service network-online.target network.target
 
 [Service]