diff --git a/arch-setup/arch-setup.sh b/arch-setup/arch-setup.sh
index 16686c3a..7bf655e5 100755
--- a/arch-setup/arch-setup.sh
+++ b/arch-setup/arch-setup.sh
@@ -103,7 +103,7 @@ if [ ! "$encryption" = "n" ]; then
     echo $root_pass | cryptsetup luksAddKey "$root" /root/.keys/root-keyfile
     echo "[INFO]: Keyfile saved to /root/.keys/root-keyfile"
     cryptsetup open --key-file="/root/.keys/root-keyfile" "$root" root
-    mkfs.ext4 /dev/mapper/root
+    mkfs.ext4 -F /dev/mapper/root
 
     mkdir /mnt/sys
     mount /dev/mapper/root /mnt/sys
@@ -117,18 +117,18 @@ if [ ! "$encryption" = "n" ]; then
         echo $home_pass | cryptsetup luksAddKey "$home" /root/.keys/home-keyfile
         echo "[INFO]: Keyfile saved to /root/.keys/home-keyfile"
         cryptsetup open --key-file="/root/.keys/home-keyfile" "$home" home
-        mkfs.ext4 /dev/mapper/home
+        mkfs.ext4 -F /dev/mapper/home
         mkdir /mnt/sys/home
         mount "/dev/mapper/home" /mnt/sys/home
     fi
 else
     mkswap $swap
     swapon $swap
-    mkfs.ext4 $root
+    mkfs.ext4 -F $root
     mkdir /mnt/sys
     mount $root /mnt/sys
     if [ "$home_s" = "y" ]; then
-        mkfs.ext4 $home
+        mkfs.ext4 -F $home
         mkdir /mnt/sys/home
         mount "$home" /mnt/sys/home
     fi
@@ -140,10 +140,10 @@ mount "$boot" /mnt/sys/boot
 clear
 
 if [ "$distro" = "1" ];then
-    pacstrap /mnt/sys base linux linux-firmware base-devel git vi nano sudo
+    pacstrap /mnt/sys base linux linux-firmware base-devel vi nano
     genfstab -U /mnt/sys >> /mnt/sys/etc/fstab
 else
-    basestrap /mnt/sys base linux linux-firmware base-devel git vi nano sudo openrc
+    basestrap /mnt/sys base linux linux-firmware base-devel vi nano openrc
     fstabgen -U /mnt/sys >> /mnt/sys/etc/fstab
 fi
 
@@ -164,6 +164,7 @@ mkdir /mnt/sys/install
 cp -r /root/.keys /mnt/sys/root
 curl https://raw.githubusercontent.com/theFr1nge/dotfiles/main/arch-setup/packages.minimal > /mnt/sys/install/packages.minimal
 curl https://raw.githubusercontent.com/theFr1nge/dotfiles/main/arch-setup/packages.full > /mnt/sys/install/packages.full
+curl https://raw.githubusercontent.com/theFr1nge/dotfiles/main/arch-setup/packages.base > /mnt/sys/install/packages.base
 curl https://raw.githubusercontent.com/theFr1nge/dotfiles/main/arch-setup/chroot.sh > /mnt/sys/install/chroot.sh
 chmod +x /mnt/sys/install/chroot.sh
 
diff --git a/arch-setup/chroot.sh b/arch-setup/chroot.sh
index 9d1840ba..fe8c4ec5 100755
--- a/arch-setup/chroot.sh
+++ b/arch-setup/chroot.sh
@@ -48,22 +48,20 @@ if [ ! -f "/tmp/.blackarch" ]; then
     /tmp/strap.sh
 
     if [ -f "/install/artix" ]; then
-        echo -e "[lib32]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor"
+        echo -e "\n[lib32]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor" >> /etc/pacman.conf
     else
-        echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor"
+        echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor" >> /etc/pacman.conf
     fi
-    pacman -Syy
-    touch /tmp/.blackarch
+
 
     echo -n "Are you going to use a flexo server?(y/N): "
     read flexo
 
-    while [ "$flex" = "y" ]; do
+    while [ "$flexo" = "y" ]; do
         echo -n "Please enter ip address of flexo server: "
         read flexo_ip
         echo "\nServer = http://$flexo_ip:7878/\$repo/os/\$arch\n" >> /etc/pacman.d/mirrorlist
     done
-
     pacman -Syy
 
     echo -n "Did any errors occur?(y/N): "
@@ -73,6 +71,7 @@ if [ ! -f "/tmp/.blackarch" ]; then
         echo "Dropping you into a shell so that you can fix them, once you quit the shell, the installation will continue from where you left off."
         bash
     fi
