diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000..5f0a605acc
Binary files /dev/null and b/.DS_Store differ
diff --git a/apps/.DS_Store b/apps/.DS_Store
new file mode 100644
index 0000000000..ea63f4b48e
Binary files /dev/null and b/apps/.DS_Store differ
diff --git a/apps/AndroidBuddy copy/credits b/apps/AndroidBuddy copy/credits
new file mode 100644
index 0000000000..9fe38ea4eb
--- /dev/null
+++ b/apps/AndroidBuddy copy/credits	
@@ -0,0 +1,5 @@
+Made by glreno on GitHub
+
+The image files are ancient public domain. The Java code for v.1.0 is (c) 2010 Werner Randelhofer. The Java code for v.2.0 (c) 2019 Gerald Reno
+
+Added to pi-apps by Lenni (@lenni_builder on Discord)
\ No newline at end of file
diff --git a/apps/AndroidBuddy copy/description b/apps/AndroidBuddy copy/description
new file mode 100644
index 0000000000..d4676522a3
--- /dev/null
+++ b/apps/AndroidBuddy copy/description	
@@ -0,0 +1,14 @@
+The ever popular kitty-that-follows-your-mouse-pointer toy.
+
+Neko is Japanese for cat. According to Wikipedia it was originally written for the NEC PC-9801.
+
+There are many many versions. Generally it is considered Public Domain software, so I am placing my fork under the Unlicense.
+
+This fork is based on Werner Randelshofer's Java port.
+
+(From the GitHub repo)
+
+To run: Menu > Accessories > Oneko
+To run in a temrinal: Oneko
+
+You have the option to create an autostart shortcut when installing.
diff --git a/apps/AndroidBuddy copy/icon-24.png b/apps/AndroidBuddy copy/icon-24.png
new file mode 100644
index 0000000000..dff39da672
Binary files /dev/null and b/apps/AndroidBuddy copy/icon-24.png differ
diff --git a/apps/AndroidBuddy copy/icon-64.png b/apps/AndroidBuddy copy/icon-64.png
new file mode 100644
index 0000000000..585f0f2670
Binary files /dev/null and b/apps/AndroidBuddy copy/icon-64.png differ
diff --git a/apps/AndroidBuddy copy/install b/apps/AndroidBuddy copy/install
new file mode 100644
index 0000000000..24ab0d334f
--- /dev/null
+++ b/apps/AndroidBuddy copy/install	
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+install_packages oneko || error "Failed to install oneko!"
+
+echo "[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Oneko
+Comment=Catch the mouse
+Comment[de]=Fang die Maus
+Icon=$(dirname "$0")/icon-64.png
+Exec=oneko
+Encoding=UTF-8
+Terminal=false
+Categories=Utility;" | sudo tee /usr/share/applications/oneko.desktop
+
+# Autostart shortcut
+response=$(yad --title "oneko installer" --text "Do you want to create an autostart shortcut for oneko? If not you will have to launch it from the start menu." --button="Yes":0 --button="No":1)
+
+if [ $? -eq 0 ]; then
+    echo "Adding autostart shortcut to ~/.config/autostart/oneko.desktop..."
+    echo "[Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=Oneko
+    Comment=Catch the mouse
+    Comment[de]=Fang die Maus
+    Icon=$(dirname "$0")/icon-64.png
+    Exec=oneko
+    Encoding=UTF-8
+    Terminal=false
+    Categories=Utility;Game;" | tee ~/.config/autostart/oneko.desktop
+    echo "Oneko will be started the next time you reboot your Raspberry Pi."
+else
+    echo "Adding no autostart shortcut."
+fi
\ No newline at end of file
diff --git a/apps/AndroidBuddy copy/uninstall b/apps/AndroidBuddy copy/uninstall
new file mode 100644
index 0000000000..4cc56bafdf
--- /dev/null
+++ b/apps/AndroidBuddy copy/uninstall	
@@ -0,0 +1,7 @@
+#!/bin/bash
+purge_packages || error "Failed to uninstall oneko!"
+
+sudo rm -rf /usr/share/applications/oneko.desktop || error "Failed to remove shortcuts!"
+rm -rf ~/.config/autostart/oneko.desktop || echo "Failed to remove autostart entry, probably because it wasn't added."
+
+exit 0
diff --git a/apps/AndroidBuddy copy/website b/apps/AndroidBuddy copy/website
new file mode 100644
index 0000000000..1ee784669e
--- /dev/null
+++ b/apps/AndroidBuddy copy/website	
@@ -0,0 +1 @@
+https://github.com/glreno/oneko
\ No newline at end of file
diff --git a/apps/Oneko/credits b/apps/Oneko/credits
new file mode 100644
index 0000000000..9fe38ea4eb
--- /dev/null
+++ b/apps/Oneko/credits
@@ -0,0 +1,5 @@
+Made by glreno on GitHub
+
+The image files are ancient public domain. The Java code for v.1.0 is (c) 2010 Werner Randelhofer. The Java code for v.2.0 (c) 2019 Gerald Reno
+
+Added to pi-apps by Lenni (@lenni_builder on Discord)
\ No newline at end of file
diff --git a/apps/Oneko/description b/apps/Oneko/description
new file mode 100644
index 0000000000..d4676522a3
--- /dev/null
+++ b/apps/Oneko/description
@@ -0,0 +1,14 @@
+The ever popular kitty-that-follows-your-mouse-pointer toy.
+
+Neko is Japanese for cat. According to Wikipedia it was originally written for the NEC PC-9801.
+
+There are many many versions. Generally it is considered Public Domain software, so I am placing my fork under the Unlicense.
+
+This fork is based on Werner Randelshofer's Java port.
+
+(From the GitHub repo)
+
+To run: Menu > Accessories > Oneko
+To run in a temrinal: Oneko
+
+You have the option to create an autostart shortcut when installing.
diff --git a/apps/Oneko/icon-24.png b/apps/Oneko/icon-24.png
new file mode 100644
index 0000000000..975873e88d
Binary files /dev/null and b/apps/Oneko/icon-24.png differ
diff --git a/apps/Oneko/icon-64.png b/apps/Oneko/icon-64.png
new file mode 100644
index 0000000000..fa1f6df2a7
Binary files /dev/null and b/apps/Oneko/icon-64.png differ
diff --git a/apps/Oneko/install b/apps/Oneko/install
new file mode 100644
index 0000000000..24ab0d334f
--- /dev/null
+++ b/apps/Oneko/install
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+install_packages oneko || error "Failed to install oneko!"
+
+echo "[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Oneko
+Comment=Catch the mouse
+Comment[de]=Fang die Maus
+Icon=$(dirname "$0")/icon-64.png
+Exec=oneko
+Encoding=UTF-8
+Terminal=false
+Categories=Utility;" | sudo tee /usr/share/applications/oneko.desktop
+
+# Autostart shortcut
+response=$(yad --title "oneko installer" --text "Do you want to create an autostart shortcut for oneko? If not you will have to launch it from the start menu." --button="Yes":0 --button="No":1)
+
+if [ $? -eq 0 ]; then
+    echo "Adding autostart shortcut to ~/.config/autostart/oneko.desktop..."
+    echo "[Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=Oneko
+    Comment=Catch the mouse
+    Comment[de]=Fang die Maus
+    Icon=$(dirname "$0")/icon-64.png
+    Exec=oneko
+    Encoding=UTF-8
+    Terminal=false
+    Categories=Utility;Game;" | tee ~/.config/autostart/oneko.desktop
+    echo "Oneko will be started the next time you reboot your Raspberry Pi."
+else
+    echo "Adding no autostart shortcut."
+fi
\ No newline at end of file
diff --git a/apps/Oneko/uninstall b/apps/Oneko/uninstall
new file mode 100644
index 0000000000..4cc56bafdf
--- /dev/null
+++ b/apps/Oneko/uninstall
@@ -0,0 +1,7 @@
+#!/bin/bash
+purge_packages || error "Failed to uninstall oneko!"
+
+sudo rm -rf /usr/share/applications/oneko.desktop || error "Failed to remove shortcuts!"
+rm -rf ~/.config/autostart/oneko.desktop || echo "Failed to remove autostart entry, probably because it wasn't added."
+
+exit 0
diff --git a/apps/Oneko/website b/apps/Oneko/website
new file mode 100644
index 0000000000..1ee784669e
--- /dev/null
+++ b/apps/Oneko/website
@@ -0,0 +1 @@
+https://github.com/glreno/oneko
\ No newline at end of file