diff --git a/changelog.md b/changelog.md
index 279a50e9..923c9e57 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,7 @@
 <h2 align="center">Archcraft : Changelogs</h2>
 
 ### April 2023
+**`Update : `** New ISO Uploaded with better `Nvidia` Support.
 **`Just a regular ISO update`**
 - Updated the ISO with latest packages
 - Enabled _single click activation_ on rofi menu and applets
diff --git a/profile/airootfs/etc/mkinitcpio-nvidia.conf b/profile/airootfs/etc/mkinitcpio-nvidia.conf
new file mode 100644
index 00000000..d12204d9
--- /dev/null
+++ b/profile/airootfs/etc/mkinitcpio-nvidia.conf
@@ -0,0 +1,67 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES=(piix ide_disk reiserfs)
+MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run last, so it may be used to
+# override the actual binaries included by a given hook
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=()
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+FILES=()
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS=(base)
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS=(base udev autodetect block filesystems)
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS=(base udev block filesystems)
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS=(base udev block mdadm encrypt filesystems)
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS=(base udev block lvm2 filesystems)
+#
+##   NOTE: If you have /usr on a separate partition, you MUST include the
+#    usr, fsck and shutdown hooks.
+HOOKS=(base udev plymouth modconf archiso archiso_loop_mnt block filesystems keyboard)
+
+# COMPRESSION
+# Use this to compress the initramfs image. By default, gzip compression
+# is used. Use 'cat' to create an uncompressed image.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+#COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+#COMPRESSION="lz4"
+COMPRESSION="zstd"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=()
diff --git a/profile/airootfs/etc/mkinitcpio.d/linux-nvidia.preset b/profile/airootfs/etc/mkinitcpio.d/linux-nvidia.preset
new file mode 100644
index 00000000..e1088b08
--- /dev/null
+++ b/profile/airootfs/etc/mkinitcpio.d/linux-nvidia.preset
@@ -0,0 +1,8 @@
+# mkinitcpio preset file for the 'linux' package (nvidia)
+
+PRESETS=('nvidia')
+
+ALL_kver="/boot/vmlinuz-linux"
+ALL_config="/etc/mkinitcpio-nvidia.conf"
+
+nvidia_image="/boot/initramfs-linux-nvidia.img"
diff --git a/profile/airootfs/etc/ssh/sshd_config b/profile/airootfs/etc/ssh/sshd_config
index 93f7d63a..dc22c11c 100644
--- a/profile/airootfs/etc/ssh/sshd_config
+++ b/profile/airootfs/etc/ssh/sshd_config
@@ -58,7 +58,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
 #PermitEmptyPasswords no
 
 # Change to no to disable s/key passwords
-#KbdInteractiveAuthentication yes
+KbdInteractiveAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -75,7 +75,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
 # be allowed through the KbdInteractiveAuthentication and
 # PasswordAuthentication.  Depending on your PAM configuration,
 # PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
+# the setting of "PermitRootLogin prohibit-password".
 # If you just want the PAM account and session checks to run without
 # PAM authentication, then enable this but set PasswordAuthentication
 # and KbdInteractiveAuthentication to 'no'.
@@ -88,7 +88,7 @@ UsePAM yes
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PermitTTY yes
-PrintMotd no # pam does that
+PrintMotd no
 #PrintLastLog yes
 #TCPKeepAlive yes
 #PermitUserEnvironment no
diff --git a/profile/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service b/profile/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service
new file mode 120000
index 00000000..cd004113
--- /dev/null
+++ b/profile/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-timesyncd.service
\ No newline at end of file
diff --git a/profile/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/profile/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
deleted file mode 120000
index 8e3ff802..00000000
--- a/profile/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/qemu-guest-agent.service
\ No newline at end of file
diff --git a/profile/airootfs/etc/systemd/system/pacman-init.service b/profile/airootfs/etc/systemd/system/pacman-init.service
index b18f7f83..b8248843 100644
--- a/profile/airootfs/etc/systemd/system/pacman-init.service
+++ b/profile/airootfs/etc/systemd/system/pacman-init.service
@@ -1,7 +1,9 @@
 [Unit]
 Description=Initializes Pacman keyring
 Requires=etc-pacman.d-gnupg.mount
-After=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount time-sync.target
+BindsTo=etc-pacman.d-gnupg.mount
+Before=archlinux-keyring-wkd-sync.service
 
 [Service]
 Type=oneshot
