diff --git a/1-setup.sh b/1-setup.sh
index 679da42..74628dd 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -53,158 +53,7 @@ pacman -Sy --noconfirm
 
 echo -e "\nInstalling Base System\n"
 
-PKGS=(
-'mesa' # Essential Xorg First
-'xorg'
-'xorg-server'
-'xorg-apps'
-'xorg-drivers'
-'xorg-xkill'
-'xorg-xinit'
-'xterm'
-'plasma-desktop' # KDE Load second
-'alsa-plugins' # audio plugins
-'alsa-utils' # audio utils
-'ark' # compression
-'audiocd-kio' 
-'autoconf' # build
-'automake' # build
-'base'
-'bash-completion'
-'bind'
-'binutils'
-'bison'
-'bluedevil'
-'bluez'
-'bluez-libs'
-'bluez-utils'
-'breeze'
-'breeze-gtk'
-'bridge-utils'
-'btrfs-progs'
-'celluloid' # video players
-'cmatrix'
-'code' # Visual Studio code
-'cronie'
-'cups'
-'dialog'
-'discover'
-'dolphin'
-'dosfstools'
-'dtc'
-'efibootmgr' # EFI boot
-'egl-wayland'
-'exfat-utils'
-'extra-cmake-modules'
-'filelight'
-'flex'
-'fuse2'
-'fuse3'
-'fuseiso'
-'gamemode'
-'gcc'
-'gimp' # Photo editing
-'git'
-'gparted' # partition management
-'gptfdisk'
-'grub'
-'grub-customizer'
-'gst-libav'
-'gst-plugins-good'
-'gst-plugins-ugly'
-'gwenview'
-'haveged'
-'htop'
-'iptables-nft'
-'jdk-openjdk' # Java 17
-'kate'
-'kcodecs'
-'kcoreaddons'
-'kde-plasma-addons'
-'kinfocenter'
-'kscreen'
-'kvantum-qt5'
-'kde-gtk-config'
-'kitty'
-'konsole'
-'kscreen'
-'layer-shell-qt'
-'libdvdcss'
-'libnewt'
-'libtool'
-'linux'
-'linux-firmware'
-'linux-headers'
-'lsof'
-'lutris'
-'lzop'
-'m4'
-'make'
-'milou'
-'nano'
-'neofetch'
-'networkmanager'
-'ntfs-3g'
-'ntp'
-'okular'
-'openbsd-netcat'
-'openssh'
-'os-prober'
-'oxygen'
-'p7zip'
-'pacman-contrib'
-'patch'
-'picom'
-'pkgconf'
-'plasma-nm'
-'powerdevil'
-'powerline-fonts'
-'print-manager'
-'pulseaudio'
-'pulseaudio-alsa'
-'pulseaudio-bluetooth'
-'python-notify2'
-'python-psutil'
-'python-pyqt5'
-'python-pip'
-'qemu'
-'rsync'
-'sddm'
-'sddm-kcm'
-'snapper'
-'spectacle'
-'steam'
-'sudo'
-'swtpm'
-'synergy'
-'systemsettings'
-'terminus-font'
-'traceroute'
-'ufw'
-'unrar'
-'unzip'
-'usbutils'
-'vim'
-'virt-manager'
-'virt-viewer'
-'wget'
-'which'
-'wine-gecko'
-'wine-mono'
-'winetricks'
-'xdg-desktop-portal-kde'
-'xdg-user-dirs'
-'zeroconf-ioslave'
-'zip'
-'zsh'
-'zsh-syntax-highlighting'
-'zsh-autosuggestions'
-)
-
-for PKG in "${PKGS[@]}"; do
-    echo "INSTALLING: ${PKG}"
-    sudo pacman -S "$PKG" --noconfirm --needed
-done
+sudo pacman -S --needed - < /pkg-files/pacman-pkgs.txt
 
 #
 # determine processor type and install microcode
diff --git a/2-user.sh b/2-user.sh
index 881a28d..89786d8 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -22,38 +22,7 @@ git clone "https://github.com/ChrisTitusTech/zsh"
 git clone --depth=1 https://github.com/romkatv/powerlevel10k.git $HOME/powerlevel10k
 ln -s "$HOME/zsh/.zshrc" $HOME/.zshrc
 
