From d6e5d0fc1d40826668d0d63b4276a5ef49d7611c Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:24:58 -0600
Subject: [PATCH 01/57] Begin to add Box86

---
 dietpi/dietpi-software | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index cfc51297f7..f6e61459e7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1170,6 +1170,19 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
 		aSOFTWARE_REQUIRES_USERINPUT[$software_id]=1
 
+		#------------------
+		software_id=185
+
+		aSOFTWARE_NAME[$software_id]='Box86'
+		aSOFTWARE_DESC[$software_id]='x86 userspace emulation'
+		aSOFTWARE_TYPE[$software_id]=0
+		aSOFTWARE_CATEGORY_INDEX[$software_id]=5
+		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=0#p0'
+		aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]]=0
+
 		# Social & Search
 		#--------------------------------------------------------------------------------
 		software_id=54
@@ -6314,6 +6327,34 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 		fi
 
+		software_id=185 # Box86
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 ))
+		then
+			Banner_Installing
+
+			G_AGI cmake gl4es
+
+			Download_Install 'https://github.com/ptitSeb/box86/archive/v0.1.8.tar.gz'
+			mkdir box86-0.1.8/build
+			cd box86-0.1.8/build
+
+			if [[ $G_HW_MODEL === 0 ]]
+			then
+				cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				make -j4
+				sudo make install
+				sudo systemctl restart systemd-binfmt
+			elif [[ $G_HW_MODEL_NAME === *'ODROID'* ]]
+			then
+				cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				make
+			else
+				cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				make
+			fi
+
+		fi
+
 		software_id=27 # TasmoAdmin
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 

From 668fb15a03e95d2324e019b70fa816e6798ea5f7 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:35:17 -0600
Subject: [PATCH 02/57] CodeFactor Fixes

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index f6e61459e7..7861fa8395 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6338,7 +6338,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			mkdir box86-0.1.8/build
 			cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL === 0 ]]
+			if [[ $G_HW_MODEL === 0 ]] 
 			then
 				cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				make -j4

From 4ed8dddd020c892fba91ebdb40a7a3d88de3830b Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:23:09 -0600
Subject: [PATCH 03/57] Fix ==

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 7861fa8395..725192b022 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6338,7 +6338,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			mkdir box86-0.1.8/build
 			cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL === 0 ]] 
+			if [[ $G_HW_MODEL == 0 ]] 
 			then
 				cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				make -j4

From 4bcb9bab2e3655898329d8d77ee042cb4e4e31bc Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:25:06 -0600
Subject: [PATCH 04/57] Again fix syntax

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 725192b022..86683d11cf 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6338,13 +6338,13 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			mkdir box86-0.1.8/build
 			cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL == 0 ]] 
+			if [[ $G_HW_MODEL == 0 ]]
 			then
 				cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				make -j4
 				sudo make install
 				sudo systemctl restart systemd-binfmt
-			elif [[ $G_HW_MODEL_NAME === *'ODROID'* ]]
+			elif [[ $G_HW_MODEL_NAME == *'ODROID'* ]]
 			then
 				cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				make

From 486b3611cc18a0724614d3083dd667b18ad65361 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:36:41 -0600
Subject: [PATCH 05/57] Wrap everything in G_EXEC

---
 dietpi/dietpi-software | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 86683d11cf..cf07668ef7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1179,6 +1179,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=0#p0'
 		aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
+		# Only works on ARMv7
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]]=0
@@ -6335,22 +6336,22 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_AGI cmake gl4es
 
 			Download_Install 'https://github.com/ptitSeb/box86/archive/v0.1.8.tar.gz'
-			mkdir box86-0.1.8/build
-			cd box86-0.1.8/build
+			G_EXEC mkdir box86-0.1.8/build
+			G_EXEC cd box86-0.1.8/build
 
 			if [[ $G_HW_MODEL == 0 ]]
 			then
-				cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				make -j4
-				sudo make install
-				sudo systemctl restart systemd-binfmt
+				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				G_EXEC make -j4
+				G_EXEC make install
+				G_EXEC systemctl restart systemd-binfmt
 			elif [[ $G_HW_MODEL_NAME == *'ODROID'* ]]
 			then
-				cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				make
+				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				G_EXEC make
 			else
-				cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				make
+				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				G_EXEC make
 			fi
 
 		fi

From 8756a52a642a747ebccc18a528fc5375aac682ab Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:38:29 -0600
Subject: [PATCH 06/57] Remove extra ]

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index cf07668ef7..82f74f219f 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1182,7 +1182,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# Only works on ARMv7
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]=0
 
 		# Social & Search
 		#--------------------------------------------------------------------------------

From ca4b6841697b714c10235f4601452800f4a6954d Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:42:21 -0600
Subject: [PATCH 07/57] Change software ID

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 82f74f219f..fa7ca59bbd 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1171,7 +1171,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_USERINPUT[$software_id]=1
 
 		#------------------
-		software_id=185
+		software_id=186
 
 		aSOFTWARE_NAME[$software_id]='Box86'
 		aSOFTWARE_DESC[$software_id]='x86 userspace emulation'
@@ -6328,7 +6328,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 		fi
 
-		software_id=185 # Box86
+		software_id=186 # Box86
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 ))
 		then
 			Banner_Installing

From f6c5f18206919c6b90d90f15aad6471062fe8b95 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:51:17 -0600
Subject: [PATCH 08/57] Remove gl4es install

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index fa7ca59bbd..b9e174f9c5 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6333,7 +6333,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 		then
 			Banner_Installing
 
-			G_AGI cmake gl4es
+			G_AGI cmake
 
 			Download_Install 'https://github.com/ptitSeb/box86/archive/v0.1.8.tar.gz'
 			G_EXEC mkdir box86-0.1.8/build

From 509c868a2aeb945fd09286daec8774a02915308a Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:03:25 -0600
Subject: [PATCH 09/57] Fix Raspberry Pi detection

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b9e174f9c5..aea537efd8 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6339,7 +6339,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC mkdir box86-0.1.8/build
 			G_EXEC cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL == 0 ]]
+			if [[ $G_HW_MODEL == *'RPi'* ]]
 			then
 				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC make -j4

From eb83d9108efa7814317842abfef1d06f2ee9883a Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:07:25 -0600
Subject: [PATCH 10/57] Finish fixing Rpi detection

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index aea537efd8..1abf6db208 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6339,7 +6339,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC mkdir box86-0.1.8/build
 			G_EXEC cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL == *'RPi'* ]]
+			if [[ $G_HW_MODEL_NAME == *'RPi'* ]]
 			then
 				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC make -j4

From afe03332dd97a9b896afe75eacaa9eb9c44890b3 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:15:50 -0600
Subject: [PATCH 11/57] Show output on makes

---
 dietpi/dietpi-software | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 1abf6db208..febb35ef5c 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6342,16 +6342,16 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			if [[ $G_HW_MODEL_NAME == *'RPi'* ]]
 			then
 				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				G_EXEC make -j4
+				G_EXEC_OUTPUT=1 G_EXEC make -j4
 				G_EXEC make install
 				G_EXEC systemctl restart systemd-binfmt
 			elif [[ $G_HW_MODEL_NAME == *'ODROID'* ]]
 			then
 				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				G_EXEC make
+				G_EXEC_OUTPUT=1 G_EXEC make
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				G_EXEC make
+				G_EXEC_OUTPUT=1 G_EXEC make
 			fi
 
 		fi

From 7a3dafb9f7c217b122da82137ea5ae8c2f9c7062 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:21:11 -0600
Subject: [PATCH 12/57] Add uninstall

---
 dietpi/dietpi-software | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index febb35ef5c..6bc6008c1d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -13392,6 +13392,14 @@ _EOF_
 
 		fi
 
+		software_id=186 # Box86
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
+
+			Banner_Uninstalling
+			rm -R /usr/local/bin/box86
+
+		fi
+
 		software_id=27 # TasmoAdmin
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 

From 6b80226f8e8565ea410eb345619d888569ccdfd9 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:36:24 -0600
Subject: [PATCH 13/57] Add more to uninstall

---
 dietpi/dietpi-software | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 6bc6008c1d..15183a08a7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -13396,7 +13396,9 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			rm -R /usr/local/bin/box86
+			rm /usr/local/bin/box86
+			rm /etc/binfmt.d/box86.conf
+			rm -R /usr/lib/i386-linux-gnu/
 
 		fi
 

From c31828316452237e5193be25a106197aef4ec414 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:40:22 -0600
Subject: [PATCH 14/57] Specify Rpi Models

---
 dietpi/dietpi-software | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 15183a08a7..cb3ec09834 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6341,7 +6341,13 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			if [[ $G_HW_MODEL_NAME == *'RPi'* ]]
 			then
-				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				if [[ $G_HW_MODEL === 2 ]]; then
+					G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				elif [[ $G_HW_MODEL === 3 ]]; then
+					G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				elif [[ $G_HW_MODEL === 3 ]]; then
+					G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+				fi
 				G_EXEC_OUTPUT=1 G_EXEC make -j4
 				G_EXEC make install
 				G_EXEC systemctl restart systemd-binfmt

From b8773355abad8d39a2615bb2c1735e8ec3c1aa60 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:46:43 -0600
Subject: [PATCH 15/57] Add gl4es

---
 dietpi/dietpi-software | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index cb3ec09834..375eee354c 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6341,11 +6341,11 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			if [[ $G_HW_MODEL_NAME == *'RPi'* ]]
 			then
-				if [[ $G_HW_MODEL === 2 ]]; then
+				if [[ $G_HW_MODEL == 2 ]]; then
 					G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				elif [[ $G_HW_MODEL === 3 ]]; then
+				elif [[ $G_HW_MODEL == 3 ]]; then
 					G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				elif [[ $G_HW_MODEL === 3 ]]; then
+				elif [[ $G_HW_MODEL == 3 ]]; then
 					G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				fi
 				G_EXEC_OUTPUT=1 G_EXEC make -j4
@@ -6360,6 +6360,13 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 				G_EXEC_OUTPUT=1 G_EXEC make
 			fi
 
+			Download_Install 'https://github.com/ptitSeb/gl4es/archive/v1.1.4.tar.gz'
+			G_EXEC mkdir gl4es-1.1.4/build
+			G_EXEC cd gl4es-1.1.4/build
+
+			G_EXEC cmake .. -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+			G_EXEC_OUTPUT=1 G_EXEC make
+
 		fi
 
 		software_id=27 # TasmoAdmin

From 6a31cc2f389f88a18a103236ccb72523af0f2ba9 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 22 Dec 2020 19:11:04 -0600
Subject: [PATCH 16/57] Remove gl4es

---
 dietpi/dietpi-software | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 375eee354c..b9bb1f386d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6359,14 +6359,6 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC_OUTPUT=1 G_EXEC make
 			fi
