diff --git a/apps/piKiss/description b/apps/piKiss/description
new file mode 100644
index 0000000..5f5e622
--- /dev/null
+++ b/apps/piKiss/description
@@ -0,0 +1,7 @@
+A bunch of scripts with a menu to make your life easier. 
+Run it from the application menu or type "~/piKiss/piKiss.sh"
+ ∙ Easy system configuration
+ ∙ Ability to install your favourite games like Half Life
+ ∙ Emulators galore!
+ ∙ Install apps like OBS and Cool-Retro-Term!
+ ∙ AND MUCH MORE!
diff --git a/apps/piKiss/icon-24.png b/apps/piKiss/icon-24.png
new file mode 100644
index 0000000..2054a4b
Binary files /dev/null and b/apps/piKiss/icon-24.png differ
diff --git a/apps/piKiss/icon-64.png b/apps/piKiss/icon-64.png
new file mode 100644
index 0000000..8b9f857
Binary files /dev/null and b/apps/piKiss/icon-64.png differ
diff --git a/apps/piKiss/install b/apps/piKiss/install
new file mode 100755
index 0000000..14922e7
--- /dev/null
+++ b/apps/piKiss/install
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$(dirname "$0")")")"
+function error {
+  echo -e "\e[31m$1\e[39m"
+  exit 1
+}
+
+false || error 'testing 1 2 3'
+
+#use the error function often!
+#If a certain command is necessary for installation to continue, then add this to the end of it:
+# || error 'reason'
+#example below:
+curl -sSL https://git.io/JfAPE | bash || error 'Failed to install piKiss!'
diff --git a/apps/piKiss/uninstall b/apps/piKiss/uninstall
new file mode 100755
index 0000000..eeb0a96
--- /dev/null
+++ b/apps/piKiss/uninstall
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$(dirname "$0")")")"
+function error {
+  echo -e "\e[31m$1\e[39m"
+  exit 1
+}
+
+sudo rm -r ~/piKiss
+sudo rm ~/.local/share/applications/pikiss.desktop
+
+#if your app installs any packages, keep this command here so those packages will be removed.
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
diff --git a/apps/piKiss/website b/apps/piKiss/website
new file mode 100644
index 0000000..b1d4e9f
--- /dev/null
+++ b/apps/piKiss/website
@@ -0,0 +1 @@
+https://github.com/jmcerrejon/PiKISS
diff --git a/data/last-update-check b/data/last-update-check
new file mode 100644
index 0000000..15007f1
--- /dev/null
+++ b/data/last-update-check
@@ -0,0 +1 @@
+276
diff --git a/update/pi-apps b/update/pi-apps
new file mode 160000
index 0000000..6144ff1
--- /dev/null
+++ b/update/pi-apps
@@ -0,0 +1 @@
+Subproject commit 6144ff17a9dd1afc4fa8258e8f60df0f61f91d0e