diff --git a/apps/OpenSCAD/credits b/apps/OpenSCAD/credits
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/apps/OpenSCAD/credits
@@ -0,0 +1 @@
+
diff --git a/apps/OpenSCAD/description b/apps/OpenSCAD/description
new file mode 100644
index 0000000..c5cf5c1
--- /dev/null
+++ b/apps/OpenSCAD/description
@@ -0,0 +1,16 @@
+OpenSCAD is software for creating solid 3D CAD models.
+
+Unlike most free software for creating 3D models, OpenSCAD does not focus on
+the artistic aspects of 3D modelling but instead on the CAD aspects.
+OpenSCAD is more suitable for creating 3D models of machine parts but
+perhaps not when creating computer-animated movies.
+
+OpenSCAD is not an interactive modeller. Instead OpenSCAD is something like
+a 3D-compiler that reads in a script file that describes the object
+and renders the 3D model from this script file. This gives designers
+full control over the modelling process and enables them to easily
+change any step in the modelling process or make designs that are
+defined by configurable parameters.
+
+To run: Menu -> Graphics -> OpenSCAD
+To run in a terminal: OpenSCAD.AppImage
diff --git a/apps/OpenSCAD/icon-24.png b/apps/OpenSCAD/icon-24.png
new file mode 100644
index 0000000..e9160c8
Binary files /dev/null and b/apps/OpenSCAD/icon-24.png differ
diff --git a/apps/OpenSCAD/icon-64.png b/apps/OpenSCAD/icon-64.png
new file mode 100644
index 0000000..8530c7c
Binary files /dev/null and b/apps/OpenSCAD/icon-64.png differ
diff --git a/apps/OpenSCAD/install-32 b/apps/OpenSCAD/install-32
new file mode 100755
index 0000000..0cec910
--- /dev/null
+++ b/apps/OpenSCAD/install-32
@@ -0,0 +1,25 @@
+#!/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://github.com/koendv/openscad-raspberrypi/releases/download/v1.6/OpenSCAD-2021.03.26-armhf.AppImage' -O ~/OpenSCAD.AppImage || error "Failed to download appimage!"
+
+chmod +x ~/OpenSCAD.AppImage || error "Failed to mark as executable!"
+
+echo "[Desktop Entry]
+Name=OpenSCAD
+GenericName=The Programmers Solid 3D CAD Modeller
+Comment=OpenSCAD is a software for creating 3D CAD objects.
+Exec=bash -c 'sudo modprobe fuse; ~/OpenSCAD.AppImage'
+Icon=$(dirname $0)/icon-64.png
+Terminal=false
+Type=Application
+MimeType=application/x-openscad;
+Categories=Graphics;3DGraphics;Engineering;
+Keywords=3d;solid;geometry;csg;model;stl;
+StartupNotify=true" > ~/.local/share/applications/OpenSCAD.desktop || error "Failed to create menu button!"
diff --git a/apps/OpenSCAD/install-64 b/apps/OpenSCAD/install-64
new file mode 100755
index 0000000..bbf35a0
--- /dev/null
+++ b/apps/OpenSCAD/install-64
@@ -0,0 +1,25 @@
+#!/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://files.openscad.org/OpenSCAD-2021.01-aarch64.AppImage' -O ~/OpenSCAD.AppImage || error "Failed to download appimage!"
+
+chmod +x ~/OpenSCAD.AppImage || error "Failed to mark as executable!"
+
+echo "[Desktop Entry]
+Name=OpenSCAD
+GenericName=The Programmers Solid 3D CAD Modeller
+Comment=OpenSCAD is a software for creating 3D CAD objects.
+Exec=bash -c 'sudo modprobe fuse; ~/OpenSCAD.AppImage'
+Icon=$(dirname $0)/icon-64.png
+Terminal=false
+Type=Application
+MimeType=application/x-openscad;
+Categories=Graphics;3DGraphics;Engineering;
+Keywords=3d;solid;geometry;csg;model;stl;
+StartupNotify=true" > ~/.local/share/applications/OpenSCAD.desktop || error "Failed to create menu button!"
diff --git a/apps/OpenSCAD/uninstall b/apps/OpenSCAD/uninstall
new file mode 100755
index 0000000..ab275fd
--- /dev/null
+++ b/apps/OpenSCAD/uninstall
@@ -0,0 +1,13 @@
+#!/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
+}
+
+rm -f ~/OpenSCAD.AppImage ~/.local/share/applications/OpenSCAD.desktop
+
+exit 0
+
diff --git a/apps/OpenSCAD/website b/apps/OpenSCAD/website
new file mode 100644
index 0000000..e0223c9
--- /dev/null
+++ b/apps/OpenSCAD/website
@@ -0,0 +1,2 @@
+http://www.openscad.org/
+https://github.com/koendv/openscad-raspberrypi
diff --git a/data/categories/structure b/data/categories/structure
index 60195f2..154b3c2 100644
--- a/data/categories/structure
+++ b/data/categories/structure
@@ -1,5 +1,6 @@
 All Is Well|Tools
 AndroidBuddy|Tools
+Angry IP scanner|Internet
 AnyDesk|Internet
 Arduino|Editors
 BalenaEtcher|Tools
@@ -44,6 +45,7 @@ Mission Planner|Tools
 Node.js|Tools
 Notepad ++|Editors
 OBS Studio|Tools
+OpenSCAD|Editors
 Pi-Apps Terminal Plugin|Tools
 PiGro|Tools
 piKiss|Tools
@@ -92,4 +94,3 @@ Wine (x86)|Tools
 WPS Office|Editors
 YouTubuddy|Multimedia
 Zoom|Internet
-Angry IP scanner|Internet