diff --git a/apps/Snapdrop/credits b/apps/Snapdrop/credits
index 556a64fcbc..3460872914 100644
--- a/apps/Snapdrop/credits
+++ b/apps/Snapdrop/credits
@@ -1 +1 @@
-@ryanfortner (GitHub)
+theofficialgman
diff --git a/apps/Snapdrop/description b/apps/Snapdrop/description
index 3fe1a5bdd5..aee86c4987 100644
--- a/apps/Snapdrop/description
+++ b/apps/Snapdrop/description
@@ -1,5 +1,4 @@
 Share files with nearby devices on the local network. Inspired by Apple's Airdrop.
 To run: Menu -> Internet -> Snapdrop
-To run in a terminal: /opt/snapdrop/Snapdrop
 To use: Open a web browser on the other computer/smartphone and go to snapdrop.net
 Now drag and drop files to the website, and the other device will see the files and download them.
diff --git a/apps/Snapdrop/install b/apps/Snapdrop/install
new file mode 100755
index 0000000000..1cb40e2fac
--- /dev/null
+++ b/apps/Snapdrop/install
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+"${DIRECTORY}/manage" install-if-not-installed 'Chromium' || error "Chromium is required but it failed to install!"
+
+sudo mkdir -p /usr/local/bin /usr/local/share/applications /usr/local/share/icons/hicolor/64x64/apps/ /usr/local/share/icons/hicolor/24x24/apps/ || error "Could not create required directories!"
+echo "Creating launcher and menu button..."
+echo '#!/bin/bash
+
+chromium-browser --user-data-dir="$HOME/.config/webapps/snapdrop" --app=https://snapdrop.net/' | sudo tee /usr/local/bin/snapdrop >/dev/null || error "Failed to create snapdrop launcher!"
+
+sudo chmod +x /usr/local/bin/snapdrop || error "Failed to set snapdrop launcher permissions!"
+
+sudo cp "$(dirname "$0")/icon-64.png" /usr/local/share/icons/hicolor/64x64/apps/snapdrop.png || error "Failed to install snapdrop icon!"
+sudo cp "$(dirname "$0")/icon-24.png" /usr/local/share/icons/hicolor/24x24/apps/snapdrop.png || error "Failed to install snapdrop icon!"
+# update timestamp of top level icon directory to signal icon cache to be refreshed
+sudo touch /usr/local/share/icons/hicolor
+
+echo "[Desktop Entry]
+Name=Snapdrop
+GenericName=Local File Sharing
+Comment=Local file sharing in your browser. Inspired by Apple's Airdrop.
+Exec=/usr/local/bin/snapdrop
+Icon=snapdrop
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Utility" | sudo tee /usr/local/share/applications/snapdrop.desktop >/dev/null || error "Failed to create menu shortcut!"
diff --git a/apps/Snapdrop/install-32 b/apps/Snapdrop/install-32
deleted file mode 100755
index 48e4300d6e..0000000000
--- a/apps/Snapdrop/install-32
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-filepath="https://github.com/ryanfortner/snapdrop-rpi/raw/master/snapdrop_20221216_armhf.deb"
-
-install_packages "${filepath}" || exit 1
diff --git a/apps/Snapdrop/install-64 b/apps/Snapdrop/install-64
deleted file mode 100755
index c9ae9f9ef7..0000000000
--- a/apps/Snapdrop/install-64
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-filepath="https://github.com/ryanfortner/snapdrop-rpi/raw/master/snapdrop_20221216_arm64.deb"
-
-install_packages "${filepath}" || exit 1
diff --git a/apps/Snapdrop/uninstall b/apps/Snapdrop/uninstall
index b81bf44c52..7ccc1b3d20 100755
--- a/apps/Snapdrop/uninstall
+++ b/apps/Snapdrop/uninstall
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-purge_packages || exit 1
\ No newline at end of file
+sudo rm -f /usr/local/share/applications/snapdrop.desktop /usr/local/share/icons/hicolor/64x64/apps/snapdrop.png /usr/local/share/icons/hicolor/24x24/apps/snapdrop.png /usr/local/bin/snapdrop
+purge_packages || exit 1
diff --git a/apps/StackEdit/credits b/apps/StackEdit/credits
index 85b8001964..3460872914 100644
--- a/apps/StackEdit/credits
+++ b/apps/StackEdit/credits
@@ -1,3 +1 @@
-Added to pi-apps by Itai-Nelken.
-webapps compiled by Itai-Nelken using nativefier.
-nativefier by jiahaog.
+theofficialgman
diff --git a/apps/StackEdit/description b/apps/StackEdit/description
index c88d6fe48c..7715e31a38 100644
--- a/apps/StackEdit/description
+++ b/apps/StackEdit/description
@@ -2,4 +2,3 @@ Full-featured, open-source Markdown editor.
 StackEdit uses the same markdown library as Stack Overflow and is fully compatible with Github README.md files as well.
 This is Botspot's preferred tool to write the README for all his repositories.
 To run: Menu -> Programming -> StackEdit
