update templates a lot