Update templates a bit