Switch to xkb for keyboard mapping