diff --git a/etc/base b/etc/base
index 1aa642d..a1664c8 100644
--- a/etc/base
+++ b/etc/base
@@ -44,6 +44,4 @@ echo "$USERNAME:$pass" | chpasswd
 
 passwd -dl root
 
-grub-install $TARGET_PHY_ID
-xbps-reconfigure -fa
 }
\ No newline at end of file
diff --git a/etc/bootloader/grub b/etc/bootloader/grub
index 1084278..8622053 100644
--- a/etc/bootloader/grub
+++ b/etc/bootloader/grub
@@ -4,4 +4,13 @@ packages() {
 	else
 		addpkg grub
 	fi
+}
+
+config() {
+	if [ "$EFI" == "1" ]; then
+		grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id="Void"
+	else
+		grub-install $TARGET_PHY_ID
+	fi
+	xbps-reconfigure -fa
 }
\ No newline at end of file
diff --git a/main.sh b/main.sh
index 1594d71..f4d6d58 100644
--- a/main.sh
+++ b/main.sh
@@ -338,6 +338,7 @@ do_chroot() {
 	echo "HOSTNAME=$HOSTNAME" >> ${target}/tmp/vinstaller/vars
 	echo "EFI=$EFI" >> ${target}/tmp/vinstaller/vars
 	echo "LANGUAGE=$LANGUAGE" >> ${target}/tmp/vinstaller/vars
+	echo "L1=$L1" >> ${target}/tmp/vinstaller/vars
 	echo "TARGET_PHY_ID=$TARGET_PHY_ID" >> ${target}/tmp/vinstaller/vars
 	echo "TARGET_PART=$TARGET_PART" >> ${target}/tmp/vinstaller/vars
 	echo "TARGETNAME_UNDERSCORE=$TARGETNAME_UNDERSCORE" >> ${target}/tmp/vinstaller/vars