diff --git a/grub/grub.cfg b/grub/grub.cfg
index 034bdb4..1fab377 100644
--- a/grub/grub.cfg
+++ b/grub/grub.cfg
@@ -1,3 +1,6 @@
+# Resolution for graphics mode
+RESOLUTION=1024x768
+
 # Load partition table and file system modules
 insmod part_gpt
 insmod part_msdos
@@ -11,17 +14,21 @@ insmod udf
 # Use graphics-mode output
 insmod all_video
 insmod font
+
+# Remove pc speaker module
+rmmod pcspkr
+
 if loadfont "${prefix}/fonts/unicode.pf2" ; then
-    set gfxmode="auto"
+    set gfxmode="${RESOLUTION}"
     terminal_input console
     terminal_output console
 fi
 
 # Enable serial console
-if serial --unit=0 --speed=115200; then
-    terminal_input --append serial
-    terminal_output --append serial
-fi
+#if serial --unit=0 --speed=115200; then
+#    terminal_input --append serial
+#    terminal_output --append serial
+#fi
 
 # Search for the ISO volume
 if [ -z "${ARCHISO_UUID}" ]; then
@@ -33,31 +40,30 @@ if [ -z "${ARCHISO_UUID}" ]; then
 fi
 
 # Set default menu entry
-default=archlinux
-timeout=15
+default=zarchlinux_amd
+timeout=5
 timeout_style=menu
 
 # GRUB init tune for accessibility
-play 600 988 1 1319 4
+#play 600 988 1 1319 4
 
 # Menu entries
 
-menuentry "Arch Linux install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
-    set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID}
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+menuentry "Z Arch Linux install medium (AMD x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'zarchlinux_amd' {
+    set gfxpayload={RESOLUTION}
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} amd_pstate=active
+    initrd /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
-
-menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
-    set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on
-    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+menuentry "Z Arch Linux install medium (Intel x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'zarchlinux_intel' {
+    set gfxpayload={RESOLUTION}
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID}
+    initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
 if [ "${grub_platform}" == "efi" ]; then
     if [ "${grub_cpu}" == "x86_64" ]; then
         menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool {
-            set gfxpayload=800x600,1024x768
+            set gfxpayload={RESOLUTION}
             linux /boot/memtest86+/memtest.efi
         }
         menuentry "UEFI Shell" --class efi {