Update templates folder.

Also some fixes...