Clean whitespace
Improve macro support

Highlight template control and variables fully