Feature/consistent hotkeys

This fixes #97.