diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index 2803d2b0b7..8228d91fc7 100755
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -742,12 +742,19 @@ shopt -s extglob
 		aSOFTWARE_NAME9_9[i]=${aSOFTWARE_NAME9_8[i]}
 		aSOFTWARE_NAME9_10[i]=${aSOFTWARE_NAME9_9[i]}
 	done
+	unset -v 'aSOFTWARE_NAME9_10[3]' # MC
+	unset -v 'aSOFTWARE_NAME9_10[4]' # ViFM
 	unset -v 'aSOFTWARE_NAME9_10[10]' # iftop
 	unset -v 'aSOFTWARE_NAME9_10[11]' # IPTraf
 	unset -v 'aSOFTWARE_NAME9_10[12]' # Iperf
 	unset -v 'aSOFTWARE_NAME9_10[13]' # MTR-Tiny
 	unset -v 'aSOFTWARE_NAME9_10[14]' # nLoad
 	unset -v 'aSOFTWARE_NAME9_10[15]' # tcpdump
+	unset -v 'aSOFTWARE_NAME9_10[18]' # Emacs
+	unset -v 'aSOFTWARE_NAME9_10[19]' # Jed
+	unset -v 'aSOFTWARE_NAME9_10[20]' # Vim
+	unset -v 'aSOFTWARE_NAME9_10[21]' # Vim-Tiny
+	unset -v 'aSOFTWARE_NAME9_10[127]' # NeoVim
 
 	# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
 	for i in "${aSOFTWARE_NAME9_10[@]}"
diff --git a/.update/patches b/.update/patches
index 9e66330d27..1b011de5ef 100755
--- a/.update/patches
+++ b/.update/patches
@@ -2093,7 +2093,7 @@ Patch_9_10()
 		fi
 
 		# Remove obsolete install states: https://github.com/MichaIng/DietPi/pull/7351
-		for i in {10..15}
+		for i in 3 4 {10..15} {18..21} 127
 		do
 			grep -q "^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[$i\]=" /boot/dietpi/.installed && G_EXEC sed --follow-symlinks -i "/^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[$i\]=/d" /boot/dietpi/.installed
 		done
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 910f50c715..49f6fdaed5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,7 +9,7 @@ Enhancements:
 - DietPi-Software | myMPD: We enabled the software option for ARMv6 Bookworm systems, since packages for Raspbian Bookworm are now available. Many thanks to @hackslikeus for bringing up the topic: https://github.com/MichaIng/DietPi/issues/7345
 
 Removed software:
-- DietPi-Software | A number of software options have been removed, which were installed just as single APT package, without any configuration or dependant. Running `dietpi-software` for such is overkill, as one can just use the native Debian package manager directly, like "apt install tcpdump". Affected software titles: iftop, IPTraf, Iperf, MTR-Tiny, nLoad, tcpdump
+- DietPi-Software | A number of software options have been removed from our menus, which were installed just as single APT package, without any configuration or dependant. Running dietpi-software for such is overkill, as one can just use the native Debian package manager directly, like "apt install tcpdump". Affected packages: mc, vifm, iftop, iptraf, iperf, mtr-tiny, nload, tcpdump, emacs, jed, vim, vim-tiny, neovim. Note: They won't be removed from your system, and they are upgraded as usual via "apt upgrade" or DietPi updates. The only difference is that you cannot install or uninstall them via dietpi-software anymore, but instead via APT directly.
 
 Bug fixes:
 - Orange Pi 5 Max | Resolved an issue where onboard WiFi was not working. Many thanks to @diego-hsp for reporting this issue: https://github.com/MichaIng/DietPi/issues/7338
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 5395f7034a..bfc0bcd8cb 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -229,12 +229,10 @@ Available commands:
 			'●─ Distributed Projects ' #19
 			'●─ SSH Clients ' #20
 			'●─ File Server Clients ' #21
-			'●─ File Managers ' #22
-			'●─ System ' #23
-			'●─ Databases & Data Stores ' #24
-			'●─ Development & Programming ' #25
-			'●─ Text Editors ' #26
-			'●─ Desktop Utilities ' #27
+			'●─ System ' #22
+			'●─ Databases & Data Stores ' #23
+			'●─ Development & Programming ' #24
+			'●─ Desktop Utilities ' #25
 		)
 
 		#--------------------------------------------------------------------------------
