diff --git a/src/templ/templ.svg b/src/templ/templ.svg
--- a/src/templ/templ.svg
+++ b/src/templ/templ.svg
@@ -1,20 +1,31 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 {% set cellSize=boardSize/18 %}
 {% set stoneRadius=cellSize/2-1 %}
 
-<svg width="{{boardSize+padding*2}}" height="{{boardSize+padding*2}}" version="1.1" xmlns="http://www.w3.org/2000/svg" alignment-baseline="center">
+{% if not labeledPoint %}
+	{% macro labeledPoint(p) %}
+	<g class="{{p.color or 'e'}}" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">
+		<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>
+		<text y="0.4em">{{p.label}}</text>
+	</g>
+	{% endmacro %}
+{% endif %}
+
+<svg width="{{boardSize+padding*2}}" height="{{boardSize+padding*2}}" version="1.1" xmlns="http://www.w3.org/2000/svg">
 	<defs>
 		<style type="text/css"><![CDATA[
-			rect{fill:white;stroke:black;stroke-width:1}
+		{% block style %}
+			rect{fill:white;stroke:black;stroke-width:1px}
 			text{font-family:"DejaVu Sans";text-anchor:middle;}
-			line{stroke:black;stroke-width:0.7}
+			line{stroke:black;stroke-width:0.7px}
 			circle{stroke:black}
 			circle.b, .b circle, .w text, .e text{fill:black}
 			circle.w, .w circle, .b text{fill:white}
 			.e circle {stroke:none;fill:white}
+		{% endblock %}
 		]]></style>
 	</defs>
-	<g width="{{boardSize}}" height="{{boardSize}}" transform="translate({{padding}},{{padding}})">
+	<g transform="translate({{padding}},{{padding}})">
 		<rect x="0" y="0" width="{{boardSize}}" height="{{boardSize}}"/>
 		{# grid #}
 		{% for i in range(1,18) %}
@@ -36,18 +47,12 @@
 
 		{# moves #}
 		{% for p in moves %}
-			<g width="{{cellSize|round(2)}}" height="{{cellSize|round(2)}}" class="{{p.color}}" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">
-				<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>
-				<text y="0.4em">{{p.label}}</text>
-			</g>
+			{{labeledPoint(p)}}
 		{% endfor %}
 
 		{# labels #}
 		{% for p in labels %}
-			<g width="{{cellSize|round(2)}}" height="{{cellSize|round(2)}}" class="e" transform="translate({{(p.x*cellSize) | round(2)}},{{(p.y*cellSize) | round(2)}})">
-				<circle cx="0" cy="0" r="{{stoneRadius|round(2)}}"/>
-				<text y="0.4em">{{p.label}}</text>
-			</g>
+			{{labeledPoint(p)}}
 		{% endfor %}
 	</g>
 </svg>