Moved to category style
Merge pull request #11277 from jfwork/master

Moved to category style