+    touch /tmp/.blackarch
 fi
 
 clear
@@ -174,8 +173,12 @@ HOOKS=(base udev plymouth autodetect keyboard keymap consolefont modconf block p
 EOF
 fi
 
+pacman -Syu --noconfirm $(cat /install/packages.base)
 pacman --noconfirm -R vim
 
+refind-install
+
+if [ -f "/install/encrypted" ]; then
 line=1
 
 blkid | while IFS= read -r i; do
@@ -183,8 +186,7 @@ blkid | while IFS= read -r i; do
     ((line=line+1))
 done
 
-if [ -f "/install/encrypted" ]; then
-echo "Please select the device you will save the LUKS key to:"
+echo -n "Please select the device you will save the LUKS key to: "
 read keydev
 
 uuid=$(blkid | sed -n 's/.*UUID=\"\([^\"]*\)\".*/\1/p'  | sed -n "$keydev"p)
@@ -210,30 +212,30 @@ fi
 
 sudo -u $username bash -c "git clone https://aur.archlinux.org/yay.git /tmp/yay"
 sudo -u $username bash -c "(cd /tmp/yay; makepkg --noconfirm -si)"
-sudo -u $username bash -c "yay --noconfirm -S plymouth"
 
-clear
-
-
-sudo -u $username bash -c "git clone --recurse-submodules https://github.com/theFr1nge/dotfiles.git ~/.dotfiles"
-sudo -u $username bash -c "(cd ~/.dotfiles; ./install.sh)"
-
-clear
 
-git clone https://github.com/adi1090x/plymouth-themes.git /tmp/pthemes
+echo -n "Would you like to automatically install my dotfiles?(y/N): "
+read dotfiles
 
+if [ "$dotfiles" = "y" ]; then
+    pacman -R --noconfirm vim
+    sudo -u $username bash -c "yay --noconfirm -S plymouth"
+    clear
+    sudo -u $username bash -c "git clone --recurse-submodules https://github.com/theFr1nge/dotfiles.git ~/.dotfiles"
+    sudo -u $username bash -c "(cd ~/.dotfiles; ./install.sh)"
+    clear
+    git clone https://github.com/adi1090x/plymouth-themes.git /tmp/pthemes
 cat << EOF > /etc/plymouth/plymouthd.conf
 [Daemon]
 Theme=sphere
 ShowDelay=0
 DeviceTimeout=8
 EOF
+    cp -r /tmp/pthemes/pack_4/sphere /usr/share/plymouth/themes
+    clear
+fi
 
-cp -r /tmp/pthemes/pack_4/sphere /usr/share/plymouth/themes
-
-clear
 
-refind-install
 
 echo -e "/boot/EFI/refind\n2\n2" | sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/bobafetthotmail/refind-theme-regular/master/install.sh)"
 
