Updated some of the templating stuff.