diff --git a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
index 8e653e747..5b6a8036b 100644
--- a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
@@ -39,8 +39,7 @@ width="565" height="683" viewBox="-102 -118 565 683"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><a href="https://d2lang.com" xlink:href="https://d2lang.com"><g id="x"><g class="shape" ><rect x="17" y="0" width="85" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="59.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text><g transform="translate(86 -16)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">1</text></g></g></a><a href="https://terrastruct.com" xlink:href="https://terrastruct.com"><g id="y"><g class="shape" ><rect x="0" y="166" width="118" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="59.000000" y="204.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text><g transform="translate(102 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">2</text></g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(70 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">3</text></g></g></a><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 59.000000 68.000000 C 59.000000 106.000000 59.000000 126.000000 59.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3883830923)"/></g><mask id="3883830923" maskUnits="userSpaceOnUse" x="-100" y="-100" width="338" height="452">
+]]></script><a href="https://d2lang.com" xlink:href="https://d2lang.com"><g id="x"><g class="shape" ><rect x="17" y="0" width="85" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="59.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text><g transform="translate(86 -16)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">1</text></g></g></a><a href="https://terrastruct.com" xlink:href="https://terrastruct.com"><g id="y"><g class="shape" ><rect x="0" y="166" width="118" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="59.000000" y="204.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text><g transform="translate(102 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">2</text></g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(70 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">3</text></g></g></a><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 59.000000 68.000000 C 59.000000 106.000000 59.000000 126.000000 59.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3883830923)"/></g><mask id="3883830923" maskUnits="userSpaceOnUse" x="-100" y="-100" width="338" height="452">
 <rect x="-100" y="-100" width="338" height="452" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
index a1bdd7f31..78c8e24ff 100644
--- a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
@@ -39,8 +39,7 @@ width="566" height="631" viewBox="-102 -118 566 631"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="x"><g class="shape" ><rect x="1" y="0" width="85" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="43.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text><g transform="translate(70 -16)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">1</text></g><title>Total abstinence is easier than perfect moderation</title></g><g id="y"><g class="shape" ><rect x="0" y="166" width="86" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="43.000000" y="204.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text><g transform="translate(70 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">2</text></g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 43.000000 68.000000 C 43.000000 106.000000 43.000000 126.000000 43.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2888388714)"/></g><mask id="2888388714" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="452">
+]]></script><g id="x"><g class="shape" ><rect x="1" y="0" width="85" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="43.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text><g transform="translate(70 -16)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">1</text></g><title>Total abstinence is easier than perfect moderation</title></g><g id="y"><g class="shape" ><rect x="0" y="166" width="86" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="43.000000" y="204.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text><g transform="translate(70 150)" class="appendix-icon"><circle cx="16" cy="16" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="21" style="font-size: 16px;text-anchor:middle;">2</text></g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 43.000000 68.000000 C 43.000000 106.000000 43.000000 126.000000 43.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2888388714)"/></g><mask id="2888388714" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="452">
 <rect x="-100" y="-100" width="306" height="452" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg
