diff --git a/arch-setup.sh b/arch-setup.sh
index 53fa635..429b345 100755
--- a/arch-setup.sh
+++ b/arch-setup.sh
@@ -273,10 +273,10 @@ setup_plymouth() {
     if whiptail --title "Setup Plymouth" --yesno "Would you like to setup Plymouth?" 10 60; then
         echo "== Setting up Plymouth =="
         if ! grep -q "splash" /etc/kernel/cmdline; then
-            echo "quiet splash" | sudo tee -a /etc/kernel/cmdline
+            echo -n " quiet splash" | sudo tee -a /etc/kernel/cmdline
         fi
         if ! grep -q "plymouth" /etc/mkinitcpio.conf; then
-            sudo sed -i 's/^HOOKS=(base udev autodetect microcode/HOOKS=(base udev autodetect microcode plymouth/' /etc/mkinitcpio.conf
+            sudo sed -i 's/^HOOKS=(base systemd autodetect microcode modconf/HOOKS=(base systemd autodetect microcode plymouth modconf/' /etc/mkinitcpio.conf
         fi
         install_package plymouth
         echo "Plymouth setup completed."
@@ -509,8 +509,8 @@ setup_fwupd() {
             sudo sbctl sign -s -o /usr/lib/fwupd/efi/fwupdx64.efi.signed /usr/lib/fwupd/efi/fwupdx64.efi
             sudo sbctl sign -s -o /usr/lib/systemd/boot/efi/systemd-bootx64.efi.signed /usr/lib/systemd/boot/efi/systemd-bootx64.efi
             if pacman -Qs shim > /dev/null; then
-                sudo mkdir -p /boot/EFI/arch
-                sudo sbctl sign -s -o /boot/EFI/arch/shimx64.efi /usr/share/shim/shimx64.efi
+                sudo mkdir -p /boot/EFI/systemd
+                sudo sbctl sign -s -o /boot/EFI/systemd/shimx64.efi /usr/share/shim/shimx64.efi
             fi
         fi
     fi