diff --git a/boot/grub/grub.cfg b/boot/grub/grub.cfg
index 0e7e7c2..ca3a799 100644
--- a/boot/grub/grub.cfg
+++ b/boot/grub/grub.cfg
@@ -1,6 +1,6 @@
 # Inspired by GLIM and Multiboot USB
 
-set timeout=30
+set timeout=-1
 
 insmod all_video
 set gfxpayload=keep
@@ -33,16 +33,19 @@ fi
 ##############
 
 menuentry "[c] CPU info " --hotkey=c {
+	echo "This CPU:"
+	echo " * ${grub_cpu}"
+	echo " * ${grub_platform}"
 	if cpuid -l ; then
-		echo "This CPU supports 64-bit."
+		echo " * supports 64-bit."
 	else
-		echo "This CPU does not support 64-bit."
+		echo " * does not support 64-bit."
 	fi
 
 	if cpuid -p ; then
-		echo "This CPU supports PAE."
+		echo " * supports PAE."
 	else
-		echo "This CPU does not support PAE."
+		echo " * does not support PAE."
 	fi
 	sleep --interruptible 10
 }
@@ -57,7 +60,7 @@ menuentry "[l] Local Boot" --hotkey=l {
 if [ -f "${isoconfig}" ]; then
 	menuentry ' ' { true }
 
-	menuentry "[i] Inspect Isos >" --hotkey=i --default {
+	menuentry "[o] Inspect Isos >" --hotkey=o --id=isos {
 		echo "Loading various ISO configurations"
 		configfile "${isoconfig}"
 	}
@@ -65,7 +68,7 @@ if [ -f "${isoconfig}" ]; then
 	menuentry ' ' { true }
 fi
 
-submenu "GRUB2 options -> "{
+submenu "[g] GRUB2 options -> " --hotkey=g {
 	menuentry "Show Drives" {
 		ls  -l
 		sleep --interruptible 9999
@@ -130,7 +133,7 @@ menuentry ' ' { // Empty Line
 
 menuentry "[i] Invaders" --hotkey=i --class=game --class=invaders {
 	echo "Starting Invaders"
-	linux16 "${prefix}/persist/invaders/invaders"
+	multiboot "${persistent}/invaders/invaders"
 	boot
 }
 
@@ -151,19 +154,19 @@ menuentry "[d] read Grub2 Documentation" --hotkey=d --class=docs {
 }
 
 menuentry "[m] MemTest86+" --hotkey=m {
-	linux16 "${persistent}/memtest86/memtest+-5.31b.bin"
+	linux16 "${persistent}/memtest86/memtest86+-5.31b.bin"
 }
 
 menuentry ' ' { // Empty Line
 	true
 }
 
-menuentry "Shutdown" --class shutdown {
+menuentry "[s] Shutdown" --class shutdown --hotkey=s {
 	echo "System shutting down..."
 	halt
 }
 
-menuentry "Reboot" --class shutdown {
+menuentry "[r] Reboot" --class shutdown --hotkey=r {
 	echo "System rebooting..."
 	reboot
 }
diff --git a/boot/grub/persistent/docs/15_environment_variables.txt b/boot/grub/persistent/docs/15_environment_variables
similarity index 100%
rename from boot/grub/persistent/docs/15_environment_variables.txt
rename to boot/grub/persistent/docs/15_environment_variables
diff --git a/boot/grub/persistent/docs/16_available_commands.txt b/boot/grub/persistent/docs/16_available_commands
similarity index 100%
rename from boot/grub/persistent/docs/16_available_commands.txt
rename to boot/grub/persistent/docs/16_available_commands
diff --git a/boot/grub/persistent/docs/show-docs.cfg b/boot/grub/persistent/docs/show-docs.cfg
index babede0..98624d2 100644
--- a/boot/grub/persistent/docs/show-docs.cfg
+++ b/boot/grub/persistent/docs/show-docs.cfg
@@ -1,120 +1,124 @@
-menuentry "License" --class docs {
-	cat "${docs}/000_license"
-	configfile "${docs}/show-docs.cfg"
-}
-
-menuentry "Index" --class docs {
+menuentry "[0] Index" --class=docs --hotkey=0 {
 	cat "${docs}/00_index"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Introduction" --class docs {
+menuentry "[1] Introduction" --class=docs --hotkey=1  {
 	cat "${docs}/01_introduction"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Naming Convention" --class docs {
+menuentry "[2] Naming Convention" --class=docs --hotkey=2  {
 	cat "${docs}/02_naming_convention"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "OS Specific Notes" --class docs {
+menuentry "[3] OS Specific Notes" --class=docs --hotkey=3  {
 	cat "${docs}/03_os_specific_notes"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Installation" --class docs {
+menuentry "[4] Installation" --class=docs --hotkey=4  {
 	cat "${docs}/04_installation"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Booting" --class docs {
+menuentry "[5] Booting" --class=docs --hotkey=5  {
 	cat "${docs}/05_booting"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Your own Configuration File" --class docs {
+menuentry "[6] Your own Configuration File" --class=docs --hotkey=6  {
 	cat "${docs}/06_your_own_configuration_file"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Themes" --class docs {
+menuentry "[7] Themes" --class=docs --hotkey=7  {
 	cat "${docs}/07_themes"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Network Booting" --class docs {
+menuentry "[8] Network Booting" --class=docs --hotkey=8  {
 	cat "${docs}/08_network_booting"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Serial Line" --class docs {
+menuentry "[9] Serial Line" --class=docs --hotkey=9  {
 	cat "${docs}/09_serial_line"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Vendor Power-on Keys" --class docs {
+menuentry "[a] Vendor Power-on Keys" --class=docs --hotkey=a  {
 	cat "${docs}/10_vendor_poweron_keys"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Grub Image Files" --class docs {
+menuentry "[b] Grub Image Files" --class=docs --hotkey=b  {
 	cat "${docs}/11_grub_image_files"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Core Image Size Limitation" --class docs {
-	cat "${docs}/12_core_image_size_limitation"
+menuentry "[c] Core Image Size Limitation" --class=docs --hotkey=c  {
+	cat "${docs}/1d_core_image_size_limitation"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Filesystem Syntax" --class docs {
+menuentry "[d] Filesystem Syntax" --class=docs --hotkey=d  {
 	cat "${docs}/13_filesystem_syntax"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "User Interface" --class docs {
+menuentry "[e] User Interface" --class=docs --hotkey=e  {
 	cat "${docs}/14_user_interface"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Environment Variables.txt" --class docs {
-	cat "${docs}/15_environment_variables.txt"
+menuentry "[f] Environment Variables.txt" --class=docs --hotkey=f  {
+	cat "${docs}/15_environment_variables"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Available Commands.txt" --class docs {
-	cat "${docs}/16_available_commands.txt"
+menuentry "[g] Available Commands.txt" --class=docs --hotkey=g  {
+	cat "${docs}/16_available_commands"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Internationalisation" --class docs {
+menuentry "[h] Internationalisation" --class=docs --hotkey=h  {
 	cat "${docs}/17_internationalisation"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Security" --class docs {
+menuentry "[i] Security" --class=docs --hotkey=i  {
 	cat "${docs}/18_security"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Platform Limitations" --class docs {
+menuentry "[j] Platform Limitations" --class=docs --hotkey=j  {
 	cat "${docs}/19_platform_limitations"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Outline" --class docs {
+menuentry "[k] Outline" --class=docs --hotkey=k  {
 	cat "${docs}/20_outline"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Supported Boot Targets" --class docs {
+menuentry "[l] Supported Boot Targets" --class=docs --hotkey=l  {
 	cat "${docs}/21_supported_boot_targets"
 	configfile "${docs}/show-docs.cfg"
 }
 
-menuentry "Error Messages" --class docs {
+menuentry "[m] Error Messages" --class=docs --hotkey=m  {
 	cat "${docs}/22_error_messages"
 	configfile "${docs}/show-docs.cfg"
 }
 
+menuentry "[o] License" --class=docs --hotkey=o  {
+	cat "${docs}/000_license"
+	configfile "${docs}/show-docs.cfg"
+}
+
+
+menuentry "[Esc] Back to Menu" {
+	configfile "${prefix}/grub.cfg"
+}
diff --git a/boot/grub/persistent/netboot/netboot.xyz.efi b/boot/grub/persistent/netboot.xyz/netboot.xyz.efi
similarity index 100%
rename from boot/grub/persistent/netboot/netboot.xyz.efi
rename to boot/grub/persistent/netboot.xyz/netboot.xyz.efi
diff --git a/boot/grub/persistent/netboot/netboot.xyz.lkrn b/boot/grub/persistent/netboot.xyz/netboot.xyz.lkrn
similarity index 100%
rename from boot/grub/persistent/netboot/netboot.xyz.lkrn
rename to boot/grub/persistent/netboot.xyz/netboot.xyz.lkrn