diff --git a/README.md b/README.md
index 254baac..2c433fe 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,12 @@
 wget -qO- https://github.com/gibbyb/sunhat/releases/download/1.0/install.sh | bash
 ```
 
+##### What is Sunhat?
+Suhat is my personal Fedora Config based on Omakub. If you use this to set up Fedora, you can expect to have just about every dependency and package you could dream of running. From local LLMs with ollama, image generation with Stable Diffusion, an awesome Neovim config written from scratch using Lazy.nvim (not to be mistaken with LazyVim), grub-btrfs & TimeShift for snapshots, & so much more. This is basically a repository of knowledge I have collected throughout the years of being a Fedora user, and could save a new user literally months of time.
+
+##### Usage:
+I would recommend looking through the sources, install, & settings directories & moving anything you are not interested in to the optional folder found in each directory. Most of the app installations are a single line, installing the app from dnf or flatpak, while some are more complex.
+
 ##### Themes:
 Themes in this repo for the most part have been removed, except for the easy stuff like changing the theme in VS Code. On Fedora, I would recommend Gradience Beta, which is installed by this app, for theming the GNOME shell. I will eventually add more themes for Kitty & Neovim, and I may even make some themes for the GNOME shell using Gradience.
 
diff --git a/configs/autostart/Nextcloud.desktop b/configs/autostart/Nextcloud.desktop
new file mode 100644
index 0000000..219765f
--- /dev/null
+++ b/configs/autostart/Nextcloud.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Nextcloud
+GenericName=File Synchronizer
+Exec="/usr/bin/nextcloud" --background
+Terminal=false
+Icon=Nextcloud
+Categories=Network
+Type=Application
+StartupNotify=false
+X-GNOME-Autostart-enabled=true
+X-GNOME-Autostart-Delay=10
diff --git a/configs/autostart/app.bluebubbles.BlueBubbles.desktop b/configs/autostart/app.bluebubbles.BlueBubbles.desktop
new file mode 100644
index 0000000..79d3a6c
--- /dev/null
+++ b/configs/autostart/app.bluebubbles.BlueBubbles.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=BlueBubbles
+Comment=BlueBubbles client for Linux
+Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=bluebubbles app.bluebubbles.BlueBubbles
+Icon=app.bluebubbles.BlueBubbles
+Terminal=false
+Type=Application
+Categories=Network;InstantMessaging;Chat;
+StartupWMClass=bluebubbles
+X-Flatpak=app.bluebubbles.BlueBubbles
diff --git a/configs/autostart/bluebubbles.desktop b/configs/autostart/bluebubbles.desktop
new file mode 100644
index 0000000..9f8448b
--- /dev/null
+++ b/configs/autostart/bluebubbles.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=bluebubbles
+Comment=bluebubbles startup script
+Exec=/app/bluebubbles/bluebubbles minimized
+StartupNotify=false
+Terminal=false
diff --git a/configs/autostart/com.bitwarden.desktop.desktop b/configs/autostart/com.bitwarden.desktop.desktop
new file mode 100644
index 0000000..f5a5315
--- /dev/null
+++ b/configs/autostart/com.bitwarden.desktop.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Bitwarden
+Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=bitwarden --file-forwarding com.bitwarden.desktop @@u %U @@
+Terminal=false
+Type=Application
+Icon=com.bitwarden.desktop
+StartupWMClass=Bitwarden
+GenericName=Password Manager
+Comment=A secure and free password manager for all of your devices.
+MimeType=x-scheme-handler/bitwarden;
+Categories=Utility;
+X-Desktop-File-Install-Version=0.27
+X-Flatpak-RenamedFrom=bitwarden.desktop;
+X-Flatpak=com.bitwarden.desktop
diff --git a/configs/autostart/com.nextcloud.desktopclient.nextcloud.desktop b/configs/autostart/com.nextcloud.desktopclient.nextcloud.desktop
new file mode 100644
index 0000000..219765f
--- /dev/null
+++ b/configs/autostart/com.nextcloud.desktopclient.nextcloud.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Nextcloud
+GenericName=File Synchronizer
+Exec="/usr/bin/nextcloud" --background
+Terminal=false
+Icon=Nextcloud
+Categories=Network
+Type=Application
+StartupNotify=false
+X-GNOME-Autostart-enabled=true
+X-GNOME-Autostart-Delay=10
diff --git a/configs/autostart/io.github.Foldex.AdwSteamGtk.desktop b/configs/autostart/io.github.Foldex.AdwSteamGtk.desktop
new file mode 100644
index 0000000..5ace66b
--- /dev/null
+++ b/configs/autostart/io.github.Foldex.AdwSteamGtk.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=io.github.Foldex.AdwSteamGtk
+Exec=flatpak run --command=adwaita-steam-gtk io.github.Foldex.AdwSteamGtk --check
+X-Flatpak=io.github.Foldex.AdwSteamGtk
diff --git a/configs/autostart/io.github.jeffshee.Hidamari.desktop b/configs/autostart/io.github.jeffshee.Hidamari.desktop
new file mode 100644
index 0000000..0b29f67
--- /dev/null
+++ b/configs/autostart/io.github.jeffshee.Hidamari.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=io.github.jeffshee.Hidamari
+Exec=flatpak run --command=hidamari io.github.jeffshee.Hidamari -b
+X-Flatpak=io.github.jeffshee.Hidamari
diff --git a/configs/autostart/jetbrains-toolbox.desktop b/configs/autostart/jetbrains-toolbox.desktop
new file mode 100755
index 0000000..93d68e3
--- /dev/null
+++ b/configs/autostart/jetbrains-toolbox.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Icon=/home/gib/.local/share/JetBrains/Toolbox/toolbox.svg
+Exec=/home/gib/.local/share/JetBrains/Toolbox/bin/jetbrains-toolbox --minimize
+Version=1.0
+Type=Application
+Categories=Development
+Name=JetBrains Toolbox
+StartupWMClass=jetbrains-toolbox
+Terminal=false
+MimeType=x-scheme-handler/jetbrains;
+X-GNOME-Autostart-enabled=true
+StartupNotify=false
+X-GNOME-Autostart-Delay=10
+X-MATE-Autostart-Delay=10
+X-KDE-autostart-after=panel
diff --git a/configs/autostart/ulauncher.desktop b/configs/autostart/ulauncher.desktop
new file mode 100644
index 0000000..da1504d
--- /dev/null
+++ b/configs/autostart/ulauncher.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Ulauncher
+Comment=Application launcher for Linux
+GenericName=Launcher
+Categories=GNOME;GTK;Utility;
+TryExec=/usr/bin/ulauncher
+Exec=env GDK_BACKEND=x11 /usr/bin/ulauncher --hide-window --hide-window
+Icon=ulauncher
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true
diff --git a/install/app_ulauncher.sh b/install/app_ulauncher.sh
index f9faf99..10c2a27 100644
--- a/install/app_ulauncher.sh
+++ b/install/app_ulauncher.sh
@@ -1,8 +1,4 @@
 sudo dnf install -y ulauncher
-
-# Start ulauncher to have it populate config before we overwrite
-mkdir -p ~/.config/autostart/
-cp ~/.local/share/sunhat/configs/ulauncher/ulauncher.desktop ~/.config/autostart/ulauncher.desktop
 gtk-launch ulauncher.desktop >/dev/null
 sleep 2 # ensure enough time for ulauncher to set defaults
 cp ~/.local/share/sunhat/configs/ulauncher/ulauncher.json ~/.config/ulauncher/settings.json
diff --git a/settings/set_autostart.sh b/settings/set_autostart.sh
new file mode 100644
index 0000000..84149f6
--- /dev/null
+++ b/settings/set_autostart.sh
@@ -0,0 +1,2 @@
+mkdir -p ~/.config/autostart/
+cp ~/.local/share/sunhat/configs/autostart/* ~/.config/autostart/ 
diff --git a/settings/set_theme.sh b/settings/set_theme.sh
deleted file mode 100644
index 3e181a1..0000000
--- a/settings/set_theme.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set default theme to to Tokyo Night
-source ~/.local/share/sunhat/themes/gnome/tokyo_night.sh