Reworked templates.