Updates to template and conventions docs