diff --git a/1-setup.sh b/1-setup.sh
index 776c935..7661cb9 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -12,21 +12,13 @@ echo "--          Network Setup           --"
 echo "--------------------------------------"
 pacman -S networkmanager dhclient --noconfirm --needed
 systemctl enable --now NetworkManager
-
-echo "--------------------------------------"
-echo "--      Set Password for Root       --"
-echo "--------------------------------------"
-echo "Enter password for root user: "
-passwd root
-
 if ! source install.conf; then
-	read -p "Please enter hostname:" hostname
-
 	read -p "Please enter username:" username
+    read -p "Please enter password:" password
 echo "username=$username" >> ${HOME}/ArchTitus/install.conf
 echo "password=$password" >> ${HOME}/ArchTitus/install.conf
 fi
-
+passwd --password $password root
 echo "-------------------------------------------------"
 echo "Setting up mirrors for optimal download          "
 echo "-------------------------------------------------"
@@ -55,9 +47,6 @@ localectl --no-ask-password set-locale LANG="en_US.UTF-8" LC_COLLATE="" LC_TIME=
 # Set keymaps
 localectl --no-ask-password set-keymap us
 
-# Hostname
-hostnamectl --no-ask-password set-hostname $hostname
-
 # Add sudo no password rights
 sed -i 's/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
 
@@ -215,7 +204,6 @@ PKGS=(
 'sddm'
 'sddm-kcm'
 'snapper'
-'snap-pac'
 'spectacle'
 'steam'
 'sudo'
@@ -280,23 +268,13 @@ elif lspci | grep -E "Integrated Graphics Controller"; then
     pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils --needed --noconfirm
 fi
 
-sudo hostnamectl set-hostname $hostname
 echo -e "\nDone!\n"
 
 if [ $(whoami) = "root"  ];
 then
-    [ ! -d "/home/$username" ] && useradd -m -G wheel,libvirt -s /bin/bash $username 
+    [ ! -d "/home/$username" ] && useradd -m -p $password -G wheel,libvirt -s /bin/bash $username 
     cp -R /root/ArchTitus /home/$username/
     chown -R $username: /home/$username/ArchTitus
-    echo "--------------------------------------"
-    echo "--      Set Password for $username  --"
-    echo "--------------------------------------"
-    echo "Enter password for $username user: "
-    passwd $username
-#    cp /etc/skel/.bash_profile /home/$username/
-#    cp /etc/skel/.bash_logout /home/$username/
-#    cp /etc/skel/.bashrc /home/$username/.bashrc
-    
 else
 	echo "You are already a user proceed with aur installs"
 fi
diff --git a/2-user.sh b/2-user.sh
index 6f95493..4fe3e47 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -46,6 +46,7 @@ PKGS=(
 'ttf-meslo' # Nerdfont package
 'ttf-roboto'
 'zoom' # video conferences
+'snap-pac'
 )
 
 for PKG in "${PKGS[@]}"; do
diff --git a/3-post-setup.sh b/3-post-setup.sh
index 58b4642..277b569 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -12,63 +12,6 @@ echo -e "\nFINAL SETUP AND CONFIGURATION"
 
 # ------------------------------------------------------------------------
 
-echo -e "\nGenerating .xinitrc file"
-
-# Generate the .xinitrc file so we can launch Awesome from the
-# terminal using the "startx" command
-cat <<EOF > ${HOME}/.xinitrc
-#!/bin/bash
-# Disable bell
-xset -b
-
-# Disable all Power Saving Stuff
-xset -dpms
-xset s off
-
-# X Root window color
-xsetroot -solid darkgrey
-
-# Merge resources (optional)
-#xrdb -merge $HOME/.Xresources
-
-# Caps to Ctrl, no caps
-setxkbmap -layout us -option ctrl:nocaps
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-        [ -x "\$f" ] && . "\$f"
-    done
-    unset f
-fi
-
-exit 0
-EOF
-
-# ------------------------------------------------------------------------
-
-echo -e "\nConfiguring LTS Kernel as a secondary boot option"
-
-sudo cp /boot/loader/entries/arch.conf /boot/loader/entries/arch-lts.conf
-sudo sed -i 's|Arch Linux|Arch Linux LTS Kernel|g' /boot/loader/entries/arch-lts.conf
-sudo sed -i 's|vmlinuz-linux|vmlinuz-linux-lts|g' /boot/loader/entries/arch-lts.conf
-sudo sed -i 's|initramfs-linux.img|initramfs-linux-lts.img|g' /boot/loader/entries/arch-lts.conf
-
-# ------------------------------------------------------------------------
-
-echo -e "\nIncreasing file watcher count"
-
-# This prevents a "too many files" error in Visual Studio Code
-echo fs.inotify.max_user_watches=524288 | sudo tee /etc/sysctl.d/40-max-user-watches.conf && sudo sysctl --system
-
-# ------------------------------------------------------------------------
-
-echo -e "\nDisabling Pulse .esd_auth module"
-
-# Pulse audio loads the `esound-protocol` module, which best I can tell is rarely needed.
-# That module creates a file called `.esd_auth` in the home directory which I'd prefer to not be there. So...
-sudo sed -i 's|load-module module-esound-protocol-unix|#load-module module-esound-protocol-unix|g' /etc/pulse/default.pa
-
-# ------------------------------------------------------------------------
-
 echo -e "\nEnabling Login Display Manager"
 
 sudo systemctl enable sddm.service
@@ -82,21 +25,14 @@ EOF
 
 # ------------------------------------------------------------------------
 
-echo -e "\nEnabling bluetooth daemon and setting it to auto-start"
-
-sudo sed -i 's|#AutoEnable=false|AutoEnable=true|g' /etc/bluetooth/main.conf
-sudo systemctl enable --now bluetooth.service
-
-# ------------------------------------------------------------------------
-
 echo -e "\nEnabling the cups service daemon so we can print"
 
-systemctl enable --now cups.service
+systemctl enable cups.service
 sudo ntpd -qg
-sudo systemctl enable --now ntpd.service
+sudo systemctl enable ntpd.service
 sudo systemctl disable dhcpcd.service
 sudo systemctl stop dhcpcd.service
-sudo systemctl enable --now NetworkManager.service
+sudo systemctl enable NetworkManager.service
 echo "
 ###############################################################################
 # Cleaning
@@ -111,6 +47,6 @@ sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 cd $pwd
 echo "
 ###############################################################################
-# Done
+# Done - Please Eject Install Media and Reboot
 ###############################################################################
 "