Add category namespacing

This is on the fly monkey patching
Improve configuration display
Merge branch 'master' into namespacing

* master:
  Improve configuration display
  Add category namespacing