Check categories.

This commit closes #2722.
Add new categories.

This commit closes #2721.