-To run in a terminal: ~/stackedit/StackEdit
diff --git a/apps/StackEdit/install b/apps/StackEdit/install
new file mode 100755
index 0000000000..6bfc91ab6d
--- /dev/null
+++ b/apps/StackEdit/install
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+"${DIRECTORY}/manage" install-if-not-installed 'Chromium' || error "Chromium is required but it failed to install!"
+
+sudo mkdir -p /usr/local/bin /usr/local/share/applications /usr/local/share/icons/hicolor/64x64/apps/ /usr/local/share/icons/hicolor/24x24/apps/ || error "Could not create required directories!"
+echo "Creating launcher and menu button..."
+echo '#!/bin/bash
+
+chromium-browser --user-data-dir="$HOME/.config/webapps/stackedit" --app=https://stackedit.io/app#' | sudo tee /usr/local/bin/stackedit >/dev/null || error "Failed to create stackedit launcher!"
+
+sudo chmod +x /usr/local/bin/stackedit || error "Failed to set stackedit launcher permissions!"
+
+sudo cp "$(dirname "$0")/icon-64.png" /usr/local/share/icons/hicolor/64x64/apps/stackedit.png || error "Failed to install stackedit icon!"
+sudo cp "$(dirname "$0")/icon-24.png" /usr/local/share/icons/hicolor/24x24/apps/stackedit.png || error "Failed to install stackedit icon!"
+# update timestamp of top level icon directory to signal icon cache to be refreshed
+sudo touch /usr/local/share/icons/hicolor
+
+echo "[Desktop Entry]
+Name=StackEdit
+GenericName=Markdown editor
+Comment=A chromium webapp for the stackedit markdown editor
+Exec=/usr/local/bin/stackedit
+Icon=stackedit
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Development;IDE;" | sudo tee /usr/local/share/applications/stackedit.desktop >/dev/null || error "Failed to create menu shortcut!"
diff --git a/apps/StackEdit/install-32 b/apps/StackEdit/install-32
deleted file mode 100755
index f6fb543296..0000000000
--- a/apps/StackEdit/install-32
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-cd $HOME
-echo "Downloading..."
-wget https://github.com/Itai-Nelken/Nativefier-WebApps/releases/download/v3.0/StackEdit-linux-armv7l.tar.xz || error 'Failed to Download!'
-echo "extracting..."
-tar -xf StackEdit-linux-armv7l.tar.xz || error "Failed to extract!"
-echo "Renaming folder..."
-mv ~/StackEdit-linux-armv7l ~/stackedit || error "Failed to rename folder!"
-echo "Creating menu shortcut..."
-echo "[Desktop Entry]
-StartupNotify=true
-Terminal=false
-Type=Application
-Name=StackEdit
-Exec="$HOME/stackedit/StackEdit"
-Path="$HOME/stackedit"
-Icon="$HOME/pi-apps/apps/StackEdit/icon-64.png"
-Categories=Development;IDE;" > ~/.local/share/applications/stackedit.desktop || error "Failed to create menu shortcut!"
-rm -f StackEdit-linux-armv7l.tar.xz
diff --git a/apps/StackEdit/install-64 b/apps/StackEdit/install-64
deleted file mode 100755
index 4fb57ae6b3..0000000000
--- a/apps/StackEdit/install-64
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-cd $HOME
-echo "Downloading..."
-wget https://github.com/Itai-Nelken/Nativefier-WebApps/releases/download/v3.0/StackEdit-linux-arm64.tar.xz || error 'Failed to Download!'
-echo "extracting..."
-tar -xf StackEdit-linux-arm64.tar.xz || error "Failed to extract!"
-echo "Renaming folder..."
-mv ~/StackEdit-linux-arm64 ~/stackedit || error "Failed to rename folder!"
-echo "Creating menu shortcut..."
-echo "[Desktop Entry]
-StartupNotify=true
-Terminal=false
-Type=Application
-Name=StackEdit
-Exec="$HOME/stackedit/StackEdit"
-Path="$HOME/stackedit"
-Icon="$HOME/pi-apps/apps/StackEdit/icon-64.png"
-Categories=Development;IDE;" > ~/.local/share/applications/stackedit.desktop || error "Failed to create menu shortcut!"
-rm -f StackEdit-linux-arm64.tar.xz
diff --git a/apps/StackEdit/uninstall b/apps/StackEdit/uninstall
index 04bb490861..44b53fdd90 100755
--- a/apps/StackEdit/uninstall
+++ b/apps/StackEdit/uninstall
@@ -1,6 +1,4 @@
 #!/bin/bash
