diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png
index 75d351d33..71fb5d174 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png differ
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index e447a9d7f..ea37bcc83 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
index 09e56ee77..1ab8dd1f6 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
@@ -96,7 +96,7 @@
 		.d2-39654206 .color-AA4{color:#EDF0FD;}
 		.d2-39654206 .color-AA5{color:#F7F8FE;}
 		.d2-39654206 .color-AB4{color:#EDF0FD;}
-		.d2-39654206 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="24.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#2bc3d8" class=" fill-B6" style="stroke-width:8;"  rx="10" /></g><text x="50.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="24.000000" y="542.000000" width="53.000000" height="66.000000" stroke="#0db254" class=" fill-B6" style="stroke-width:8;" /></g><text x="50.500000" y="580.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="c"><g class="shape" ><path d="M 69 431 L 69 366 L 122 366 L 122 431 C 113 417 104 417 96 431 C 87 446 78 446 69 431 Z" stroke="#b2350d" class=" fill-AB4" style="stroke-width:7;" /></g><text x="95.500000" y="399.610964" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="Oval"><g class="shape" ><ellipse rx="50.000000" ry="50.000000" cx="50.000000" cy="216.000000" stroke="#a1a4af" class="shape fill-B6" style="stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-276093939" markerWidth="28.000000" markerHeight="28.000000" refX="9.000000" refY="14.000000" viewBox="0.000000 0.000000 28.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 28.000000,0.000000 21.000000,14.000000 28.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><marker id="mk-3520845909" markerWidth="22.000000" markerHeight="28.000000" refX="13.000000" refY="14.000000" viewBox="0.000000 0.000000 22.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 22.000000,14.000000 0.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><path d="M 13.943485 66.252119 C -27.300000 104.287778 -40.000000 136.000000 -40.000000 166.000000 C -40.000000 196.000000 -40.000000 236.000000 -40.000000 266.000000 C -40.000000 296.000000 -40.000000 333.600000 -40.000000 360.000000 C -40.000000 386.400000 -27.300000 503.712222 13.943485 541.747881" fill="none" class="connection stroke-B2" style="stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-276093939)" marker-end="url(#mk-3520845909)" mask="url(#d2-39654206)" /></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="25.000000" markerHeight="32.000000" refX="14.500000" refY="16.000000" viewBox="0.000000 0.000000 25.000000 32.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 25.000000,16.000000 0.000000,32.000000" fill="#20222a" class="connection" stroke-width="7" /> </marker><path d="M 95.000000 440.000000 C 95.000000 480.200000 89.600000 502.000000 74.889659 529.241372" stroke="#20222a" fill="none" class="connection" style="stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#d2-39654206)" /></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2406817645" markerWidth="48.400000" markerHeight="36.000000" refX="9.100000" refY="18.000000" viewBox="0.000000 0.000000 48.400000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="5.500000,18.000000 26.400000,4.500000 48.400000,18.000000 26.400000,31.500000" class="connection stroke-B1 fill-N7" stroke-width="6" /> </marker><marker id="mk-2681561429" markerWidth="44.000000" markerHeight="28.000000" refX="35.000000" refY="14.000000" viewBox="0.000000 0.000000 44.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 22.000000,0.000000 44.000000,14.000000 22.000000,28.000000" class="connection fill-B1" stroke-width="6" /> </marker><path d="M 50.000000 79.000000 C 50.000000 106.000000 50.000000 126.000000 50.000000 154.000000" fill="none" class="connection stroke-B1" style="stroke-width:6;" marker-start="url(#mk-2406817645)" marker-end="url(#mk-2681561429)" mask="url(#d2-39654206)" /><text x="68.500000" y="156.000000" class="text-italic fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="(c -- a)[0]"><path d="M 117.229469 359.789482 C 134.800000 326.000000 140.000000 296.000000 140.000000 266.000000 C 140.000000 236.000000 127.400000 104.400000 82.517737 63.079821" fill="none" class="connection stroke-B1" style="stroke-width:7;" mask="url(#d2-39654206)" /></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" 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 points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 50.000000 272.000000 C 50.000000 306.000000 55.200000 326.000000 73.001207 360.233091" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-39654206)" /></g><mask id="d2-39654206" maskUnits="userSpaceOnUse" x="-43" y="-4" width="187" height="616">
+		.d2-39654206 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="24.000000" y="0.000000" width="53.000000" height="66.000000" rx="10.000000" stroke="#2bc3d8" class=" fill-B6" style="stroke-width:8;" /></g><text x="50.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="24.000000" y="542.000000" width="53.000000" height="66.000000" stroke="#0db254" class=" fill-B6" style="stroke-width:8;" /></g><text x="50.500000" y="580.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="c"><g class="shape" ><path d="M 69 431 L 69 366 L 122 366 L 122 431 C 113 417 104 417 96 431 C 87 446 78 446 69 431 Z" stroke="#b2350d" class=" fill-AB4" style="stroke-width:7;" /></g><text x="95.500000" y="399.610964" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="Oval"><g class="shape" ><ellipse rx="50.000000" ry="50.000000" cx="50.000000" cy="216.000000" stroke="#a1a4af" class="shape fill-B6" style="stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-276093939" markerWidth="28.000000" markerHeight="28.000000" refX="9.000000" refY="14.000000" viewBox="0.000000 0.000000 28.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 28.000000,0.000000 21.000000,14.000000 28.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><marker id="mk-3520845909" markerWidth="22.000000" markerHeight="28.000000" refX="13.000000" refY="14.000000" viewBox="0.000000 0.000000 22.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 22.000000,14.000000 0.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><path d="M 13.943485 66.252119 C -27.300000 104.287778 -40.000000 136.000000 -40.000000 166.000000 C -40.000000 196.000000 -40.000000 236.000000 -40.000000 266.000000 C -40.000000 296.000000 -40.000000 333.600000 -40.000000 360.000000 C -40.000000 386.400000 -27.300000 503.712222 13.943485 541.747881" fill="none" class="connection stroke-B2" style="stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-276093939)" marker-end="url(#mk-3520845909)" mask="url(#d2-39654206)" /></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="25.000000" markerHeight="32.000000" refX="14.500000" refY="16.000000" viewBox="0.000000 0.000000 25.000000 32.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 25.000000,16.000000 0.000000,32.000000" fill="#20222a" class="connection" stroke-width="7" /> </marker><path d="M 95.000000 440.000000 C 95.000000 480.200000 89.600000 502.000000 74.889659 529.241372" stroke="#20222a" fill="none" class="connection" style="stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#d2-39654206)" /></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2406817645" markerWidth="48.400000" markerHeight="36.000000" refX="9.100000" refY="18.000000" viewBox="0.000000 0.000000 48.400000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="5.500000,18.000000 26.400000,4.500000 48.400000,18.000000 26.400000,31.500000" class="connection stroke-B1 fill-N7" stroke-width="6" /> </marker><marker id="mk-2681561429" markerWidth="44.000000" markerHeight="28.000000" refX="35.000000" refY="14.000000" viewBox="0.000000 0.000000 44.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 22.000000,0.000000 44.000000,14.000000 22.000000,28.000000" class="connection fill-B1" stroke-width="6" /> </marker><path d="M 50.000000 79.000000 C 50.000000 106.000000 50.000000 126.000000 50.000000 154.000000" fill="none" class="connection stroke-B1" style="stroke-width:6;" marker-start="url(#mk-2406817645)" marker-end="url(#mk-2681561429)" mask="url(#d2-39654206)" /><text x="68.500000" y="156.000000" class="text-italic fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="(c -- a)[0]"><path d="M 117.229469 359.789482 C 134.800000 326.000000 140.000000 296.000000 140.000000 266.000000 C 140.000000 236.000000 127.400000 104.400000 82.517737 63.079821" fill="none" class="connection stroke-B1" style="stroke-width:7;" mask="url(#d2-39654206)" /></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" 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 points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 50.000000 272.000000 C 50.000000 306.000000 55.200000 326.000000 73.001207 360.233091" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-39654206)" /></g><mask id="d2-39654206" maskUnits="userSpaceOnUse" x="-43" y="-4" width="187" height="616">
 <rect x="-43" y="-4" width="187" height="616" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
index f2011c11b..84a80c6db 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
@@ -96,7 +96,7 @@
 		.d2-2391175043 .color-AA4{color:#EDF0FD;}
 		.d2-2391175043 .color-AA5{color:#F7F8FE;}
 		.d2-2391175043 .color-AB4{color:#EDF0FD;}
-		.d2-2391175043 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="63.000000" y="12.000000" width="80.000000" height="66.000000" stroke="#2bc3d8" class=" fill-B6" style="stroke-width:8;"  rx="10" /></g><text x="103.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="55.000000" y="494.000000" width="80.000000" height="66.000000" stroke="#0db254" class=" fill-B6" style="stroke-width:8;" /></g><text x="95.000000" y="532.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="c"><g class="shape" ><path d="M 108 403 L 108 338 L 188 338 L 188 403 C 175 389 161 389 148 403 C 135 418 121 418 108 403 Z" stroke="#b2350d" class=" fill-AB4" style="stroke-width:7;" /></g><text x="148.000000" y="371.610964" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="Oval"><g class="shape" ><ellipse rx="50.000000" ry="50.000000" cx="103.000000" cy="208.000000" stroke="#a1a4af" class="shape fill-B6" style="stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-276093939" markerWidth="28.000000" markerHeight="28.000000" refX="9.000000" refY="14.000000" viewBox="0.000000 0.000000 28.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 28.000000,0.000000 21.000000,14.000000 28.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><marker id="mk-3520845909" markerWidth="22.000000" markerHeight="28.000000" refX="13.000000" refY="14.000000" viewBox="0.000000 0.000000 22.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 22.000000,14.000000 0.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><path d="M 83.000000 91.000000 L 83.000000 108.000000 S 83.000000 118.000000 73.000000 118.000000 L 22.000000 118.000000 S 12.000000 118.000000 12.000000 128.000000 L 12.000000 444.000000 S 12.000000 454.000000 22.000000 454.000000 L 72.500000 454.000000 S 82.500000 454.000000 82.500000 464.000000 L 82.500000 481.000000" fill="none" class="connection stroke-B2" style="stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-276093939)" marker-end="url(#mk-3520845909)" mask="url(#d2-2391175043)" /></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="25.000000" markerHeight="32.000000" refX="14.500000" refY="16.000000" viewBox="0.000000 0.000000 25.000000 32.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 25.000000,16.000000 0.000000,32.000000" fill="#20222a" class="connection" stroke-width="7" /> </marker><path d="M 148.000000 410.000000 L 148.000000 444.000000 S 148.000000 454.000000 138.000000 454.000000 L 119.166667 454.000000 S 109.166667 454.000000 109.166667 464.000000 L 109.166667 479.500000" stroke="#20222a" fill="none" class="connection" style="stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#d2-2391175043)" /></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2406817645" markerWidth="48.400000" markerHeight="36.000000" refX="9.100000" refY="18.000000" viewBox="0.000000 0.000000 48.400000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="5.500000,18.000000 26.400000,4.500000 48.400000,18.000000 26.400000,31.500000" class="connection stroke-B1 fill-N7" stroke-width="6" /> </marker><marker id="mk-2681561429" markerWidth="44.000000" markerHeight="28.000000" refX="35.000000" refY="14.000000" viewBox="0.000000 0.000000 44.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 22.000000,0.000000 44.000000,14.000000 22.000000,28.000000" class="connection fill-B1" stroke-width="6" /> </marker><path d="M 103.000000 91.000000 L 103.000000 146.000000" fill="none" class="connection stroke-B1" style="stroke-width:6;" marker-start="url(#mk-2406817645)" marker-end="url(#mk-2681561429)" mask="url(#d2-2391175043)" /><text x="121.500000" y="148.000000" class="text-italic fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="(c -- a)[0]"><path d="M 161.058331 331.000243 L 161.250003 307.999653 S 161.333333 298.000000 171.333333 298.000000 L 183.000000 298.000000 S 193.000000 298.000000 193.000000 288.000000 L 193.000000 128.000000 S 193.000000 118.000000 183.000000 118.000000 L 133.000000 118.000000 S 123.000000 118.000000 123.000000 108.000000 L 123.000000 85.500000" fill="none" class="connection stroke-B1" style="stroke-width:7;" mask="url(#d2-2391175043)" /></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" 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 points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 135.000000 253.000000 L 135.000000 331.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-2391175043)" /></g><mask id="d2-2391175043" maskUnits="userSpaceOnUse" x="9" y="8" width="188" height="556">
+		.d2-2391175043 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g id="a"><g class="shape" ><rect x="63.000000" y="12.000000" width="80.000000" height="66.000000" rx="10.000000" stroke="#2bc3d8" class=" fill-B6" style="stroke-width:8;" /></g><text x="103.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="55.000000" y="494.000000" width="80.000000" height="66.000000" stroke="#0db254" class=" fill-B6" style="stroke-width:8;" /></g><text x="95.000000" y="532.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">b</text></g><g id="c"><g class="shape" ><path d="M 108 403 L 108 338 L 188 338 L 188 403 C 175 389 161 389 148 403 C 135 418 121 418 108 403 Z" stroke="#b2350d" class=" fill-AB4" style="stroke-width:7;" /></g><text x="148.000000" y="371.610964" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="Oval"><g class="shape" ><ellipse rx="50.000000" ry="50.000000" cx="103.000000" cy="208.000000" stroke="#a1a4af" class="shape fill-B6" style="stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-276093939" markerWidth="28.000000" markerHeight="28.000000" refX="9.000000" refY="14.000000" viewBox="0.000000 0.000000 28.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 28.000000,0.000000 21.000000,14.000000 28.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><marker id="mk-3520845909" markerWidth="22.000000" markerHeight="28.000000" refX="13.000000" refY="14.000000" viewBox="0.000000 0.000000 22.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 22.000000,14.000000 0.000000,28.000000" class="connection fill-B2" stroke-width="6" /> </marker><path d="M 83.000000 91.000000 L 83.000000 108.000000 S 83.000000 118.000000 73.000000 118.000000 L 22.000000 118.000000 S 12.000000 118.000000 12.000000 128.000000 L 12.000000 444.000000 S 12.000000 454.000000 22.000000 454.000000 L 72.500000 454.000000 S 82.500000 454.000000 82.500000 464.000000 L 82.500000 481.000000" fill="none" class="connection stroke-B2" style="stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-276093939)" marker-end="url(#mk-3520845909)" mask="url(#d2-2391175043)" /></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="25.000000" markerHeight="32.000000" refX="14.500000" refY="16.000000" viewBox="0.000000 0.000000 25.000000 32.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 25.000000,16.000000 0.000000,32.000000" fill="#20222a" class="connection" stroke-width="7" /> </marker><path d="M 148.000000 410.000000 L 148.000000 444.000000 S 148.000000 454.000000 138.000000 454.000000 L 119.166667 454.000000 S 109.166667 454.000000 109.166667 464.000000 L 109.166667 479.500000" stroke="#20222a" fill="none" class="connection" style="stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#d2-2391175043)" /></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2406817645" markerWidth="48.400000" markerHeight="36.000000" refX="9.100000" refY="18.000000" viewBox="0.000000 0.000000 48.400000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="5.500000,18.000000 26.400000,4.500000 48.400000,18.000000 26.400000,31.500000" class="connection stroke-B1 fill-N7" stroke-width="6" /> </marker><marker id="mk-2681561429" markerWidth="44.000000" markerHeight="28.000000" refX="35.000000" refY="14.000000" viewBox="0.000000 0.000000 44.000000 28.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,14.000000 22.000000,0.000000 44.000000,14.000000 22.000000,28.000000" class="connection fill-B1" stroke-width="6" /> </marker><path d="M 103.000000 91.000000 L 103.000000 146.000000" fill="none" class="connection stroke-B1" style="stroke-width:6;" marker-start="url(#mk-2406817645)" marker-end="url(#mk-2681561429)" mask="url(#d2-2391175043)" /><text x="121.500000" y="148.000000" class="text-italic fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="(c -- a)[0]"><path d="M 161.058331 331.000243 L 161.250003 307.999653 S 161.333333 298.000000 171.333333 298.000000 L 183.000000 298.000000 S 193.000000 298.000000 193.000000 288.000000 L 193.000000 128.000000 S 193.000000 118.000000 183.000000 118.000000 L 133.000000 118.000000 S 123.000000 118.000000 123.000000 108.000000 L 123.000000 85.500000" fill="none" class="connection stroke-B1" style="stroke-width:7;" mask="url(#d2-2391175043)" /></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><marker id="mk-3488378134" 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 points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 135.000000 253.000000 L 135.000000 331.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-2451250203)" marker-end="url(#mk-3488378134)" mask="url(#d2-2391175043)" /></g><mask id="d2-2391175043" maskUnits="userSpaceOnUse" x="9" y="8" width="188" height="556">
 <rect x="9" y="8" width="188" height="556" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg
index 9f23c496a..487e5b08b 100644
--- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.3.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 685 84"><svg id="d2-svg" class="d2-841842780" width="685" height="84" viewBox="-1 -17 685 84"><rect x="-1.000000" y="-17.000000" width="685.000000" height="84.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.4.1-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 685 84"><svg id="d2-svg" class="d2-841842780" width="685" height="84" viewBox="-1 -17 685 84"><rect x="-1.000000" y="-17.000000" width="685.000000" height="84.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .d2-841842780 .text-bold {
 	font-family: "d2-841842780-font-bold";
 }
diff --git a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg
index b9ea856c3..a21bfc68c 100644
--- a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.3.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 525 84"><svg id="d2-svg" class="d2-2772170457" width="525" height="84" viewBox="11 -5 525 84"><rect x="11.000000" y="-5.000000" width="525.000000" height="84.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" d2Version="v0.4.1-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 525 84"><svg id="d2-svg" class="d2-2772170457" width="525" height="84" viewBox="11 -5 525 84"><rect x="11.000000" y="-5.000000" width="525.000000" height="84.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .d2-2772170457 .text-bold {
 	font-family: "d2-2772170457-font-bold";
 }