diff --git a/configs/arch_config.fish b/configs/arch_config.fish
index c8170ee..55391ab 100755
--- a/configs/arch_config.fish
+++ b/configs/arch_config.fish
@@ -4,32 +4,42 @@
 
 source $HOME/.config/fish/configs/uni.fish
 
+function get_pkg_version
+    set pkg $argv[1]
+
+    if pacman -Q $pkg >/dev/null 2>&1
+        pacman -Q $pkg
+    else
+        echo ""
+    end
+end
+
+function kernel_to_pkg
+    set kernel (uname -r)
+
+    if string match -q "*zen*" $kernel
+        echo linux-zen
+    else if string match -q "*lts*" $kernel
+        echo linux-lts
+    else if string match -q "*hardened*" $kernel
+        echo linux-hardened
+    else
+        echo linux
+    end
+end
+
 function updateall
-    # Get current Discord version (if installed)
-    if pacman -Q discord >/dev/null 2>&1
-        set discord_version_before (pacman -Q discord)
-    else
-        set discord_version_before ""
+######## Get current versions (if installed)
+    if command -q tar
+        set discord_version (get_pkg_version discord)
     end
+    set kernel_version (get_pkg_version (kernel_to_pkg))
 
-    if pacman -Q linux-zen >/dev/null 2>&1
-        set kernel_version_before (pacman -Q linux-zen)
-    else
-        set kernel_version_before ""
-    end
-
-    # Run updates
+######## Run PACMAN updates
     sudo pacman -Syu
 
-    # Get new Discord version (if installed)
-    if pacman -Q discord >/dev/null 2>&1
-        set discord_version_after (pacman -Q discord)
-    else
-        set discord_version_after ""
-    end
-
-    # Compare discord versions
-    if test "$discord_version_before" != "$discord_version_after"
+######## Do additional Discord Updates
+    if test "$discord_version" != "$(get_pkg_version discord)"
         echo "Discord version changed: $discord_version_before -> $discord_version_after"
         if test -e /usr/bin/curl
             echo "Running Vencord installer..."
@@ -39,23 +49,45 @@ function updateall
         end
     end
 
+######## Run FLATPAK Updates
+
     if test -e /usr/bin/flatpak
         flatpak update
     end
+
+######## Run GIT Updates
+
+    if test -d ~/.config/quickshell && test -d ~/.config/quickshell/.git
+        pushd ~/.config/quickshell/
+        git pull
+        popd
+    end
+
+    if test -d ~/.config/fish && test -d ~/.config/fish/.git
+        pushd ~/.config/fish/
+        git pull
+        popd
+    end
+
+    if test -d ~/.config/hypr && test -d ~/.config/hypr/.git
+        pushd ~/.config/hypr/
+        git pull
+        popd
+    end
+
+######## Run AUR Updates
+
     if test -e /usr/bin/paru
         paru -Sua --sudoloop
     else if test -e /usr/bin/yay
         yay -Sua --sudoloop
     end
-    # Get new Discord version (if installed)
-    if pacman -Q linux-zen >/dev/null 2>&1
-        set kernel_version_after (pacman -Q linux-zen)
-    else
-        set kernel_version_after ""
-    end
-    if test "$kernel_version_before" != "$kernel_version_after"
+
+######## Restart if Kernel Updated
+
+    if test "$kernel_version" != "$(get_pkg_version $(kernel_to_pkg))"
         echo "Kernel changed: $kernel_version_before -> $kernel_version_after"
-        echo -n "Reboot now? [y/N]: "
+        echo "Reboot now? [y/N]: "
 
         read answer