Fix theme, move shortcuts to their own file