Switch to the new categories