GSoC 2013 finishing touches on templates