implement cat
Merge remote-tracking branch 'upstream/develop' into develop

merge to develop
fix cat
Merge pull request #53 from palaa159/develop

Merge from Apon: add and fix categories aka. "Themes"