@@ -1514,7 +1512,7 @@ Available commands:
 		software_id=152
 		aSOFTWARE_NAME[$software_id]='Avahi-Daemon'
 		aSOFTWARE_DESC[$software_id]='Hostname broadcast via mDNS (Zeroconf, Bonjour)'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=16
 		#------------------
 		software_id=171
 		aSOFTWARE_NAME[$software_id]='frp'
@@ -1648,77 +1646,65 @@ Available commands:
 		aSOFTWARE_CATX[$software_id]=21
 		aSOFTWARE_DOCS[$software_id]=' dietpi-drive_manager > Add network drive'
 
-		# File Managers
-		#--------------------------------------------------------------------------------
-		software_id=3
-		aSOFTWARE_NAME[$software_id]='MC'
-		aSOFTWARE_DESC[$software_id]='Midnight Commander - a powerful file manager'
-		aSOFTWARE_CATX[$software_id]=22
-		#------------------
-		software_id=4
-		aSOFTWARE_NAME[$software_id]='ViFM'
-		aSOFTWARE_DESC[$software_id]='file manager with vi bindings'
-		aSOFTWARE_CATX[$software_id]=22
-
 		# System
 		#--------------------------------------------------------------------------------
 		software_id=5
 		aSOFTWARE_NAME[$software_id]='ALSA'
 		aSOFTWARE_DESC[$software_id]='Advanced Linux Sound Architecture'
-		aSOFTWARE_CATX[$software_id]=23
+		aSOFTWARE_CATX[$software_id]=22
 		#------------------
 		software_id=7
 		aSOFTWARE_NAME[$software_id]='FFmpeg'
 		aSOFTWARE_DESC[$software_id]='Audio & video codec libary and programs'
-		aSOFTWARE_CATX[$software_id]=23
+		aSOFTWARE_CATX[$software_id]=22
 		#------------------
 		software_id=6
 		aSOFTWARE_NAME[$software_id]='X.Org X Server'
 		aSOFTWARE_DESC[$software_id]='aka X11 - X Window System implementation'
-		aSOFTWARE_CATX[$software_id]=23
+		aSOFTWARE_CATX[$software_id]=22
 		#------------------
 		software_id=170
 		aSOFTWARE_NAME[$software_id]='UnRAR'
 		aSOFTWARE_DESC[$software_id]='unarchiver for .rar files'
-		aSOFTWARE_CATX[$software_id]=23
+		aSOFTWARE_CATX[$software_id]=22
 
 		# Databases & Data Stores
 		#--------------------------------------------------------------------------------
 		software_id=87
 		aSOFTWARE_NAME[$software_id]='SQLite'
 		aSOFTWARE_DESC[$software_id]='Persistent single-file database system'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#sqlite'
 		#------------------
 		software_id=88
 		aSOFTWARE_NAME[$software_id]='MariaDB'
 		aSOFTWARE_DESC[$software_id]='Persistent cached file-per-table database server'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#mariadb'
 		#------------------
 		software_id=90
 		aSOFTWARE_NAME[$software_id]='phpMyAdmin'
 		aSOFTWARE_DESC[$software_id]='Optional MariaDB web interface admin tools'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#phpmyadmin'
 		aSOFTWARE_DEPS[$software_id]='88 89 webserver'
 		#------------------
 		software_id=91
 		aSOFTWARE_NAME[$software_id]='Redis'
 		aSOFTWARE_DESC[$software_id]='Volatile in-memory non-SQL database server'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#redis'
 		#------------------
 		software_id=74
 		aSOFTWARE_NAME[$software_id]='InfluxDB'
 		aSOFTWARE_DESC[$software_id]='Persistent time-series database server'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#influxdb'
 		#------------------
 		software_id=194
 		aSOFTWARE_NAME[$software_id]='PostgreSQL'
 		aSOFTWARE_DESC[$software_id]='Persistent advanced object-relational database server'
-		aSOFTWARE_CATX[$software_id]=24
+		aSOFTWARE_CATX[$software_id]=23
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/databases/#postgresql'
 
 		# Development & Programming
