diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index e1a335bf41..39a597d034 100755
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -205,7 +205,8 @@ shopt -s extglob
 	)
 
 	# Convert software index to title array
-	aSOFTWARE_NAME=(
+	# - Start with v6.34 state
+	aSOFTWARE_NAME6_34=(
 		[0]='OpenSSH Client'
 		[1]='Samba Client'
 		[2]='Folding@Home'
@@ -233,7 +234,7 @@ shopt -s extglob
 		[24]='MATE'
 		[25]='Xfce'
 		[26]='GNUstep'
-		[27]='TightVNC Server'
+		[27]='TasmoAdmin'
 		[28]='TigerVNC Server'
 		[29]='XRDP'
 		[30]='NoMachine'
@@ -268,7 +269,7 @@ shopt -s extglob
 		[59]='RPi Cam Web Interface'
 		[60]='WiFi Hotspot'
 		[61]='Tor Hotspot'
-		[62]='DietPi-CloudShell'
+		#[62]=''
 		[63]='LinuxDash'
 		[64]='phpSysInfo'
 		[65]='Netdata'
@@ -322,7 +323,7 @@ shopt -s extglob
 		[113]='Chromium'
 		[114]='Nextcloud'
 		[115]='Webmin'
-		[116]='SickRage'
+		[116]='Medusa'
 		[117]='PiVPN'
 		[118]='Mopidy'
 		[119]='CAVA'
@@ -340,13 +341,13 @@ shopt -s extglob
 		[131]='Blynk Server'
 		[132]='Aria2'
 		[133]='YaCy'
-		[134]='Tonido'
+		#[134]=''
 		[135]='IceCast'
 		[136]='motionEye'
-		[137]='CloudPrint'
+		#[137]=''
 		[138]='VirtualHere'
 		[139]='SABnzbd'
-		[140]='SDL2'
+		[140]='Domoticz'
 		[141]='Spotify Connect Web'
 		[142]='CouchPotato'
 		[143]='Koel'
@@ -354,7 +355,7 @@ shopt -s extglob
 		[145]='Radarr'
 		[146]='Tautulli'
 		[147]='Jackett'
-		#[148]=
+		[148]='myMPD'
 		[149]='NZBGet'
 		[150]='Mono'
 		[151]='Nvidia'
@@ -374,126 +375,26 @@ shopt -s extglob
 		[165]='Gitea'
 		[166]='PI-SPC'
 		[167]='Raspotify'
-		#[168]=
+		[168]='Nextcloud Talk'
 		[169]='Google AIY'
+		[170]='UnRAR'
+		[171]='DietPi-NordVPN'
+		[172]='WireGuard'
+		[173]='LXQt'
+		[174]='GIMP'
+		[175]='Xfce Power Manager'
+		[176]='Mycroft AI'
+		[177]='Firefox Sync Server'
+		[178]='Jellyfin'
+		[179]='Komga'
+		[180]='Bazarr'
+		[181]='PaperMC'
+		[182]='Unbound'
+		[183]='vaultwarden'
+		[184]='Tor Relay'
+		[185]='Portainer'
 	)
 
-	aSOFTWARE_NAME6_14=()
-	aSOFTWARE_NAME6_15=()
-	for i in "${!aSOFTWARE_NAME[@]}"
-	do
-		aSOFTWARE_NAME6_14[i]=${aSOFTWARE_NAME[i]}
-		aSOFTWARE_NAME6_15[i]=${aSOFTWARE_NAME6_14[i]}
-	done
-	aSOFTWARE_NAME6_15[148]='myMPD'
-
-	aSOFTWARE_NAME6_16=()
-	aSOFTWARE_NAME6_17=()
-	aSOFTWARE_NAME6_18=()
-	for i in "${!aSOFTWARE_NAME6_15[@]}"
-	do
-		aSOFTWARE_NAME6_16[i]=${aSOFTWARE_NAME6_15[i]}
-		aSOFTWARE_NAME6_17[i]=${aSOFTWARE_NAME6_16[i]}
-		aSOFTWARE_NAME6_18[i]=${aSOFTWARE_NAME6_17[i]}
-	done
-	aSOFTWARE_NAME6_18[168]='Nextcloud Talk'
-
-	aSOFTWARE_NAME6_19=()
-	aSOFTWARE_NAME6_20=()
-	for i in "${!aSOFTWARE_NAME6_18[@]}"
-	do
-		aSOFTWARE_NAME6_19[i]=${aSOFTWARE_NAME6_18[i]}
-		aSOFTWARE_NAME6_20[i]=${aSOFTWARE_NAME6_19[i]}
-	done
-	aSOFTWARE_NAME6_20[116]='Medusa'
-	aSOFTWARE_NAME6_20[170]='UnRAR'
-	aSOFTWARE_NAME6_20[171]='DietPi-NordVPN'
-	aSOFTWARE_NAME6_20[172]='WireGuard'
-
-	aSOFTWARE_NAME6_21=()
-	aSOFTWARE_NAME6_22=()
-	aSOFTWARE_NAME6_23=()
-	for i in "${!aSOFTWARE_NAME6_20[@]}"
-	do
-		aSOFTWARE_NAME6_21[i]=${aSOFTWARE_NAME6_20[i]}
-		aSOFTWARE_NAME6_22[i]=${aSOFTWARE_NAME6_21[i]}
-		aSOFTWARE_NAME6_23[i]=${aSOFTWARE_NAME6_22[i]}
-	done
-	aSOFTWARE_NAME6_23[173]='LXQt'
-	aSOFTWARE_NAME6_23[174]='GIMP'
-	aSOFTWARE_NAME6_23[175]='Xfce Power Manager'
-
-	aSOFTWARE_NAME6_24=()
-	aSOFTWARE_NAME6_25=()
-	for i in "${!aSOFTWARE_NAME6_23[@]}"
-	do
-		aSOFTWARE_NAME6_24[i]=${aSOFTWARE_NAME6_23[i]}
-		aSOFTWARE_NAME6_25[i]=${aSOFTWARE_NAME6_24[i]}
-	done
-	aSOFTWARE_NAME6_25[176]='Mycroft AI'
-
-	aSOFTWARE_NAME6_26=()
-	for i in "${!aSOFTWARE_NAME6_25[@]}"
-	do
-		aSOFTWARE_NAME6_26[i]=${aSOFTWARE_NAME6_25[i]}
-	done
-	unset -v 'aSOFTWARE_NAME6_26[27]' # TightVNC: Replaced by TigerVNC on Stretch+
-	unset -v 'aSOFTWARE_NAME6_26[140]' # SDL2: Merged into Amiberry for targeted minimal install
-
-	aSOFTWARE_NAME6_27=()
-	for i in "${!aSOFTWARE_NAME6_26[@]}"
-	do
-		aSOFTWARE_NAME6_27[i]=${aSOFTWARE_NAME6_26[i]}
-	done
-	aSOFTWARE_NAME6_27[27]='TasmoAdmin'
-
-	aSOFTWARE_NAME6_28=()
-	aSOFTWARE_NAME6_29=()
-	for i in "${!aSOFTWARE_NAME6_27[@]}"
-	do
-		aSOFTWARE_NAME6_28[i]=${aSOFTWARE_NAME6_27[i]}
-		aSOFTWARE_NAME6_29[i]=${aSOFTWARE_NAME6_28[i]}
-	done
-	aSOFTWARE_NAME6_29[140]='Domoticz'
-
-	aSOFTWARE_NAME6_30=()
-	aSOFTWARE_NAME6_31=()
-	for i in "${!aSOFTWARE_NAME6_29[@]}"
-	do
-		aSOFTWARE_NAME6_30[i]=${aSOFTWARE_NAME6_29[i]}
-		aSOFTWARE_NAME6_31[i]=${aSOFTWARE_NAME6_30[i]}
-	done
-	aSOFTWARE_NAME6_31[177]='Firefox Sync Server'
-
-	aSOFTWARE_NAME6_32=()
-	for i in "${!aSOFTWARE_NAME6_31[@]}"
-	do
-		aSOFTWARE_NAME6_32[i]=${aSOFTWARE_NAME6_31[i]}
-	done
-	aSOFTWARE_NAME6_32[178]='Jellyfin'
-	aSOFTWARE_NAME6_32[179]='Komga'
-
-	aSOFTWARE_NAME6_33=()
-	for i in "${!aSOFTWARE_NAME6_32[@]}"
-	do
-		aSOFTWARE_NAME6_33[i]=${aSOFTWARE_NAME6_32[i]}
-	done
-	aSOFTWARE_NAME6_33[180]='Bazarr'
-
-	aSOFTWARE_NAME6_34=()
-	for i in "${!aSOFTWARE_NAME6_33[@]}"
-	do
-		aSOFTWARE_NAME6_34[i]=${aSOFTWARE_NAME6_33[i]}
-	done
-	unset -v 'aSOFTWARE_NAME6_34[62]' # DietPi-CloudShell
-	unset -v 'aSOFTWARE_NAME6_34[134]' # Tonido
-	unset -v 'aSOFTWARE_NAME6_34[137]' # CloudPrint
-	aSOFTWARE_NAME6_34[181]='PaperMC'
-	aSOFTWARE_NAME6_34[182]='Unbound'
-	aSOFTWARE_NAME6_34[183]='vaultwarden'
-	aSOFTWARE_NAME6_34[184]='Tor Relay'
-	aSOFTWARE_NAME6_34[185]='Portainer'
-
 	# v6.35
 	aSOFTWARE_NAME6_35=()
 	for i in "${!aSOFTWARE_NAME6_34[@]}"
@@ -757,7 +658,7 @@ shopt -s extglob
 
 	aSOFTWARE_NAME9_11=()
 	aSOFTWARE_NAME9_12=()
-	for i in "${!aSOFTWARE_NAME9_11[@]}"
+	for i in "${!aSOFTWARE_NAME9_10[@]}"
 	do
 		aSOFTWARE_NAME9_11[i]=${aSOFTWARE_NAME9_10[i]}
 		aSOFTWARE_NAME9_12[i]=${aSOFTWARE_NAME9_11[i]}