Add missing shortcuts, remove shortcuts that don't exist,
and reorder as needed