Refactor two (buggy...) lists of workspace shortcuts

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>