diff --git a/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist b/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist
index 4ddef02..effc5dc 100644
--- a/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist
+++ b/archiso/airootfs/etc/pacman.d/cachyos-mirrorlist
@@ -4,16 +4,18 @@
 ####                                              ####
 ######################################################
 #### Entry in file /etc/pacman.conf:
-###     [cachyos-desktop]
-###     Include = /etc/pacman.d/cachyos-mirrorlist
 ###     [cachyos]
-###     Include = /etc/pacman.d/cachyos-mirrorlist
+###     Include = /etc/pacman.d/cachyos-v3-mirrorlist
 ######################################################
-## Netherlands
-Server = https://build.cachyos.org/repo/$arch/$repo
-Server = https://nl.cachyos.org/repo/$arch/$repo
 ## Germany
-Server = https://aur.cachyos.org/repo/$arch/$repo
 Server = https://mirror.cachyos.org/repo/$arch/$repo
+Server = https://aur.cachyos.org/repo/$arch/$repo
+Server = https://build.cachyos.org/repo/$arch/$repo
+## Netherlands
+Server = https://nl.cachyos.org/repo/$arch/$repo
 ## Hungary much thanks to to ArchanfelHUN!
 Server = https://hun.cachyos.org/repo/$arch/$repo
+## Singapore much thanks to SM9!
+Server = https://sg.cachyos.org/repo/$arch/$repo
+## South Korea much thanks to silent_heigou!
+Server = https://kr.cachyos.org/repo/$arch/$repo
diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index 9259dcc..cf5fc52 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -45,12 +45,13 @@ Main() {
 
     if [[ "${_exitcode}" -eq 2 ]]; then
         echo "USING GRUB!"
-        yes | sudo pacman -Rsn cachyos-calamares-systemd cachyos-calamares-systemd-config
-        yes | sudo pacman -Sy --needed cachyos-calamares cachyos-calamares-config
+        yes | sudo pacman -R cachyos-calamares-systemd cachyos-calamares-systemd-config
+        yes | sudo pacman -R cachyos-calamares cachyos-calamares-config
+        yes | sudo pacman -Sy cachyos-calamares cachyos-calamares-config
     elif [[ "${_exitcode}" -eq 3 ]]; then
         echo "USING SYSTEMD-BOOT!"
-        yes | sudo pacman -Rsn cachyos-calamares cachyos-calamares-config
-        yes | sudo pacman -Sy --needed cachyos-calamares-systemd cachyos-calamares-systemd-config
+        yes | sudo pacman -R cachyos-calamares cachyos-calamares-config
+        yes | sudo pacman -Sy cachyos-calamares-systemd cachyos-calamares-systemd-config
     else
         exit
     fi
diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64
index 5bf36f1..5cfa36d 100644
--- a/archiso/packages_xfce.x86_64
+++ b/archiso/packages_xfce.x86_64
@@ -187,7 +187,6 @@ perl
 pipewire
 pipewire-alsa
 pipewire-jack
-pipewire-media-session
 pipewire-pulse
 pipewire-v4l2
 pipewire-zeroconf