Fixed the issue with the templates not being loaded correctly in designer after saving.