Fixed new templates