New commit

@toopay  Here is the new pull request from my old one with conflicts.
Maybe we should make the hotkeys addition optional, so it can be turned on/off with an global option. Possible cases could be that the hotkeys collide with shortcuts already used in existing apps