Reorganize and add some TagHighlight groups
Include and Macro colors