@@ -1726,18 +1712,18 @@ Available commands:
 		software_id=17
 		aSOFTWARE_NAME[$software_id]='Git'
 		aSOFTWARE_DESC[$software_id]='Clone and manage Git repositories locally'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		#------------------
 		software_id=130
 		aSOFTWARE_NAME[$software_id]='Python 3'
 		aSOFTWARE_DESC[$software_id]='Runtime system, pip package installer and development headers'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#python-3'
 		#------------------
 		software_id=189
 		aSOFTWARE_NAME[$software_id]='VSCodium'
 		aSOFTWARE_DESC[$software_id]='FLOSS version of MS VSCode'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#vscodium'
 		aSOFTWARE_DEPS[$software_id]='5 6 17'
 		# - RISC-V: https://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/dists/vscodium/Release
@@ -1746,14 +1732,14 @@ Available commands:
 		software_id=188
 		aSOFTWARE_NAME[$software_id]='Go'
 		aSOFTWARE_DESC[$software_id]='Runtime environment and package installer'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#go'
 		aSOFTWARE_DEPS[$software_id]='17'
 		#------------------
 		software_id=8
 		aSOFTWARE_NAME[$software_id]='Java JDK'
 		aSOFTWARE_DESC[$software_id]='OpenJDK Development Kit'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#java'
 		aSOFTWARE_DEPS[$software_id]='196'
 		# - ARMv6: No functional Java available
@@ -1762,7 +1748,7 @@ Available commands:
 		software_id=196
 		aSOFTWARE_NAME[$software_id]='Java JRE'
 		aSOFTWARE_DESC[$software_id]='OpenJDK Runtime Environment'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#java'
 		# - ARMv6: No functional Java available
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
@@ -1770,13 +1756,13 @@ Available commands:
 		software_id=9
 		aSOFTWARE_NAME[$software_id]='Node.js'
 		aSOFTWARE_DESC[$software_id]='JavaScript runtime environment'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/webserver_stack/#nodejs'
 		#------------------
 		software_id=150
 		aSOFTWARE_NAME[$software_id]='Mono'
 		aSOFTWARE_DESC[$software_id]='Runtime libraries and repository'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/programming/#mono'
 		# - RISC-V: https://download.mono-project.com/repo/debian/dists/buster/main/, https://packages.debian.org/trixie/mono-runtime
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
@@ -1784,50 +1770,23 @@ Available commands:
 		software_id=34
 		aSOFTWARE_NAME[$software_id]='PHP Composer'
 		aSOFTWARE_DESC[$software_id]='Package manager for PHP'
-		aSOFTWARE_CATX[$software_id]=25
+		aSOFTWARE_CATX[$software_id]=24
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/webserver_stack/#php-composer'
 		aSOFTWARE_DEPS[$software_id]='89'
 
-		# Text Editors
-		#--------------------------------------------------------------------------------
-		software_id=18
-		aSOFTWARE_NAME[$software_id]='Emacs'
-		aSOFTWARE_DESC[$software_id]='GNU Emacs editor'
-		aSOFTWARE_CATX[$software_id]=26
-		#------------------
-		software_id=19
-		aSOFTWARE_NAME[$software_id]='Jed'
-		aSOFTWARE_DESC[$software_id]='editor for programmers'
-		aSOFTWARE_CATX[$software_id]=26
-		#------------------
-		software_id=20
-		aSOFTWARE_NAME[$software_id]='Vim'
-		aSOFTWARE_DESC[$software_id]='vi enhanced text editor'
-		aSOFTWARE_CATX[$software_id]=26
-		#------------------
-		software_id=21
-		aSOFTWARE_NAME[$software_id]='Vim-Tiny'
-		aSOFTWARE_DESC[$software_id]='compact release of vim'
-		aSOFTWARE_CATX[$software_id]=26
-		#------------------
-		software_id=127
-		aSOFTWARE_NAME[$software_id]='Neovim'
-		aSOFTWARE_DESC[$software_id]='heavily refactored vim fork'
-		aSOFTWARE_CATX[$software_id]=26
-
 		# Desktop Utilities
 		#--------------------------------------------------------------------------------
 		software_id=22
 		aSOFTWARE_NAME[$software_id]='QuiteRSS'
 		aSOFTWARE_DESC[$software_id]='cross-platform, free rss reader'