diff --git a/arch-setup/packages.base b/arch-setup/packages.base
new file mode 100644
index 00000000..5a8d6bfb
--- /dev/null
+++ b/arch-setup/packages.base
@@ -0,0 +1,15 @@
+networkmanager
+efibootmgr
+refind
+dhcpcd
+python
+git
+vim
+xorg-server
+xorg-init
+xorg-apps
+xf86-video-intel
+sudo
+cronie
+wget
+curl
diff --git a/arch-setup/packages.csv b/arch-setup/packages.csv
deleted file mode 100644
index 39dc7a98..00000000
--- a/arch-setup/packages.csv
+++ /dev/null
@@ -1,250 +0,0 @@
-Mandatory,Package_Name,Install_Method,Command
-1,activitywatch-bin
-0,aic94xx-firmware
-0,alacritty
-1,antibody
-1,arandr
-0,arch-install-scripts
-0,archivemount
-0,arch-wiki-lite
-0,aria2
-0,asar
-0,autoconf2.13
-0,baobab
-1,bat
-0,betterdiscord
-0,betterdiscordctl-git
-0,bfg
-0,bitwarden
-1,bitwarden-cli
-1,blackarch-keyring
-1,blueman
-0,borgmatic
-0,botan
-0,brave-bin
-1,calcurse
-0,calibre
-0,canon-pixma-ts5055-complete
-0,capt-src
-1,catdoc
-1,cbindgen
-1,ccls
-1,checkupdates+aur
-0,cheese
-1,chrony
-1,clipnotify
-1,cmake
-0,cndrvcups-lt
-0,code
-0,cpanminus
-1,cpupower
-0,ctags
-0,ctemplate
-0,cups-pdf
-1,dash
-1,dejagnu
-1,direnv
-0,discord
-0,doxygen
-1,dunst
-0,efitools
-0,electron6
-0,engrampa
-1,exfat-utils
-1,figlet
-1,fltk
-0,ghidra-darcula
-0,gimp
-0,gitkraken
-1,git-secret
-1,gksu
-0,glxinfo
-1,gn-m85
-0,gnuplot
-1,go
-0,google-cloud-sdk
-0,googler
-1,gparted
-0,gperf
-0,gradle
-1,gtk2-perl
-1,gtk2_prefs
-1,firefox
-1,htop
-1,i7z
-1,imake
-1,inetutils
-0,inkscape
-1,intel-ucode
-1,amd-ucode
-1,iperf
-0,jetbrains-toolbox
-0,keepass
-1,khard
-0,languagetool
-1,lib32-libpng12
-1,lib32-libtiff
-0,libreoffice-fresh
-0,lld
-0,luit
-1,lxappearance
-1,ly
-1,mailcap
-1,man-pages
-1,meson
-1,mksh
-0,mozilla-common
-1,mpd-mpris
-0,mpris-ctl
-1,mutt-wizard
-1,ncmpcpp
-1,ncpamixer
-1,ncurses5-compat-libs
-1,nemo
-1,neofetch
-1,neovim
-1,net-tools
-1,newsboat
-0,nextcloud-client
-1,notmuch
-1,nvm
-1,opencv
-1,openh264
-1,openssl-1.0
-1,pamixer
-1,parcel-bundler
-1,pavucontrol
-0,peaclock
-1,perl-date-holidayparser
-1,perl-file-copy-recursive
-1,perl-module-install
-1,perl-pod-parser
-0,pipes.sh
-1,playerctl
-1,polkit-gnome
-1,qt5ct
-1,qt5-quickcontrols
-1,qt5-script
-1,qt5-styleplugins
-1,qutebrowser
-0,r8152-dkms
-1,refind
-1,rsync
-0,ruby-bundler
-0,ruby-erubis
-0,ruby-rainbow
-0,ruby-ronn
-0,ruby-thor
-0,ruby-xdg
-1,rust
-,scdoc
-,scrot
-,simplescreenrecorder
-,solid
-,spicetify-cli
-,spotify
-,spotifyd-full-git
-,spotify-tui
-,sselp
-,stegoveritas
-,sublime-text-3
-,surfraw
-,sxhkd
-,sysbench
-,syslinux
-,system-config-printer
-,taskwarrior-tui
-,tcsh
-,telegram-desktop
-,terminal_dimensions-git
-,termite
-,texlive-bibtexextra
-,texlive-fontsextra
-,texlive-formatsextra
-,texlive-games
-,texlive-humanities
-,texlive-music
-,texlive-pstricks
-,texlive-publishers
-,texlive-science
-,thermald
-,tidy
-,tlp
-,tmate
-,tmsu-bin
-,torbrowser-launcher
-,tracker3
-,ttf-inconsolata
-,ttf-joypixels
-,ttf-linux-libertine
-,ttf-material-design-icons
-,ttf-symbola
-,turbostat
-,typora
-,udevil
-,unclutter
-,unp
-,urlscan
-,vala
-,vi
-,virtualbox
-,vlc
-,vtop
-,vue-cli
-,wallabag-client
-,wd719x-firmware
-,webkitgtk-bin
-,weechat
-,wget
-,whatsapp-nativefier-dark
-,wireless_tools
-,wireshark-qt
-,xautolock
-,xbanish-timeout-git
-,xbitmaps
-,xf86-video-intel
-,xf86-video-vesa
-,xkblayout-state-git
-,xkb-switch
-,xmenu
-,xorg-docs
-,xorg-fonts-100dpi
-,xorg-fonts-75dpi
-,xorg-font-utils
-,xorg-iceauth
-,xorg-server
-,xorg-server-devel
-,xorg-server-xnest
-,xorg-server-xvfb
-,xorg-sessreg
-,xorg-smproxy
-,xorg-x11perf
-,xorg-xbacklight
-,xorg-xcmsdb
-,xorg-xcursorgen
-,xorg-xdriinfo
-,xorg-xev
-,xorg-xgamma
-,xorg-xhost
-,xorg-xinit
-,xorg-xinput
-,xorg-xkbevd
-,xorg-xkbutils
-,xorg-xkill
-,xorg-xlsatoms
-,xorg-xlsclients
-,xorg-xpr
-,xorg-xrefresh
-,xorg-xsetroot
-,xorg-xvinfo
-,xorg-xwayland
-,xorg-xwd
-,xorg-xwud
-,xscreensaver
-,xss-lock
-,xsvg
-,yarn
-,yasm
-,yay
-,ytfzf
-,zoom