Attempt #2 to add keyboard shortcuts.