Add hotkey support, at least partially