-
-			Download_Install 'https://github.com/ptitSeb/gl4es/archive/v1.1.4.tar.gz'
-			G_EXEC mkdir gl4es-1.1.4/build
-			G_EXEC cd gl4es-1.1.4/build
-
-			G_EXEC cmake .. -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-			G_EXEC_OUTPUT=1 G_EXEC make
-
 		fi
 
 		software_id=27 # TasmoAdmin

From 7629112132e8b36fd234ababef74a9dbf74234af Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Wed, 23 Dec 2020 10:17:46 -0600
Subject: [PATCH 17/57] Fix Rpi 4 detection

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b9bb1f386d..68ffa612b7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6345,7 +6345,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 					G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				elif [[ $G_HW_MODEL == 3 ]]; then
 					G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				elif [[ $G_HW_MODEL == 3 ]]; then
+				elif [[ $G_HW_MODEL == 4 ]]; then
 					G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				fi
 				G_EXEC_OUTPUT=1 G_EXEC make -j4

From e754175752c98b79f78e0d2c0fa7327340db2f21 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 26 Dec 2020 23:49:54 +0000
Subject: [PATCH 18/57] Merge branch 'dev' into 'box86'

---
 .meta/dietpi-survey_report      |  2 +-
 CHANGELOG.txt                   |  8 ++++---
 PREP_SYSTEM_FOR_DIETPI.sh       |  2 +-
 dietpi/dietpi-letsencrypt       | 16 ++++++-------
 dietpi/dietpi-software          | 42 ++++++++++++++++-----------------
 dietpi/func/dietpi-set_swapfile |  9 +++----
 dietpi/patch_file               | 20 +++++-----------
 rootfs/etc/bashrc.d/dietpi.bash |  2 +-
 8 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index 6223de7a32..81d3bf1bd8 100644
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -331,7 +331,7 @@
 	aSOFTWARE_NAME[155]='HTPC Manager'
 	aSOFTWARE_NAME[156]='Steam'
 	aSOFTWARE_NAME[157]='Home Assistant'
-	aSOFTWARE_NAME[158]='Minio'
+	aSOFTWARE_NAME[158]='MinIO'
 	aSOFTWARE_NAME[159]='Allo'
 	aSOFTWARE_NAME[160]='Allo_update'
 	aSOFTWARE_NAME[161]='FuguHub'
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3070ec1996..7bf89fb2bf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,8 @@ Changes:
 New Software:
 
 Fixes:
+- DietPi-Set_swapfile | Resolve an issue where "zram"/"zram0" dietpi.txt path entries were dropped, when running the script without input arguments. This especially broke applying zram-swap on first boot. Many thanks to @Dr0bac for reporting this issue: https://github.com/MichaIng/DietPi/issues/4002
+- DietPi-Software | Bitwarden_RS: Resolved an issue where the self-signed TLS certificate could not be imported on iOS. To apply this fix to an existing instance, the configuration file "/mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env" needs to be removed or moved to a different location, so "dietpi-software reinstall 183" will re-create the configuration and TLS certificate.
 
 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/pull/4XXX
 
@@ -1354,8 +1356,8 @@ General | Resolved multiple issues with failed GNU key management during APT ins
 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-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/MichaIng/DietPi/issues/1548
@@ -1379,7 +1381,7 @@ DietPi-Config | Display options > Resolution: Added fkms/kms (OpenGL) modes for
 DietPi-Config | Sparky SBC: Added option to select usb-dac-1.1 sound card, which will enable USB1.1 compatibility.
 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-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 implement for other devices: https://dietpi.com/phpbb/viewtopic.php?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
diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
index dde9266a86..e22691e509 100644
--- a/PREP_SYSTEM_FOR_DIETPI.sh
+++ b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -1839,7 +1839,7 @@ _EOF_
 		G_EXEC rmdir /mnt/tmp_root
 
 		G_DIETPI-NOTIFY 2 'Running general cleanup of misc files'
