Update templates, test :art: