Tweak basic templating