Updated Hotkey Handling