index dfc6918e6..35734e017 100644
--- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg
@@ -39,7 +39,7 @@ width="1071" height="452" viewBox="-102 -102 1071 452"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="&#34;ninety\nnine&#34;"><g class="shape" ><rect x="0" y="0" width="91" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="45.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="45.500000" dy="0.000000">ninety</tspan><tspan x="45.500000" dy="18.500000">nine</tspan></text></g><g id="eighty
eight"><g class="shape" ><rect x="151" y="8" width="91" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="196.500000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eighty
eight</text></g><g id="&#34;seventy
\nseven&#34;"><g class="shape" ><rect x="302" y="0" width="102" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="353.000000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="353.000000" dy="0.000000">seventy
</tspan><tspan x="353.000000" dy="18.500000">seven</tspan></text></g><g id="&#34;a\\yode&#34;"><g class="shape" ><rect x="464" y="8" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="511.000000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\yode</text></g><g id="there"><g class="shape" ><rect x="624" y="182" width="83" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="665.500000" y="220.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">there</text></g><g id="&#39;a\&#34;ode&#39;"><g class="shape" ><rect x="618" y="8" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="665.000000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\&#34;ode</text></g><g id="&#34;a\\node&#34;"><g class="shape" ><rect x="772" y="8" width="95" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="819.500000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\node</text></g><g id="(&#34;a\\yode&#34; -&gt; there)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 511.000000 76.000000 C 511.000000 120.400000 533.500000 144.126623 619.978850 190.735354" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><g id="(&#39;a\&#34;ode&#39; -&gt; there)[0]"><path d="M 665.000000 76.000000 C 665.000000 120.400000 665.000000 142.000000 665.000000 178.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><g id="(&#34;a\\node&#34; -&gt; there)[0]"><path d="M 819.500000 76.000000 C 819.500000 120.400000 796.900000 144.000000 710.032868 190.124141" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><mask id="1631294189" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1071" height="452">
+]]></script><g id="&#34;ninety\nnine&#34;"><g class="shape" ><rect x="0" y="0" width="91" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="45.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="45.500000" dy="0.000000">ninety</tspan><tspan x="45.500000" dy="18.500000">nine</tspan></text></g><g id="eighty&#xD;eight"><g class="shape" ><rect x="151" y="8" width="91" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="196.500000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eighty&#xD;eight</text></g><g id="&#34;seventy&#xD;\nseven&#34;"><g class="shape" ><rect x="302" y="0" width="102" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="353.000000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="353.000000" dy="0.000000">seventy&#xD;</tspan><tspan x="353.000000" dy="18.500000">seven</tspan></text></g><g id="&#34;a\\yode&#34;"><g class="shape" ><rect x="464" y="8" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="511.000000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\yode</text></g><g id="there"><g class="shape" ><rect x="624" y="182" width="83" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="665.500000" y="220.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">there</text></g><g id="&#39;a\&#34;ode&#39;"><g class="shape" ><rect x="618" y="8" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="665.000000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\&#34;ode</text></g><g id="&#34;a\\node&#34;"><g class="shape" ><rect x="772" y="8" width="95" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="819.500000" y="46.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\node</text></g><g id="(&#34;a\\yode&#34; -&gt; there)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 511.000000 76.000000 C 511.000000 120.400000 533.500000 144.126623 619.978850 190.735354" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><g id="(&#39;a\&#34;ode&#39; -&gt; there)[0]"><path d="M 665.000000 76.000000 C 665.000000 120.400000 665.000000 142.000000 665.000000 178.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><g id="(&#34;a\\node&#34; -&gt; there)[0]"><path d="M 819.500000 76.000000 C 819.500000 120.400000 796.900000 144.000000 710.032868 190.124141" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1631294189)"/></g><mask id="1631294189" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1071" height="452">
 <rect x="-100" y="-100" width="1071" height="452" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg
index d56b73f56..c2dbc03cb 100644
--- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg
@@ -39,7 +39,7 @@ width="871" height="432" viewBox="-90 -90 871 432"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="&#34;ninety\nnine&#34;"><g class="shape" ><rect x="12" y="12" width="91" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="57.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="57.500000" dy="0.000000">ninety</tspan><tspan x="57.500000" dy="18.500000">nine</tspan></text></g><g id="eighty
eight"><g class="shape" ><rect x="123" y="20" width="91" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="168.500000" y="58.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eighty
eight</text></g><g id="&#34;seventy
\nseven&#34;"><g class="shape" ><rect x="234" y="12" width="102" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="285.000000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="285.000000" dy="0.000000">seventy
</tspan><tspan x="285.000000" dy="18.500000">seven</tspan></text></g><g id="&#34;a\\yode&#34;"><g class="shape" ><rect x="356" y="28" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="403.000000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\yode</text></g><g id="there"><g class="shape" ><rect x="475" y="174" width="83" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="516.500000" y="212.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">there</text></g><g id="&#39;a\&#34;ode&#39;"><g class="shape" ><rect x="470" y="28" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="517.000000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\&#34;ode</text></g><g id="&#34;a\\node&#34;"><g class="shape" ><rect x="584" y="28" width="95" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="631.500000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\node</text></g><g id="(&#34;a\\yode&#34; -&gt; there)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 403.000000 96.000000 L 403.000000 124.000000 S 403.000000 134.000000 413.000000 134.000000 L 486.250000 134.000000 S 496.250000 134.000000 496.250000 144.000000 L 496.250000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><g id="(&#39;a\&#34;ode&#39; -&gt; there)[0]"><path d="M 517.000000 96.000000 L 517.000000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><g id="(&#34;a\\node&#34; -&gt; there)[0]"><path d="M 631.500000 96.000000 L 631.500000 124.000000 S 631.500000 134.000000 621.500000 134.000000 L 547.750000 134.000000 S 537.750000 134.000000 537.750000 144.000000 L 537.750000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><mask id="1719411410" maskUnits="userSpaceOnUse" x="-100" y="-100" width="871" height="432">
+]]></script><g id="&#34;ninety\nnine&#34;"><g class="shape" ><rect x="12" y="12" width="91" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="57.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="57.500000" dy="0.000000">ninety</tspan><tspan x="57.500000" dy="18.500000">nine</tspan></text></g><g id="eighty&#xD;eight"><g class="shape" ><rect x="123" y="20" width="91" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="168.500000" y="58.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eighty&#xD;eight</text></g><g id="&#34;seventy&#xD;\nseven&#34;"><g class="shape" ><rect x="234" y="12" width="102" height="82" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="285.000000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="285.000000" dy="0.000000">seventy&#xD;</tspan><tspan x="285.000000" dy="18.500000">seven</tspan></text></g><g id="&#34;a\\yode&#34;"><g class="shape" ><rect x="356" y="28" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="403.000000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\yode</text></g><g id="there"><g class="shape" ><rect x="475" y="174" width="83" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="516.500000" y="212.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">there</text></g><g id="&#39;a\&#34;ode&#39;"><g class="shape" ><rect x="470" y="28" width="94" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="517.000000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\&#34;ode</text></g><g id="&#34;a\\node&#34;"><g class="shape" ><rect x="584" y="28" width="95" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="631.500000" y="66.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a\node</text></g><g id="(&#34;a\\yode&#34; -&gt; there)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 403.000000 96.000000 L 403.000000 124.000000 S 403.000000 134.000000 413.000000 134.000000 L 486.250000 134.000000 S 496.250000 134.000000 496.250000 144.000000 L 496.250000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><g id="(&#39;a\&#34;ode&#39; -&gt; there)[0]"><path d="M 517.000000 96.000000 L 517.000000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><g id="(&#34;a\\node&#34; -&gt; there)[0]"><path d="M 631.500000 96.000000 L 631.500000 124.000000 S 631.500000 134.000000 621.500000 134.000000 L 547.750000 134.000000 S 537.750000 134.000000 537.750000 144.000000 L 537.750000 170.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1719411410)"/></g><mask id="1719411410" maskUnits="userSpaceOnUse" x="-100" y="-100" width="871" height="432">
 <rect x="-100" y="-100" width="871" height="432" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/links/dagre/sketch.exp.svg b/e2etests/testdata/stable/links/dagre/sketch.exp.svg
