fix(template): Final template fix