Finally moved over all user/ templates to itemplates