index c292bc055..921cd83b6 100644
--- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg
@@ -64,8 +64,7 @@ width="338" height="452" viewBox="-102 -118 338 452"><style type="text/css">
 </clipPath>
 </defs>
 </svg>
-</g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(70 150)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+</g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(70 150)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3440_35088111)">
 <path d="M16 31.1109C24.3456 31.1109 31.1111 24.3454 31.1111 15.9998C31.1111 7.65415 24.3456 0.888672 16 0.888672C7.65436 0.888672 0.888885 7.65415 0.888885 15.9998C0.888885 24.3454 7.65436 31.1109 16 31.1109Z" fill="white" stroke="#DEE1EB"/>
 <path d="M14.3909 16.7965C14.7364 17.2584 15.1772 17.6406 15.6834 17.9171C16.1896 18.1938 16.7494 18.3582 17.3248 18.3993C17.9001 18.4405 18.4777 18.3575 19.0181 18.1559C19.5586 17.9543 20.0492 17.6389 20.4571 17.2309L22.8708 14.8173C23.6036 14.0586 24.0089 13.0425 23.9998 11.9877C23.9906 10.933 23.5676 9.92404 22.8217 9.17821C22.0759 8.43237 21.067 8.00931 20.0123 8.00015C18.9575 7.99098 17.9413 8.39644 17.1827 9.1292L15.7988 10.505" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg
index 0875c3993..c3f55532f 100644
--- a/e2etests/testdata/stable/links/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg
@@ -64,8 +64,7 @@ width="338" height="422" viewBox="-90 -106 338 422"><style type="text/css">
 </clipPath>
 </defs>
 </svg>
-</g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(82 132)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+</g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title><g transform="translate(82 132)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3440_35088111)">
 <path d="M16 31.1109C24.3456 31.1109 31.1111 24.3454 31.1111 15.9998C31.1111 7.65415 24.3456 0.888672 16 0.888672C7.65436 0.888672 0.888885 7.65415 0.888885 15.9998C0.888885 24.3454 7.65436 31.1109 16 31.1109Z" fill="white" stroke="#DEE1EB"/>
 <path d="M14.3909 16.7965C14.7364 17.2584 15.1772 17.6406 15.6834 17.9171C16.1896 18.1938 16.7494 18.3582 17.3248 18.3993C17.9001 18.4405 18.4777 18.3575 19.0181 18.1559C19.5586 17.9543 20.0492 17.6389 20.4571 17.2309L22.8708 14.8173C23.6036 14.0586 24.0089 13.0425 23.9998 11.9877C23.9906 10.933 23.5676 9.92404 22.8217 9.17821C22.0759 8.43237 21.067 8.00931 20.0123 8.00015C18.9575 7.99098 17.9413 8.39644 17.1827 9.1292L15.7988 10.505" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
