Added keymap selection and US keymap