[artf738405] Completed seperation of property template from settings template