diff --git a/apps/Autostar/credits b/apps/Autostar/credits
new file mode 100644
index 0000000..a082e3e
--- /dev/null
+++ b/apps/Autostar/credits
@@ -0,0 +1 @@
+Botspot made, Botspot added.
diff --git a/apps/Autostar/description b/apps/Autostar/description
new file mode 100644
index 0000000..9b3a80a
--- /dev/null
+++ b/apps/Autostar/description
@@ -0,0 +1,9 @@
+Simple utility to make programs run on boot. The sky's the limit.
+People use this to:
+- Launch a website automatically, on boot.
+- Start a backup.
+- Launch your favorite apps on boot so they are ready to use sooner.
+- See what other apps have added autostart entries, and customize/disable them.
+
+To run: Menu -> Accessories -> AutoStar
+To run in terminal: ~/autostar/main.sh
diff --git a/apps/Autostar/icon-24.png b/apps/Autostar/icon-24.png
new file mode 100644
index 0000000..a112b27
Binary files /dev/null and b/apps/Autostar/icon-24.png differ
diff --git a/apps/Autostar/icon-64.png b/apps/Autostar/icon-64.png
new file mode 100644
index 0000000..d3e2c43
Binary files /dev/null and b/apps/Autostar/icon-64.png differ
diff --git a/apps/Autostar/install b/apps/Autostar/install
new file mode 100755
index 0000000..9349ead
--- /dev/null
+++ b/apps/Autostar/install
@@ -0,0 +1,19 @@
+#!/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
+}
+
+# Get dependencies
+"${DIRECTORY}/pkg-install" "yad" "$(dirname "$0")" || exit 1
+
+rm -rf ~/autostar || error "Failed to first remove autostar folder from $HOME!"
+echo "Downloading autostar..."
+git clone https://github.com/Botspot/autostar || error "Failed to clone AutoStar repository!"
+
+echo "Running AutoStar setup script..."
+~/autostar/main.sh setup || error "AutoStar setup script failed!"
+
diff --git a/apps/Autostar/uninstall b/apps/Autostar/uninstall
new file mode 100755
index 0000000..27d6e10
--- /dev/null
+++ b/apps/Autostar/uninstall
@@ -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
+}
+
+#if your app installs any packages, keep this command here so those packages will be removed.
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
+
+rm -rf ~/autostar ~/.local/share/applications/autostar.desktop
+
diff --git a/apps/Autostar/website b/apps/Autostar/website
new file mode 100644
index 0000000..edc168b
--- /dev/null
+++ b/apps/Autostar/website
@@ -0,0 +1 @@
+https://github.com/Botspot/cloudbuddy
diff --git a/apps/CloudBuddy/credits b/apps/CloudBuddy/credits
new file mode 100644
index 0000000..a082e3e
--- /dev/null
+++ b/apps/CloudBuddy/credits
@@ -0,0 +1 @@
+Botspot made, Botspot added.
diff --git a/apps/CloudBuddy/description b/apps/CloudBuddy/description
new file mode 100644
index 0000000..9cd9b9a
--- /dev/null
+++ b/apps/CloudBuddy/description
@@ -0,0 +1,5 @@
+CloudBuddy is the ultimate wizard for cloud storage. Google Drive, Onedrive, Dropbox, and many more.
+Botspot made this gui frontend for the popular rclone tool to connect to your cloud drives, download from them, upload to them, mount them to your file manager, and more. In addition, CloudBuddy features an interactive file browser to easily generate shareable links and to perform various server-side operations.
+
+To run: Menu -> Internet -> CloudBuddy
+To run in terminal: ~/cloudbuddy/main.sh
diff --git a/apps/CloudBuddy/icon-24.png b/apps/CloudBuddy/icon-24.png
new file mode 100644
index 0000000..8a6d653
Binary files /dev/null and b/apps/CloudBuddy/icon-24.png differ
diff --git a/apps/CloudBuddy/icon-64.png b/apps/CloudBuddy/icon-64.png
new file mode 100644
index 0000000..d8e5e9d
Binary files /dev/null and b/apps/CloudBuddy/icon-64.png differ
diff --git a/apps/CloudBuddy/install b/apps/CloudBuddy/install
new file mode 100755
index 0000000..71f2a38
--- /dev/null
+++ b/apps/CloudBuddy/install
@@ -0,0 +1,19 @@
+#!/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
+}
+
+# Get dependencies
+"${DIRECTORY}/pkg-install" "yad xclip expect" "$(dirname "$0")" || exit 1
+
+rm -rf ~/cloudbuddy || error "Failed to first remove cloudbuddy folder from $HOME!"
+echo "Downloading cloudbuddy..."
+git clone https://github.com/Botspot/cloudbuddy || error "Failed to clone CloudBuddy repository!"
+
+echo "Running CloudBuddy setup script..."
+~/cloudbuddy/main.sh setup || error "CloudBuddy setup script failed!"
+
diff --git a/apps/CloudBuddy/uninstall b/apps/CloudBuddy/uninstall
new file mode 100755
index 0000000..a39b03b
--- /dev/null
+++ b/apps/CloudBuddy/uninstall
@@ -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
+}
+
+#if your app installs any packages, keep this command here so those packages will be removed.
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
+
+rm -rf ~/cloudbuddy ~/.local/share/applications/cloudbuddy.desktop
+
diff --git a/apps/CloudBuddy/website b/apps/CloudBuddy/website
new file mode 100644
index 0000000..edc168b
--- /dev/null
+++ b/apps/CloudBuddy/website
@@ -0,0 +1 @@
+https://github.com/Botspot/cloudbuddy
diff --git a/data/categories/structure b/data/categories/structure
index 22551a4..fe55b0b 100644
--- a/data/categories/structure
+++ b/data/categories/structure
@@ -5,6 +5,7 @@ Angry IP scanner|Internet
 AnyDesk|Internet
 Arduino|Editors
 AstroMenace|Games
+Autostar|Tools
 BalenaEtcher|Tools
 BlockPi|Editors
 Bongo Cam|Multimedia
@@ -15,6 +16,7 @@ Browsh|Internet
 Chiaki|Games
 Chromium Widevine|Multimedia
 Clam Antivirus|Tools
+CloudBuddy|Internet
 Color Emoji font|Eyecandy
 CommanderPi|Tools
 Conky|Eyecandy