diff --git a/.includes/functions.sh b/.includes/functions.sh
index fcd6ba1..500e583 100755
--- a/.includes/functions.sh
+++ b/.includes/functions.sh
@@ -1,6 +1,8 @@
 install_package() {
     # If for some reason we have to change AUR helpers, this function should make it easy to update everything all at once.
-    yay --sudoloop --needed --noconfirm -Sy "$@"
+    # make sure system is up to date
+    yay --sudoflags "-A" --sudoloop --noconfirm -Syu
+    yay --sudoflags "-A" --sudoloop --needed --noconfirm -Sy "$@"
 }
 
 restart() {
diff --git a/.includes/gaming.sh b/.includes/gaming.sh
index 0c99921..849f795 100755
--- a/.includes/gaming.sh
+++ b/.includes/gaming.sh
@@ -4,8 +4,6 @@
 # URL from where wine is downloaded, must be i686
 wineURL="https://www.playonlinux.com/wine/binaries/phoenicis/upstream-linux-x86/PlayOnLinux-wine-7.11-upstream-linux-x86.tar.gz"
 
-# Make sure system is up to date
-yay -Syu --noconfirm
 
 # Install required packages
 install_package cabextract box86 dos2unix p7zip unzip xdotool
diff --git a/.includes/gui.sh b/.includes/gui.sh
index a811971..68fc874 100755
--- a/.includes/gui.sh
+++ b/.includes/gui.sh
@@ -6,9 +6,6 @@ packages="${packages//lxqt/lxqt lxterminal oxygen-icons ratpoison network-manage
 packages="${packages//mate/mate mate-extra network-manager-applet}"
 packages="${packages//i3/clipster grun jq i3-wm libnotify lxterminal notification-daemon pamixer playerctl python-i3ipc sgtk-menu sox transfersh yad}"
 
-# Make sure system is up to date
-yay -Syu --noconfirm
-
 # Proper command for launching the desktop session.
 case "${1}" in
     "lxqt") session="startlxqt";;
@@ -16,9 +13,6 @@ case "${1}" in
     *) session="$1";;
 esac
 
-# Sometimes this causes a problem, so try to remove them before hand.
-yay -Rdd --noconfirm xorg-mkfontscale
-yay -Rdd --noconfirm xorg-mkfontdir
 install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xf86-video-dummy-with-vt xorg
 
 # Configure nodm