Updated templates and less