Goodies: update templates for real.