-		rm -Rfv /{root,home/*}/.{bash_history,nano_history,wget-hsts,cache,local,config,gnupg,viminfo,dbus,gconf,nano,vim}
+		rm -Rfv /{root,home/*}/.{bash_history,nano_history,wget-hsts,cache,local,config,gnupg,viminfo,dbus,gconf,nano,vim,zshrc,oh-my-zsh}
 
 		# Remove PREP script
 		[[ -f $FP_PREP_SCRIPT ]] && rm -v "$FP_PREP_SCRIPT"
diff --git a/dietpi/dietpi-letsencrypt b/dietpi/dietpi-letsencrypt
index 91c524e6d4..1b9d630ba2 100644
--- a/dietpi/dietpi-letsencrypt
+++ b/dietpi/dietpi-letsencrypt
@@ -19,7 +19,7 @@
 
 	# Import DietPi-Globals --------------------------------------------------------------
 	. /boot/dietpi/func/dietpi-globals
-	G_PROGRAM_NAME='DietPi-LetsEncrypt'
+	readonly G_PROGRAM_NAME='DietPi-LetsEncrypt'
 	G_CHECK_ROOT_USER
 	G_CHECK_ROOTFS_RW
 	G_INIT
@@ -247,10 +247,10 @@ _EOF_
 			fi
 
 		#------------------------------------------------------------------------------------------------------
-		# Minio
+		# MinIO
 		elif pgrep '[m]inio' > /dev/null; then
 
-			G_DIETPI-NOTIFY 0 'Minio S3 server detected'
+			G_DIETPI-NOTIFY 0 'MinIO S3 server detected'
 
 			# Cert me up
 			/boot/dietpi/dietpi-services stop
@@ -298,7 +298,7 @@ _EOF_
 			# Create renewl script
 			cat << _EOF_ > /home/minio-user/.minio/dietpi-cert-renewl.sh
 #!/bin/dash
-# Minio only works with copied and owned certs. Upon renewal the new certs needs to be copied and re-owned
+# MinIO only works with copied and owned certs. Upon renewal the new certs needs to be copied and re-owned
 systemctl stop minio
 
 # Ensure strict permissions while copying:
@@ -318,15 +318,15 @@ _EOF_
 			# Change permissions on renewal script
 			G_EXEC chmod +x /home/minio-user/.minio/dietpi-cert-renewl.sh
 
-			# Add Minio renewal to certbot system service
+			# Add MinIO renewal to certbot system service
 			[[ -d $FP_RENEWAL ]] || mkdir "$FP_RENEWAL"
 			cat << _EOF_ > "$FP_RENEWAL"/dietpi-minio.conf
 [Service]
 ExecStartPost=/home/minio-user/.minio/dietpi-cert-renewl.sh &>> $FP_LOGFILE
 _EOF_
 
-			# Inform user that HTTPS redirect and HSTS is not supported for Minio, if chosen
-			(( $LETSENCRYPT_REDIRECT || $LETSENCRYPT_HSTS )) && echo '[ INFO ] HTTPS redirect and HSTS is not supported for Minio, thus will be ignored.' | tee $FP_LOGFILE
+			# Inform user that HTTPS redirect and HSTS is not supported for MinIO, if chosen
+			(( $LETSENCRYPT_REDIRECT || $LETSENCRYPT_HSTS )) && echo '[ INFO ] HTTPS redirect and HSTS is not supported for MinIO, thus will be ignored.' | tee $FP_LOGFILE
 
 		else
 
@@ -336,7 +336,7 @@ Currently DietPi-LetsEncrypt configures the following web applications:
  - Apache2 (webserver)
  - Nginx (webserver)
  - Lighttpd (webserver)
- - Minio S3 (object storage server)\n
+ - MinIO S3 (object storage server)\n
 Would you like to switch to DietPi-Software, to install one of the above?' && /boot/dietpi/dietpi-software
 			return 1
 
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 68ffa612b7..c43c3e3647 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1013,7 +1013,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		#------------------
 		software_id=158
 
-		aSOFTWARE_NAME[$software_id]='Minio'
+		aSOFTWARE_NAME[$software_id]='MinIO'
 		aSOFTWARE_DESC[$software_id]='S3 compatible distributed object server'
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=4
@@ -5539,11 +5539,11 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 			[[ -d '/opt/bitwarden_rs' ]] && G_EXEC rm -R /opt/bitwarden_rs
 			G_EXEC mv "bitwarden_rs-$version" /opt/bitwarden_rs
 
-			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available and limit concurrent cargo build jobs to 2 if less than 3 GiB memory are available.
+			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available and limit concurrent cargo build jobs to 2 if less than 3 GiB memory is available.
 			local memory=$(free -tm | mawk '/^Total:/{print $2;exit}') jobs=
 			if (( $memory < 1948 ))
 			then
-				G_DIETPI-NOTIFY 2 'Bitwaden_RS build requires at least 2 GiB memory. We will now increase your swap file size to satisfy this requirement.'
+				G_DIETPI-NOTIFY 2 'Bitwaden_RS build requires at least 2 GiB memory. We will now increase your swap size to satisfy this requirement.'
 				/boot/dietpi/func/dietpi-set_swapfile 1
 				(( $G_HW_CPU_CORES > 2 )) && jobs=2
 
@@ -5568,7 +5568,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 			G_EXEC_NOHALT=1 G_EXEC rm rustup-init.sh
 			G_EXEC . .cargo/env
 
-			# Build: Don't run multiple jobs concurrently, as one job can require > 500 MiB memory and can utilize all cores as well.
+			# Build
 			G_EXEC cd /opt/bitwarden_rs
 			G_EXEC_OUTPUT=1 G_EXEC cargo build ${jobs:+-j $jobs} --features sqlite --release
 			G_EXEC cd /tmp/$G_PROGRAM_NAME
@@ -5591,7 +5591,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
-			INSTALL_URL_ADDRESS='https://github.com/Fornoth/spotify-connect-web/releases' # Full path fails wget spider test...
+			INSTALL_URL_ADDRESS='https://github.com/Fornoth/spotify-connect-web/releases'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 			no_check_url=1 Download_Install "$INSTALL_URL_ADDRESS/download/0.0.4-alpha/spotify-connect-web_0.0.4-alpha.tar.gz" /mnt/dietpi_userdata
 
@@ -6033,7 +6033,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 		fi
 
-		software_id=158 # Minio
+		software_id=158 # MinIO
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
@@ -7213,10 +7213,10 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 
 			# Openbox + PCmanFM + panel configs
 			mkdir -p /root/.config/{openbox,pcmanfm/LXDE,lxpanel/LXDE/panels}
-			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/lxde-rc.xml -o /root/.config/openbox/lxde-rc.xml
-			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm.conf -o /root/.config/pcmanfm/LXDE/pcmanfm.conf
-			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm-desktopitems.conf -o /root/.config/pcmanfm/LXDE/desktop-items-0.conf
-			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/lxde/panel -o /root/.config/lxpanel/LXDE/panels/panel
+			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.conf/desktop/lxde/lxde-rc.xml -o /root/.config/openbox/lxde-rc.xml
+			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm.conf -o /root/.config/pcmanfm/LXDE/pcmanfm.conf
+			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.conf/desktop/lxde/pcmanfm-desktopitems.conf -o /root/.config/pcmanfm/LXDE/desktop-items-0.conf
+			G_THREAD_START curl -sSfL https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.conf/desktop/lxde/panel -o /root/.config/lxpanel/LXDE/panels/panel
 
 			# Remove LXRandR menu item (monitor configuration tool as we set res in dietpi-config)
 			[[ -f '/usr/share/applications/lxrandr.desktop' ]] && G_EXEC rm /usr/share/applications/lxrandr.desktop
@@ -7264,7 +7264,7 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 			Banner_Configuration
 
 			# Configs
-			Download_Install "https://github.com/MichaIng/DietPi/raw/$G_GITBRANCH/.conf/desktop/lxqt/lxqt-$G_DISTRO_NAME.7z" /root/.config
+			Download_Install "https://github.com/$G_GITOWNER/DietPi/raw/$G_GITBRANCH/.conf/desktop/lxqt/lxqt-$G_DISTRO_NAME.7z" /root/.config
 			# Disable trash
 			# - Skip on Buster since trash seems to be implemented differently: https://github.com/MichaIng/DietPi/issues/1918#issuecomment-488085982
 			(( $G_DISTRO < 5 )) && G_CONFIG_INJECT 'use_trash=' 'use_trash=0' /etc/xdg/libfm/libfm.conf
@@ -11899,6 +11899,7 @@ _EOF_
 
 			Banner_Configuration
 
+			# User
 			Create_User -d /mnt/dietpi_userdata/bitwarden_rs bitwarden_rs
 
 			# Data and config dir
@@ -11910,7 +11911,7 @@ _EOF_
 				G_EXEC cp /opt/bitwarden_rs/.env.template /mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env
 				G_CONFIG_INJECT 'DATA_FOLDER=' 'DATA_FOLDER=/mnt/dietpi_userdata/bitwarden_rs' /mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env
 				# Create TLS certificate for web vault: Currently only RSA is supported. Add SAN with local IP and hostname, required for the client to accept the connection.
-				G_EXEC_OUTPUT=1 G_EXEC openssl req -reqexts SAN -subj '/CN=DietPi Bitwarden_RS' -config <(cat /etc/ssl/openssl.cnf <(echo -ne "[SAN]\nsubjectAltName=DNS:$(</etc/hostname),IP:$(mawk 'NR==4' /run/dietpi/.network)"))\
+				G_EXEC_OUTPUT=1 G_EXEC openssl req -reqexts SAN -subj '/CN=DietPi Bitwarden_RS' -config <(cat /etc/ssl/openssl.cnf <(echo -ne "[SAN]\nsubjectAltName=DNS:$(</etc/hostname),IP:$(mawk 'NR==4' /run/dietpi/.network)\nbasicConstraints=CA:TRUE,pathlen:0"))\
 					-x509 -days 7200 -sha256 -extensions SAN -out /mnt/dietpi_userdata/bitwarden_rs/cert.pem\
 					-newkey rsa:4096 -nodes -keyout /mnt/dietpi_userdata/bitwarden_rs/privkey.pem
 				G_CONFIG_INJECT 'ROCKET_TLS=' 'ROCKET_TLS={certs="./cert.pem",key="./privkey.pem"}' /mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env
@@ -11922,7 +11923,7 @@ _EOF_
 			G_EXEC chown -R bitwarden_rs:bitwarden_rs /mnt/dietpi_userdata/bitwarden_rs
 			G_EXEC chmod +x /opt/bitwarden_rs/target/release/bitwarden_rs
 
-			# Service
+			# Service: https://github.com/dani-garcia/bitwarden_rs/wiki/Setup-as-a-systemd-service
 			cat << '_EOF_' > /etc/systemd/system/bitwarden_rs.service
 [Unit]
 Description=Bitwarden Server (Rust Edition)
@@ -11981,7 +11982,6 @@ ExecStart=/mnt/dietpi_userdata/spotify-connect-web/spotify-connect-web
 [Install]
 WantedBy=multi-user.target
 _EOF_
-
 		fi
 
 		software_id=142 # CouchPotato
@@ -12589,7 +12589,7 @@ _EOF_
 
 		fi
 
-		software_id=158 # Minio
+		software_id=158 # MinIO
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
@@ -12598,7 +12598,7 @@ _EOF_
 			[[ -f '/etc/default/minio' ]] || cat << '_EOF_' > /etc/default/minio
 # Default file path
 MINIO_VOLUMES="/mnt/dietpi_userdata/minio-data"
-# Use if you want to run Minio on a custom port.
+# Use if you want to run MinIO on a custom port.
 #MINIO_OPTS="--address :9199"
 # Access key of the server.
 #MINIO_ACCESS_KEY=Server-Access-Key
@@ -12657,8 +12657,8 @@ _EOF_
 			# Check for existing portainer installation
 			if [[ -d '/mnt/dietpi_userdata/docker-data/volumes/portainer_data' ]]; then
 				G_DIETPI-NOTIFY 2 'Portainer detected, container will be dropped before reinstallation.'
-				G_EXEC docker rm "$(docker ps -a | mawk '/portainer\/portainer-ce/{print $1}')" --force
-				G_EXEC docker rmi "$(docker images -a | mawk '/portainer\/portainer-ce/{print $3}')"
+				G_EXEC docker rm "$(docker ps -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $1}')" --force
+				G_EXEC docker rmi "$(docker images -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $3}')"
 			else
 				# Create data directory
 				G_EXEC docker volume create portainer_data
@@ -15239,7 +15239,7 @@ _EOF_
 
 		fi
 
-		software_id=158 # Minio
+		software_id=158 # MinIO
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
@@ -15327,8 +15327,8 @@ _EOF_
 				G_EXEC systemctl restart docker
 
 				# Remove portainer container, image & volume
-				G_EXEC docker rm "$(docker ps -a | mawk '/portainer\/portainer-ce/{print $1}')" --force
-				G_EXEC docker rmi "$(docker images -a | mawk '/portainer\/portainer-ce/{print $3}')"
+				G_EXEC docker rm "$(docker ps -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $1}')" --force
+				G_EXEC docker rmi "$(docker images -a | mawk '/portainer\/portainer(-ce)?( |$)/{print $3}')"
 				G_EXEC docker volume rm portainer_data
 			fi
 
diff --git a/dietpi/func/dietpi-set_swapfile b/dietpi/func/dietpi-set_swapfile
index 26688c9bef..51e5758cfb 100644
--- a/dietpi/func/dietpi-set_swapfile
+++ b/dietpi/func/dietpi-set_swapfile
@@ -38,14 +38,15 @@
 		SWAP_SIZE=$(mawk '$2=="file" {printf "%.0f",$3/1024;exit}' /proc/swaps) && disable_error=1 G_CHECK_VALIDINT "$SWAP_SIZE" || SWAP_SIZE=1
 
 	fi
-	# - Path: Store current saved (only absolute paths to exclude zram) and active paths for later use
-	SWAP_PATH_CURRENT=$(sed -n '/^[[:blank:]]*AUTO_SETUP_SWAPFILE_LOCATION=\//{s/^[^=]*=//p;q}' /boot/dietpi.txt)
+	# - Path: Store dietpi.txt entry (excluding zram-swap) and active swap files for disabling and removal before creating a new swap space
+	SWAP_PATH=$(sed -n '/^[[:blank:]]*AUTO_SETUP_SWAPFILE_LOCATION=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
 	read -ra SWAP_FILES_ACTIVE < <(mawk '$2=="file" {print $1}' /proc/swaps)
+	[[ $SWAP_PATH == '/'* && $SWAP_PATH != '/dev/zram0' ]] && SWAP_FILES_ACTIVE+=("$SWAP_PATH")
 	if [[ $2 == '/'* || $2 == 'zram' || $2 == 'zram0' ]]; then
 
 		SWAP_PATH=$2
 
-	elif SWAP_PATH=$SWAP_PATH_CURRENT; [[ $SWAP_PATH != '/'* && $SWAP_PATH != 'zram' && $SWAP_PATH != 'zram0' ]]; then
+	elif [[ $SWAP_PATH != '/'* && $SWAP_PATH != 'zram' && $SWAP_PATH != 'zram0' ]]; then
 
 		SWAP_PATH=$(mawk '$2=="file" {print $1;exit}' /proc/swaps) && [[ $SWAP_PATH == '/'* || $SWAP_PATH == 'zram' || $SWAP_PATH == 'zram0' ]] || SWAP_PATH='/var/swap'
 
@@ -79,7 +80,7 @@
 
 		G_DIETPI-NOTIFY 2 'Disabling and deleting all existing swap files'
 		G_EXEC_NOHALT=1 G_EXEC swapoff -a
-		rm -fv "$SWAP_PATH_CURRENT" "${SWAP_FILES_ACTIVE[@]}"
+		rm -fv "${SWAP_FILES_ACTIVE[@]}"
 		sed -i '/[[:blank:]]swap[[:blank:]]/d' /etc/fstab
 		# zram-swap
 		[[ -f '/etc/modules-load.d/dietpi-zram-swap.conf' ]] && rm -v /etc/modules-load.d/dietpi-zram-swap.conf
diff --git a/dietpi/patch_file b/dietpi/patch_file
index c8f2f884ea..771632ac55 100644
--- a/dietpi/patch_file
+++ b/dietpi/patch_file
@@ -359,7 +359,7 @@ APT::AutoRemove::SuggestsImportant "false";
 _EOF_'
 			#-------------------------------------------------------------------------------
 			# Reinstalls:
-			# v6.5	Shairport-sync 3.1.7
+			# v6.5	Shairport Sync 3.1.7
 			# 	RPi Cam
 			# v6.26	Aria2 for .conf addition: https://github.com/MichaIng/DietPi/issues/1575#issuecomment-370248708
 			# v6.34	Sonarr/Radarr: https://github.com/MichaIng/DietPi/issues/1566#issuecomment-369334473
@@ -377,7 +377,7 @@ _EOF_'
 			# Add certificate combining for Lighttpd to Certbot auto renewal: https://github.com/MichaIng/DietPi/pull/1553
 			if [[ -f '/boot/dietpi/.dietpi-letsencrypt' ]]; then
 
-				# Switch Minio to new certbot.service.d/ hook:
+				# Switch MinIO to new certbot.service.d/ hook:
 				[[ -f '/etc/systemd/system/certbot.service' ]] && grep -q '^aSOFTWARE_INSTALL_STATE\[158\]=2' /boot/dietpi/.installed && rm /etc/systemd/system/certbot.service
 				# Overall settings and config renewal, skip DietPi-Services:
 				G_DIETPI_SERVICES_DISABLE=1 /boot/dietpi/dietpi-letsencrypt 1
@@ -489,12 +489,7 @@ _EOF_'
 			[[ -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/MichaIng/DietPi/issues/1670
-			if command -v dropbearkey > /dev/null; then
-
-				[[ -f '/etc/dropbear/dropbear_ecdsa_host_key' ]] || dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key
-				[[ -f '/etc/dropbear/dropbear_dss_host_key' ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
-
-			fi
+			command -v dropbearkey > /dev/null && [[ ! -f '/etc/dropbear/dropbear_ecdsa_host_key' ]] && dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key
 			#-------------------------------------------------------------------------------
 			# Reinstall firmware-misc-nonfree by default (Ralink): https://github.com/MichaIng/DietPi/issues/1675
 			(( $G_HW_MODEL == 21 )) || dpkg-query -s wpasupplicant &> /dev/null && G_AGI firmware-misc-nonfree
@@ -1685,20 +1680,17 @@ Use "dietpi-config" to adjust these settings to your needs.'
 
 			fi
 			#-------------------------------------------------------------------------------
-			# Update x86_64 kernel module settings
+			# x86_64: Cleanup config files to disable nouveau
 			if (( $G_HW_ARCH == 10 )); then
 
-				# Cleanup nouveau disabling
 				rm -f /etc/modprobe.d/*nouveau*
-				cat << _EOF_ > /etc/modprobe.d/dietpi-disable_nouveau.conf
+				cat << '_EOF_' > /etc/modprobe.d/dietpi-disable_nouveau.conf
 blacklist nouveau
 blacklist lbm-nouveau
 options nouveau modeset=0
 alias nouveau off
 alias lbm-nouveau off
 _EOF_
-				# Apply usb-storage quirks to disable UAS for unsupported drives (Seagate ST5000LM000-2AN170): https://github.com/MichaIng/DietPi/issues/2905
-				echo 'options usb-storage quirks=0bc2:ab30:u' > /etc/modprobe.d/dietpi-usb-storage_quirks.conf
 				# Update initramfs with above changes
 				if command -v update-tirfs > /dev/null; then
 
@@ -1715,7 +1707,7 @@ _EOF_
 			# RPi Buster: Re-apply firmware Buster-only repo, remove Stretch branch, reinstall raspi-copies-and-fills (on ARMv6/7 models) which is now compatible
 			if (( $G_HW_MODEL < 10 && $G_DISTRO > 4 )); then
 
-				echo 'deb https://archive.raspberrypi.org/debian/ buster main ui' > /etc/apt/sources.list.d/raspi.list
+				echo 'deb https://archive.raspberrypi.org/debian/ buster main' > /etc/apt/sources.list.d/raspi.list
 				G_AGUP
 				(( $G_HW_ARCH == 3 )) || G_AGI raspi-copies-and-fills
 
diff --git a/rootfs/etc/bashrc.d/dietpi.bash b/rootfs/etc/bashrc.d/dietpi.bash
index 8d54602fab..b92f243b7f 100644
--- a/rootfs/etc/bashrc.d/dietpi.bash
+++ b/rootfs/etc/bashrc.d/dietpi.bash
@@ -47,9 +47,9 @@
 	alias dietpi-wifidb='/boot/dietpi/func/dietpi-wifidb'
 	alias dietpi-optimal_mtu='/boot/dietpi/func/dietpi-optimal_mtu'
 	alias dietpi-cloudshell='/boot/dietpi/dietpi-cloudshell'
+	alias dietpi-nordvpn='/boot/dietpi/misc/dietpi-nordvpn'
 	alias cpu='/boot/dietpi/dietpi-cpuinfo'
 	# - Optional DietPi software aliases
-	[[ -f '/etc/systemd/system/dietpi-nordvpn.service' ]] && alias dietpi-nordvpn='/boot/dietpi/misc/dietpi-nordvpn'
 	[[ -d '/mnt/dietpi_userdata/sonarr' || -d '/mnt/dietpi_userdata/radarr' || -d '/mnt/dietpi_userdata/lidarr' ]] && alias dietpi-arr_to_RAM='/boot/dietpi/misc/dietpi-arr_to_RAM'
 	command -v kodi > /dev/null && alias startkodi='/boot/dietpi/misc/start_kodi'
 	[[ -f '/usr/local/games/opentyrian/run' ]] && alias opentyrian='/usr/local/games/opentyrian/run'

From c62020fd7c2459c73a687beffbe02a45142d7707 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 10:54:58 -0600
Subject: [PATCH 19/57] Add make install to all options

---
 dietpi/dietpi-software | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 68ffa612b7..0ed7456fe4 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6355,9 +6355,11 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			then
 				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC_OUTPUT=1 G_EXEC make
+				G_EXEC make install
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC_OUTPUT=1 G_EXEC make
+				G_EXEC make install
 			fi
 		fi
 

From 1ac0bca484af8f40ed60c0f2b29924092eeef7a9 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 11:10:55 -0600
Subject: [PATCH 20/57] Add support for Steam on ARM

---
 dietpi/dietpi-software | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 4077600255..4568c99230 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1143,12 +1143,9 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_ALSA[$software_id]=1
 		aSOFTWARE_REQUIRES_XSERVERXORG[$software_id]=1
 		aSOFTWARE_REQUIRES_DESKTOP[$software_id]=1
-		# Native PC only
-		for ((i=0; i<=$MAX_G_HW_MODEL; i++))
-		do
-			aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,$i]=0
-		done
-		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,21]=1
+		# Native PC and ARMv7 only
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
+		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,3]=1
 		#------------------
 		software_id=164
 
@@ -2452,6 +2449,16 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 
 		fi
 
+		# Software that requires Box86 on ARM
+		# - Steam
+		software_id=186
+		if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH === 2 )); then
+
+			aSOFTWARE_INSTALL_STATE[$software_id]=1
+			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
+
+		fi
+
 		#-------------------------------------------------------------------------
 		# WEBSERVER - Manual stack install
 		# - Define extra DietPi install flags for WEBSERVER_STACKS
@@ -6016,21 +6023,18 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			Banner_Installing
 
-			# Enable foreign i386 architecture, since Steam is i386-only: https://packages.debian.org/steam
-			if [[ $(dpkg --print-foreign-architectures) != *'i386'* ]]; then
+			Download_Install 'https://repo.steampowered.com/steam/archive/precise/steam_latest.deb'
 
-				dpkg --add-architecture i386
-				G_AGUP
+			# Add Nvidia i386 driver libs, if Nvidia driver is installed and runnning on x86_64
+			if [[ G_HW_ARCH == 10 ]]
+			then
+				local nvidia=
+				dpkg-query -s nvidia-driver &> /dev/null && nvidia='nvidia-driver-libs-i386'
 
+				debconf-set-selections <<< 'steam steam/question select I AGREE'
+				G_AGI $nvidia
 			fi
 
-			# Add Nvidia i386 driver libs, if Nvidia driver is installed
-			local nvidia=
-			dpkg-query -s nvidia-driver &> /dev/null && nvidia='nvidia-driver-libs-i386'
-
-			debconf-set-selections <<< 'steam steam/question select I AGREE'
-			G_AGI steam $nvidia
-
 		fi
 
 		software_id=158 # MinIO

From a8c025567a09eb3602071d117ba8aaba2730af19 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 11:12:40 -0600
Subject: [PATCH 21/57] Add dependencies for Steam games

---
 dietpi/dietpi-software | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 4568c99230..25f36ad9a6 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6033,6 +6033,9 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 				debconf-set-selections <<< 'steam steam/question select I AGREE'
 				G_AGI $nvidia
+			elif [[ G_HW_ARCH == 2 ]]
+			then
+				G_AGI libappindicator1 libtcmalloc-minimal4
 			fi
 
 		fi

From 13c986fb7c1fa2c62511a515804679a5fb570059 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 11:15:32 -0600
Subject: [PATCH 22/57] CodeFactor Fixes

---
 dietpi/dietpi-software | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 25f36ad9a6..eae0ce6e67 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -2452,7 +2452,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# Software that requires Box86 on ARM
 		# - Steam
 		software_id=186
-		if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH === 2 )); then
+		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH === 2 ]]; then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
@@ -6026,14 +6026,14 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			Download_Install 'https://repo.steampowered.com/steam/archive/precise/steam_latest.deb'
 
 			# Add Nvidia i386 driver libs, if Nvidia driver is installed and runnning on x86_64
-			if [[ G_HW_ARCH == 10 ]]
+			if [[ $G_HW_ARCH == 10 ]]
 			then
 				local nvidia=
 				dpkg-query -s nvidia-driver &> /dev/null && nvidia='nvidia-driver-libs-i386'
 
 				debconf-set-selections <<< 'steam steam/question select I AGREE'
 				G_AGI $nvidia
-			elif [[ G_HW_ARCH == 2 ]]
+			elif [[ $G_HW_ARCH == 2 ]]
 			then
 				G_AGI libappindicator1 libtcmalloc-minimal4
 			fi

From cb70c8f50c48612d4c2d71bed074178d0ac8e90b Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 11:16:41 -0600
Subject: [PATCH 23/57] More syntax fixes

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index eae0ce6e67..8d2d78c2b5 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -2452,7 +2452,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# Software that requires Box86 on ARM
 		# - Steam
 		software_id=186
-		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH === 2 ]]; then
+		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ]]; then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"

From 546ac67e59199823f5bfe95d4d3cedf6ac6cc3f1 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:17:45 -0600
Subject: [PATCH 24/57] Fix uninstall

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 8d2d78c2b5..8a45bb6d6a 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -14172,8 +14172,8 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			G_AGP steam
-			rm -Rf /{root,home/*}/.steam /mnt/dietpi_userdata/steam
+			G_AGP steam-launcher
+			rm -Rf /{root,home/*}/{.steam,.local/share/Steam} /mnt/dietpi_userdata/steam
 
 		fi
 

From b50d9e80fd572498b4347f0d3b26156684aaf385 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:39:30 -0600
Subject: [PATCH 25/57] 6.35 Remove steamdeps binary for ARM, as it takes lots
 of time to run and tries to install unneeded i386 binaries

---
 dietpi/dietpi-software | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 8a45bb6d6a..0bfc9ee01f 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12515,6 +12515,11 @@ _EOF_
 			fi
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
+			# Remove steamdeps binary on ARM
+			if [[ G_HW_ARCH === 2 ]]; then
+				rm /usr/bin/steamdeps
+			fi
+
 		fi
 
 		software_id=157 # Home Assistant

From fbef0cfa62e2cacb6f5ddfd156e81ab226d527c3 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:40:02 -0600
Subject: [PATCH 26/57] Fix syntax

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 0bfc9ee01f..42bea6a8ed 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12516,7 +12516,7 @@ _EOF_
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
 			# Remove steamdeps binary on ARM
-			if [[ G_HW_ARCH === 2 ]]; then
+			if [[ G_HW_ARCH == 2 ]]; then
 				rm /usr/bin/steamdeps
 			fi
 

From 5e562f09b569cd71d3fbe370c002abf23610717f Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:41:09 -0600
Subject: [PATCH 27/57] 6.35 Fix more syntax

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 42bea6a8ed..5eb6f31c2a 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12516,7 +12516,7 @@ _EOF_
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
 			# Remove steamdeps binary on ARM
-			if [[ G_HW_ARCH == 2 ]]; then
+			if [[ $G_HW_ARCH == 2 ]]; then
 				rm /usr/bin/steamdeps
 			fi
 

From 0976e567b95155d96b4f82b136e9024d9cba2e93 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:52:23 -0600
Subject: [PATCH 28/57] 6.35 Keep steamdeps binary currently

---
 dietpi/dietpi-software | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 5eb6f31c2a..8a45bb6d6a 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12515,11 +12515,6 @@ _EOF_
 			fi
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
-			# Remove steamdeps binary on ARM
-			if [[ $G_HW_ARCH == 2 ]]; then
-				rm /usr/bin/steamdeps
-			fi
-
 		fi
 
 		software_id=157 # Home Assistant

From 9f9985229a9d3dac82c1a9ea50f939134dfb6d0a Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Mon, 28 Dec 2020 06:53:50 -0600
Subject: [PATCH 29/57] Stop Steam from installing i386 packages on ARM

---
 dietpi/dietpi-software | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 8a45bb6d6a..d6c04c29a7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12515,6 +12515,15 @@ _EOF_
 			fi
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
+			# Stop Steam from trying to install i386 packages on ARM
+			if [[ G_HW_ARCH === 2 ]]; then
+				cat << '_EOF_' > /usr/bin/steamdeps
+#!/bin/bash
+
+exit 0
+_EOF_
+			fi
+
 		fi
 
 		software_id=157 # Home Assistant

From 837ba5c03925543f70d2297707e933727582e056 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Mon, 28 Dec 2020 06:54:31 -0600
Subject: [PATCH 30/57] 6.35 Again fix syntax

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index d6c04c29a7..26bed79d31 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12516,7 +12516,7 @@ _EOF_
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
 			# Stop Steam from trying to install i386 packages on ARM
-			if [[ G_HW_ARCH === 2 ]]; then
+			if [[ G_HW_ARCH == 2 ]]; then
 				cat << '_EOF_' > /usr/bin/steamdeps
 #!/bin/bash
 

From 4c35b72a1c89550c5dd0a8b074c0425534168d2c Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Mon, 28 Dec 2020 07:07:51 -0600
Subject: [PATCH 31/57] 6.35 Add missing $

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 26bed79d31..538369a79d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12516,7 +12516,7 @@ _EOF_
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 
 			# Stop Steam from trying to install i386 packages on ARM
-			if [[ G_HW_ARCH == 2 ]]; then
+			if [[ $G_HW_ARCH == 2 ]]; then
 				cat << '_EOF_' > /usr/bin/steamdeps
 #!/bin/bash
 

From 60c758d5042d7a6f47f5b679c7567a25a8a908e0 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:55:27 -0600
Subject: [PATCH 32/57] 6.35 Fixes

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 538369a79d..2859d48289 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6346,7 +6346,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC mkdir box86-0.1.8/build
 			G_EXEC cd box86-0.1.8/build
 
-			if [[ $G_HW_MODEL_NAME == *'RPi'* ]]
+			if (( $G_HW_MODEL < 10 ))
 			then
 				if [[ $G_HW_MODEL == 2 ]]; then
 					G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -6358,7 +6358,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 				G_EXEC_OUTPUT=1 G_EXEC make -j4
 				G_EXEC make install
 				G_EXEC systemctl restart systemd-binfmt
-			elif [[ $G_HW_MODEL_NAME == *'ODROID'* ]]
+			elif (( $G_HW_MODEL < 20 ))
 			then
 				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 				G_EXEC_OUTPUT=1 G_EXEC make

From 42002a633825f31db3209f86e2a69ef65216fd42 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 16 Jan 2021 12:32:41 -0600
Subject: [PATCH 33/57] 6.35 Add warning about running x86 software on ARM

---
 dietpi/dietpi-software | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index c86100490f..6bab6d646d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -2455,6 +2455,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ]]; then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
+			G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
 
 		fi

From d55eb29445f3f93d37a19bf863b6e0d6e9b6f1d2 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 16 Jan 2021 12:35:29 -0600
Subject: [PATCH 34/57] 6.35 Fix installation platforms on Steam

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 6bab6d646d..b8b2e105b7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1145,7 +1145,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_DESKTOP[$software_id]=1
 		# Native PC and ARMv7 only
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
-		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,3]=1
+		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,3]=0
 		#------------------
 		software_id=164
 

From 766b0c13c229569eb061b008ef67c24324d606c2 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 16 Jan 2021 15:55:18 -0600
Subject: [PATCH 35/57] 6.35 Remove Steam APT repository since it doesn't
 update from that and it recreates steamdeps

---
 dietpi/dietpi-software | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b8b2e105b7..10b53682b8 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12430,6 +12430,7 @@ _EOF_
 
 			# Stop Steam from trying to install i386 packages on ARM
 			if [[ $G_HW_ARCH == 2 ]]; then
+				G_EXEC rm /etc/apt/sources.list.d/steam.list 
 				cat << '_EOF_' > /usr/bin/steamdeps
 #!/bin/bash
 

From 9b44ec9d6d3bbd97c06bc4406a4edf3b1663d382 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 16 Jan 2021 16:22:59 -0600
Subject: [PATCH 36/57] 6.35 Modify desktop file to start without showing any
 errors and in small mode

---
 dietpi/dietpi-software | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 10b53682b8..76b1079105 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12427,15 +12427,16 @@ _EOF_
 
 			fi
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
-
-			# Stop Steam from trying to install i386 packages on ARM
 			if [[ $G_HW_ARCH == 2 ]]; then
+				# Stop Steam from trying to install i386 packages on ARM
 				G_EXEC rm /etc/apt/sources.list.d/steam.list 
 				cat << '_EOF_' > /usr/bin/steamdeps
 #!/bin/bash
 
 exit 0
 _EOF_
+				# Modify Steam desktop shortcut
+				G_CONFIG_INJECT '/usr/bin/steam/[[:blank:]]' 'sh -c "STEAMOS=1 STEAM_RUNTiME=1 /usr/bin/steam +open steam://open/minigameslist %U"' /home/dietpi/Desktop/steam.desktop
 			fi
 
 		fi

From 88b62a8c72538506d38c7947bedbcbf307655875 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 16 Jan 2021 17:01:31 -0600
Subject: [PATCH 37/57] 6.35 Add desktop shortcut instead of modifying it

---
 dietpi/dietpi-software | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 76b1079105..1558ad458c 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12435,8 +12435,17 @@ _EOF_
 
 exit 0
 _EOF_
-				# Modify Steam desktop shortcut
-				G_CONFIG_INJECT '/usr/bin/steam/[[:blank:]]' 'sh -c "STEAMOS=1 STEAM_RUNTiME=1 /usr/bin/steam +open steam://open/minigameslist %U"' /home/dietpi/Desktop/steam.desktop
+				# Add Steam desktop shortcut
+				cat << '_EOF_' > /home/dietpi/Desktop/steam.desktop
+[Desktop Entry]
+Name=Steam
+Exec=sh -c "STEAMOS=1 STEAM_RUNTiME=1 /usr/bin/steam +open steam://open/minigameslist %U"
+Icon=steam
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;Game;
+MimeType=x-scheme-handler/steam;
+_EOF_
 			fi
 
 		fi

From 76fe093ed1511ba6cc83a36b9515e8b52a8a087d Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 08:53:02 -0600
Subject: [PATCH 38/57] 6.35 Fixes and optimiztions

---
 dietpi/dietpi-software | 63 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 1558ad458c..fd1db6a2e6 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1145,7 +1145,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_DESKTOP[$software_id]=1
 		# Native PC and ARMv7 only
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
-		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,3]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
 		#------------------
 		software_id=164
 
@@ -2455,7 +2455,6 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ]]; then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
-			G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
 
 		fi
@@ -6083,11 +6082,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			# Add Nvidia i386 driver libs, if Nvidia driver is installed and runnning on x86_64
 			if [[ $G_HW_ARCH == 10 ]]
 			then
-				local nvidia=
-				dpkg-query -s nvidia-driver &> /dev/null && nvidia='nvidia-driver-libs-i386'
-
-				debconf-set-selections <<< 'steam steam/question select I AGREE'
-				G_AGI $nvidia
+				dpkg-query -s nvidia-driver &> /dev/null && G_AGI nvidia-driver-libs-i386
 			elif [[ $G_HW_ARCH == 2 ]]
 			then
 				G_AGI libappindicator1 libtcmalloc-minimal4
@@ -6397,32 +6392,28 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			G_AGI cmake
 
-			Download_Install 'https://github.com/ptitSeb/box86/archive/v0.1.8.tar.gz'
-			G_EXEC mkdir box86-0.1.8/build
-			G_EXEC cd box86-0.1.8/build
-
-			if (( $G_HW_MODEL < 10 ))
-			then
-				if [[ $G_HW_MODEL == 2 ]]; then
-					G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				elif [[ $G_HW_MODEL == 3 ]]; then
-					G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				elif [[ $G_HW_MODEL == 4 ]]; then
-					G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				fi
-				G_EXEC_OUTPUT=1 G_EXEC make -j4
-				G_EXEC make install
-				G_EXEC systemctl restart systemd-binfmt
+			local version=$(curl -sSfL https://api.github.com/repos/ptitSeb/box86/tags | mawk '/"name": /{print $4;exit}')
+			[[ $version ]] || version='v0.2.0' # Fallback
+			Download_Install "https://github.com/ptitSeb/box86/archive/$version.tar.gz"
+			G_EXEC mkdir box86-${version#v}/build
+			G_EXEC cd box86-${version#v}/build
+
+			if [[ $G_HW_MODEL == 2 ]]; then
+				G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+			elif [[ $G_HW_MODEL == 3 ]]; then
+				G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+			elif [[ $G_HW_MODEL == 4 ]]; then
+				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 			elif (( $G_HW_MODEL < 20 ))
 			then
 				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				G_EXEC_OUTPUT=1 G_EXEC make
-				G_EXEC make install
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-				G_EXEC_OUTPUT=1 G_EXEC make
-				G_EXEC make install
 			fi
+			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS='-g0 -O3' -j$(nproc)
+			G_EXEC strip --remove-section=.comment --remove-section=.note box86
+			G_EXEC make install
+			(( $G_HW_MODEL < 10 )) && G_EXEC systemctl restart systemd-binfmt
 		fi
 
 		software_id=27 # TasmoAdmin
@@ -12429,9 +12420,9 @@ _EOF_
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 			if [[ $G_HW_ARCH == 2 ]]; then
 				# Stop Steam from trying to install i386 packages on ARM
-				G_EXEC rm /etc/apt/sources.list.d/steam.list 
+				G_EXEC rm /etc/apt/{sources.list.d/steam.list,trusted.gpg.d/steam.gpg}
 				cat << '_EOF_' > /usr/bin/steamdeps
-#!/bin/bash
+#!/bin/dash
 
 exit 0
 _EOF_
@@ -12439,7 +12430,7 @@ _EOF_
 				cat << '_EOF_' > /home/dietpi/Desktop/steam.desktop
 [Desktop Entry]
 Name=Steam
-Exec=sh -c "STEAMOS=1 STEAM_RUNTiME=1 /usr/bin/steam +open steam://open/minigameslist %U"
+Exec=env STEAMOS=1 STEAM_RUNTIME=1 /usr/bin/steam +open steam://open/minigameslist %U
 Icon=steam
 Terminal=false
 Type=Application
@@ -13345,7 +13336,9 @@ _EOF_
 			Banner_Uninstalling
 			rm /usr/local/bin/box86
 			rm /etc/binfmt.d/box86.conf
-			rm -R /usr/lib/i386-linux-gnu/
+			rm /usr/lib/i386-linux-gnu/libstdc++.so.6
+			rm /usr/lib/i386-linux-gnu/libstdc++.so.5
+			rm /usr/lib/i386-linux-gnu/libgcc_s.so.1
 
 		fi
 
@@ -14114,6 +14107,7 @@ _EOF_
 
 			Banner_Uninstalling
 			G_AGP steam-launcher
+			G_AGP steam
 			rm -Rf /{root,home/*}/{.steam,.local/share/Steam} /mnt/dietpi_userdata/steam
 
 		fi
@@ -16572,6 +16566,13 @@ _EOF_
 
 			fi
 
+			# Box86
+			if (( ${aSOFTWARE_INSTALL_STATE[186] == 1} )); then
+
+				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
+
+			fi
+
 			# dietpi-config can be used to install/configure the following software. Ask user.
 			# - No-IP
 			if (( ${aSOFTWARE_INSTALL_STATE[67]} == 1 )); then

From 00468f3422f8f5c1f611933c7352419446bafb00 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 09:00:05 -0600
Subject: [PATCH 39/57] CodeFactor Fixes

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index fd1db6a2e6..de555f3c27 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6410,7 +6410,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 			fi
-			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS='-g0 -O3' -j$(nproc)
+			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS="-g0 -O3" -j$(nproc)
 			G_EXEC strip --remove-section=.comment --remove-section=.note box86
 			G_EXEC make install
 			(( $G_HW_MODEL < 10 )) && G_EXEC systemctl restart systemd-binfmt

From c170c727b7751738c1ec5dd3f86ef6029c561a2e Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 09:01:20 -0600
Subject: [PATCH 40/57] 6.35 More CodeFactor Fixes

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index de555f3c27..268f6bd447 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6410,7 +6410,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 			fi
-			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS="-g0 -O3" -j$(nproc)
+			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS='-g0 -O3' "-j$(nproc)"
 			G_EXEC strip --remove-section=.comment --remove-section=.note box86
 			G_EXEC make install
 			(( $G_HW_MODEL < 10 )) && G_EXEC systemctl restart systemd-binfmt

From 205c6f86396c879cf999831fec87684850ddcc73 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 09:44:57 -0600
Subject: [PATCH 41/57] 6.35 Exclude steamdeps from being updated

---
 dietpi/dietpi-software | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 268f6bd447..b76e7d17e3 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6085,6 +6085,8 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 				dpkg-query -s nvidia-driver &> /dev/null && G_AGI nvidia-driver-libs-i386
 			elif [[ $G_HW_ARCH == 2 ]]
 			then
+				echo -e 'path-exclude /usr/bin/steamdeps\npath-exclude /usr/lib/steam/bin_steamdeps.py' > /etc/dpkg/dpkg.cfg.d/98-dietpi-steam
+				echo -e '#!/bin/dash\nexit 0' > /usr/bin/steamdeps
 				G_AGI libappindicator1 libtcmalloc-minimal4
 			fi
 
@@ -12419,13 +12421,6 @@ _EOF_
 			fi
 			ln -s /mnt/dietpi_userdata/steam /root/.steam
 			if [[ $G_HW_ARCH == 2 ]]; then
-				# Stop Steam from trying to install i386 packages on ARM
-				G_EXEC rm /etc/apt/{sources.list.d/steam.list,trusted.gpg.d/steam.gpg}
-				cat << '_EOF_' > /usr/bin/steamdeps
-#!/bin/dash
-
-exit 0
-_EOF_
 				# Add Steam desktop shortcut
 				cat << '_EOF_' > /home/dietpi/Desktop/steam.desktop
 [Desktop Entry]

From c0d9f0af3d638c66bd340d8f7c141f0bc9815dbe Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 10:15:38 -0600
Subject: [PATCH 42/57] 6.35 Remove steam desktop shortcut on uninstall

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b76e7d17e3..0303188e02 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -14103,7 +14103,7 @@ _EOF_
 			Banner_Uninstalling
 			G_AGP steam-launcher
 			G_AGP steam
-			rm -Rf /{root,home/*}/{.steam,.local/share/Steam} /mnt/dietpi_userdata/steam
+			rm -Rf /{root,home/*}/{.steam,.local/share/Steam,steam.desktop} /mnt/dietpi_userdata/steam
 
 		fi
 

From 8a6965fbbfa14b95a003253693ea07710c85ce48 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 10:23:12 -0600
Subject: [PATCH 43/57] 6.35 Fix syntax

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 0303188e02..b783736c46 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -16562,7 +16562,7 @@ _EOF_
 			fi
 
 			# Box86
-			if (( ${aSOFTWARE_INSTALL_STATE[186] == 1} )); then
+			if (( ${aSOFTWARE_INSTALL_STATE[186]} == 1 )); then
 
 				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 

From 5c8a2e6e1934a90f1b4b6f0c4268adee5d19e797 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 10:25:25 -0600
Subject: [PATCH 44/57] 6.35 Fix warning

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index b783736c46..2f36802c1a 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -16561,8 +16561,8 @@ _EOF_
 
 			fi
 
-			# Box86
-			if (( ${aSOFTWARE_INSTALL_STATE[186]} == 1 )); then
+			# Box86 warning
+			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 )); then
 
 				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 

From 76ec0f0747ec6af276645d9691ad8c8510ffed29 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 10:28:48 -0600
Subject: [PATCH 45/57] 6.35 Only show warning on ARMv7

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 2f36802c1a..0d24ebc19d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -16562,7 +16562,7 @@ _EOF_
 			fi
 
 			# Box86 warning
-			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 )); then
+			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && G_HW_ARCH == 2)); then
 
 				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 

From d359ed24c44a2bd398d878c07577184d99e9de55 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 10:39:03 -0600
Subject: [PATCH 46/57] 6.35 Use (()) instead of [[]]

---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 0d24ebc19d..2ae311db28 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -2452,7 +2452,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# Software that requires Box86 on ARM
 		# - Steam
 		software_id=186
-		if [[ ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ]]; then
+		if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 )); then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
@@ -16562,7 +16562,7 @@ _EOF_
 			fi
 
 			# Box86 warning
-			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && G_HW_ARCH == 2)); then
+			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2)); then
 
 				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 

From 2a1bbdc288d8df97d28e02ac329452ee0f968425 Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Sat, 23 Jan 2021 16:32:42 -0600
Subject: [PATCH 47/57] 6.35 Fix removal of Steam desktop shortcut

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 2ae311db28..c2300bba1e 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -14103,7 +14103,7 @@ _EOF_
 			Banner_Uninstalling
 			G_AGP steam-launcher
 			G_AGP steam
-			rm -Rf /{root,home/*}/{.steam,.local/share/Steam,steam.desktop} /mnt/dietpi_userdata/steam
+			rm -Rf /{root,home/*}/{.steam,.local/share/Steam,Desktop/steam.desktop} /mnt/dietpi_userdata/steam
 
 		fi
 

From c8a73126bddfdbfd099212d99914162d92c5871d Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 24 Jan 2021 01:48:50 +0100
Subject: [PATCH 48/57] v6.35

+ DietPi-Software | Box86: Move to free software ID 62
+ DietPi-Software | Box86: Install cmake dependency parallel to source archive download
+ DietPi-Software | Box86: On uninstall, attempt to remove files only if they exist
+ DietPi-Software | Steam: Apply DPkg file exclusion prior to and install dependencies parallel to package download and install
+ DietPi-Software | Steam: Align desktop entry with other cases: Install to /usr/share/applications and link to users ~/Desktop dirs
+ DietPi-Software | Steam: Remove DPkg config on uninstall
---
 dietpi/dietpi-software | 99 ++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index c2300bba1e..c891360b6e 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1168,7 +1168,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_REQUIRES_USERINPUT[$software_id]=1
 
 		#------------------
-		software_id=186
+		software_id=62
 
 		aSOFTWARE_NAME[$software_id]='Box86'
 		aSOFTWARE_DESC[$software_id]='x86 userspace emulation'
@@ -2450,8 +2450,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		fi
 
 		# Software that requires Box86 on ARM
-		# - Steam
-		software_id=186
+		# - Steam (156)
+		software_id=62
 		if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 )); then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
@@ -6077,19 +6077,21 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			Banner_Installing
 
-			Download_Install 'https://repo.steampowered.com/steam/archive/precise/steam_latest.deb'
-
-			# Add Nvidia i386 driver libs, if Nvidia driver is installed and runnning on x86_64
+			# x86_64: Add Nvidia i386 driver libs, if Nvidia driver is installed
 			if [[ $G_HW_ARCH == 10 ]]
 			then
-				dpkg-query -s nvidia-driver &> /dev/null && G_AGI nvidia-driver-libs-i386
+				dpkg-query -s nvidia-driver &> /dev/null && DEPS_LIST='nvidia-driver-libs-i386'
+
+			# ARM: Avoid auto-install of i386 dependencies when starting Steam
 			elif [[ $G_HW_ARCH == 2 ]]
 			then
-				echo -e 'path-exclude /usr/bin/steamdeps\npath-exclude /usr/lib/steam/bin_steamdeps.py' > /etc/dpkg/dpkg.cfg.d/98-dietpi-steam
-				echo -e '#!/bin/dash\nexit 0' > /usr/bin/steamdeps
-				G_AGI libappindicator1 libtcmalloc-minimal4
+				DEPS_LIST='libappindicator1 libtcmalloc-minimal4'
+				G_EXEC eval "echo -e 'path-exclude /usr/bin/steamdeps\npath-exclude /usr/lib/steam/bin_steamdeps.py' > /etc/dpkg/dpkg.cfg.d/98-dietpi-steam"
+				G_EXEC eval "echo -e '#!/bin/dash\nexit 0' > /usr/bin/steamdeps"
 			fi
 
+			Download_Install 'https://repo.steampowered.com/steam/archive/precise/steam_latest.deb'
+
 		fi
 
 		software_id=158 # MinIO
@@ -6387,34 +6389,46 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 		fi
 
-		software_id=186 # Box86
+		software_id=62 # Box86
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 ))
 		then
 			Banner_Installing
 
-			G_AGI cmake
+			# APT deps
+			DEPS_LIST='cmake'
 
+			# Download
 			local version=$(curl -sSfL https://api.github.com/repos/ptitSeb/box86/tags | mawk '/"name": /{print $4;exit}')
 			[[ $version ]] || version='v0.2.0' # Fallback
 			Download_Install "https://github.com/ptitSeb/box86/archive/$version.tar.gz"
+
+			# Build
 			G_EXEC mkdir box86-${version#v}/build
 			G_EXEC cd box86-${version#v}/build
-
-			if [[ $G_HW_MODEL == 2 ]]; then
+			# - RPi 2
+			if [[ $G_HW_MODEL == 2 ]]
+			then
 				G_EXEC cmake .. -DRPI2=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-			elif [[ $G_HW_MODEL == 3 ]]; then
+			# - RPi 3
+			elif [[ $G_HW_MODEL == 3 ]]
+			then
 				G_EXEC cmake .. -DRPI3=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-			elif [[ $G_HW_MODEL == 4 ]]; then
+			# - RPi 4
+			elif [[ $G_HW_MODEL == 4 ]]
+			then
 				G_EXEC cmake .. -DRPI4=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+			# - Odroids
 			elif (( $G_HW_MODEL < 20 ))
 			then
 				G_EXEC cmake .. -DODROID=1 -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+			# - Others
 			else
 				G_EXEC cmake .. -DARM_DYNAREC=ON -DNOGIT=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 			fi
 			G_EXEC_OUTPUT=1 G_EXEC make CFLAGS='-g0 -O3' "-j$(nproc)"
 			G_EXEC strip --remove-section=.comment --remove-section=.note box86
 			G_EXEC make install
+
 			(( $G_HW_MODEL < 10 )) && G_EXEC systemctl restart systemd-binfmt
 		fi
 
@@ -12406,23 +12420,23 @@ _EOF_
 			Banner_Configuration
 
 			# Move data dir to dietpi_userdata
-			if [[ -d '/mnt/dietpi_userdata/steam' ]]; then
-
-				rm -Rf /root/.steam
-
-			elif [[ -d '/root/.steam' ]]; then
+			if [[ -d '/mnt/dietpi_userdata/steam' ]]
+			then
+				G_EXEC rm -Rf /root/.steam
 
-				mv /root/.steam /mnt/dietpi_userdata/steam
+			elif [[ -d '/root/.steam' ]]
+			then
+				G_EXEC mv /root/.steam /mnt/dietpi_userdata/steam
 
 			else
-
-				mkdir -p /mnt/dietpi_userdata/steam
-
+				G_EXEC mkdir -p /mnt/dietpi_userdata/steam
 			fi
-			ln -s /mnt/dietpi_userdata/steam /root/.steam
-			if [[ $G_HW_ARCH == 2 ]]; then
+			G_EXEC ln -s /mnt/dietpi_userdata/steam /root/.steam
+
+			if [[ $G_HW_ARCH == 2 ]]
+			then
 				# Add Steam desktop shortcut
-				cat << '_EOF_' > /home/dietpi/Desktop/steam.desktop
+				cat << '_EOF_' > /usr/share/applications/steam.desktop
 [Desktop Entry]
 Name=Steam
 Exec=env STEAMOS=1 STEAM_RUNTIME=1 /usr/bin/steam +open steam://open/minigameslist %U
@@ -12432,6 +12446,8 @@ Type=Application
 Categories=Network;FileTransfer;Game;
 MimeType=x-scheme-handler/steam;
 _EOF_
+				G_EXEC ln -s /usr/share/applications/steam.desktop /root/Desktop/steam.desktop
+				[[ -d '/home/dietpi/Desktop' ]] && G_EXEC ln -s /usr/share/applications/steam.desktop /home/dietpi/Desktop/steam.desktop
 			fi
 
 		fi
@@ -13325,16 +13341,16 @@ _EOF_
 
 		fi
 
-		software_id=186 # Box86
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
-
+		software_id=62 # Box86
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 ))
+		then
 			Banner_Uninstalling
-			rm /usr/local/bin/box86
-			rm /etc/binfmt.d/box86.conf
-			rm /usr/lib/i386-linux-gnu/libstdc++.so.6
-			rm /usr/lib/i386-linux-gnu/libstdc++.so.5
-			rm /usr/lib/i386-linux-gnu/libgcc_s.so.1
-
+			[[ -f '/usr/local/bin/box86' ]] && rm -v /usr/local/bin/box86
+			[[ -f '/etc/binfmt.d/box86.conf' ]] && rm -v /etc/binfmt.d/box86.conf
+			[[ -f '/usr/lib/i386-linux-gnu/libstdc++.so.6' ]] && rm -v /usr/lib/i386-linux-gnu/libstdc++.so.6
+			[[ -f '/usr/lib/i386-linux-gnu/libstdc++.so.5' ]] && rm -v /usr/lib/i386-linux-gnu/libstdc++.so.5
+			[[ -f '/usr/lib/i386-linux-gnu/libgcc_s.so.1' ]] && rm -v /usr/lib/i386-linux-gnu/libgcc_s.so.1
+			[[ -d '/usr/lib/i386-linux-gnu' ]] && rmdir --ignore-fail-on-non-empty /usr/lib/i386-linux-gnu
 		fi
 
 		software_id=27 # TasmoAdmin
@@ -14098,13 +14114,12 @@ _EOF_
 		fi
 
 		software_id=156 # Steam
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
-
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 ))
+		then
 			Banner_Uninstalling
-			G_AGP steam-launcher
-			G_AGP steam
+			G_AGP steam-launcher steam
+			[[ -f '/etc/dpkg/dpkg.cfg.d/98-dietpi-steam' ]] && rm -v /etc/dpkg/dpkg.cfg.d/98-dietpi-steam
 			rm -Rf /{root,home/*}/{.steam,.local/share/Steam,Desktop/steam.desktop} /mnt/dietpi_userdata/steam
-
 		fi
 
 		software_id=119 # CAVA

From c91227569b1020491fd7cb41edb07709da893f76 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 24 Jan 2021 02:07:59 +0100
Subject: [PATCH 49/57] v6.35

+ DietPi-Software | Steam: It's still required to apply i386 arch to install the nvidia-driver-libs-i386 package. On Steam startup this is otherwise done anyway.
---
 dietpi/dietpi-software | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index c891360b6e..beb2e8e81e 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6078,9 +6078,10 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			Banner_Installing
 
 			# x86_64: Add Nvidia i386 driver libs, if Nvidia driver is installed
-			if [[ $G_HW_ARCH == 10 ]]
+			if [[ $G_HW_ARCH == 10 ]] && dpkg-query -s nvidia-driver
 			then
-				dpkg-query -s nvidia-driver &> /dev/null && DEPS_LIST='nvidia-driver-libs-i386'
+				[[ $(dpkg --print-foreign-architectures) == *'i386'* ]] || { G_EXEC dpkg --add-architecture i386; G_AGUP; }
+				DEPS_LIST='nvidia-driver-libs-i386'
 
 			# ARM: Avoid auto-install of i386 dependencies when starting Steam
 			elif [[ $G_HW_ARCH == 2 ]]

From 781a77e89b61cc28b58cc6e29e3211024ec7e7b0 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 24 Jan 2021 02:09:16 +0100
Subject: [PATCH 50/57] v6.35

+ DietPi-Software | Steam: Mute dpkg-query output when checking for nvidia-driver package
---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index beb2e8e81e..e7799fced7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6078,7 +6078,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			Banner_Installing
 
 			# x86_64: Add Nvidia i386 driver libs, if Nvidia driver is installed
-			if [[ $G_HW_ARCH == 10 ]] && dpkg-query -s nvidia-driver
+			if [[ $G_HW_ARCH == 10 ]] && dpkg-query -s nvidia-driver &> /dev/null
 			then
 				[[ $(dpkg --print-foreign-architectures) == *'i386'* ]] || { G_EXEC dpkg --add-architecture i386; G_AGUP; }
 				DEPS_LIST='nvidia-driver-libs-i386'

From 52607183de7271b9af9ca37f449cc0014699009a Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Tue, 26 Jan 2021 18:43:03 +0100
Subject: [PATCH 51/57] v6.35

+ DietPi-Software | Box86: Add python3-minimal as build dependency
---
 dietpi/dietpi-software | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index e7799fced7..3b1c9b94bc 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6396,7 +6396,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			Banner_Installing
 
 			# APT deps
-			DEPS_LIST='cmake'
+			DEPS_LIST='cmake python3-minimal'
 
 			# Download
 			local version=$(curl -sSfL https://api.github.com/repos/ptitSeb/box86/tags | mawk '/"name": /{print $4;exit}')
@@ -13369,7 +13369,7 @@ _EOF_
 
 		fi
 
-		software_id=83
+		software_id=83 # Apache2
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
@@ -13377,7 +13377,7 @@ _EOF_
 
 		fi
 
-		software_id=85
+		software_id=85 # Nginx
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
@@ -13385,7 +13385,7 @@ _EOF_
 
 		fi
 
-		software_id=84
+		software_id=84 # Lighttpd
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
@@ -13638,6 +13638,7 @@ _EOF_
 				rm -R /etc/systemd/system/blynkserver.service*
 
 			fi
+			[[ -d '/etc/systemd/system/blynkserver.service.d' ]] && rm -R /etc/systemd/system/blynkserver.service.d
 			getent passwd blynk > /dev/null && userdel blynk
 			getent group blynk > /dev/null && groupdel blynk # Pre-v6.33
 			[[ -d '/mnt/dietpi_userdata/blynk' ]] && rm -R /mnt/dietpi_userdata/blynk
@@ -13657,6 +13658,7 @@ _EOF_
 				rm -R /etc/systemd/system/aria2.service*
 
 			fi
+			[[ -d '/etc/systemd/system/aria2.service.d' ]] && rm -R /etc/systemd/system/aria2.service.d
 			G_AGP aria2
 			getent passwd aria2 > /dev/null && userdel aria2
 			getent group aria2 > /dev/null && groupdel aria2

From 817de9de40366cfb3a0eb41dc01309173547a3c2 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Wed, 27 Jan 2021 15:41:11 +0100
Subject: [PATCH 52/57] v6.35

+ DietPi-Software | Steam: Switch to own repack of the Debian i386 Steam package to allow install on armhf arch
+ DietPi-Software | Steam: Since Bullseye, nvidia-driver-libs-i386 has been removed but nvidia-driver-libs is multiarch, hence nvidia-driver-libs:i386 can be installed instead which matches the changed package suggestions. The same can be done on older distros as nvidia-driver-libs-i386 is a meta package to pull nvidia-driver-libs:i386 only and the preinst check, introduced with Buster, prints a related info based on nvidia-driver-libs:i386 install, not on nvidia-driver-libs-i386 install, if an Nvidia GPU is detected. As well the Nvidia driver detection is changed to match the one from the preinst script which checks the kernel module directly instead of depending on an actual DEB package install.
---
 dietpi/dietpi-software | 54 ++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 3b1c9b94bc..ce150ee4a3 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1136,14 +1136,14 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		software_id=156
 
 		aSOFTWARE_NAME[$software_id]='Steam'
-		aSOFTWARE_DESC[$software_id]='client'
+		aSOFTWARE_DESC[$software_id]='Valve gaming platform client'
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 		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
-		# Native PC and ARMv7 only
+		# x86_64 and ARMv7 only
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
 		#------------------
@@ -6077,22 +6077,26 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			Banner_Installing
 
-			# x86_64: Add Nvidia i386 driver libs, if Nvidia driver is installed
-			if [[ $G_HW_ARCH == 10 ]] && dpkg-query -s nvidia-driver &> /dev/null
+			# Allow non-interactive install
+			G_EXEC eval "debconf-set-selections <<< 'steam steam/question select I AGREE'"
+
+			# x86_64: Install Debian i386 package
+			if [[ $G_HW_ARCH == 10 ]]
 			then
+				# Add i386 arch: https://packages.debian.org/bullseye/steam
 				[[ $(dpkg --print-foreign-architectures) == *'i386'* ]] || { G_EXEC dpkg --add-architecture i386; G_AGUP; }
-				DEPS_LIST='nvidia-driver-libs-i386'
+				# Add Nvidia i386 driver libs, if Nvidia driver is detected
+				local nvidia
+				[[ -e '/sys/module/nvidia/version' ]] && nvidia='nvidia-driver-libs:i386'
+				G_AGI steam $nvidia
 
-			# ARM: Avoid auto-install of i386 dependencies when starting Steam
+			# ARM: Install repacked Debian i386 package for armhf
 			elif [[ $G_HW_ARCH == 2 ]]
 			then
 				DEPS_LIST='libappindicator1 libtcmalloc-minimal4'
-				G_EXEC eval "echo -e 'path-exclude /usr/bin/steamdeps\npath-exclude /usr/lib/steam/bin_steamdeps.py' > /etc/dpkg/dpkg.cfg.d/98-dietpi-steam"
-				G_EXEC eval "echo -e '#!/bin/dash\nexit 0' > /usr/bin/steamdeps"
+				Download_Install "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/steam_$G_HW_ARCH_NAME.deb"
 			fi
 
-			Download_Install 'https://repo.steampowered.com/steam/archive/precise/steam_latest.deb'
-
 		fi
 
 		software_id=158 # MinIO
@@ -12434,22 +12438,8 @@ _EOF_
 			fi
 			G_EXEC ln -s /mnt/dietpi_userdata/steam /root/.steam
 
-			if [[ $G_HW_ARCH == 2 ]]
-			then
-				# Add Steam desktop shortcut
-				cat << '_EOF_' > /usr/share/applications/steam.desktop
-[Desktop Entry]
-Name=Steam
-Exec=env STEAMOS=1 STEAM_RUNTIME=1 /usr/bin/steam +open steam://open/minigameslist %U
-Icon=steam
-Terminal=false
-Type=Application
-Categories=Network;FileTransfer;Game;
-MimeType=x-scheme-handler/steam;
-_EOF_
-				G_EXEC ln -s /usr/share/applications/steam.desktop /root/Desktop/steam.desktop
-				[[ -d '/home/dietpi/Desktop' ]] && G_EXEC ln -s /usr/share/applications/steam.desktop /home/dietpi/Desktop/steam.desktop
-			fi
+			# Add Steam desktop shortcut
+			G_EXEC ln -s /usr/share/applications/steam.desktop /root/Desktop/steam.desktop
 
 		fi
 
@@ -14120,9 +14110,8 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 ))
 		then
 			Banner_Uninstalling
-			G_AGP steam-launcher steam
-			[[ -f '/etc/dpkg/dpkg.cfg.d/98-dietpi-steam' ]] && rm -v /etc/dpkg/dpkg.cfg.d/98-dietpi-steam
-			rm -Rf /{root,home/*}/{.steam,.local/share/Steam,Desktop/steam.desktop} /mnt/dietpi_userdata/steam
+			G_AGP steam
+			rm -Rf /{root,home/*}/{.steam,Desktop/steam.desktop} /mnt/dietpi_userdata/steam
 		fi
 
 		software_id=119 # CAVA
@@ -16580,10 +16569,9 @@ _EOF_
 			fi
 
 			# Box86 warning
-			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2)); then
-
-				G_WHIP_MSG 'Warning: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
-
+			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ))
+			then
+				G_WHIP_MSG 'WARNING: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
 			fi
 
 			# dietpi-config can be used to install/configure the following software. Ask user.

From 7614c7666f5511d372ee58a23726b616ca20ea2e Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Wed, 27 Jan 2021 15:45:28 +0100
Subject: [PATCH 53/57] v6.35

+ DietPi-Software | Box86: Reload binfmt on all ARM systems rather than RPi only.
---
 dietpi/dietpi-software | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index ce150ee4a3..9912b4ad69 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6434,7 +6434,8 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC strip --remove-section=.comment --remove-section=.note box86
 			G_EXEC make install
 
-			(( $G_HW_MODEL < 10 )) && G_EXEC systemctl restart systemd-binfmt
+			# Reload binfmt to have i386 binaries executed via box86 automatically from now on
+			(( $G_HW_ARCH < 10 )) && G_EXEC systemctl restart systemd-binfmt
 		fi
 
 		software_id=27 # TasmoAdmin

From 1fee7e41f208527f10a77858be7defe23728596e Mon Sep 17 00:00:00 2001
From: ravenclaw900 <50060110+ravenclaw900@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:24:26 -0600
Subject: [PATCH 54/57] v6.35 Fix typo

---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 9912b4ad69..abe64f2f75 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -16572,7 +16572,7 @@ _EOF_
 			# Box86 warning
 			if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 ))
 			then
-				G_WHIP_MSG 'WARNING: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibally issues.'
+				G_WHIP_MSG 'WARNING: The piece of software you are about to install is meant for the x86 platform.\n\nBox86 will be used to run it on ARM, however there may be performance and compatibility issues.'
 			fi
 
 			# dietpi-config can be used to install/configure the following software. Ask user.

From 12d85d05fa183c1196db6787d59194ba7eae4e78 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sun, 31 Jan 2021 19:02:32 +0100
Subject: [PATCH 55/57] v6.35

+ DietPi-Software | Steam: Do not override existing desktop entry, but force re-creation of broken symlinks
---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index abe64f2f75..1d7d1cc9b3 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12440,7 +12440,7 @@ _EOF_
 			G_EXEC ln -s /mnt/dietpi_userdata/steam /root/.steam
 
 			# Add Steam desktop shortcut
-			G_EXEC ln -s /usr/share/applications/steam.desktop /root/Desktop/steam.desktop
+			[[ -f '/root/Desktop/steam.desktop' ]] || G_EXEC ln -sf /usr/share/applications/steam.desktop /root/Desktop/steam.desktop
 
 		fi
 

From c07c2e15816226d939d3e6bdeeb942c20405e568 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 1 Feb 2021 14:14:03 +0100
Subject: [PATCH 56/57] v6.35

+ DietPi-Software | Box86: Do not force a reinstall if pulled in as dependency, since compiling can take quite long and all dependency specific configurations are done at the dependency-side, e.g. environment variables for Steam applied within the Steam launcher.
---
 dietpi/dietpi-software | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 1d7d1cc9b3..f58b98950c 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -2449,10 +2449,11 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 
 		fi
 
-		# Software that requires Box86 on ARM
+		# Software that requires Box86 on ARM: Do not reinstall Box86 if present already!
 		# - Steam (156)
 		software_id=62
-		if (( ${aSOFTWARE_INSTALL_STATE[156]} == 1 && $G_HW_ARCH == 2 )); then
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} < 2 && $G_HW_ARCH == 2 &&
+			${aSOFTWARE_INSTALL_STATE[156]} == 1 )); then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"

From d4dbadd518461df9efae19b5ddba9cb0b9f259a2 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 1 Feb 2021 23:16:15 +0100
Subject: [PATCH 57/57] v6.35

+ DietPi-Software | Steam: Remove ARM dependencies from install code since it is now added to the package itself
+ DietPi-Software | Steam: Remove leftover symlinks on uninstall
---
 dietpi/dietpi-software | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index f58b98950c..ad45054b5d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6094,7 +6094,6 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			# ARM: Install repacked Debian i386 package for armhf
 			elif [[ $G_HW_ARCH == 2 ]]
 			then
-				DEPS_LIST='libappindicator1 libtcmalloc-minimal4'
 				Download_Install "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/steam_$G_HW_ARCH_NAME.deb"
 			fi
 
@@ -14113,17 +14112,15 @@ _EOF_
 		then
 			Banner_Uninstalling
 			G_AGP steam
-			rm -Rf /{root,home/*}/{.steam,Desktop/steam.desktop} /mnt/dietpi_userdata/steam
+			rm -Rf /{root,home/*}/{.steam{,path,pid},Desktop/steam.desktop} /mnt/dietpi_userdata/steam
 		fi
 
 		software_id=119 # CAVA
-		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
-
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 ))
+		then
 			Banner_Uninstalling
 			G_AGP cava
-			rm -Rf /{root,home/*}/.config/cava
-			rm -f /{root,home/*}/cava.psf
-
+			rm -Rf /{root,home/*}/{.config/cava,cava.psf}
 		fi
 
 		software_id=118 # Mopidy