Updates a lot on templating/macros