-PKGS=(
-'autojump'
-'awesome-terminal-fonts'
-'brave-bin' # Brave Browser
-'dxvk-bin' # DXVK DirectX to Vulcan
-'github-desktop-bin' # Github Desktop sync
-'lightly-git'
-'lightlyshaders-git'
-'mangohud' # Gaming FPS Counter
-'mangohud-common'
-'nerd-fonts-fira-code'
-'nordic-darker-standard-buttons-theme'
-'nordic-darker-theme'
-'nordic-kde-git'
-'nordic-theme'
-'noto-fonts-emoji'
-'papirus-icon-theme'
-'plasma-pa'
-'ocs-url' # install packages from websites
-'sddm-nordic-theme-git'
-'snapper-gui-git'
-'ttf-droid'
-'ttf-hack'
-'ttf-meslo' # Nerdfont package
-'ttf-roboto'
-'zoom' # video conferences
-'snap-pac'
-)
-
-for PKG in "${PKGS[@]}"; do
-    yay -S --noconfirm $PKG
-done
+yay -S --needed - < /pkg-files/aur-pkgs.txt
 
 export PATH=$PATH:~/.local/bin
 cp -r $HOME/ArchTitus/dotfiles/* $HOME/.config/
diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt
new file mode 100644
index 0000000..3b99627
--- /dev/null
+++ b/pkg-files/aur-pkgs.txt
@@ -0,0 +1,26 @@
+autojump
+awesome-terminal-fonts
+brave-bin 
+dxvk-bin 
+github-desktop-bin 
+lightly-git
+lightlyshaders-git
+mangohud 
+mangohud-common
+nerd-fonts-fira-code
+nordic-darker-standard-buttons-theme
+nordic-darker-theme
+nordic-kde-git
+nordic-theme
+noto-fonts-emoji
+papirus-icon-theme
+plasma-pa
+ocs-url 
+sddm-nordic-theme-git
+snapper-gui-git
+ttf-droid
+ttf-hack
+ttf-meslo 
+ttf-roboto
+zoom 
+snap-pac
\ No newline at end of file
diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt
new file mode 100644
index 0000000..490abf2
--- /dev/null
+++ b/pkg-files/pacman-pkgs.txt
@@ -0,0 +1,145 @@
+mesa 
+xorg
+xorg-server
+xorg-apps
+xorg-drivers
+xorg-xkill
+xorg-xinit
+xterm
+plasma-desktop 
+alsa-plugins 
+alsa-utils 
+ark 
+audiocd-kio 
+autoconf 
+automake 
+base
+bash-completion
+bind
+binutils
+bison
+bluedevil
+bluez
+bluez-libs
+bluez-utils
+breeze
+breeze-gtk
+bridge-utils
+btrfs-progs
+celluloid 
+cmatrix
+code 
+cronie
+cups
+dialog
+discover
+dolphin
+dosfstools
+dtc
+efibootmgr 
+egl-wayland
+exfat-utils
+extra-cmake-modules
+filelight
+flex
+fuse2
+fuse3
+fuseiso
+gamemode
+gcc
+gimp 
+git
+gparted 
+gptfdisk
+grub
+grub-customizer
+gst-libav
+gst-plugins-good
+gst-plugins-ugly
+gwenview
+haveged
+htop
+iptables-nft
+jdk-openjdk 
+kate
+kcodecs
+kcoreaddons
+kde-plasma-addons
+kinfocenter
+kscreen
+kvantum-qt5
+kde-gtk-config
+kitty
+konsole
+kscreen
+layer-shell-qt
+libdvdcss
+libnewt
+libtool
+linux
+linux-firmware
+linux-headers
+lsof
+lutris
+lzop
+m4
+make
+milou
+nano
+neofetch
+networkmanager
+ntfs-3g
+ntp
+okular
+openbsd-netcat
+openssh
+os-prober
+oxygen
+p7zip
+pacman-contrib
+patch
+picom
+pkgconf
+plasma-nm
+powerdevil
+powerline-fonts
+print-manager
+pulseaudio
+pulseaudio-alsa
+pulseaudio-bluetooth
+python-notify2
+python-psutil
+python-pyqt5
+python-pip
+qemu
+rsync
+sddm
+sddm-kcm
+snapper
+spectacle
+steam
+sudo
+swtpm
+synergy
+systemsettings
+terminus-font
+traceroute
+ufw
+unrar
+unzip
+usbutils
+vim
+virt-manager
+virt-viewer
+wget
+which
+wine-gecko
+wine-mono
+winetricks
+xdg-desktop-portal-kde
+xdg-user-dirs
+zeroconf-ioslave
+zip
+zsh
+zsh-syntax-highlighting
+zsh-autosuggestions
\ No newline at end of file