Wip/fix shortcuts

Last time I tried it didn't worked. I do again.