unify templates and better SVG