allowing the templates to be overridden (the source)

works :D (integration tested)