Adding more keyboard support for the keymaps