diff --git a/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service b/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service
new file mode 120000
index 00000000..cabf28be
--- /dev/null
+++ b/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-time-wait-sync.service
\ No newline at end of file
diff --git a/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
new file mode 120000
index 00000000..cd004113
--- /dev/null
+++ b/profile/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/systemd-timesyncd.service
\ No newline at end of file
diff --git a/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf b/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf
index c78db77f..bdde43bc 100644
--- a/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf
+++ b/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf
@@ -4,4 +4,4 @@ linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp
diff --git a/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf b/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf
index 6f1b1ace..9ba6e0bd 100644
--- a/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf
+++ b/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf
@@ -4,4 +4,4 @@ linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp
diff --git a/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-no-nouveau.conf b/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-no-nouveau.conf
deleted file mode 100644
index 4ccaf78d..00000000
--- a/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-no-nouveau.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-title   Boot Archcraft (x86_64, UEFI, open source, no nouveau)
-sort-key 03
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes
diff --git a/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf b/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf
new file mode 100644
index 00000000..8c3f67ad
--- /dev/null
+++ b/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf
@@ -0,0 +1,7 @@
+title   Boot Archcraft (x86_64, UEFI, nvidia)
+sort-key 03
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp
diff --git a/profile/efiboot/loader/entries/06-archcraftiso-x86_64-linux-nomodeset.conf b/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf
similarity index 63%
rename from profile/efiboot/loader/entries/06-archcraftiso-x86_64-linux-nomodeset.conf
rename to profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf
index 9ba261e4..52984dba 100644
--- a/profile/efiboot/loader/entries/06-archcraftiso-x86_64-linux-nomodeset.conf
+++ b/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf
@@ -1,7 +1,7 @@
 title   Boot Archcraft (x86_64, UEFI, nomodeset)
-sort-key 06
+sort-key 04
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp
diff --git a/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nvidia-nouveau.conf b/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nvidia-nouveau.conf
deleted file mode 100644
index b76e3725..00000000
--- a/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nvidia-nouveau.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-title   Boot Archcraft (x86_64, UEFI, NVIDIA)
-sort-key 04
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
diff --git a/profile/efiboot/loader/entries/05-archcraftiso-x86_64-linux-nvidia-no-nouveau.conf b/profile/efiboot/loader/entries/05-archcraftiso-x86_64-linux-nvidia-no-nouveau.conf
deleted file mode 100644
index bdaf2656..00000000
--- a/profile/efiboot/loader/entries/05-archcraftiso-x86_64-linux-nvidia-no-nouveau.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-title   Boot Archcraft (x86_64, UEFI, NVIDIA, no nouveau)
-sort-key 05
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfreenonouveau nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
diff --git a/profile/grub/grub.cfg b/profile/grub/grub.cfg
index 525aad17..06fcb937 100644
--- a/profile/grub/grub.cfg
+++ b/profile/grub/grub.cfg
@@ -3,15 +3,18 @@ insmod part_gpt
 insmod part_msdos
 insmod fat
 insmod iso9660
+insmod ntfs
+insmod ntfscomp
+insmod exfat
+insmod udf
 
 # Use graphics-mode output
 insmod all_video
 insmod font
 if loadfont "${prefix}/fonts/unicode.pf2" ; then
-    insmod gfxterm
     set gfxmode="auto"
     terminal_input console
-    terminal_output gfxterm
+    terminal_output console
 fi
 
 # Enable serial console
@@ -20,6 +23,15 @@ if serial --unit=0 --speed=115200; then
     terminal_output --append serial
 fi
 
+# Search for the ISO volume
+if [ -z "${ARCHISO_UUID}" ]; then
+    if [ -z "${ARCHISO_HINT}" ]; then
+        regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
+    fi
+    search --no-floppy --set=root --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}"
+    probe --set ARCHISO_UUID --fs-uuid "${root}"
+fi
+
 # Set default menu entry
 default=archcraft
 timeout=10
@@ -29,42 +41,28 @@ timeout_style=menu
 menuentry "Boot Archcraft (x86_64, UEFI)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraft' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp
     initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
 menuentry "Boot Archcraft (x86_64, UEFI, open source)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftos' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp
     initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
