Add new categories as in #395

If one or two people agree with these changes, we can merge this into the live version.

Thanks! :cat: