add more category data

- add `which`, `abbr` columns to category table
Merge branch 'more-categories' into develop