Improve highlighting for macros + various fix and cleaning