-menuentry "Boot Archcraft (x86_64, UEFI, open source, no nouveau)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftnn' {
+menuentry "Boot Archcraft (x86_64, UEFI, nvidia)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftpn' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-}
-
-menuentry "Boot Archcraft (x86_64, UEFI, NVIDIA)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftpn' {
-    set gfxpayload=keep
-    search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-}
-
-menuentry "Boot Archcraft (x86_64, UEFI, NVIDIA, no nouveau)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftpnn' {
-    set gfxpayload=keep
-    search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfreenonouveau nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp
+    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img
 }
 
 menuentry "Boot Archcraft (x86_64, UEFI, nomodeset)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftnm' {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp
     initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
diff --git a/profile/packages.x86_64 b/profile/packages.x86_64
index 3480d07a..c02a5bb0 100644
--- a/profile/packages.x86_64
+++ b/profile/packages.x86_64
@@ -149,6 +149,8 @@ xf86-video-vesa
 xf86-video-intel
 xf86-video-amdgpu
 xf86-video-ati
+mesa
+mesa-utils
 
 ## GPU Drivers (Nvidia) ------------------------------
 xf86-video-nouveau
@@ -234,7 +236,7 @@ kvantum
 qt5ct
 
 ## Display Manager ------------------------------
-sddm
+sddm-git
 archcraft-sddm-theme
 
 ## Desktop ------------------------------
@@ -373,7 +375,9 @@ xarchiver
 ## Misc ------------------------------
 
 ## Package Tools
+bison
 fakeroot
+flex
 make
 automake
 autoconf
diff --git a/profile/syslinux/archcraftiso_head.cfg b/profile/syslinux/archcraftiso_head.cfg
index 738ee592..332c8502 100644
--- a/profile/syslinux/archcraftiso_head.cfg
+++ b/profile/syslinux/archcraftiso_head.cfg
@@ -8,7 +8,7 @@ MENU AUTOBOOT Starting Archcraft in # second{,s}.
 # Menu items width
 MENU WIDTH 70
 # Gap from top
-MENU VSHIFT 8
+MENU VSHIFT 9
 # Gap from sides
 MENU HSHIFT 6
 # Gap from left
@@ -16,11 +16,11 @@ MENU MARGIN 4
 # How many visible rows
 MENU ROWS 10
 # Tab message row height
-MENU TABMSGROW 16
+MENU TABMSGROW 15
 # CMD line height
-MENU CMDLINEROW 16
+MENU CMDLINEROW 15
 # Help message row
-MENU HELPMSGROW 19
+MENU HELPMSGROW 18
 # Help message ending row
 MENU HELPMSGENDROW 30
 
diff --git a/profile/syslinux/archcraftiso_sys-linux.cfg b/profile/syslinux/archcraftiso_sys-linux.cfg
index b19793a5..93e79b83 100644
--- a/profile/syslinux/archcraftiso_sys-linux.cfg
+++ b/profile/syslinux/archcraftiso_sys-linux.cfg
@@ -7,7 +7,7 @@ ENDTEXT
 MENU LABEL Boot Archcraft (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp
 
 # Open Source
 LABEL arch64free
@@ -18,40 +18,18 @@ ENDTEXT
 MENU LABEL Boot Archcraft (x86_64, BIOS, open source)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes
-
-# Open Source, No Nouveau
-LABEL arch64freenonouveau
-TEXT HELP
-Boot Archcraft install medium on BIOS with open source drivers.
-It allows you to install Archcraft or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Archcraft (x86_64, BIOS, open source, no nouveau)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp
 
 # NVIDIA Proprietary
 LABEL arch64nonfree
 TEXT HELP
-Boot Archcraft install medium on BIOS with proprietary drivers (NVIDIA).
+Boot Archcraft install medium on BIOS with proprietary nvidia drivers.
 It allows you to install Archcraft or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Archcraft (x86_64, BIOS, NVIDIA)
+MENU LABEL Boot Archcraft (x86_64, BIOS, nvidia)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
-
-# NVIDIA Proprietary, No Nouveau
-LABEL arch64nonfreenonouveau
-TEXT HELP
-Boot Archcraft install medium on BIOS with proprietary drivers (NVIDIA).
-It allows you to install Archcraft or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Archcraft (x86_64, BIOS, NVIDIA, no nouveau)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=nonfreenonouveau nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp
 
 # Nomodeset
 LABEL arch64nomodeset
@@ -62,4 +40,4 @@ ENDTEXT
 MENU LABEL Boot Archcraft (x86_64, BIOS, nomodeset)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp