Add more decoration to templates