Update with a non-conflicting keymap

Closes #16