Added keyboard shortcuts
Removed old hotkey listeners