Big fix on template files.