diff --git a/0-preinstall.sh b/0-preinstall.sh
index 95c2373..f03fa4e 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -109,14 +109,15 @@ echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 echo "--------------------------------------"
-echo "-- Check for low memory systems <8G --"
+echo "-- Check for low memory systems <16G --"
 echo "--------------------------------------"
 TOTALMEM=$(cat /proc/meminfo | grep -i 'memtotal' | grep -o '[[:digit:]]*')
-if [[  $TOTALMEM -lt 8000000 ]]; then
+if [[  $TOTALMEM -lt 16323861 ]]; then
     #Put swap into the actual system, not into RAM disk, otherwise there is no point in it, it'll cache RAM into RAM. So, /mnt/ everything.
+    echo "Creating 8GB Swapfile"
     mkdir /mnt/opt/swap #make a dir that we can apply NOCOW to to make it btrfs-friendly.
     chattr +C /mnt/opt/swap #apply NOCOW, btrfs needs that.
-    dd if=/dev/zero of=/mnt/opt/swap/swapfile bs=1M count=2048 status=progress
+    dd if=/dev/zero of=/mnt/opt/swap/swapfile bs=1M count=8196 status=progress
     chmod 600 /mnt/opt/swap/swapfile #set permissions.
     chown root /mnt/opt/swap/swapfile
     mkswap /mnt/opt/swap/swapfile
diff --git a/1-setup.sh b/1-setup.sh
index 679da42..bb2e99f 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -51,6 +51,12 @@ sed -i 's/^#Para/Para/' /etc/pacman.conf
 sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf
 pacman -Sy --noconfirm
 
+#Enable Chaotic AUR
+pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+pacman-key --lsign-key 3056513887B78AEB
+pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+echo "[chaotic-aur]" >> /etc/pacman.conf
+echo "Include = /etc/pacman.d/chaotic-mirrorlist"
 echo -e "\nInstalling Base System\n"
 
 PKGS=(
@@ -199,6 +205,15 @@ PKGS=(
 'zsh'
 'zsh-syntax-highlighting'
 'zsh-autosuggestions'
+'google-chome'
+'google-earth-pro'
+'qgis'
+'pamac-aur'
+'firefox'
+'thunderbird'
+'system-config-printer'
+'obs-studio'
+'kde-applications'
 )
 
 for PKG in "${PKGS[@]}"; do
@@ -228,7 +243,7 @@ if lspci | grep -E "NVIDIA|GeForce"; then
     pacman -S nvidia --noconfirm --needed
 	nvidia-xconfig
 elif lspci | grep -E "Radeon"; then
-    pacman -S xf86-video-amdgpu --noconfirm --needed
+    pacman -S xf86-video-amdgpu libva-mesa-driver mesa-vdpau --noconfirm --needed
 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