index d820ac24c..cc99a11a1 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
@@ -45,7 +45,7 @@ width="3829" height="1786" viewBox="-90 -50 3829 1786"><style type="text/css">
 <text class="text-mono" x="430.000000" y="218.000000" style="text-anchor:start;font-size:20px;fill:#EDF0FD">private() int</text>
 <text class="text-mono" x="682.000000" y="218.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3">void</text></g></g><g id="d"><g class="shape" ><path d="M 765 181 C 765 182 764 183 763 183 C 751 184 742 195 742 209 C 742 224 752 236 766 236 H 856 C 870 236 882 223 882 208 C 882 193 871 181 858 180 C 857 180 856 179 856 178 C 853 163 839 152 823 152 C 812 152 803 157 797 164 C 796 165 795 165 794 165 C 792 164 789 164 786 164 C 775 164 766 171 765 181 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="811.330000" y="215.516000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cloudyyyy</text></g><g id="e"><g class="shape" ></g><g transform="translate(922.000000 166.000000)"><rect class="shape" width="196" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" class="text-mono-bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" class="text-mono-bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" class="text-mono-bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" class="text-mono-bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="f"><g class="shape" ><path d="M 1140 142 C 1140 118 1185 118 1190 118 C 1195 118 1240 118 1240 142 V 212 C 1240 236 1195 236 1190 236 C 1185 236 1140 236 1140 212 V 142 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 1140 142 C 1140 166 1185 166 1190 166 C 1195 166 1240 166 1240 142" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1190.000000" y="194.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cyl</text></g><g id="g"><g class="shape" ><path d="M 1340 236 C 1340 236 1339 236 1339 236 L 1290 191 C 1289 191 1289 190 1290 189 L 1339 144 C 1340 144 1340 144 1341 144 L 1390 189 C 1391 189 1391 190 1390 191 L 1341 236 C 1341 236 1340 236 1340 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1340.000000" y="195.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dia</text></g><g id="h"><g class="shape" ><path d="M 1440 225 L 1440 160 L 1540 160 L 1540 225 C 1523 211 1507 211 1490 225 C 1473 240 1457 240 1440 225 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1490.000000" y="193.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs</text></g><g id="i"><g class="shape" ><path d="M 1617 167 L 1580 201 L 1617 236 L 1690 236 L 1726 201 L 1690 167 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1653.000000" y="207.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">six corners</text></g><g id="j"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="1766" y="87" width="128" height="128" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1830.000000" y="236.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a random icon</text></g><g id="k"><g class="shape" ><ellipse class="shape" cx="1982.000000" cy="201.000000" rx="50.000000" ry="35.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1982.000000" y="206.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">over</text></g><g id="l"><g class="shape" ><path d="M 2082 163 L 2132 163 L 2132 178 L 2182 178 L 2182 236 L 2082 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2132.000000" y="212.300000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">pack</text></g><g id="m"><g class="shape" ><path d="M 2227 149 H 2318 C 2319 149 2320 149 2321 150 L 2338 166 C 2339 167 2339 168 2339 169 V 236 C 2339 236 2339 236 2339 236 H 2227 C 2226 236 2226 236 2226 236 V 150 C 2226 149 2226 149 2227 149 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2338 236 H 2227 C 2226 236 2226 236 2226 235 V 150 C 2226 149 2226 149 2227 149 H 2317 C 2318 149 2318 149 2318 150 V 167 C 2318 168 2319 169 2320 169 H 2338 C 2339 169 2339 169 2339 170 V 235 C 2338 236 2339 236 2338 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2282.500000" y="198.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs page</text></g><g id="n"><g class="shape" ><path d="M 2405 154 L 2548 154 L 2522 236 L 2379 236 L 2379 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2463.500000" y="192.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2463.500000" dy="0.000000">too</tspan><tspan x="2463.500000" dy="18.500000">hard	o say</tspan></text></g><g id="o"><g class="shape" ><path d="M 2738 199 H 2588 V 198 C 2588 181 2604 166 2630 158 C 2616 152 2608 142 2608 132 C 2608 114 2632 99 2663 99 C 2694 99 2718 114 2718 132 C 2718 143 2710 152 2695 158 C 2721 165 2737 181 2737 198 V 199 H 2738 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2663.000000" y="220.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2663.000000" dy="0.000000">single</tspan><tspan x="2663.000000" dy="18.500000">person</tspan></text></g><g id="p"><g class="shape" ><path d="M 2802 170 H 2905 C 2929 170 2929 200 2929 203 C 2929 206 2929 236 2905 236 H 2802 C 2778 236 2778 206 2778 203 C 2778 200 2778 170 2802 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2905 170 C 2881 170 2881 200 2881 203 C 2881 206 2881 236 2905 236" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2841.500000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a queue</text></g><g id="q"><g class="shape" ><rect x="2969" y="133" width="103" height="103" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="3020.500000" y="190.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a square</text></g><g id="r"><g class="shape" ><path d="M 3112 135 L 3264 135 L 3299 186 L 3264 236 L 3112 236 L 3147 186 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3205.500000" y="191.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a step at a time</text></g><g id="s"><g class="shape" ><path d="M 3351 170 H 3436 C 3432 170 3421 188 3421 203 C 3421 218 3432 236 3436 236 H 3351 C 3347 236 3336 218 3336 203 C 3336 188 3347 170 3351 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3386.000000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">data</text></g><g id="t"><g class="shape" ><rect class="shape" x="3476" y="128" width="161" height="108" style="fill:#FFFFFF;stroke:#EDF0FD;stroke-width:2;"/><rect class="class_header" x="3476.000000" y="128.000000" width="161.000000" height="36.000000" fill="#EDF0FD" /><text class="text" x="3486.000000" y="153.750000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">users</text><text class="text" x="3486.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">id</text>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" class="text-mono-bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="f"><g class="shape" ><path d="M 1140 142 C 1140 118 1185 118 1190 118 C 1195 118 1240 118 1240 142 V 212 C 1240 236 1195 236 1190 236 C 1185 236 1140 236 1140 212 V 142 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 1140 142 C 1140 166 1185 166 1190 166 C 1195 166 1240 166 1240 142" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1190.000000" y="194.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cyl</text></g><g id="g"><g class="shape" ><path d="M 1340 236 C 1340 236 1339 236 1339 236 L 1290 191 C 1289 191 1289 190 1290 189 L 1339 144 C 1340 144 1340 144 1341 144 L 1390 189 C 1391 189 1391 190 1390 191 L 1341 236 C 1341 236 1340 236 1340 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1340.000000" y="195.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dia</text></g><g id="h"><g class="shape" ><path d="M 1440 225 L 1440 160 L 1540 160 L 1540 225 C 1523 211 1507 211 1490 225 C 1473 240 1457 240 1440 225 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1490.000000" y="193.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs</text></g><g id="i"><g class="shape" ><path d="M 1617 167 L 1580 201 L 1617 236 L 1690 236 L 1726 201 L 1690 167 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1653.000000" y="207.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">six corners</text></g><g id="j"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="1766" y="87" width="128" height="128" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1830.000000" y="236.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a random icon</text></g><g id="k"><g class="shape" ><ellipse class="shape" cx="1982.000000" cy="201.000000" rx="50.000000" ry="35.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1982.000000" y="206.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">over</text></g><g id="l"><g class="shape" ><path d="M 2082 163 L 2132 163 L 2132 178 L 2182 178 L 2182 236 L 2082 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2132.000000" y="212.300000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">pack</text></g><g id="m"><g class="shape" ><path d="M 2227 149 H 2318 C 2319 149 2320 149 2321 150 L 2338 166 C 2339 167 2339 168 2339 169 V 236 C 2339 236 2339 236 2339 236 H 2227 C 2226 236 2226 236 2226 236 V 150 C 2226 149 2226 149 2227 149 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2338 236 H 2227 C 2226 236 2226 236 2226 235 V 150 C 2226 149 2226 149 2227 149 H 2317 C 2318 149 2318 149 2318 150 V 167 C 2318 168 2319 169 2320 169 H 2338 C 2339 169 2339 169 2339 170 V 235 C 2338 236 2339 236 2338 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2282.500000" y="198.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs page</text></g><g id="n"><g class="shape" ><path d="M 2405 154 L 2548 154 L 2522 236 L 2379 236 L 2379 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2463.500000" y="192.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2463.500000" dy="0.000000">too</tspan><tspan x="2463.500000" dy="18.500000">hard&#x9;o say</tspan></text></g><g id="o"><g class="shape" ><path d="M 2738 199 H 2588 V 198 C 2588 181 2604 166 2630 158 C 2616 152 2608 142 2608 132 C 2608 114 2632 99 2663 99 C 2694 99 2718 114 2718 132 C 2718 143 2710 152 2695 158 C 2721 165 2737 181 2737 198 V 199 H 2738 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2663.000000" y="220.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2663.000000" dy="0.000000">single</tspan><tspan x="2663.000000" dy="18.500000">person</tspan></text></g><g id="p"><g class="shape" ><path d="M 2802 170 H 2905 C 2929 170 2929 200 2929 203 C 2929 206 2929 236 2905 236 H 2802 C 2778 236 2778 206 2778 203 C 2778 200 2778 170 2802 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2905 170 C 2881 170 2881 200 2881 203 C 2881 206 2881 236 2905 236" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2841.500000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a queue</text></g><g id="q"><g class="shape" ><rect x="2969" y="133" width="103" height="103" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="3020.500000" y="190.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a square</text></g><g id="r"><g class="shape" ><path d="M 3112 135 L 3264 135 L 3299 186 L 3264 236 L 3112 236 L 3147 186 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3205.500000" y="191.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a step at a time</text></g><g id="s"><g class="shape" ><path d="M 3351 170 H 3436 C 3432 170 3421 188 3421 203 C 3421 218 3432 236 3436 236 H 3351 C 3347 236 3336 218 3336 203 C 3336 188 3347 170 3351 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3386.000000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">data</text></g><g id="t"><g class="shape" ><rect class="shape" x="3476" y="128" width="161" height="108" style="fill:#FFFFFF;stroke:#EDF0FD;stroke-width:2;"/><rect class="class_header" x="3476.000000" y="128.000000" width="161.000000" height="36.000000" fill="#EDF0FD" /><text class="text" x="3486.000000" y="153.750000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">users</text><text class="text" x="3486.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">id</text>
 <text class="text" x="3553.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">int</text>
 <text class="text" x="3617.000000" y="187.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="3476.000000" y1="200.000000" x2="3637.000000" y2="200.000000" style="stroke-width:2;stroke:#EDF0FD" /><text class="text" x="3486.000000" y="223.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">name</text>
 <text class="text" x="3553.000000" y="223.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">varchar</text>
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
index d820ac24c..cc99a11a1 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
@@ -45,7 +45,7 @@ width="3829" height="1786" viewBox="-90 -50 3829 1786"><style type="text/css">
 <text class="text-mono" x="430.000000" y="218.000000" style="text-anchor:start;font-size:20px;fill:#EDF0FD">private() int</text>
 <text class="text-mono" x="682.000000" y="218.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3">void</text></g></g><g id="d"><g class="shape" ><path d="M 765 181 C 765 182 764 183 763 183 C 751 184 742 195 742 209 C 742 224 752 236 766 236 H 856 C 870 236 882 223 882 208 C 882 193 871 181 858 180 C 857 180 856 179 856 178 C 853 163 839 152 823 152 C 812 152 803 157 797 164 C 796 165 795 165 794 165 C 792 164 789 164 786 164 C 775 164 766 171 765 181 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="811.330000" y="215.516000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cloudyyyy</text></g><g id="e"><g class="shape" ></g><g transform="translate(922.000000 166.000000)"><rect class="shape" width="196" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" class="text-mono-bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" class="text-mono-bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" class="text-mono-bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" class="text-mono-bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="f"><g class="shape" ><path d="M 1140 142 C 1140 118 1185 118 1190 118 C 1195 118 1240 118 1240 142 V 212 C 1240 236 1195 236 1190 236 C 1185 236 1140 236 1140 212 V 142 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 1140 142 C 1140 166 1185 166 1190 166 C 1195 166 1240 166 1240 142" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1190.000000" y="194.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cyl</text></g><g id="g"><g class="shape" ><path d="M 1340 236 C 1340 236 1339 236 1339 236 L 1290 191 C 1289 191 1289 190 1290 189 L 1339 144 C 1340 144 1340 144 1341 144 L 1390 189 C 1391 189 1391 190 1390 191 L 1341 236 C 1341 236 1340 236 1340 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1340.000000" y="195.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dia</text></g><g id="h"><g class="shape" ><path d="M 1440 225 L 1440 160 L 1540 160 L 1540 225 C 1523 211 1507 211 1490 225 C 1473 240 1457 240 1440 225 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1490.000000" y="193.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs</text></g><g id="i"><g class="shape" ><path d="M 1617 167 L 1580 201 L 1617 236 L 1690 236 L 1726 201 L 1690 167 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1653.000000" y="207.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">six corners</text></g><g id="j"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="1766" y="87" width="128" height="128" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1830.000000" y="236.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a random icon</text></g><g id="k"><g class="shape" ><ellipse class="shape" cx="1982.000000" cy="201.000000" rx="50.000000" ry="35.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1982.000000" y="206.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">over</text></g><g id="l"><g class="shape" ><path d="M 2082 163 L 2132 163 L 2132 178 L 2182 178 L 2182 236 L 2082 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2132.000000" y="212.300000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">pack</text></g><g id="m"><g class="shape" ><path d="M 2227 149 H 2318 C 2319 149 2320 149 2321 150 L 2338 166 C 2339 167 2339 168 2339 169 V 236 C 2339 236 2339 236 2339 236 H 2227 C 2226 236 2226 236 2226 236 V 150 C 2226 149 2226 149 2227 149 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2338 236 H 2227 C 2226 236 2226 236 2226 235 V 150 C 2226 149 2226 149 2227 149 H 2317 C 2318 149 2318 149 2318 150 V 167 C 2318 168 2319 169 2320 169 H 2338 C 2339 169 2339 169 2339 170 V 235 C 2338 236 2339 236 2338 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2282.500000" y="198.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs page</text></g><g id="n"><g class="shape" ><path d="M 2405 154 L 2548 154 L 2522 236 L 2379 236 L 2379 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2463.500000" y="192.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2463.500000" dy="0.000000">too</tspan><tspan x="2463.500000" dy="18.500000">hard	o say</tspan></text></g><g id="o"><g class="shape" ><path d="M 2738 199 H 2588 V 198 C 2588 181 2604 166 2630 158 C 2616 152 2608 142 2608 132 C 2608 114 2632 99 2663 99 C 2694 99 2718 114 2718 132 C 2718 143 2710 152 2695 158 C 2721 165 2737 181 2737 198 V 199 H 2738 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2663.000000" y="220.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2663.000000" dy="0.000000">single</tspan><tspan x="2663.000000" dy="18.500000">person</tspan></text></g><g id="p"><g class="shape" ><path d="M 2802 170 H 2905 C 2929 170 2929 200 2929 203 C 2929 206 2929 236 2905 236 H 2802 C 2778 236 2778 206 2778 203 C 2778 200 2778 170 2802 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2905 170 C 2881 170 2881 200 2881 203 C 2881 206 2881 236 2905 236" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2841.500000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a queue</text></g><g id="q"><g class="shape" ><rect x="2969" y="133" width="103" height="103" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="3020.500000" y="190.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a square</text></g><g id="r"><g class="shape" ><path d="M 3112 135 L 3264 135 L 3299 186 L 3264 236 L 3112 236 L 3147 186 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3205.500000" y="191.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a step at a time</text></g><g id="s"><g class="shape" ><path d="M 3351 170 H 3436 C 3432 170 3421 188 3421 203 C 3421 218 3432 236 3436 236 H 3351 C 3347 236 3336 218 3336 203 C 3336 188 3347 170 3351 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3386.000000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">data</text></g><g id="t"><g class="shape" ><rect class="shape" x="3476" y="128" width="161" height="108" style="fill:#FFFFFF;stroke:#EDF0FD;stroke-width:2;"/><rect class="class_header" x="3476.000000" y="128.000000" width="161.000000" height="36.000000" fill="#EDF0FD" /><text class="text" x="3486.000000" y="153.750000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">users</text><text class="text" x="3486.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">id</text>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" class="text-mono-bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="f"><g class="shape" ><path d="M 1140 142 C 1140 118 1185 118 1190 118 C 1195 118 1240 118 1240 142 V 212 C 1240 236 1195 236 1190 236 C 1185 236 1140 236 1140 212 V 142 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 1140 142 C 1140 166 1185 166 1190 166 C 1195 166 1240 166 1240 142" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1190.000000" y="194.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">cyl</text></g><g id="g"><g class="shape" ><path d="M 1340 236 C 1340 236 1339 236 1339 236 L 1290 191 C 1289 191 1289 190 1290 189 L 1339 144 C 1340 144 1340 144 1341 144 L 1390 189 C 1391 189 1391 190 1390 191 L 1341 236 C 1341 236 1340 236 1340 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1340.000000" y="195.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dia</text></g><g id="h"><g class="shape" ><path d="M 1440 225 L 1440 160 L 1540 160 L 1540 225 C 1523 211 1507 211 1490 225 C 1473 240 1457 240 1440 225 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1490.000000" y="193.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs</text></g><g id="i"><g class="shape" ><path d="M 1617 167 L 1580 201 L 1617 236 L 1690 236 L 1726 201 L 1690 167 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1653.000000" y="207.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">six corners</text></g><g id="j"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="1766" y="87" width="128" height="128" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1830.000000" y="236.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a random icon</text></g><g id="k"><g class="shape" ><ellipse class="shape" cx="1982.000000" cy="201.000000" rx="50.000000" ry="35.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="1982.000000" y="206.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">over</text></g><g id="l"><g class="shape" ><path d="M 2082 163 L 2132 163 L 2132 178 L 2182 178 L 2182 236 L 2082 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2132.000000" y="212.300000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">pack</text></g><g id="m"><g class="shape" ><path d="M 2227 149 H 2318 C 2319 149 2320 149 2321 150 L 2338 166 C 2339 167 2339 168 2339 169 V 236 C 2339 236 2339 236 2339 236 H 2227 C 2226 236 2226 236 2226 236 V 150 C 2226 149 2226 149 2227 149 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2338 236 H 2227 C 2226 236 2226 236 2226 235 V 150 C 2226 149 2226 149 2227 149 H 2317 C 2318 149 2318 149 2318 150 V 167 C 2318 168 2319 169 2320 169 H 2338 C 2339 169 2339 169 2339 170 V 235 C 2338 236 2339 236 2338 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2282.500000" y="198.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">docs page</text></g><g id="n"><g class="shape" ><path d="M 2405 154 L 2548 154 L 2522 236 L 2379 236 L 2379 236 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2463.500000" y="192.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2463.500000" dy="0.000000">too</tspan><tspan x="2463.500000" dy="18.500000">hard&#x9;o say</tspan></text></g><g id="o"><g class="shape" ><path d="M 2738 199 H 2588 V 198 C 2588 181 2604 166 2630 158 C 2616 152 2608 142 2608 132 C 2608 114 2632 99 2663 99 C 2694 99 2718 114 2718 132 C 2718 143 2710 152 2695 158 C 2721 165 2737 181 2737 198 V 199 H 2738 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2663.000000" y="220.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25"><tspan x="2663.000000" dy="0.000000">single</tspan><tspan x="2663.000000" dy="18.500000">person</tspan></text></g><g id="p"><g class="shape" ><path d="M 2802 170 H 2905 C 2929 170 2929 200 2929 203 C 2929 206 2929 236 2905 236 H 2802 C 2778 236 2778 206 2778 203 C 2778 200 2778 170 2802 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/><path d="M 2905 170 C 2881 170 2881 200 2881 203 C 2881 206 2881 236 2905 236" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="2841.500000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a queue</text></g><g id="q"><g class="shape" ><rect x="2969" y="133" width="103" height="103" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="3020.500000" y="190.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a square</text></g><g id="r"><g class="shape" ><path d="M 3112 135 L 3264 135 L 3299 186 L 3264 236 L 3112 236 L 3147 186 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3205.500000" y="191.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a step at a time</text></g><g id="s"><g class="shape" ><path d="M 3351 170 H 3436 C 3432 170 3421 188 3421 203 C 3421 218 3432 236 3436 236 H 3351 C 3347 236 3336 218 3336 203 C 3336 188 3347 170 3351 170 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="3386.000000" y="208.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">data</text></g><g id="t"><g class="shape" ><rect class="shape" x="3476" y="128" width="161" height="108" style="fill:#FFFFFF;stroke:#EDF0FD;stroke-width:2;"/><rect class="class_header" x="3476.000000" y="128.000000" width="161.000000" height="36.000000" fill="#EDF0FD" /><text class="text" x="3486.000000" y="153.750000" style="text-anchor:start;font-size:24px;fill:#FFFFFF">users</text><text class="text" x="3486.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">id</text>
 <text class="text" x="3553.000000" y="187.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">int</text>
 <text class="text" x="3617.000000" y="187.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="3476.000000" y1="200.000000" x2="3637.000000" y2="200.000000" style="stroke-width:2;stroke:#EDF0FD" /><text class="text" x="3486.000000" y="223.000000" style="text-anchor:start;font-size:20px;fill:#0D32B2">name</text>
 <text class="text" x="3553.000000" y="223.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">varchar</text>
