Replaced EJS with macros