hotkeys: polishing integration - 2
hotkeys: polishing integration - 3
hotkeys: clean-up