Enhance hotkeys