Changed some TABs to spaces in macros, that should end the conflicts because we use different tab sizes (4 vs 8)