cleanup category files and add missing deprecated app removal

etc/categories

@@ -5,7 +5,6 @@ Amiberry|Games
 AndroidBuddy|Tools
 Angry IP scanner|Internet
 AntiMicroX|Tools
-AnyDesk|Internet
 Arduino|Programming
 AstroMenace|Games
 Audacious|Multimedia
@@ -30,7 +29,6 @@ Celeste64|Games
 Celeste Classic|Games
 Chiaki|Games
 Chromium|Internet/Browsers
-Chromium Widevine|hidden
 ckb-next|Tools
 Clam Antivirus|System Management
 CloudBuddy|Internet
@@ -54,19 +52,15 @@ Drawing|Creative Arts
 Ducopanel|Tools
 Eagle CAD|Engineering
 Easy Effects|Multimedia
-eDEX-UI|hidden
 Electron Fiddle|Programming
 Epiphany|Internet/Browsers
-ExaGear|Tools/Emulation
-Falkon|Internet/Browsers
 Fastfetch|System Management
 FF Multi Converter|Tools
 Filezilla|Internet
 Firefox Rapid Release|Internet/Browsers
 Flameshot|Tools
 Floorp|Internet/Browsers
 Flow|Internet/Browsers
-FreeCAD|Engineering
 FreeTube|Multimedia
 Friday Night Funkin' Rewritten|Games
 Fritzing|Engineering
@@ -105,19 +99,15 @@ LibrePCB|Engineering
 LibreWolf|Internet/Browsers
 Lightpad|Appearance
 LineRider|Games
-LinuxCNC|Engineering
 Linux Wifi Hotspot|Tools
 LMMS|Multimedia
 Lokinet|hidden
-Mac OS Theme|Appearance
 Marathon|Games
 MatterControl|Engineering
 Microsoft PowerShell|Terminals
 Microsoft Teams|Internet/Communication
 Minecraft Bedrock|Games
 Minecraft Java GDLauncher|Games
-Minecraft Java Lunar|hidden
-Minecraft Java MultiMC5|hidden
 Minecraft Java Prism Launcher|Games
 Minecraft Java Server|Games
 Minecraft Pi (Modded)|Games
@@ -127,7 +117,6 @@ Monero GUI|Tools
 More RAM|Tools
 Mullvad|Internet/Browsers
 Mu|Programming
-MuseScore2|hidden
 MuseScore|Multimedia
 Nautilus|Tools
 Nemo|Tools
@@ -143,14 +132,11 @@ Oomox Theme Designer|Appearance
 OpenSCAD|Engineering
 Open-Typer|Office
 Pac-Man|Games
-Pale Moon|hidden
 PeaZip|Tools
 Persepolis Download Manager|Internet
 Pi-Apps Terminal Plugin (bash)|Tools
 PiGro|Tools
 Pika Backup|System Management
-PiKISS GUI|hidden
-piKiss|hidden
 Pinta|Creative Arts
 Pi Power Tools|System Management
 PiSafe|Tools
@@ -166,7 +152,6 @@ PyChess|Games
 QEMU|Tools/Emulation
 QR Code Reader|Tools
 Quartz|Internet/Browsers
-Raspi2png|Tools
 Reaper|Multimedia
 Remarkable|Programming
 Renoise (Demo)|Multimedia
@@ -198,7 +183,6 @@ Syncthing|System Management
 SysMonTask|System Management
 System Monitoring Center|System Management
 Tabby|Terminals
-TBOPlayer|Multimedia
 TeamViewer|Internet
 Telegram|Internet/Communication
 template|hidden
@@ -227,7 +211,6 @@ Web Apps|Internet
 Webcord|Internet/Communication
 Wechat|Internet/Communication
 WhatsApp|Internet/Communication
-Windows 10 Theme|Appearance
 Windows Flasher|Tools
 Windows Screensavers|Appearance
 Wine (x64)|Tools/Emulation

etc/category-overrides-jetson-18.04

@@ -23,7 +23,6 @@ Godot|hidden
 Kodi|hidden
 LibreWolf|hidden
 Lightpad|hidden
-Mac OS Theme|hidden
 Minecraft Pi (Modded)|hidden
 More RAM|hidden
 MuseScore|hidden
@@ -32,8 +31,6 @@ Oomox Theme Designer|hidden
 OpenSCAD|hidden
 Open-Typer|hidden
 PiGro|hidden
-PiKISS GUI|hidden
-piKiss|hidden
 Pi Power Tools|hidden
 PPSSPP (PSP emulator)|hidden
 QEMU|hidden
@@ -47,7 +44,6 @@ Sublime Text|hidden
 Tetris CLI|hidden
 Tor|hidden
 Vivaldi|hidden
-Windows 10 Theme|hidden
 Windows Flasher|hidden
 Windows Screensavers|hidden
 YouTubuddy|hidden

etc/category-overrides-jetson-generic

@@ -11,18 +11,14 @@ Gnome Software|Tools
 Godot|hidden
 Kodi|hidden
 Lightpad|hidden
-Mac OS Theme|hidden
 Minecraft Pi (Modded)|hidden
 More RAM|hidden
 Oomox Theme Designer|hidden
 PiGro|hidden
