Replaced the Category system with a Tagging system
Fixes #38