diff --git a/apps/PiSafe/description b/apps/PiSafe/description
new file mode 100644
index 0000000..fa9a6f5
--- /dev/null
+++ b/apps/PiSafe/description
@@ -0,0 +1,3 @@
+Create compressed image files.  Flash SD cards from a disk image. Many file types supported.
+To run: Menu -> Accessories -> PiSafe
+To run in a terminal: pisafe
diff --git a/apps/PiSafe/icon-24.png b/apps/PiSafe/icon-24.png
new file mode 100644
index 0000000..1461b80
Binary files /dev/null and b/apps/PiSafe/icon-24.png differ
diff --git a/apps/PiSafe/icon-64.png b/apps/PiSafe/icon-64.png
new file mode 100644
index 0000000..b505afa
Binary files /dev/null and b/apps/PiSafe/icon-64.png differ
diff --git a/apps/PiSafe/install b/apps/PiSafe/install
new file mode 100755
index 0000000..ea03d33
--- /dev/null
+++ b/apps/PiSafe/install
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+wget https://raw.githubusercontent.com/RichardMidnight/pi-safe/main/pisafe -O pisafe || error "Failed to download!"
+
+bash pisafe install -y || error "failed to install PiSafe!"
+rm -f ~/pisafe
+exit 0
diff --git a/apps/PiSafe/uninstall b/apps/PiSafe/uninstall
new file mode 100755
index 0000000..546cee8
--- /dev/null
+++ b/apps/PiSafe/uninstall
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+pisafe uninstall -y
+
+exit 0
diff --git a/apps/PiSafe/website b/apps/PiSafe/website
new file mode 100644
index 0000000..8763c02
--- /dev/null
+++ b/apps/PiSafe/website
@@ -0,0 +1 @@
+https://github.com/RichardMidnight/pi-safe
diff --git a/data/categories/structure b/data/categories/structure
index 06b2858..052ee8c 100644
--- a/data/categories/structure
+++ b/data/categories/structure
@@ -5,6 +5,7 @@ AnyDesk|Internet
 Arduino|Editors
 AstroMenace|Games
 BalenaEtcher|Tools
+BlockPi|Editors
 Bongo Cam|Multimedia
 Box86|Tools
 Boxy SVG|Editors
@@ -46,15 +47,18 @@ Mesa 20.3|Tools
 Minecraft Bedrock|Games
 Minecraft Java|Games
 Minecraft Pi (Modded)|Games
+Minetest (MIneclone 2)|Games
 Mission Planner|Tools
 Node.js|Tools
 Notepad ++|Editors
 OBS Studio|Tools
+Old Scool Runescape|Games
 OpenSCAD|Editors
 Pi-Apps Terminal Plugin|Tools
 PiGro|Tools
 piKiss|Tools
 Pi Power Tools|Tools
+PiSafe|Tools
 pocketmine|Games
 Powerline-Shell|Eyecandy
 PPSSPP (PSP emulator)|Games
@@ -84,7 +88,6 @@ tldr|Tools
 Tor Browser|Internet
 Turbo Scratch|Editors
 Ulauncher|Eyecandy
-unrar|Tools
 Update Buddy|Tools
 USBImager|Tools
 VeraCrypt|Tools
@@ -96,6 +99,7 @@ Web Apps|Internet
 Wechat|Internet
 Whatsapp|Internet
 Windows 10 Theme|Eyecandy
+Windows Screensavers|Eyecandy
 Wine (x86)|Tools
 WPS Office|Editors
 YouTubuddy|Multimedia