-		aSOFTWARE_CATX[$software_id]=27
+		aSOFTWARE_CATX[$software_id]=25
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/desktop/#quiterss'
 		aSOFTWARE_DEPS[$software_id]='6'
 		#------------------
 		software_id=113
 		aSOFTWARE_NAME[$software_id]='Chromium'
 		aSOFTWARE_DESC[$software_id]='web browser for desktop or autostart'
-		aSOFTWARE_CATX[$software_id]=27
+		aSOFTWARE_CATX[$software_id]=25
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/desktop/#chromium'
 		aSOFTWARE_DEPS[$software_id]='5 6'
 		# - ARMv6: https://github.com/RPi-Distro/chromium-browser/issues/21
@@ -1838,7 +1797,7 @@ Available commands:
 		software_id=67
 		aSOFTWARE_NAME[$software_id]='Firefox'
 		aSOFTWARE_DESC[$software_id]='web browser for desktop'
-		aSOFTWARE_CATX[$software_id]=27
+		aSOFTWARE_CATX[$software_id]=25
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/desktop/#firefox'
 		aSOFTWARE_DEPS[$software_id]='5 6'
 		# - ARMv6: https://github.com/RPi-Distro/chromium-browser/issues/21#issuecomment-997044303
@@ -1847,14 +1806,14 @@ Available commands:
 		software_id=174
 		aSOFTWARE_NAME[$software_id]='GIMP'
 		aSOFTWARE_DESC[$software_id]='mspaint on steroids'
-		aSOFTWARE_CATX[$software_id]=27
+		aSOFTWARE_CATX[$software_id]=25
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/desktop/#gimp'
 		aSOFTWARE_DEPS[$software_id]='6'
 		#------------------
  		software_id=175
  		aSOFTWARE_NAME[$software_id]='Xfce Power Manager'
  		aSOFTWARE_DESC[$software_id]='with brightness control, recommended for LXDE/LXQt'
- 		aSOFTWARE_CATX[$software_id]=27
+ 		aSOFTWARE_CATX[$software_id]=25
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/desktop/#xfce-power-manager'
  		aSOFTWARE_DEPS[$software_id]='6'
 
@@ -2715,41 +2674,6 @@ _EOF_
 			G_AGI git
 		fi
 
-		if To_Install 4 # Vifm
-		then
-			G_AGI vifm
-		fi
-
-		if To_Install 20 # Vim
-		then
-			G_AGI vim
-		fi
-
-		if To_Install 21 # Vim-Tiny
-		then
-			G_AGI vim-tiny
-		fi
-
-		if To_Install 127 # Neovim
-		then
-			G_AGI neovim
-		fi
-
-		if To_Install 18 # Emacs
-		then
-			G_AGI emacs
-		fi
-
-		if To_Install 3 # Midnight Commander
-		then
-			G_AGI mc
-		fi
-
-		if To_Install 19
-		then
-			G_AGI jed
-		fi
-
 		if To_Install 0 # OpenSSH Client
 		then
 			G_AGI openssh-client
@@ -13951,36 +13875,6 @@ _EOF_
 			[[ -d '/mnt/dietpi_userdata/jellyfin' ]] && G_EXEC rm -R /mnt/dietpi_userdata/jellyfin
 		fi
 
-		if To_Uninstall 19
-		then
-			G_AGP jed
-		fi
-
-		if To_Uninstall 3 # Midnight Commander
-		then
-			G_AGP mc
-		fi
-
-		if To_Uninstall 18 # Emacs
-		then
-			G_AGP emacs
-		fi
-
-		if To_Uninstall 20 # Vim
-		then
-			G_AGP vim
-		fi
-
-		if To_Uninstall 21 # Vim-Tiny
-		then
-			G_AGP vim-tiny
-		fi
-
-		if To_Uninstall 127 # Neovim
-		then
-			G_AGP neovim
-		fi
-
 		if To_Uninstall 0 # OpenSSH Client
 		then
 			# The OpenSSH server depends on the OpenSSH client, hence only mark it for autoremoval only.
@@ -14190,11 +14084,6 @@ _EOF_
 			[[ -f '/root/.config/configstore/update-notifier-npm.json' ]] && G_EXEC rm /root/.config/configstore/update-notifier-npm.json
 		fi
 
-		if To_Uninstall 4
-		then
-			G_AGP vifm
-		fi
-
 		if To_Uninstall 170 # UnRAR
 		then
 			G_AGP unrar