diff --git a/e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg b/e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg
index f11e216fb..503fe6011 100644
--- a/e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg
@@ -65,8 +65,7 @@ width="306" height="452" viewBox="-102 -118 306 452"><style type="text/css">
 </clipPath>
 </defs>
 </svg>
-</g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 43.000000 68.000000 C 43.000000 106.000000 43.000000 126.000000 43.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2888388714)"/></g><mask id="2888388714" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="452">
+</g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 43.000000 68.000000 C 43.000000 106.000000 43.000000 126.000000 43.000000 162.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2888388714)"/></g><mask id="2888388714" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="452">
 <rect x="-100" y="-100" width="306" height="452" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/tooltips/elk/sketch.exp.svg b/e2etests/testdata/stable/tooltips/elk/sketch.exp.svg
index 179ee155b..4456f5528 100644
--- a/e2etests/testdata/stable/tooltips/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/tooltips/elk/sketch.exp.svg
@@ -65,8 +65,7 @@ width="306" height="422" viewBox="-90 -106 306 422"><style type="text/css">
 </clipPath>
 </defs>
 </svg>
-</g><title>Gee, I feel kind of LIGHT in the head now,
-knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 55.000000 80.000000 L 55.000000 144.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#463846916)"/></g><mask id="463846916" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="422">
+</g><title>Gee, I feel kind of LIGHT in the head now,&#xA;knowing I can&#39;t make my satellite dish PAYMENTS!</title></g><g id="(x -&gt; y)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 55.000000 80.000000 L 55.000000 144.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#463846916)"/></g><mask id="463846916" maskUnits="userSpaceOnUse" x="-100" y="-100" width="306" height="422">
 <rect x="-100" y="-100" width="306" height="422" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/lib/svg/text.go b/lib/svg/text.go
index c0777b9ee..a729d5675 100644
--- a/lib/svg/text.go
+++ b/lib/svg/text.go
@@ -1,9 +1,12 @@
 package svg
 
 import (
-	"html"
+	"bytes"
+	"encoding/xml"
 )
 
 func EscapeText(text string) string {
-	return html.EscapeString(text)
+	buf := new(bytes.Buffer)
+	_ = xml.EscapeText(buf, []byte(text))
+	return buf.String()
 }