Fixed keyboard_layout and keyboard_variant configuration