Improve regex to match macros
Improve CSS