Use 'macro' instead of 'templating'
Fix dependencies