diff --git a/bin/sunhat b/bin/sunhat
index e092ed5..421533c 100755
--- a/bin/sunhat
+++ b/bin/sunhat
@@ -3,7 +3,7 @@
 source $SUNHAT_PATH/bin/ascii.sh
 
 if [ $# -eq 0 ]; then
-	SUB=$(gum choose "Theme" "Font" "Install" "Update" --height 8 --header "" | tr '[:upper:]' '[:lower:]')
+	SUB=$(gum choose "theme" "font" "install" "update" --height 8 --header "" | tr '[:upper:]' '[:lower:]')
 else
 	SUB=$1
 fi
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 96%
rename from bin/sunhat-Theme
rename to bin/sunhat-theme
index c353b41..01ff3a9 100644
--- a/bin/sunhat-Theme
+++ b/bin/sunhat-theme
@@ -1,5 +1,5 @@
 # Pick a preconfigured theme
-THEME_NAMES=("Tokyo Night" "Nord" "Catppuccin" "Everforest" "Gruvbox" "Kanagawa" "Rose Pine")
+THEME_NAMES=("Tokyo Night" "Catppuccin" "Nord" "Everforest" "Gruvbox" "Kanagawa" "Rose Pine")
 THEME=$(gum choose "${THEME_NAMES[@]}" --header "Choose your theme" --height 9 | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g')
 
 [ ! -n "$THEME" ] && exit 0
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/defaults/bash/aliases b/defaults/bash/aliases
index 8a3b430..d8be6ea 100644
--- a/defaults/bash/aliases
+++ b/defaults/bash/aliases
@@ -16,9 +16,9 @@ alias lta='lt -a'
 alias ff="fzf --preview 'batcat --style=numbers --color=always {}'"
 
 # Directories
-alias cd..='cd ..'
-alias cd...='cd ../..'
-alias cd....='cd ../../..'
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
 
 # Tools
 alias n='nvim'
diff --git a/install.sh b/install.sh
index d06af62..1fa7b2f 100644
--- a/install.sh
+++ b/install.sh
@@ -3,9 +3,10 @@ source ~/.local/share/sunhat/bin/ascii.sh
 
 # Needed for all installers
 sudo dnf update -y
-sudo dnf install -y curl git jq
+sudo dnf install -y curl git unzip
 
 # Ensure computer doesn't go to sleep while installing
+gsettings set org.gnome.desktop.screensaver lock-enabled false
 gsettings set org.gnome.desktop.session idle-delay 0
 
 # Run Scripts Required for Application Installs
@@ -21,10 +22,11 @@ for script in ~/.local/share/sunhat/settings/*.sh; do source $script; done
 source ~/.local/share/sunhat/GPU/install.sh
 
 # Revert to normal idle settings
+gsettings set org.gnome.desktop.screensaver lock-enabled true
 gsettings set org.gnome.desktop.session idle-delay 300
 
 # Upgrade everything that might ask for a reboot last
 sudo dnf update -y --refresh
 
-# Reboot to pickup changes
+# Logout to pickup changes
 gum confirm "Ready to logout for all settings to take effect?" && gnome-session-quit --logout --no-prompt
diff --git a/install/a-shell.sh b/install/a-shell.sh
deleted file mode 100644
index dea365a..0000000
--- a/install/a-shell.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-mkdir ~/Documents/Configs
-
-[ -f "~/.bashrc" ] && rm ~/.bashrc
-cp ~/.local/share/sunhat/configs/rc/bashrc ~/Documents/Configs/bashrc
-ln -s ~/Documents/Configs/bashrc ~/.bashrc
-source ~/.bashrc
-
-[ -f "~/.inputrc" ] && rm ~/.inputrc
-cp ~/.local/share/sunhat/configs/rc/inputrc ~/Documents/Configs/inputrc
-ln -s ~/Documents/Configs/inputrc ~/.inputrc
diff --git a/install/app_ulauncher.sh b/install/app_ulauncher.sh
index 10c2a27..26554bb 100644
--- a/install/app_ulauncher.sh
+++ b/install/app_ulauncher.sh
@@ -1,4 +1,4 @@
 sudo dnf install -y ulauncher
-gtk-launch ulauncher.desktop >/dev/null
+gtk-launch ulauncher.desktop >/dev/null 2>&1
 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_git.sh b/settings/set_git.sh
index dc90f41..13a5ed0 100644
--- a/settings/set_git.sh
+++ b/settings/set_git.sh
@@ -7,8 +7,8 @@ git config --global pull.rebase true
 
 # Set git editor and user
 git config --global core.editor "nvim"
-git config --global user.name "gibbyb"
-git config --global user.email "gib@gibbyb.com"
+git config --global user.name $GH_USERNAME
+git config --global user.email $GH_EMAIL
 
 # Sign in to GitHub
 gh auth login
diff --git a/settings/set_gnome_extensions.sh b/settings/set_gnome_extensions.sh
index a0f15c9..3c5ec7d 100644
--- a/settings/set_gnome_extensions.sh
+++ b/settings/set_gnome_extensions.sh
@@ -3,6 +3,8 @@ pipx install gnome-extensions-cli --system-site-packages
 # Turn off Fedora Watermark extension
 gnome-extensions disable background-logo@fedorahosted.org
 
+gum confirm "To install GNOME extensions, you will need to accept quite a few prompts. Are you ready to proceed?"
+
 # Install new extensions
 gext install allowlockedremotedesktop@kamens.us
 gext install app-hider@lynith.dev
diff --git a/settings/set_theme.sh b/settings/set_theme.sh
new file mode 100644
index 0000000..e69de29
diff --git a/settings/set_config.sh b/sources/dotfiles.sh
similarity index 53%
rename from settings/set_config.sh
rename to sources/dotfiles.sh
index 4dfb012..10cfd41 100644
--- a/settings/set_config.sh
+++ b/sources/dotfiles.sh
@@ -1,11 +1,23 @@
+# Make Directory for all Dotfiles so you can sync them with Nextcloud.
 mkdir ~/Documents/Configs
+
+# Set up Bash Config and Source it ASAP.
+[ -f "~/.bashrc" ] && rm ~/.bashrc
+cp ~/.local/share/sunhat/configs/rc/bashrc ~/Documents/Configs/bashrc
+ln -s ~/Documents/Configs/bashrc ~/.bashrc
+source ~/.bashrc
+
+[ -f "~/.inputrc" ] && rm ~/.inputrc
+cp ~/.local/share/sunhat/configs/rc/inputrc ~/Documents/Configs/inputrc
+ln -s ~/Documents/Configs/inputrc ~/.inputrc
+
+# Copy all Dotfiles to the Configs Directory.
 cp -r ~/.local/share/sunhat/configs/dotfiles/. ~/Documents/Configs/
 
-espanso service stop
+# Remove old dotfiles if they exist & create symlinks to the new dotfiles.
 rm -rf ~/.config/espanso
 ln -s ~/Documents/Configs/espanso ~/.config/espanso
-espanso service start
-rm -rf ~/.config/espanso
+rm -rf ~/.config/forge
 ln -s ~/Documents/Configs/forge ~/.config/forge
 rm -rf ~/.config/kitty
 ln -s ~/Documents/Configs/kitty ~/.config/kitty
diff --git a/sources/env.sh b/sources/env.sh
new file mode 100644
index 0000000..8f45555
--- /dev/null
+++ b/sources/env.sh
@@ -0,0 +1,4 @@
+export GH_USERNAME="gibbyb"
+export GH_EMAIL="gib@gibbyb.com"
+export GH_EDITOR="nvim"
+export HOST_NAME="desktop.gib"
diff --git a/sources/hostname.sh b/sources/hostname.sh
index d1b8a09..16c6ed2 100644
--- a/sources/hostname.sh
+++ b/sources/hostname.sh
@@ -1,2 +1 @@
-read -p "Set your hostname: " hostname_response
-sudo hostnamectl set-hostname $hostname_response
+sudo hostnamectl set-hostname $HOST_NAME