Closes #869 (closed)
Improve event categories
This will create a new commit in order to revert the existing changes.
