Redid keymap (and fixed a typo in config).