keymap.xml with some fixes