master: adjust shortcuts