Fix config color tag specification
Merge dev/fix_config_tag -> devel
Remove trailing spaces/tabs in output themes
Merge branch 'dev/fix/whitespace' into devel
Change tabs to spaces
Merge branch 'dev/retab' into devel