Renaming templates and finishing style