Fix for an issue related to updating templates and the associated warning ; fix for an issue where PNG files can be named improperly.