diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 9d47781..b03e3db 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -194,7 +194,11 @@ create_install() {
     $NSPAWN $TMPDIR/root locale-gen
     echo "KEYMAP=$KEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
     #$NSPAWN $TMPDIR/root localectl set-x11-keymap $KEYMAP 1> /dev/null 2>&1
-    echo "Section InputClass\nOption XkbLayout $KEYMAP\nEndSection" > $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    echo 'Section "InputClass"' > $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    echo 'Identifier "system-keyboard"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    echo 'Option "XkbLayout" "us"' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    echo 'EndSection' >> $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
+    sed -i s/"us"/"$KEYMAP"/ $TMPDIR/root/etc/X11/xorg.conf.d/00-keyboard.conf
     echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
     #$NSPAWN $TMPDIR/root systemctl disable systemd-resolved.service 1> /dev/null 2>&1
     rm -f $TMPDIR/root/etc/systemd/system/multi-user.target.wants/systemd-resolved.service