diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ec6ed6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/packages/*/*
+/packages/*
diff --git a/README.md b/README.md
index 35b2770..254baac 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,13 @@
 wget -qO- https://github.com/gibbyb/sunhat/releases/download/1.0/install.sh | bash
 ```
 
+##### 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.
+
 ##### To Do:
 
 - [ ] Add a way to change the font & theme of kitty using the script
 - [ ] Add a themes for Neovim that are not using LazyVim
 - [ ] Configure GNOME extensions with cli tool.
-- [ ] Find a consistent way to download applications not in repos.
 - [ ] Add a way to update all packages installed with git in the packages folder.
 - [ ] Add a way to update all links to packages installed by link
diff --git a/backgrounds/80s-retro-tropical-sunset-by-freepik.jpg b/backgrounds/80s-retro-tropical-sunset-by-freepik.jpg
deleted file mode 100644
index 825bb4b..0000000
Binary files a/backgrounds/80s-retro-tropical-sunset-by-freepik.jpg and /dev/null differ
diff --git a/backgrounds/catppuccintotoro.png b/backgrounds/catppuccintotoro.png
deleted file mode 100644
index 4f94b9c..0000000
Binary files a/backgrounds/catppuccintotoro.png and /dev/null differ
diff --git a/backgrounds/ferns-green.jpg b/backgrounds/ferns-green.jpg
deleted file mode 100644
index 54f6766..0000000
Binary files a/backgrounds/ferns-green.jpg and /dev/null differ
diff --git a/backgrounds/fog_forest_2.jpg b/backgrounds/fog_forest_2.jpg
deleted file mode 100644
index 8a5567a..0000000
Binary files a/backgrounds/fog_forest_2.jpg and /dev/null differ
diff --git a/backgrounds/kanagawa.jpg b/backgrounds/kanagawa.jpg
deleted file mode 100644
index 197c48d..0000000
Binary files a/backgrounds/kanagawa.jpg and /dev/null differ
diff --git a/backgrounds/nord_scenary.png b/backgrounds/nord_scenary.png
deleted file mode 100644
index 0152fa6..0000000
Binary files a/backgrounds/nord_scenary.png and /dev/null differ
diff --git a/backgrounds/simple-pastel-by-triarts-from-freepik.jpg b/backgrounds/simple-pastel-by-triarts-from-freepik.jpg
deleted file mode 100644
index 14e1170..0000000
Binary files a/backgrounds/simple-pastel-by-triarts-from-freepik.jpg and /dev/null differ
diff --git a/bin/ascii.sh b/bin/ascii.sh
index dd98ca3..298759b 100644
--- a/bin/ascii.sh
+++ b/bin/ascii.sh
@@ -1,11 +1,12 @@
-ascii_art='
+ascii_art=$(cat << 'EOF'
  __             _           _            _.--._
 / _\_   _ _ __ | |__   __ _| |_     _.-.'      `.-._
 \ \| | | | '_ \| '_ \ / _` | __|  .' ./`--...--' \  `.
 _\ \ |_| | | | | | | | (_| | |_   `.'.`--.._..--'   .'
 \__/\__,_|_| |_|_| |_|\__,_|\__|    `-..__    __..-'
                                           ````
-'
+EOF
+)
 
 # Define the color gradient (shades of cyan and blue)
 colors=(
diff --git a/bin/sunhat-font b/bin/sunhat-Font
similarity index 100%
rename from bin/sunhat-font
rename to bin/sunhat-Font
diff --git a/bin/sunhat-install b/bin/sunhat-Install
similarity index 100%
rename from bin/sunhat-install
rename to bin/sunhat-Install
diff --git a/bin/sunhat-theme b/bin/sunhat-Theme
similarity index 97%
rename from bin/sunhat-theme
rename to bin/sunhat-Theme
index 74087d5..c353b41 100644
--- a/bin/sunhat-theme
+++ b/bin/sunhat-Theme
@@ -5,7 +5,7 @@ THEME=$(gum choose "${THEME_NAMES[@]}" --header "Choose your theme" --height 9 |
 [ ! -n "$THEME" ] && exit 0
 
 # Install theme in Gnome, Terminal, and both default editors
-source $SUNHAT_PATH/themes/gnome/$THEME.sh
+#source $SUNHAT_PATH/themes/gnome/$THEME.sh
 #cp $SUNHAT_PATH/themes/kitty/$THEME.conf ~/.config/kitty/kitty.conf
 #cp $SUNHAT_PATH/themes/neovim/$THEME.lua ~/.config/nvim/lua/gib_nvim/colors.lua
 
diff --git a/bin/sunhat-update b/bin/sunhat-Update
similarity index 100%
rename from bin/sunhat-update
rename to bin/sunhat-Update
diff --git a/configs/rc/bashrc b/configs/rc/bashrc
index 0d66add..a5b41aa 100644
--- a/configs/rc/bashrc
+++ b/configs/rc/bashrc
@@ -1,5 +1 @@
 source ~/.local/share/sunhat/defaults/bash/rc
-
-# Editor used by CLI
-export EDITOR="nvim"
-export SUDO_EDITOR="nvim"
diff --git a/defaults/bash/rc b/defaults/bash/rc
index bd8fe3f..2893391 100644
--- a/defaults/bash/rc
+++ b/defaults/bash/rc
@@ -1,3 +1,3 @@
-source ~/.local/share/omakub/defaults/bash/shell
-source ~/.local/share/omakub/defaults/bash/aliases
-source ~/.local/share/omakub/defaults/bash/powerline
+source ~/.local/share/sunhat/defaults/bash/shell
+source ~/.local/share/sunhat/defaults/bash/aliases
+source ~/.local/share/sunhat/defaults/bash/powerline
diff --git a/defaults/bash/shell b/defaults/bash/shell
index 133c8cf..3ee6522 100644
--- a/defaults/bash/shell
+++ b/defaults/bash/shell
@@ -12,6 +12,6 @@ export SUNHAT_PATH="/home/$USER/.local/share/sunhat"
 export BUN_INSTALL="$HOME/.bun"
 
 # Set complete path
-export PATH="./bin:$HOME/.local/bin:$HOME/$SUNHAT_PATH/bin:$HOME/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$BUN_INSTALL/bin"
+export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/sunhat/bin:$HOME/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin"
 set +h
 
diff --git a/install/app_grub_btrfs.sh b/install/app_grub_btrfs.sh
index 4ed5756..8d408b0 100644
--- a/install/app_grub_btrfs.sh
+++ b/install/app_grub_btrfs.sh
@@ -1,5 +1,6 @@
+sudo dnf install -y btrfs-progs gawk inotify-tools
 git clone https://github.com/Antynea/grub-btrfs ~/.local/share/sunhat/packages/grub-btrfs/
-mv ~/.local/share/sunhat/configs/grub-btrfs/config ~/.local/share/sunhat/grub-btrfs/config
+cp ~/.local/share/sunhat/configs/grub-btrfs/config ~/.local/share/sunhat/packages/grub-btrfs/config
 cd ~/.local/share/sunhat/packages/grub-btrfs
 sudo make install
 sudo grub2-mkconfig -o /etc/grub2-efi.cfg
diff --git a/install/app_ulauncher.sh b/install/app_ulauncher.sh
index 8ab5e70..f9faf99 100644
--- a/install/app_ulauncher.sh
+++ b/install/app_ulauncher.sh
@@ -5,4 +5,4 @@ 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/omakub/configs/ulauncher/ulauncher.json ~/.config/ulauncher/settings.json
+cp ~/.local/share/sunhat/configs/ulauncher/ulauncher.json ~/.config/ulauncher/settings.json
diff --git a/packages/espanso b/packages/espanso
new file mode 160000
index 0000000..8daadcc
--- /dev/null
+++ b/packages/espanso
@@ -0,0 +1 @@
+Subproject commit 8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7
diff --git a/packages/grub-btrfs b/packages/grub-btrfs
new file mode 160000
index 0000000..f682e17
--- /dev/null
+++ b/packages/grub-btrfs
@@ -0,0 +1 @@
+Subproject commit f682e17b30def8ebbf9b4b3f0a60df0443633e4c
diff --git a/packages/hanabi b/packages/hanabi
new file mode 160000
index 0000000..710859c
--- /dev/null
+++ b/packages/hanabi
@@ -0,0 +1 @@
+Subproject commit 710859c3708524ea2a1d22b262ee9753e7523e53
diff --git a/settings/set_gnome_extensions.sh b/settings/set_gnome_extensions.sh
index 8b0bfd1..a0f15c9 100644
--- a/settings/set_gnome_extensions.sh
+++ b/settings/set_gnome_extensions.sh
@@ -25,7 +25,8 @@ gext install wifiqrcode@glerro.pm.me
 # Install Hanabi
 git clone https://github.com/jeffshee/gnome-ext-hanabi.git ~/.local/share/sunhat/packages/hanabi
 cd ~/.local/share/sunhat/packages/hanabi
-./run.sh install
+./run.sh install > /dev/null
+echo "Hanabi installed"
 
 # Compile gsettings schemas in order to be able to set them
 sudo cp ~/.local/share/gnome-shell/extensions/app-hider/schemas/org.gnome-shell-extension.app-hider.gschema.xml /usr/share/glib-2.0/schemas/
diff --git a/sources/ms_repos.sh b/sources/ms_repos.sh
index c1cd0e8..c59fb80 100644
--- a/sources/ms_repos.sh
+++ b/sources/ms_repos.sh
@@ -1,4 +1,3 @@
-echo -e "\nInstall Microsoft Repos for VSCode & Edge\n"
 sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
 sudo dnf config-manager --add-repo \
     https://packages.microsoft.com/yumrepos/edge
diff --git a/themes/gnome/catppuccin.sh b/themes/gnome/catppuccin.sh
deleted file mode 100644
index 169760f..0000000
--- a/themes/gnome/catppuccin.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-magenta-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-magenta'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/catppuccintotoro.png"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/everforest.sh b/themes/gnome/everforest.sh
deleted file mode 100644
index dd1664c..0000000
--- a/themes/gnome/everforest.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-bark-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-bark'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/fog_forest_2.jpg"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/gruvbox.sh b/themes/gnome/gruvbox.sh
deleted file mode 100644
index 8818a12..0000000
--- a/themes/gnome/gruvbox.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-sage-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-sage'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/ferns-green.jpg"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/kanagawa.sh b/themes/gnome/kanagawa.sh
deleted file mode 100644
index 1afce8a..0000000
--- a/themes/gnome/kanagawa.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-purple-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-purple'
-
-OMAKUB_BACKGROUND_ORG_PATH="$HOME/.local/share/omakub/backgrounds/kanagawa.jpg"
-OMAKUB_BACKGROUND_DEST_PATH="$HOME/.local/share/backgrounds/kanagawa.jpg"
-[ ! -f $OMAKUB_BACKGROUND_DEST_PATH ] && cp $OMAKUB_BACKGROUND_ORG_PATH $OMAKUB_BACKGROUND_DEST_PATH
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_BACKGROUND_DEST_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_BACKGROUND_DEST_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/nord.sh b/themes/gnome/nord.sh
deleted file mode 100644
index 032e202..0000000
--- a/themes/gnome/nord.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-blue-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-blue'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/nord_scenary.png"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/rose-pine.sh b/themes/gnome/rose-pine.sh
deleted file mode 100644
index 66870df..0000000
--- a/themes/gnome/rose-pine.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-red'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-red'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/simple-pastel-by-triarts-from-freepik.jpg"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'
diff --git a/themes/gnome/tokyo-night.sh b/themes/gnome/tokyo-night.sh
deleted file mode 100644
index 2d3e336..0000000
--- a/themes/gnome/tokyo-night.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-purple-dark'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-purple'
-
-OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH="$HOME/.local/share/omakub/backgrounds/80s-retro-tropical-sunset-by-freepik.jpg"
-gsettings set org.gnome.desktop.background picture-uri $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $OMAKUB_DEFAULT_BACKGROUND_IMAGE_PATH
-gsettings set org.gnome.desktop.background picture-options 'zoom'