-echo "removing ~/stackedit..."
-rm -rf ~/stackedit || error "Failed to remove ~/stackedit!"
-echo "removing menu shortcut..."
-rm -f ~/.local/share/applications/stackedit.desktop || error "Failed to remove menu shortcut!"
-echo "DONE!"
+
+sudo rm -f /usr/local/share/applications/stackedit.desktop /usr/local/share/icons/hicolor/64x64/apps/stackedit.png /usr/local/share/icons/hicolor/24x24/apps/stackedit.png /usr/local/bin/stackedit
+purge_packages || exit 1
diff --git a/apps/WhatsApp/credits b/apps/WhatsApp/credits
index 8907be3f02..3460872914 100644
--- a/apps/WhatsApp/credits
+++ b/apps/WhatsApp/credits
@@ -1,3 +1 @@
-Apps compiled using Nativefier and DEB packages hosted by cycool29
-Nativefier made by jiahaog.
-Thanks to Botspot for help with debugging the menu shortcut and for creating pi-apps!
+theofficialgman
diff --git a/apps/WhatsApp/description b/apps/WhatsApp/description
index 63a60e69a5..e819a24c2c 100644
--- a/apps/WhatsApp/description
+++ b/apps/WhatsApp/description
@@ -1,7 +1,5 @@
-Nativefier Whatsapp Web webapp
+Whatsapp Web webapp
 
-A simple Whatsapp Web chromium webapp wrapped in electron with nativefier.
-it has a tray icon, so it doesn't take space on the taskbar, but keeps running in the background.
+A simple Whatsapp Web chromium webapp.
 
-To run: Menu -> Internet -> Whatsapp Web
-To run in a terminal: /opt/WhatsApp/WhatsApp
+To run: Menu -> Internet -> WhatsApp
diff --git a/apps/WhatsApp/install b/apps/WhatsApp/install
new file mode 100755
index 0000000000..19dbc83017
--- /dev/null
+++ b/apps/WhatsApp/install
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+"${DIRECTORY}/manage" install-if-not-installed 'Chromium' || error "Chromium is required but it failed to install!"
+
+sudo mkdir -p /usr/local/bin /usr/local/share/applications /usr/local/share/icons/hicolor/64x64/apps/ /usr/local/share/icons/hicolor/24x24/apps/ || error "Could not create required directories!"
+echo "Creating launcher and menu button..."
+echo '#!/bin/bash
+
+chromium-browser --user-data-dir="$HOME/.config/webapps/WhatsApp" --app=https://web.whatsapp.com' | sudo tee /usr/local/bin/whatsapp >/dev/null || error "Failed to create whatsapp launcher!"
+
+sudo chmod +x /usr/local/bin/whatsapp || error "Failed to set whatsapp launcher permissions!"
+
+sudo cp "$(dirname "$0")/icon-64.png" /usr/local/share/icons/hicolor/64x64/apps/whatsapp.png || error "Failed to install whatsapp icon!"
+sudo cp "$(dirname "$0")/icon-24.png" /usr/local/share/icons/hicolor/24x24/apps/whatsapp.png || error "Failed to install whatsapp icon!"
+# update timestamp of top level icon directory to signal icon cache to be refreshed
+sudo touch /usr/local/share/icons/hicolor
+
+echo "[Desktop Entry]
+Name=WhatsApp
+GenericName=Online Messaging
+Comment=A chromium webapp for the WhatsApp messaging service
+Exec=/usr/local/bin/whatsapp
+Icon=whatsapp
+Type=Application
+StartupNotify=false
+StartupWMClass=WhatsApp
+Categories=Internet;Chat;Network
+Keywords=whatsapp;" | sudo tee /usr/local/share/applications/whatsapp.desktop >/dev/null || error "Failed to create menu shortcut!"
diff --git a/apps/WhatsApp/install-32 b/apps/WhatsApp/install-32
deleted file mode 100755
index d653051ae7..0000000000
--- a/apps/WhatsApp/install-32
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-version=25.0
-
-install_packages https://github.com/cycool29/whatsapp-for-linux/releases/download/${version}/whatsapp_${version}_armhf.deb || exit 1
diff --git a/apps/WhatsApp/install-64 b/apps/WhatsApp/install-64
deleted file mode 100755
index 6d27ad591a..0000000000
--- a/apps/WhatsApp/install-64
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-version=25.0
-
-install_packages https://github.com/cycool29/whatsapp-for-linux/releases/download/${version}/whatsapp_${version}_arm64.deb || exit 1
diff --git a/apps/WhatsApp/uninstall b/apps/WhatsApp/uninstall
index 238a43e0be..39487ec210 100755
--- a/apps/WhatsApp/uninstall
+++ b/apps/WhatsApp/uninstall
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+sudo rm -f /usr/local/share/applications/whatsapp.desktop /usr/local/share/icons/hicolor/64x64/apps/whatsapp.png /usr/local/share/icons/hicolor/24x24/apps/whatsapp.png /usr/local/bin/whatsapp
 purge_packages || exit 1
diff --git a/etc/categories b/etc/categories
index fdeaaafa16..f747706f33 100644
--- a/etc/categories
+++ b/etc/categories
@@ -165,12 +165,12 @@ Screenshot|Tools
 Shattered Pixel Dungeon|Games
 Shotwell|Creative Arts
 SimpleScreenRecorder|Multimedia
-Snapdrop|hidden
+Snapdrop|Tools
 Snap Store|Tools
 Sonic Pi|Multimedia
 SpeedTest-CLI|Internet
 Sphero SDK|Programming
-StackEdit|hidden
+StackEdit|Programming
 Steam|Games
 Steam Link|Games
 StepMania|Games