ADD: New hotkey.

Also cleaned up a lot of the code.