Indicators refactoring (add name and category for GUI, remove old unused categories ...)