Minor Category Edits
Merge remote-tracking branch 'origin/CPTheme' into CPTheme