diff --git a/share/config_files/aarch64/grub2-efi.cfg b/share/config_files/aarch64/grub2-efi.cfg
index 83f57637..3cb8465f 100644
--- a/share/config_files/aarch64/grub2-efi.cfg
+++ b/share/config_files/aarch64/grub2-efi.cfg
@@ -1,17 +1,50 @@
-set default="0"
+set default="1"
 
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+serial --speed=115200
+terminal_input serial console
+terminal_output serial console
+
+load_video
+set gfxpayload=keep
 insmod gzio
 insmod part_gpt
 insmod ext2
-insmod gzio
 
-set timeout=5
+set timeout=60
 ### END /etc/grub.d/00_header ###
 
+search --no-floppy --set=root -l '@ISOLABEL@'
+
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
-        linux @KERNELPATH@ @ROOT@ ro console=ttyS0,115200 debug earlyprintk=uart8250-32bit,0x1c020000 maxcpus=1
-        initrd @INITRDPATH@
-        devicetree /images/pxeboot/apm-mustang.dtb
+	linux @KERNELPATH@ @ROOT@ ro console=ttyS0,115200n8
+	initrd @INITRDPATH@
+}
+menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
+	linux @KERNELPATH@ @ROOT@ rd.live.check console=ttyS0,115200n8
+	initrd @INITRDPATH@
+}
+submenu 'Troubleshooting -->' {
+	menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
+		linux @KERNELPATH@ @ROOT@ nomodeset
+		initrd @INITRDPATH@
+	}
+	menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
+		linux @KERNELPATH@ @ROOT@ rescue console=ttyS0,115200n8
+		initrd @INITRDPATH@
+	}
 }
-