Polishing up templates