New templates + old one fixes