diff --git a/etc/bootloader/grub b/etc/bootloader/grub
index 556329a..5251b7d 100644
--- a/etc/bootloader/grub
+++ b/etc/bootloader/grub
@@ -36,18 +36,17 @@ config() {
 			grub-kbdcomp -o ${KEY_LANG}.gkb ${KEY_LANG}
 			tar cf memdisk.tar ${KEY_LANG}.gkb
 
-			mkdir -p /boot/grub/
+			mkdir -p /boot/efi/EFI/void/
 			echo "set root=(memdisk)" > /boot/grub/early-grub.cfg
 			echo "set prefix=($root)/" >> /boot/grub/early-grub.cfg
 			echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg
-			echo "keymap /dvorak.gkb" >> /boot/grub/early-grub.cfg
-			echo "cryptomount -u 1234abcdef1234abcdef1234abcdef" >> /boot/grub/early-grub.cfg
-			echo "set root='cryptouuid/1234abcdef1234abcdef1234abcdef'" >> /boot/grub/early-grub.cfg
+			echo "keymap /${KEY_LANG}.gkb" >> /boot/grub/early-grub.cfg
+			echo "cryptomount -u ${CRYPTUUID}" >> /boot/grub/early-grub.cfg
+			echo "set root='lvmid/${VGUUID}/${lVUUID}'" >> /boot/grub/early-grub.cfg
 			echo "set prefix=($root)/grub" >> /boot/grub/early-grub.cfg
 			echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
 
-			grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64_de.efi -O x86_64-efi -m memdisk.tar memdisk tar at_keyboard keylayouts configfile
-			mkdir -p /boot/efi/EFI/void/
+			grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64_de.efi -O x86_64-efi -m part_gpt cryptodisk luks gcry_rijndael gcry_rijndael gcry_sha256 lvm btrfs memdisk.tar memdisk tar at_keyboard keylayouts configfile
 			cp -f grubx64_de.efi /boot/efi/EFI/void/grubx64_de.efi
 
 			rm -rf grubx64_de.efi memdisk.tar ${KEY_LANG}.gkb
@@ -70,7 +69,7 @@ config() {
 
 
 	if [ "${EFI}" == "1" ]; then
-		grub-install
+		grub-install --bootloader-id="VoidLinux"
 		efibootmgr --create --disk "${TARGET_PHY_ID}-part1" --loader /EFI/void/grubx64_de.efi --label "Voidlinux DE" --verbose
 	else
 		grub-install "${TARGET_PHY_ID}"