More work on configurable keybindings