-PiKISS GUI|hidden
-piKiss|hidden
 Pi Power Tools|hidden
 QEMU|hidden
 Snap Store|hidden
 Steam|hidden
 Stunt Rally|hidden
-Windows 10 Theme|hidden
 Windows Flasher|hidden
 Windows Screensavers|hidden

etc/category-overrides-non-raspberry

@@ -4,11 +4,7 @@ Downgrade Chromium|hidden
 Flow|hidden
 Gnome Software|Tools
 Lightpad|hidden
-Mac OS Theme|hidden
 PiGro|hidden
-PiKISS GUI|hidden
-piKiss|hidden
 Pi Power Tools|hidden
-Windows 10 Theme|hidden
 Windows Flasher|hidden
 Windows Screensavers|hidden

etc/runonce-entries

@@ -72,6 +72,7 @@ You can install Steam from Pi-Apps on a 64bit OS."
   remove_deprecated_app "Cawbird"
   remove_deprecated_app "Email Checker"
   remove_deprecated_app "Pi-Apps Terminal Plugin (python)"
+  remove_deprecated_app "Pi-Apps Terminal Plugin"
   remove_deprecated_app "Sysmon"
   remove_deprecated_app "BlockPi"
   remove_deprecated_app "TBOPlayer"
@@ -93,12 +94,20 @@ You can install the Snap Store from Pi-Apps on a 64bit OS."
   remove_deprecated_app "BalenaEtcher" "32" "The latest version of BalenaEtcher relies on libraries that are not available on ARM 32bit Linux.
 You can install BalenaEtcher from Pi-Apps on a 64bit OS."
   remove_deprecated_app "Puffin" "" "The Puffin browser demo was never maintained by the upstream developers. It can not run on newer raspberry pi hardware, newer PiOS versions, and any other hardware. We have no choice but to remove this application from Pi-Apps."
+  remove_deprecated_app "Puffin Browser Demo" "" "The Puffin browser demo was never maintained by the upstream developers. It can not run on newer raspberry pi hardware, newer PiOS versions, and any other hardware. We have no choice but to remove this application from Pi-Apps."
+  remove_deprecated_app "ExaGear"
+  remove_deprecated_app "Mac OS Theme"
+  remove_deprecated_app "Windows 10 Theme"
+  remove_deprecated_app "MuseScore2"
+  remove_deprecated_app "Pale Moon Browser"
+  remove_deprecated_app "Pale Moon"
   true
 EOF
   ;;
 esac
 
-#remove old apps and migrate chromium downgrading apps to the new "Downgrade Chromium" app
+#migrate renamed apps
+#future app renames should follow the standard set by renaming 'Geekbench' to 'Geekbench 5'
 runonce <<"EOF"
   #rework chromium downgrading apps to one single new app: 'Downgrade Chromium'
   rm -rf "${DIRECTORY}/apps/Back to Chromium v86"
@@ -111,10 +120,6 @@ runonce <<"EOF"
   rm -rf "${DIRECTORY}/apps/Turbo Scratch"
   mv -f "${DIRECTORY}/data/status/Turbo Scratch" "${DIRECTORY}/data/status/Turbowarp" 2>/dev/null
   
-  #rename 'Pi-Apps Terminal Plugin' app to 'Pi-Apps Terminal Plugin (python)'
-  rm -rf "${DIRECTORY}/apps/Pi-Apps Terminal Plugin"
-  mv -f "${DIRECTORY}/data/status/Pi-Apps Terminal Plugin" "${DIRECTORY}/data/status/Pi-Apps Terminal Plugin (python)" 2>/dev/null
-  
   #rename 'Whatsapp' app to 'WhatsApp'
   rm -rf "${DIRECTORY}/apps/Whatsapp"
   mv -f "${DIRECTORY}/data/status/Whatsapp" "${DIRECTORY}/data/status/WhatsApp" 2>/dev/null
@@ -123,19 +128,10 @@ runonce <<"EOF"
   rm -rf "${DIRECTORY}/apps/Sonic Pi 3.2"
   mv -f "${DIRECTORY}/data/status/Sonic Pi 3.2" "${DIRECTORY}/data/status/Sonic Pi" 2>/dev/null
   
-  
   #rename 'Min Browser' to 'Min'
   rm -rf "${DIRECTORY}/apps/Min Browser"
   mv -f "${DIRECTORY}/data/status/Min Browser" "${DIRECTORY}/data/status/Min" 2>/dev/null
   
-  #rename 'Pale Moon Browser' to 'Pale Moon'
-  rm -rf "${DIRECTORY}/apps/Pale Moon Browser"
-  mv -f "${DIRECTORY}/data/status/Pale Moon Browser" "${DIRECTORY}/data/status/Pale Moon" 2>/dev/null
-  
-  #rename 'Puffin Browser Demo' to 'Puffin'
-  rm -rf "${DIRECTORY}/apps/Puffin Browser Demo"
-  mv -f "${DIRECTORY}/data/status/Puffin Browser Demo" "${DIRECTORY}/data/status/Puffin" 2>/dev/null
-  
   #rename 'Quartz Browser' to 'Quartz'
   rm -rf "${DIRECTORY}/apps/Quartz Browser"
   mv -f "${DIRECTORY}/data/status/Quartz Browser" "${DIRECTORY}/data/status/Quartz" 2>/dev/null