Merge pull request #2183 from alixander/circle-fit

circle fit
2024-10-31 06:07:41 -06:00 · 2024-10-31 06:07:41 -06:00 · 2cef20b99a
commit 2cef20b99a
parent 3d3925447f 62cf930a14
99 changed files with 9014 additions and 9011 deletions
--- a/ci/release/changelogs/next.md
+++ b/ci/release/changelogs/next.md
@ -8,6 +8,8 @@
 - CLI: attempts writing to path atomically, falling back to non-atomic if failed [#2141](https://github.com/terrastruct/d2/pull/2141)
 - Export: pptx has "created at" metadata removed, so successive runs yield the same result [#2169](https://github.com/terrastruct/d2/pull/2160)
 - Formatter: empty board keywords (e.g. `layers`) are removed [#2178](https://github.com/terrastruct/d2/pull/2178)
 - Render: circle containers are tighter fitting [#2183](https://github.com/terrastruct/d2/pull/2183)
 - Render: a tooltip or link by itself will not expand width of shape [#2183](https://github.com/terrastruct/d2/pull/2183)
 #### Bugfixes ⛑️
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@ -1544,11 +1544,8 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			switch shapeType {
 			case shape.TABLE_TYPE, shape.CLASS_TYPE, shape.CODE_TYPE:
 			default:
-				if obj.Link != nil {
+				if obj.Link != nil && obj.Tooltip != nil {
-					paddingX += 32
+					paddingX += 64
 				}
 				if obj.Tooltip != nil {
 					paddingX += 32
 				}
 			}
 		}
--- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg
--- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg
--- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg
--- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg
--- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg
--- a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 304 407"><svg id="d2-svg" class="d2-1118191387" width="304" height="407" viewBox="-101 -118 304 407"><rect x="-101.000000" y="-118.000000" width="304" height="407" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 272 407"><svg id="d2-svg" class="d2-3480929874" width="272" height="407" viewBox="-101 -118 272 407"><rect x="-101.000000" y="-118.000000" width="272" height="407" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-1118191387 .text-bold {
+.d2-3480929874 .text-bold {
-	font-family: "d2-1118191387-font-bold";
+	font-family: "d2-3480929874-font-bold";
 }
@font-face {
-	font-family: d2-1118191387-font-bold;
+	font-family: d2-3480929874-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,81 +21,81 @@
  opacity: 0.5;
 }
-		.d2-1118191387 .fill-N1{fill:#0A0F25;}
+		.d2-3480929874 .fill-N1{fill:#0A0F25;}
-		.d2-1118191387 .fill-N2{fill:#676C7E;}
+		.d2-3480929874 .fill-N2{fill:#676C7E;}
-		.d2-1118191387 .fill-N3{fill:#9499AB;}
+		.d2-3480929874 .fill-N3{fill:#9499AB;}
-		.d2-1118191387 .fill-N4{fill:#CFD2DD;}
+		.d2-3480929874 .fill-N4{fill:#CFD2DD;}
-		.d2-1118191387 .fill-N5{fill:#DEE1EB;}
+		.d2-3480929874 .fill-N5{fill:#DEE1EB;}
-		.d2-1118191387 .fill-N6{fill:#EEF1F8;}
+		.d2-3480929874 .fill-N6{fill:#EEF1F8;}
-		.d2-1118191387 .fill-N7{fill:#FFFFFF;}
+		.d2-3480929874 .fill-N7{fill:#FFFFFF;}
-		.d2-1118191387 .fill-B1{fill:#0D32B2;}
+		.d2-3480929874 .fill-B1{fill:#0D32B2;}
-		.d2-1118191387 .fill-B2{fill:#0D32B2;}
+		.d2-3480929874 .fill-B2{fill:#0D32B2;}
-		.d2-1118191387 .fill-B3{fill:#E3E9FD;}
+		.d2-3480929874 .fill-B3{fill:#E3E9FD;}
-		.d2-1118191387 .fill-B4{fill:#E3E9FD;}
+		.d2-3480929874 .fill-B4{fill:#E3E9FD;}
-		.d2-1118191387 .fill-B5{fill:#EDF0FD;}
+		.d2-3480929874 .fill-B5{fill:#EDF0FD;}
-		.d2-1118191387 .fill-B6{fill:#F7F8FE;}
+		.d2-3480929874 .fill-B6{fill:#F7F8FE;}
-		.d2-1118191387 .fill-AA2{fill:#4A6FF3;}
+		.d2-3480929874 .fill-AA2{fill:#4A6FF3;}
-		.d2-1118191387 .fill-AA4{fill:#EDF0FD;}
+		.d2-3480929874 .fill-AA4{fill:#EDF0FD;}
-		.d2-1118191387 .fill-AA5{fill:#F7F8FE;}
+		.d2-3480929874 .fill-AA5{fill:#F7F8FE;}
-		.d2-1118191387 .fill-AB4{fill:#EDF0FD;}
+		.d2-3480929874 .fill-AB4{fill:#EDF0FD;}
-		.d2-1118191387 .fill-AB5{fill:#F7F8FE;}
+		.d2-3480929874 .fill-AB5{fill:#F7F8FE;}
-		.d2-1118191387 .stroke-N1{stroke:#0A0F25;}
+		.d2-3480929874 .stroke-N1{stroke:#0A0F25;}
-		.d2-1118191387 .stroke-N2{stroke:#676C7E;}
+		.d2-3480929874 .stroke-N2{stroke:#676C7E;}
-		.d2-1118191387 .stroke-N3{stroke:#9499AB;}
+		.d2-3480929874 .stroke-N3{stroke:#9499AB;}
-		.d2-1118191387 .stroke-N4{stroke:#CFD2DD;}
+		.d2-3480929874 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1118191387 .stroke-N5{stroke:#DEE1EB;}
+		.d2-3480929874 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1118191387 .stroke-N6{stroke:#EEF1F8;}
+		.d2-3480929874 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1118191387 .stroke-N7{stroke:#FFFFFF;}
+		.d2-3480929874 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1118191387 .stroke-B1{stroke:#0D32B2;}
+		.d2-3480929874 .stroke-B1{stroke:#0D32B2;}
-		.d2-1118191387 .stroke-B2{stroke:#0D32B2;}
+		.d2-3480929874 .stroke-B2{stroke:#0D32B2;}
-		.d2-1118191387 .stroke-B3{stroke:#E3E9FD;}
+		.d2-3480929874 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1118191387 .stroke-B4{stroke:#E3E9FD;}
+		.d2-3480929874 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1118191387 .stroke-B5{stroke:#EDF0FD;}
+		.d2-3480929874 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1118191387 .stroke-B6{stroke:#F7F8FE;}
+		.d2-3480929874 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1118191387 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-3480929874 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1118191387 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-3480929874 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1118191387 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-3480929874 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1118191387 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-3480929874 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1118191387 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-3480929874 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1118191387 .background-color-N1{background-color:#0A0F25;}
+		.d2-3480929874 .background-color-N1{background-color:#0A0F25;}
-		.d2-1118191387 .background-color-N2{background-color:#676C7E;}
+		.d2-3480929874 .background-color-N2{background-color:#676C7E;}
-		.d2-1118191387 .background-color-N3{background-color:#9499AB;}
+		.d2-3480929874 .background-color-N3{background-color:#9499AB;}
-		.d2-1118191387 .background-color-N4{background-color:#CFD2DD;}
+		.d2-3480929874 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1118191387 .background-color-N5{background-color:#DEE1EB;}
+		.d2-3480929874 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1118191387 .background-color-N6{background-color:#EEF1F8;}
+		.d2-3480929874 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1118191387 .background-color-N7{background-color:#FFFFFF;}
+		.d2-3480929874 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1118191387 .background-color-B1{background-color:#0D32B2;}
+		.d2-3480929874 .background-color-B1{background-color:#0D32B2;}
-		.d2-1118191387 .background-color-B2{background-color:#0D32B2;}
+		.d2-3480929874 .background-color-B2{background-color:#0D32B2;}
-		.d2-1118191387 .background-color-B3{background-color:#E3E9FD;}
+		.d2-3480929874 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1118191387 .background-color-B4{background-color:#E3E9FD;}
+		.d2-3480929874 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1118191387 .background-color-B5{background-color:#EDF0FD;}
+		.d2-3480929874 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1118191387 .background-color-B6{background-color:#F7F8FE;}
+		.d2-3480929874 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1118191387 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-3480929874 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1118191387 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-3480929874 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1118191387 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-3480929874 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1118191387 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-3480929874 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1118191387 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-3480929874 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1118191387 .color-N1{color:#0A0F25;}
+		.d2-3480929874 .color-N1{color:#0A0F25;}
-		.d2-1118191387 .color-N2{color:#676C7E;}
+		.d2-3480929874 .color-N2{color:#676C7E;}
-		.d2-1118191387 .color-N3{color:#9499AB;}
+		.d2-3480929874 .color-N3{color:#9499AB;}
-		.d2-1118191387 .color-N4{color:#CFD2DD;}
+		.d2-3480929874 .color-N4{color:#CFD2DD;}
-		.d2-1118191387 .color-N5{color:#DEE1EB;}
+		.d2-3480929874 .color-N5{color:#DEE1EB;}
-		.d2-1118191387 .color-N6{color:#EEF1F8;}
+		.d2-3480929874 .color-N6{color:#EEF1F8;}
-		.d2-1118191387 .color-N7{color:#FFFFFF;}
+		.d2-3480929874 .color-N7{color:#FFFFFF;}
-		.d2-1118191387 .color-B1{color:#0D32B2;}
+		.d2-3480929874 .color-B1{color:#0D32B2;}
-		.d2-1118191387 .color-B2{color:#0D32B2;}
+		.d2-3480929874 .color-B2{color:#0D32B2;}
-		.d2-1118191387 .color-B3{color:#E3E9FD;}
+		.d2-3480929874 .color-B3{color:#E3E9FD;}
-		.d2-1118191387 .color-B4{color:#E3E9FD;}
+		.d2-3480929874 .color-B4{color:#E3E9FD;}
-		.d2-1118191387 .color-B5{color:#EDF0FD;}
+		.d2-3480929874 .color-B5{color:#EDF0FD;}
-		.d2-1118191387 .color-B6{color:#F7F8FE;}
+		.d2-3480929874 .color-B6{color:#F7F8FE;}
-		.d2-1118191387 .color-AA2{color:#4A6FF3;}
+		.d2-3480929874 .color-AA2{color:#4A6FF3;}
-		.d2-1118191387 .color-AA4{color:#EDF0FD;}
+		.d2-3480929874 .color-AA4{color:#EDF0FD;}
-		.d2-1118191387 .color-AA5{color:#F7F8FE;}
+		.d2-3480929874 .color-AA5{color:#F7F8FE;}
-		.d2-1118191387 .color-AB4{color:#EDF0FD;}
+		.d2-3480929874 .color-AB4{color:#EDF0FD;}
-		.d2-1118191387 .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><a href="root.layers.x" xlink:href="root.layers.x"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="85.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="42.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g></a><g transform="translate(69 -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><mask id="d2-1118191387" maskUnits="userSpaceOnUse" x="-101" y="-118" width="304" height="285">
+		.d2-3480929874 .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><a href="root.layers.x" xlink:href="root.layers.x"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g></a><g transform="translate(37 -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><mask id="d2-3480929874" maskUnits="userSpaceOnUse" x="-101" y="-118" width="272" height="285">
-<rect x="-101" y="-118" width="304" height="285" fill="white"></rect>
+<rect x="-101" y="-118" width="272" height="285" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
-</mask><line x1="-41.000000" x2="143.000000" y1="117.000000" y2="117.000000" class=" stroke-B2" /><g class="appendix" x="-1" y="67" width="104" height="100%"><g transform="translate(0 167)" class="appendix-icon"><circle cx="16" cy="0" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="5" style="font-size: 16px;text-anchor:middle;">1</text></g><text class="text" x="48" y="172" style="font-size: 16px;">x</text></g>
+</mask><line x1="-41.000000" x2="111.000000" y1="117.000000" y2="117.000000" class=" stroke-B2" /><g class="appendix" x="-1" y="67" width="72" height="100%"><g transform="translate(0 167)" class="appendix-icon"><circle cx="16" cy="0" r="16" fill="white" stroke="#DEE1EB" /><text class="text-bold" x="16" y="5" style="font-size: 16px;text-anchor:middle;">1</text></g><text class="text" x="48" y="172" style="font-size: 16px;">x</text></g>
 <style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
--- a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
--- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg
--- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg
--- a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
+++ b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
--- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg
+++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg
--- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 305 285"><svg id="d2-svg" class="d2-4088621414" width="305" height="285" viewBox="-101 -118 305 285"><rect x="-101.000000" y="-118.000000" width="305.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 273 285"><svg id="d2-svg" class="d2-1163758495" width="273" height="285" viewBox="-101 -118 273 285"><rect x="-101.000000" y="-118.000000" width="273.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-4088621414 .text-bold {
+.d2-1163758495 .text-bold {
-	font-family: "d2-4088621414-font-bold";
+	font-family: "d2-1163758495-font-bold";
 }
@font-face {
-	font-family: d2-4088621414-font-bold;
+	font-family: d2-1163758495-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-4088621414 .fill-N1{fill:#0A0F25;}
+		.d2-1163758495 .fill-N1{fill:#0A0F25;}
-		.d2-4088621414 .fill-N2{fill:#676C7E;}
+		.d2-1163758495 .fill-N2{fill:#676C7E;}
-		.d2-4088621414 .fill-N3{fill:#9499AB;}
+		.d2-1163758495 .fill-N3{fill:#9499AB;}
-		.d2-4088621414 .fill-N4{fill:#CFD2DD;}
+		.d2-1163758495 .fill-N4{fill:#CFD2DD;}
-		.d2-4088621414 .fill-N5{fill:#DEE1EB;}
+		.d2-1163758495 .fill-N5{fill:#DEE1EB;}
-		.d2-4088621414 .fill-N6{fill:#EEF1F8;}
+		.d2-1163758495 .fill-N6{fill:#EEF1F8;}
-		.d2-4088621414 .fill-N7{fill:#FFFFFF;}
+		.d2-1163758495 .fill-N7{fill:#FFFFFF;}
-		.d2-4088621414 .fill-B1{fill:#0D32B2;}
+		.d2-1163758495 .fill-B1{fill:#0D32B2;}
-		.d2-4088621414 .fill-B2{fill:#0D32B2;}
+		.d2-1163758495 .fill-B2{fill:#0D32B2;}
-		.d2-4088621414 .fill-B3{fill:#E3E9FD;}
+		.d2-1163758495 .fill-B3{fill:#E3E9FD;}
-		.d2-4088621414 .fill-B4{fill:#E3E9FD;}
+		.d2-1163758495 .fill-B4{fill:#E3E9FD;}
-		.d2-4088621414 .fill-B5{fill:#EDF0FD;}
+		.d2-1163758495 .fill-B5{fill:#EDF0FD;}
-		.d2-4088621414 .fill-B6{fill:#F7F8FE;}
+		.d2-1163758495 .fill-B6{fill:#F7F8FE;}
-		.d2-4088621414 .fill-AA2{fill:#4A6FF3;}
+		.d2-1163758495 .fill-AA2{fill:#4A6FF3;}
-		.d2-4088621414 .fill-AA4{fill:#EDF0FD;}
+		.d2-1163758495 .fill-AA4{fill:#EDF0FD;}
-		.d2-4088621414 .fill-AA5{fill:#F7F8FE;}
+		.d2-1163758495 .fill-AA5{fill:#F7F8FE;}
-		.d2-4088621414 .fill-AB4{fill:#EDF0FD;}
+		.d2-1163758495 .fill-AB4{fill:#EDF0FD;}
-		.d2-4088621414 .fill-AB5{fill:#F7F8FE;}
+		.d2-1163758495 .fill-AB5{fill:#F7F8FE;}
-		.d2-4088621414 .stroke-N1{stroke:#0A0F25;}
+		.d2-1163758495 .stroke-N1{stroke:#0A0F25;}
-		.d2-4088621414 .stroke-N2{stroke:#676C7E;}
+		.d2-1163758495 .stroke-N2{stroke:#676C7E;}
-		.d2-4088621414 .stroke-N3{stroke:#9499AB;}
+		.d2-1163758495 .stroke-N3{stroke:#9499AB;}
-		.d2-4088621414 .stroke-N4{stroke:#CFD2DD;}
+		.d2-1163758495 .stroke-N4{stroke:#CFD2DD;}
-		.d2-4088621414 .stroke-N5{stroke:#DEE1EB;}
+		.d2-1163758495 .stroke-N5{stroke:#DEE1EB;}
-		.d2-4088621414 .stroke-N6{stroke:#EEF1F8;}
+		.d2-1163758495 .stroke-N6{stroke:#EEF1F8;}
-		.d2-4088621414 .stroke-N7{stroke:#FFFFFF;}
+		.d2-1163758495 .stroke-N7{stroke:#FFFFFF;}
-		.d2-4088621414 .stroke-B1{stroke:#0D32B2;}
+		.d2-1163758495 .stroke-B1{stroke:#0D32B2;}
-		.d2-4088621414 .stroke-B2{stroke:#0D32B2;}
+		.d2-1163758495 .stroke-B2{stroke:#0D32B2;}
-		.d2-4088621414 .stroke-B3{stroke:#E3E9FD;}
+		.d2-1163758495 .stroke-B3{stroke:#E3E9FD;}
-		.d2-4088621414 .stroke-B4{stroke:#E3E9FD;}
+		.d2-1163758495 .stroke-B4{stroke:#E3E9FD;}
-		.d2-4088621414 .stroke-B5{stroke:#EDF0FD;}
+		.d2-1163758495 .stroke-B5{stroke:#EDF0FD;}
-		.d2-4088621414 .stroke-B6{stroke:#F7F8FE;}
+		.d2-1163758495 .stroke-B6{stroke:#F7F8FE;}
-		.d2-4088621414 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-1163758495 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-4088621414 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-1163758495 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-4088621414 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-1163758495 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-4088621414 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-1163758495 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-4088621414 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-1163758495 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-4088621414 .background-color-N1{background-color:#0A0F25;}
+		.d2-1163758495 .background-color-N1{background-color:#0A0F25;}
-		.d2-4088621414 .background-color-N2{background-color:#676C7E;}
+		.d2-1163758495 .background-color-N2{background-color:#676C7E;}
-		.d2-4088621414 .background-color-N3{background-color:#9499AB;}
+		.d2-1163758495 .background-color-N3{background-color:#9499AB;}
-		.d2-4088621414 .background-color-N4{background-color:#CFD2DD;}
+		.d2-1163758495 .background-color-N4{background-color:#CFD2DD;}
-		.d2-4088621414 .background-color-N5{background-color:#DEE1EB;}
+		.d2-1163758495 .background-color-N5{background-color:#DEE1EB;}
-		.d2-4088621414 .background-color-N6{background-color:#EEF1F8;}
+		.d2-1163758495 .background-color-N6{background-color:#EEF1F8;}
-		.d2-4088621414 .background-color-N7{background-color:#FFFFFF;}
+		.d2-1163758495 .background-color-N7{background-color:#FFFFFF;}
-		.d2-4088621414 .background-color-B1{background-color:#0D32B2;}
+		.d2-1163758495 .background-color-B1{background-color:#0D32B2;}
-		.d2-4088621414 .background-color-B2{background-color:#0D32B2;}
+		.d2-1163758495 .background-color-B2{background-color:#0D32B2;}
-		.d2-4088621414 .background-color-B3{background-color:#E3E9FD;}
+		.d2-1163758495 .background-color-B3{background-color:#E3E9FD;}
-		.d2-4088621414 .background-color-B4{background-color:#E3E9FD;}
+		.d2-1163758495 .background-color-B4{background-color:#E3E9FD;}
-		.d2-4088621414 .background-color-B5{background-color:#EDF0FD;}
+		.d2-1163758495 .background-color-B5{background-color:#EDF0FD;}
-		.d2-4088621414 .background-color-B6{background-color:#F7F8FE;}
+		.d2-1163758495 .background-color-B6{background-color:#F7F8FE;}
-		.d2-4088621414 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-1163758495 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-4088621414 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-1163758495 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-4088621414 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-1163758495 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-4088621414 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-1163758495 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-4088621414 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-1163758495 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-4088621414 .color-N1{color:#0A0F25;}
+		.d2-1163758495 .color-N1{color:#0A0F25;}
-		.d2-4088621414 .color-N2{color:#676C7E;}
+		.d2-1163758495 .color-N2{color:#676C7E;}
-		.d2-4088621414 .color-N3{color:#9499AB;}
+		.d2-1163758495 .color-N3{color:#9499AB;}
-		.d2-4088621414 .color-N4{color:#CFD2DD;}
+		.d2-1163758495 .color-N4{color:#CFD2DD;}
-		.d2-4088621414 .color-N5{color:#DEE1EB;}
+		.d2-1163758495 .color-N5{color:#DEE1EB;}
-		.d2-4088621414 .color-N6{color:#EEF1F8;}
+		.d2-1163758495 .color-N6{color:#EEF1F8;}
-		.d2-4088621414 .color-N7{color:#FFFFFF;}
+		.d2-1163758495 .color-N7{color:#FFFFFF;}
-		.d2-4088621414 .color-B1{color:#0D32B2;}
+		.d2-1163758495 .color-B1{color:#0D32B2;}
-		.d2-4088621414 .color-B2{color:#0D32B2;}
+		.d2-1163758495 .color-B2{color:#0D32B2;}
-		.d2-4088621414 .color-B3{color:#E3E9FD;}
+		.d2-1163758495 .color-B3{color:#E3E9FD;}
-		.d2-4088621414 .color-B4{color:#E3E9FD;}
+		.d2-1163758495 .color-B4{color:#E3E9FD;}
-		.d2-4088621414 .color-B5{color:#EDF0FD;}
+		.d2-1163758495 .color-B5{color:#EDF0FD;}
-		.d2-4088621414 .color-B6{color:#F7F8FE;}
+		.d2-1163758495 .color-B6{color:#F7F8FE;}
-		.d2-4088621414 .color-AA2{color:#4A6FF3;}
+		.d2-1163758495 .color-AA2{color:#4A6FF3;}
-		.d2-4088621414 .color-AA4{color:#EDF0FD;}
+		.d2-1163758495 .color-AA4{color:#EDF0FD;}
-		.d2-4088621414 .color-AA5{color:#F7F8FE;}
+		.d2-1163758495 .color-AA5{color:#F7F8FE;}
-		.d2-4088621414 .color-AB4{color:#EDF0FD;}
+		.d2-1163758495 .color-AB4{color:#EDF0FD;}
-		.d2-4088621414 .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><a href="y.svg" xlink:href="y.svg"><g id="y"><g class="shape" ><rect x="0.000000" y="0.000000" width="86.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="43.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g></a><g transform="translate(70 -16)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-1163758495 .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><a href="y.svg" xlink:href="y.svg"><g id="y"><g class="shape" ><rect x="0.000000" y="0.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="27.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g></a><g transform="translate(38 -16)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-4088621414" maskUnits="userSpaceOnUse" x="-101" y="-118" width="305" height="285">
+</g><mask id="d2-1163758495" maskUnits="userSpaceOnUse" x="-101" y="-118" width="273" height="285">
-<rect x="-101" y="-118" width="305" height="285" fill="white"></rect>
+<rect x="-101" y="-118" width="273" height="285" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 304 285"><svg id="d2-svg" class="d2-1416247347" width="304" height="285" viewBox="-101 -118 304 285"><rect x="-101.000000" y="-118.000000" width="304.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 272 285"><svg id="d2-svg" class="d2-2759850755" width="272" height="285" viewBox="-101 -118 272 285"><rect x="-101.000000" y="-118.000000" width="272.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-1416247347 .text-bold {
+.d2-2759850755 .text-bold {
-	font-family: "d2-1416247347-font-bold";
+	font-family: "d2-2759850755-font-bold";
 }
@font-face {
-	font-family: d2-1416247347-font-bold;
+	font-family: d2-2759850755-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-1416247347 .fill-N1{fill:#0A0F25;}
+		.d2-2759850755 .fill-N1{fill:#0A0F25;}
-		.d2-1416247347 .fill-N2{fill:#676C7E;}
+		.d2-2759850755 .fill-N2{fill:#676C7E;}
-		.d2-1416247347 .fill-N3{fill:#9499AB;}
+		.d2-2759850755 .fill-N3{fill:#9499AB;}
-		.d2-1416247347 .fill-N4{fill:#CFD2DD;}
+		.d2-2759850755 .fill-N4{fill:#CFD2DD;}
-		.d2-1416247347 .fill-N5{fill:#DEE1EB;}
+		.d2-2759850755 .fill-N5{fill:#DEE1EB;}
-		.d2-1416247347 .fill-N6{fill:#EEF1F8;}
+		.d2-2759850755 .fill-N6{fill:#EEF1F8;}
-		.d2-1416247347 .fill-N7{fill:#FFFFFF;}
+		.d2-2759850755 .fill-N7{fill:#FFFFFF;}
-		.d2-1416247347 .fill-B1{fill:#0D32B2;}
+		.d2-2759850755 .fill-B1{fill:#0D32B2;}
-		.d2-1416247347 .fill-B2{fill:#0D32B2;}
+		.d2-2759850755 .fill-B2{fill:#0D32B2;}
-		.d2-1416247347 .fill-B3{fill:#E3E9FD;}
+		.d2-2759850755 .fill-B3{fill:#E3E9FD;}
-		.d2-1416247347 .fill-B4{fill:#E3E9FD;}
+		.d2-2759850755 .fill-B4{fill:#E3E9FD;}
-		.d2-1416247347 .fill-B5{fill:#EDF0FD;}
+		.d2-2759850755 .fill-B5{fill:#EDF0FD;}
-		.d2-1416247347 .fill-B6{fill:#F7F8FE;}
+		.d2-2759850755 .fill-B6{fill:#F7F8FE;}
-		.d2-1416247347 .fill-AA2{fill:#4A6FF3;}
+		.d2-2759850755 .fill-AA2{fill:#4A6FF3;}
-		.d2-1416247347 .fill-AA4{fill:#EDF0FD;}
+		.d2-2759850755 .fill-AA4{fill:#EDF0FD;}
-		.d2-1416247347 .fill-AA5{fill:#F7F8FE;}
+		.d2-2759850755 .fill-AA5{fill:#F7F8FE;}
-		.d2-1416247347 .fill-AB4{fill:#EDF0FD;}
+		.d2-2759850755 .fill-AB4{fill:#EDF0FD;}
-		.d2-1416247347 .fill-AB5{fill:#F7F8FE;}
+		.d2-2759850755 .fill-AB5{fill:#F7F8FE;}
-		.d2-1416247347 .stroke-N1{stroke:#0A0F25;}
+		.d2-2759850755 .stroke-N1{stroke:#0A0F25;}
-		.d2-1416247347 .stroke-N2{stroke:#676C7E;}
+		.d2-2759850755 .stroke-N2{stroke:#676C7E;}
-		.d2-1416247347 .stroke-N3{stroke:#9499AB;}
+		.d2-2759850755 .stroke-N3{stroke:#9499AB;}
-		.d2-1416247347 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2759850755 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1416247347 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2759850755 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1416247347 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2759850755 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1416247347 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2759850755 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1416247347 .stroke-B1{stroke:#0D32B2;}
+		.d2-2759850755 .stroke-B1{stroke:#0D32B2;}
-		.d2-1416247347 .stroke-B2{stroke:#0D32B2;}
+		.d2-2759850755 .stroke-B2{stroke:#0D32B2;}
-		.d2-1416247347 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2759850755 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1416247347 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2759850755 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1416247347 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2759850755 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1416247347 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2759850755 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1416247347 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2759850755 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1416247347 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2759850755 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1416247347 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2759850755 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1416247347 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2759850755 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1416247347 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2759850755 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1416247347 .background-color-N1{background-color:#0A0F25;}
+		.d2-2759850755 .background-color-N1{background-color:#0A0F25;}
-		.d2-1416247347 .background-color-N2{background-color:#676C7E;}
+		.d2-2759850755 .background-color-N2{background-color:#676C7E;}
-		.d2-1416247347 .background-color-N3{background-color:#9499AB;}
+		.d2-2759850755 .background-color-N3{background-color:#9499AB;}
-		.d2-1416247347 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2759850755 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1416247347 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2759850755 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1416247347 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2759850755 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1416247347 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2759850755 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1416247347 .background-color-B1{background-color:#0D32B2;}
+		.d2-2759850755 .background-color-B1{background-color:#0D32B2;}
-		.d2-1416247347 .background-color-B2{background-color:#0D32B2;}
+		.d2-2759850755 .background-color-B2{background-color:#0D32B2;}
-		.d2-1416247347 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2759850755 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1416247347 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2759850755 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1416247347 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2759850755 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1416247347 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2759850755 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1416247347 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2759850755 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1416247347 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2759850755 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1416247347 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2759850755 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1416247347 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2759850755 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1416247347 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2759850755 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1416247347 .color-N1{color:#0A0F25;}
+		.d2-2759850755 .color-N1{color:#0A0F25;}
-		.d2-1416247347 .color-N2{color:#676C7E;}
+		.d2-2759850755 .color-N2{color:#676C7E;}
-		.d2-1416247347 .color-N3{color:#9499AB;}
+		.d2-2759850755 .color-N3{color:#9499AB;}
-		.d2-1416247347 .color-N4{color:#CFD2DD;}
+		.d2-2759850755 .color-N4{color:#CFD2DD;}
-		.d2-1416247347 .color-N5{color:#DEE1EB;}
+		.d2-2759850755 .color-N5{color:#DEE1EB;}
-		.d2-1416247347 .color-N6{color:#EEF1F8;}
+		.d2-2759850755 .color-N6{color:#EEF1F8;}
-		.d2-1416247347 .color-N7{color:#FFFFFF;}
+		.d2-2759850755 .color-N7{color:#FFFFFF;}
-		.d2-1416247347 .color-B1{color:#0D32B2;}
+		.d2-2759850755 .color-B1{color:#0D32B2;}
-		.d2-1416247347 .color-B2{color:#0D32B2;}
+		.d2-2759850755 .color-B2{color:#0D32B2;}
-		.d2-1416247347 .color-B3{color:#E3E9FD;}
+		.d2-2759850755 .color-B3{color:#E3E9FD;}
-		.d2-1416247347 .color-B4{color:#E3E9FD;}
+		.d2-2759850755 .color-B4{color:#E3E9FD;}
-		.d2-1416247347 .color-B5{color:#EDF0FD;}
+		.d2-2759850755 .color-B5{color:#EDF0FD;}
-		.d2-1416247347 .color-B6{color:#F7F8FE;}
+		.d2-2759850755 .color-B6{color:#F7F8FE;}
-		.d2-1416247347 .color-AA2{color:#4A6FF3;}
+		.d2-2759850755 .color-AA2{color:#4A6FF3;}
-		.d2-1416247347 .color-AA4{color:#EDF0FD;}
+		.d2-2759850755 .color-AA4{color:#EDF0FD;}
-		.d2-1416247347 .color-AA5{color:#F7F8FE;}
+		.d2-2759850755 .color-AA5{color:#F7F8FE;}
-		.d2-1416247347 .color-AB4{color:#EDF0FD;}
+		.d2-2759850755 .color-AB4{color:#EDF0FD;}
-		.d2-1416247347 .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><a href="x/index.svg" xlink:href="x/index.svg"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="85.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="42.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g></a><g transform="translate(69 -16)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-2759850755 .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><a href="x/index.svg" xlink:href="x/index.svg"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g></a><g transform="translate(37 -16)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-1416247347" maskUnits="userSpaceOnUse" x="-101" y="-118" width="304" height="285">
+</g><mask id="d2-2759850755" maskUnits="userSpaceOnUse" x="-101" y="-118" width="272" height="285">
-<rect x="-101" y="-118" width="304" height="285" fill="white"></rect>
+<rect x="-101" y="-118" width="272" height="285" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg
@ -1,9 +1,9 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 279 445"><svg id="d2-svg" class="d2-3562348775" width="279" height="445" viewBox="-101 -101 279 445"><rect x="-101.000000" y="-101.000000" width="279.000000" height="445.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 285 451"><svg id="d2-svg" class="d2-2618525867" width="285" height="451" viewBox="-101 -101 285 451"><rect x="-101.000000" y="-101.000000" width="285.000000" height="451.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3562348775 .text-bold {
+.d2-2618525867 .text-bold {
-	font-family: "d2-3562348775-font-bold";
+	font-family: "d2-2618525867-font-bold";
 }
@font-face {
-	font-family: d2-3562348775-font-bold;
+	font-family: d2-2618525867-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -18,79 +18,79 @@
  opacity: 0.5;
 }
-		.d2-3562348775 .fill-N1{fill:#0A0F25;}
+		.d2-2618525867 .fill-N1{fill:#0A0F25;}
-		.d2-3562348775 .fill-N2{fill:#676C7E;}
+		.d2-2618525867 .fill-N2{fill:#676C7E;}
-		.d2-3562348775 .fill-N3{fill:#9499AB;}
+		.d2-2618525867 .fill-N3{fill:#9499AB;}
-		.d2-3562348775 .fill-N4{fill:#CFD2DD;}
+		.d2-2618525867 .fill-N4{fill:#CFD2DD;}
-		.d2-3562348775 .fill-N5{fill:#DEE1EB;}
+		.d2-2618525867 .fill-N5{fill:#DEE1EB;}
-		.d2-3562348775 .fill-N6{fill:#EEF1F8;}
+		.d2-2618525867 .fill-N6{fill:#EEF1F8;}
-		.d2-3562348775 .fill-N7{fill:#FFFFFF;}
+		.d2-2618525867 .fill-N7{fill:#FFFFFF;}
-		.d2-3562348775 .fill-B1{fill:#0D32B2;}
+		.d2-2618525867 .fill-B1{fill:#0D32B2;}
-		.d2-3562348775 .fill-B2{fill:#0D32B2;}
+		.d2-2618525867 .fill-B2{fill:#0D32B2;}
-		.d2-3562348775 .fill-B3{fill:#E3E9FD;}
+		.d2-2618525867 .fill-B3{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B4{fill:#E3E9FD;}
+		.d2-2618525867 .fill-B4{fill:#E3E9FD;}
-		.d2-3562348775 .fill-B5{fill:#EDF0FD;}
+		.d2-2618525867 .fill-B5{fill:#EDF0FD;}
-		.d2-3562348775 .fill-B6{fill:#F7F8FE;}
+		.d2-2618525867 .fill-B6{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AA2{fill:#4A6FF3;}
+		.d2-2618525867 .fill-AA2{fill:#4A6FF3;}
-		.d2-3562348775 .fill-AA4{fill:#EDF0FD;}
+		.d2-2618525867 .fill-AA4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AA5{fill:#F7F8FE;}
+		.d2-2618525867 .fill-AA5{fill:#F7F8FE;}
-		.d2-3562348775 .fill-AB4{fill:#EDF0FD;}
+		.d2-2618525867 .fill-AB4{fill:#EDF0FD;}
-		.d2-3562348775 .fill-AB5{fill:#F7F8FE;}
+		.d2-2618525867 .fill-AB5{fill:#F7F8FE;}
-		.d2-3562348775 .stroke-N1{stroke:#0A0F25;}
+		.d2-2618525867 .stroke-N1{stroke:#0A0F25;}
-		.d2-3562348775 .stroke-N2{stroke:#676C7E;}
+		.d2-2618525867 .stroke-N2{stroke:#676C7E;}
-		.d2-3562348775 .stroke-N3{stroke:#9499AB;}
+		.d2-2618525867 .stroke-N3{stroke:#9499AB;}
-		.d2-3562348775 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2618525867 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3562348775 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2618525867 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3562348775 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2618525867 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3562348775 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2618525867 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3562348775 .stroke-B1{stroke:#0D32B2;}
+		.d2-2618525867 .stroke-B1{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B2{stroke:#0D32B2;}
+		.d2-2618525867 .stroke-B2{stroke:#0D32B2;}
-		.d2-3562348775 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2618525867 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2618525867 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3562348775 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2618525867 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2618525867 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2618525867 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3562348775 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2618525867 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2618525867 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3562348775 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2618525867 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3562348775 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2618525867 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3562348775 .background-color-N1{background-color:#0A0F25;}
+		.d2-2618525867 .background-color-N1{background-color:#0A0F25;}
-		.d2-3562348775 .background-color-N2{background-color:#676C7E;}
+		.d2-2618525867 .background-color-N2{background-color:#676C7E;}
-		.d2-3562348775 .background-color-N3{background-color:#9499AB;}
+		.d2-2618525867 .background-color-N3{background-color:#9499AB;}
-		.d2-3562348775 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2618525867 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3562348775 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2618525867 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3562348775 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2618525867 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3562348775 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2618525867 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3562348775 .background-color-B1{background-color:#0D32B2;}
+		.d2-2618525867 .background-color-B1{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B2{background-color:#0D32B2;}
+		.d2-2618525867 .background-color-B2{background-color:#0D32B2;}
-		.d2-3562348775 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2618525867 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2618525867 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3562348775 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2618525867 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2618525867 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2618525867 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3562348775 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2618525867 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2618525867 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3562348775 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2618525867 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3562348775 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2618525867 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3562348775 .color-N1{color:#0A0F25;}
+		.d2-2618525867 .color-N1{color:#0A0F25;}
-		.d2-3562348775 .color-N2{color:#676C7E;}
+		.d2-2618525867 .color-N2{color:#676C7E;}
-		.d2-3562348775 .color-N3{color:#9499AB;}
+		.d2-2618525867 .color-N3{color:#9499AB;}
-		.d2-3562348775 .color-N4{color:#CFD2DD;}
+		.d2-2618525867 .color-N4{color:#CFD2DD;}
-		.d2-3562348775 .color-N5{color:#DEE1EB;}
+		.d2-2618525867 .color-N5{color:#DEE1EB;}
-		.d2-3562348775 .color-N6{color:#EEF1F8;}
+		.d2-2618525867 .color-N6{color:#EEF1F8;}
-		.d2-3562348775 .color-N7{color:#FFFFFF;}
+		.d2-2618525867 .color-N7{color:#FFFFFF;}
-		.d2-3562348775 .color-B1{color:#0D32B2;}
+		.d2-2618525867 .color-B1{color:#0D32B2;}
-		.d2-3562348775 .color-B2{color:#0D32B2;}
+		.d2-2618525867 .color-B2{color:#0D32B2;}
-		.d2-3562348775 .color-B3{color:#E3E9FD;}
+		.d2-2618525867 .color-B3{color:#E3E9FD;}
-		.d2-3562348775 .color-B4{color:#E3E9FD;}
+		.d2-2618525867 .color-B4{color:#E3E9FD;}
-		.d2-3562348775 .color-B5{color:#EDF0FD;}
+		.d2-2618525867 .color-B5{color:#EDF0FD;}
-		.d2-3562348775 .color-B6{color:#F7F8FE;}
+		.d2-2618525867 .color-B6{color:#F7F8FE;}
-		.d2-3562348775 .color-AA2{color:#4A6FF3;}
+		.d2-2618525867 .color-AA2{color:#4A6FF3;}
-		.d2-3562348775 .color-AA4{color:#EDF0FD;}
+		.d2-2618525867 .color-AA4{color:#EDF0FD;}
-		.d2-3562348775 .color-AA5{color:#F7F8FE;}
+		.d2-2618525867 .color-AA5{color:#F7F8FE;}
-		.d2-3562348775 .color-AB4{color:#EDF0FD;}
+		.d2-2618525867 .color-AB4{color:#EDF0FD;}
-		.d2-3562348775 .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="x"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="38.500000" cy="38.500000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="44.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="6.000000" y="177.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="215.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><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" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 38.980001 78.999900 C 38.599998 117.000000 38.500000 137.000000 38.500000 173.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-3562348775)" /></g><mask id="d2-3562348775" maskUnits="userSpaceOnUse" x="-101" y="-101" width="279" height="445">
+		.d2-2618525867 .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="x"><g class="shape" ><ellipse rx="41.500000" ry="41.500000" cx="41.500000" cy="41.500000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="41.500000" y="47.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g id="y"><g class="shape" ><rect x="9.000000" y="183.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="42.000000" y="221.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g id="(x -&gt; y)[0]"><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" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 41.980001 84.999900 C 41.599998 123.000000 41.500000 143.000000 41.500000 179.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2618525867)" /></g><mask id="d2-2618525867" maskUnits="userSpaceOnUse" x="-101" y="-101" width="285" height="451">
-<rect x="-101" y="-101" width="279" height="445" fill="white"></rect>
+<rect x="-101" y="-101" width="285" height="451" fill="white"></rect>
-<rect x="34.500000" y="28.000000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="37.500000" y="31.000000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="34.500000" y="199.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="37.500000" y="205.500000" width="9" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 324 285"><svg id="d2-svg" class="d2-2347425782" width="324" height="285" viewBox="-101 -118 324 285"><rect x="-101.000000" y="-118.000000" width="324.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 292 285"><svg id="d2-svg" class="d2-1638018465" width="292" height="285" viewBox="-101 -118 292 285"><rect x="-101.000000" y="-118.000000" width="292.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-2347425782 .text-bold {
+.d2-1638018465 .text-bold {
-	font-family: "d2-2347425782-font-bold";
+	font-family: "d2-1638018465-font-bold";
 }
@font-face {
-	font-family: d2-2347425782-font-bold;
+	font-family: d2-1638018465-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-2347425782 .fill-N1{fill:#0A0F25;}
+		.d2-1638018465 .fill-N1{fill:#0A0F25;}
-		.d2-2347425782 .fill-N2{fill:#676C7E;}
+		.d2-1638018465 .fill-N2{fill:#676C7E;}
-		.d2-2347425782 .fill-N3{fill:#9499AB;}
+		.d2-1638018465 .fill-N3{fill:#9499AB;}
-		.d2-2347425782 .fill-N4{fill:#CFD2DD;}
+		.d2-1638018465 .fill-N4{fill:#CFD2DD;}
-		.d2-2347425782 .fill-N5{fill:#DEE1EB;}
+		.d2-1638018465 .fill-N5{fill:#DEE1EB;}
-		.d2-2347425782 .fill-N6{fill:#EEF1F8;}
+		.d2-1638018465 .fill-N6{fill:#EEF1F8;}
-		.d2-2347425782 .fill-N7{fill:#FFFFFF;}
+		.d2-1638018465 .fill-N7{fill:#FFFFFF;}
-		.d2-2347425782 .fill-B1{fill:#0D32B2;}
+		.d2-1638018465 .fill-B1{fill:#0D32B2;}
-		.d2-2347425782 .fill-B2{fill:#0D32B2;}
+		.d2-1638018465 .fill-B2{fill:#0D32B2;}
-		.d2-2347425782 .fill-B3{fill:#E3E9FD;}
+		.d2-1638018465 .fill-B3{fill:#E3E9FD;}
-		.d2-2347425782 .fill-B4{fill:#E3E9FD;}
+		.d2-1638018465 .fill-B4{fill:#E3E9FD;}
-		.d2-2347425782 .fill-B5{fill:#EDF0FD;}
+		.d2-1638018465 .fill-B5{fill:#EDF0FD;}
-		.d2-2347425782 .fill-B6{fill:#F7F8FE;}
+		.d2-1638018465 .fill-B6{fill:#F7F8FE;}
-		.d2-2347425782 .fill-AA2{fill:#4A6FF3;}
+		.d2-1638018465 .fill-AA2{fill:#4A6FF3;}
-		.d2-2347425782 .fill-AA4{fill:#EDF0FD;}
+		.d2-1638018465 .fill-AA4{fill:#EDF0FD;}
-		.d2-2347425782 .fill-AA5{fill:#F7F8FE;}
+		.d2-1638018465 .fill-AA5{fill:#F7F8FE;}
-		.d2-2347425782 .fill-AB4{fill:#EDF0FD;}
+		.d2-1638018465 .fill-AB4{fill:#EDF0FD;}
-		.d2-2347425782 .fill-AB5{fill:#F7F8FE;}
+		.d2-1638018465 .fill-AB5{fill:#F7F8FE;}
-		.d2-2347425782 .stroke-N1{stroke:#0A0F25;}
+		.d2-1638018465 .stroke-N1{stroke:#0A0F25;}
-		.d2-2347425782 .stroke-N2{stroke:#676C7E;}
+		.d2-1638018465 .stroke-N2{stroke:#676C7E;}
-		.d2-2347425782 .stroke-N3{stroke:#9499AB;}
+		.d2-1638018465 .stroke-N3{stroke:#9499AB;}
-		.d2-2347425782 .stroke-N4{stroke:#CFD2DD;}
+		.d2-1638018465 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2347425782 .stroke-N5{stroke:#DEE1EB;}
+		.d2-1638018465 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2347425782 .stroke-N6{stroke:#EEF1F8;}
+		.d2-1638018465 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2347425782 .stroke-N7{stroke:#FFFFFF;}
+		.d2-1638018465 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2347425782 .stroke-B1{stroke:#0D32B2;}
+		.d2-1638018465 .stroke-B1{stroke:#0D32B2;}
-		.d2-2347425782 .stroke-B2{stroke:#0D32B2;}
+		.d2-1638018465 .stroke-B2{stroke:#0D32B2;}
-		.d2-2347425782 .stroke-B3{stroke:#E3E9FD;}
+		.d2-1638018465 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2347425782 .stroke-B4{stroke:#E3E9FD;}
+		.d2-1638018465 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2347425782 .stroke-B5{stroke:#EDF0FD;}
+		.d2-1638018465 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2347425782 .stroke-B6{stroke:#F7F8FE;}
+		.d2-1638018465 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2347425782 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-1638018465 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2347425782 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-1638018465 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2347425782 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-1638018465 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2347425782 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-1638018465 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2347425782 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-1638018465 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2347425782 .background-color-N1{background-color:#0A0F25;}
+		.d2-1638018465 .background-color-N1{background-color:#0A0F25;}
-		.d2-2347425782 .background-color-N2{background-color:#676C7E;}
+		.d2-1638018465 .background-color-N2{background-color:#676C7E;}
-		.d2-2347425782 .background-color-N3{background-color:#9499AB;}
+		.d2-1638018465 .background-color-N3{background-color:#9499AB;}
-		.d2-2347425782 .background-color-N4{background-color:#CFD2DD;}
+		.d2-1638018465 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2347425782 .background-color-N5{background-color:#DEE1EB;}
+		.d2-1638018465 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2347425782 .background-color-N6{background-color:#EEF1F8;}
+		.d2-1638018465 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2347425782 .background-color-N7{background-color:#FFFFFF;}
+		.d2-1638018465 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2347425782 .background-color-B1{background-color:#0D32B2;}
+		.d2-1638018465 .background-color-B1{background-color:#0D32B2;}
-		.d2-2347425782 .background-color-B2{background-color:#0D32B2;}
+		.d2-1638018465 .background-color-B2{background-color:#0D32B2;}
-		.d2-2347425782 .background-color-B3{background-color:#E3E9FD;}
+		.d2-1638018465 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2347425782 .background-color-B4{background-color:#E3E9FD;}
+		.d2-1638018465 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2347425782 .background-color-B5{background-color:#EDF0FD;}
+		.d2-1638018465 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2347425782 .background-color-B6{background-color:#F7F8FE;}
+		.d2-1638018465 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2347425782 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-1638018465 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2347425782 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-1638018465 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2347425782 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-1638018465 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2347425782 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-1638018465 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2347425782 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-1638018465 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2347425782 .color-N1{color:#0A0F25;}
+		.d2-1638018465 .color-N1{color:#0A0F25;}
-		.d2-2347425782 .color-N2{color:#676C7E;}
+		.d2-1638018465 .color-N2{color:#676C7E;}
-		.d2-2347425782 .color-N3{color:#9499AB;}
+		.d2-1638018465 .color-N3{color:#9499AB;}
-		.d2-2347425782 .color-N4{color:#CFD2DD;}
+		.d2-1638018465 .color-N4{color:#CFD2DD;}
-		.d2-2347425782 .color-N5{color:#DEE1EB;}
+		.d2-1638018465 .color-N5{color:#DEE1EB;}
-		.d2-2347425782 .color-N6{color:#EEF1F8;}
+		.d2-1638018465 .color-N6{color:#EEF1F8;}
-		.d2-2347425782 .color-N7{color:#FFFFFF;}
+		.d2-1638018465 .color-N7{color:#FFFFFF;}
-		.d2-2347425782 .color-B1{color:#0D32B2;}
+		.d2-1638018465 .color-B1{color:#0D32B2;}
-		.d2-2347425782 .color-B2{color:#0D32B2;}
+		.d2-1638018465 .color-B2{color:#0D32B2;}
-		.d2-2347425782 .color-B3{color:#E3E9FD;}
+		.d2-1638018465 .color-B3{color:#E3E9FD;}
-		.d2-2347425782 .color-B4{color:#E3E9FD;}
+		.d2-1638018465 .color-B4{color:#E3E9FD;}
-		.d2-2347425782 .color-B5{color:#EDF0FD;}
+		.d2-1638018465 .color-B5{color:#EDF0FD;}
-		.d2-2347425782 .color-B6{color:#F7F8FE;}
+		.d2-1638018465 .color-B6{color:#F7F8FE;}
-		.d2-2347425782 .color-AA2{color:#4A6FF3;}
+		.d2-1638018465 .color-AA2{color:#4A6FF3;}
-		.d2-2347425782 .color-AA4{color:#EDF0FD;}
+		.d2-1638018465 .color-AA4{color:#EDF0FD;}
-		.d2-2347425782 .color-AA5{color:#F7F8FE;}
+		.d2-1638018465 .color-AA5{color:#F7F8FE;}
-		.d2-2347425782 .color-AB4{color:#EDF0FD;}
+		.d2-1638018465 .color-AB4{color:#EDF0FD;}
-		.d2-2347425782 .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><a href="test2.svg" xlink:href="test2.svg"><g id="doh"><g class="shape" ><rect x="0.000000" y="0.000000" width="105.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="52.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">doh</text></g></a><g transform="translate(89 -16)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-1638018465 .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><a href="test2.svg" xlink:href="test2.svg"><g id="doh"><g class="shape" ><rect x="0.000000" y="0.000000" width="73.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="36.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">doh</text></g></a><g transform="translate(57 -16)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-2347425782" maskUnits="userSpaceOnUse" x="-101" y="-118" width="324" height="285">
+</g><mask id="d2-1638018465" maskUnits="userSpaceOnUse" x="-101" y="-118" width="292" height="285">
-<rect x="-101" y="-118" width="324" height="285" fill="white"></rect>
+<rect x="-101" y="-118" width="292" height="285" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="28" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="28" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 362 285"><svg id="d2-svg" class="d2-525054211" width="362" height="285" viewBox="-101 -118 362 285"><rect x="-101.000000" y="-118.000000" width="362.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 330 285"><svg id="d2-svg" class="d2-2664867100" width="330" height="285" viewBox="-101 -118 330 285"><rect x="-101.000000" y="-118.000000" width="330.000000" height="285.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-525054211 .text-bold {
+.d2-2664867100 .text-bold {
-	font-family: "d2-525054211-font-bold";
+	font-family: "d2-2664867100-font-bold";
 }
@font-face {
-	font-family: d2-525054211-font-bold;
+	font-family: d2-2664867100-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-525054211 .fill-N1{fill:#0A0F25;}
+		.d2-2664867100 .fill-N1{fill:#0A0F25;}
-		.d2-525054211 .fill-N2{fill:#676C7E;}
+		.d2-2664867100 .fill-N2{fill:#676C7E;}
-		.d2-525054211 .fill-N3{fill:#9499AB;}
+		.d2-2664867100 .fill-N3{fill:#9499AB;}
-		.d2-525054211 .fill-N4{fill:#CFD2DD;}
+		.d2-2664867100 .fill-N4{fill:#CFD2DD;}
-		.d2-525054211 .fill-N5{fill:#DEE1EB;}
+		.d2-2664867100 .fill-N5{fill:#DEE1EB;}
-		.d2-525054211 .fill-N6{fill:#EEF1F8;}
+		.d2-2664867100 .fill-N6{fill:#EEF1F8;}
-		.d2-525054211 .fill-N7{fill:#FFFFFF;}
+		.d2-2664867100 .fill-N7{fill:#FFFFFF;}
-		.d2-525054211 .fill-B1{fill:#0D32B2;}
+		.d2-2664867100 .fill-B1{fill:#0D32B2;}
-		.d2-525054211 .fill-B2{fill:#0D32B2;}
+		.d2-2664867100 .fill-B2{fill:#0D32B2;}
-		.d2-525054211 .fill-B3{fill:#E3E9FD;}
+		.d2-2664867100 .fill-B3{fill:#E3E9FD;}
-		.d2-525054211 .fill-B4{fill:#E3E9FD;}
+		.d2-2664867100 .fill-B4{fill:#E3E9FD;}
-		.d2-525054211 .fill-B5{fill:#EDF0FD;}
+		.d2-2664867100 .fill-B5{fill:#EDF0FD;}
-		.d2-525054211 .fill-B6{fill:#F7F8FE;}
+		.d2-2664867100 .fill-B6{fill:#F7F8FE;}
-		.d2-525054211 .fill-AA2{fill:#4A6FF3;}
+		.d2-2664867100 .fill-AA2{fill:#4A6FF3;}
-		.d2-525054211 .fill-AA4{fill:#EDF0FD;}
+		.d2-2664867100 .fill-AA4{fill:#EDF0FD;}
-		.d2-525054211 .fill-AA5{fill:#F7F8FE;}
+		.d2-2664867100 .fill-AA5{fill:#F7F8FE;}
-		.d2-525054211 .fill-AB4{fill:#EDF0FD;}
+		.d2-2664867100 .fill-AB4{fill:#EDF0FD;}
-		.d2-525054211 .fill-AB5{fill:#F7F8FE;}
+		.d2-2664867100 .fill-AB5{fill:#F7F8FE;}
-		.d2-525054211 .stroke-N1{stroke:#0A0F25;}
+		.d2-2664867100 .stroke-N1{stroke:#0A0F25;}
-		.d2-525054211 .stroke-N2{stroke:#676C7E;}
+		.d2-2664867100 .stroke-N2{stroke:#676C7E;}
-		.d2-525054211 .stroke-N3{stroke:#9499AB;}
+		.d2-2664867100 .stroke-N3{stroke:#9499AB;}
-		.d2-525054211 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2664867100 .stroke-N4{stroke:#CFD2DD;}
-		.d2-525054211 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2664867100 .stroke-N5{stroke:#DEE1EB;}
-		.d2-525054211 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2664867100 .stroke-N6{stroke:#EEF1F8;}
-		.d2-525054211 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2664867100 .stroke-N7{stroke:#FFFFFF;}
-		.d2-525054211 .stroke-B1{stroke:#0D32B2;}
+		.d2-2664867100 .stroke-B1{stroke:#0D32B2;}
-		.d2-525054211 .stroke-B2{stroke:#0D32B2;}
+		.d2-2664867100 .stroke-B2{stroke:#0D32B2;}
-		.d2-525054211 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2664867100 .stroke-B3{stroke:#E3E9FD;}
-		.d2-525054211 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2664867100 .stroke-B4{stroke:#E3E9FD;}
-		.d2-525054211 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2664867100 .stroke-B5{stroke:#EDF0FD;}
-		.d2-525054211 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2664867100 .stroke-B6{stroke:#F7F8FE;}
-		.d2-525054211 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2664867100 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-525054211 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2664867100 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-525054211 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2664867100 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-525054211 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2664867100 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-525054211 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2664867100 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-525054211 .background-color-N1{background-color:#0A0F25;}
+		.d2-2664867100 .background-color-N1{background-color:#0A0F25;}
-		.d2-525054211 .background-color-N2{background-color:#676C7E;}
+		.d2-2664867100 .background-color-N2{background-color:#676C7E;}
-		.d2-525054211 .background-color-N3{background-color:#9499AB;}
+		.d2-2664867100 .background-color-N3{background-color:#9499AB;}
-		.d2-525054211 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2664867100 .background-color-N4{background-color:#CFD2DD;}
-		.d2-525054211 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2664867100 .background-color-N5{background-color:#DEE1EB;}
-		.d2-525054211 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2664867100 .background-color-N6{background-color:#EEF1F8;}
-		.d2-525054211 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2664867100 .background-color-N7{background-color:#FFFFFF;}
-		.d2-525054211 .background-color-B1{background-color:#0D32B2;}
+		.d2-2664867100 .background-color-B1{background-color:#0D32B2;}
-		.d2-525054211 .background-color-B2{background-color:#0D32B2;}
+		.d2-2664867100 .background-color-B2{background-color:#0D32B2;}
-		.d2-525054211 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2664867100 .background-color-B3{background-color:#E3E9FD;}
-		.d2-525054211 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2664867100 .background-color-B4{background-color:#E3E9FD;}
-		.d2-525054211 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2664867100 .background-color-B5{background-color:#EDF0FD;}
-		.d2-525054211 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2664867100 .background-color-B6{background-color:#F7F8FE;}
-		.d2-525054211 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2664867100 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-525054211 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2664867100 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-525054211 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2664867100 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-525054211 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2664867100 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-525054211 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2664867100 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-525054211 .color-N1{color:#0A0F25;}
+		.d2-2664867100 .color-N1{color:#0A0F25;}
-		.d2-525054211 .color-N2{color:#676C7E;}
+		.d2-2664867100 .color-N2{color:#676C7E;}
-		.d2-525054211 .color-N3{color:#9499AB;}
+		.d2-2664867100 .color-N3{color:#9499AB;}
-		.d2-525054211 .color-N4{color:#CFD2DD;}
+		.d2-2664867100 .color-N4{color:#CFD2DD;}
-		.d2-525054211 .color-N5{color:#DEE1EB;}
+		.d2-2664867100 .color-N5{color:#DEE1EB;}
-		.d2-525054211 .color-N6{color:#EEF1F8;}
+		.d2-2664867100 .color-N6{color:#EEF1F8;}
-		.d2-525054211 .color-N7{color:#FFFFFF;}
+		.d2-2664867100 .color-N7{color:#FFFFFF;}
-		.d2-525054211 .color-B1{color:#0D32B2;}
+		.d2-2664867100 .color-B1{color:#0D32B2;}
-		.d2-525054211 .color-B2{color:#0D32B2;}
+		.d2-2664867100 .color-B2{color:#0D32B2;}
-		.d2-525054211 .color-B3{color:#E3E9FD;}
+		.d2-2664867100 .color-B3{color:#E3E9FD;}
-		.d2-525054211 .color-B4{color:#E3E9FD;}
+		.d2-2664867100 .color-B4{color:#E3E9FD;}
-		.d2-525054211 .color-B5{color:#EDF0FD;}
+		.d2-2664867100 .color-B5{color:#EDF0FD;}
-		.d2-525054211 .color-B6{color:#F7F8FE;}
+		.d2-2664867100 .color-B6{color:#F7F8FE;}
-		.d2-525054211 .color-AA2{color:#4A6FF3;}
+		.d2-2664867100 .color-AA2{color:#4A6FF3;}
-		.d2-525054211 .color-AA4{color:#EDF0FD;}
+		.d2-2664867100 .color-AA4{color:#EDF0FD;}
-		.d2-525054211 .color-AA5{color:#F7F8FE;}
+		.d2-2664867100 .color-AA5{color:#F7F8FE;}
-		.d2-525054211 .color-AB4{color:#EDF0FD;}
+		.d2-2664867100 .color-AB4{color:#EDF0FD;}
-		.d2-525054211 .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><a href="https://example.com" xlink:href="https://example.com"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="143.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="71.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">I&#39;m a Mac</text></g></a><g transform="translate(127 -16)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-2664867100 .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><a href="https://example.com" xlink:href="https://example.com"><g id="x"><g class="shape" ><rect x="0.000000" y="0.000000" width="111.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="55.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">I&#39;m a Mac</text></g></a><g transform="translate(95 -16)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-525054211" maskUnits="userSpaceOnUse" x="-101" y="-118" width="362" height="285">
+</g><mask id="d2-2664867100" maskUnits="userSpaceOnUse" x="-101" y="-118" width="330" height="285">
-<rect x="-101" y="-118" width="362" height="285" fill="white"></rect>
+<rect x="-101" y="-118" width="330" height="285" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="66" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="66" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json
@ -595,11 +595,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 819,
+        "x": 820,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1177,11 +1177,11 @@
        },
        {
          "x": 870,
-          "y": 347.6000061035156
+          "y": 347.79998779296875
        },
        {
          "x": 870,
-          "y": 394
+          "y": 395
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg
--- a/e2etests/testdata/patterns/multiple/dagre/board.exp.json
+++ b/e2etests/testdata/patterns/multiple/dagre/board.exp.json
@ -595,11 +595,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 839,
+        "x": 840,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1177,11 +1177,11 @@
        },
        {
          "x": 890,
-          "y": 345.79998779296875
+          "y": 346
        },
        {
          "x": 890,
-          "y": 385
+          "y": 386
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg
+++ b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg
--- a/e2etests/testdata/patterns/paper/dagre/board.exp.json
+++ b/e2etests/testdata/patterns/paper/dagre/board.exp.json
@ -595,11 +595,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 819,
+        "x": 820,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1177,11 +1177,11 @@
        },
        {
          "x": 870,
-          "y": 347.6000061035156
+          "y": 347.79998779296875
        },
        {
          "x": 870,
-          "y": 394
+          "y": 395
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg
+++ b/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg
--- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
@ -10,7 +10,7 @@
        "x": 0,
        "y": 0
      },
-      "width": 98,
+      "width": 66,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 117 85"><svg id="d2-svg" class="d2-1658760307" width="117" height="85" viewBox="-1 -18 117 85"><rect x="-1.000000" y="-18.000000" width="117.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 85 85"><svg id="d2-svg" class="d2-518173582" width="85" height="85" viewBox="-1 -18 85 85"><rect x="-1.000000" y="-18.000000" width="85.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-1658760307 .text-bold {
+.d2-518173582 .text-bold {
-	font-family: "d2-1658760307-font-bold";
+	font-family: "d2-518173582-font-bold";
 }
@font-face {
-	font-family: d2-1658760307-font-bold;
+	font-family: d2-518173582-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-1658760307 .fill-N1{fill:#0A0F25;}
+		.d2-518173582 .fill-N1{fill:#0A0F25;}
-		.d2-1658760307 .fill-N2{fill:#676C7E;}
+		.d2-518173582 .fill-N2{fill:#676C7E;}
-		.d2-1658760307 .fill-N3{fill:#9499AB;}
+		.d2-518173582 .fill-N3{fill:#9499AB;}
-		.d2-1658760307 .fill-N4{fill:#CFD2DD;}
+		.d2-518173582 .fill-N4{fill:#CFD2DD;}
-		.d2-1658760307 .fill-N5{fill:#DEE1EB;}
+		.d2-518173582 .fill-N5{fill:#DEE1EB;}
-		.d2-1658760307 .fill-N6{fill:#EEF1F8;}
+		.d2-518173582 .fill-N6{fill:#EEF1F8;}
-		.d2-1658760307 .fill-N7{fill:#FFFFFF;}
+		.d2-518173582 .fill-N7{fill:#FFFFFF;}
-		.d2-1658760307 .fill-B1{fill:#0D32B2;}
+		.d2-518173582 .fill-B1{fill:#0D32B2;}
-		.d2-1658760307 .fill-B2{fill:#0D32B2;}
+		.d2-518173582 .fill-B2{fill:#0D32B2;}
-		.d2-1658760307 .fill-B3{fill:#E3E9FD;}
+		.d2-518173582 .fill-B3{fill:#E3E9FD;}
-		.d2-1658760307 .fill-B4{fill:#E3E9FD;}
+		.d2-518173582 .fill-B4{fill:#E3E9FD;}
-		.d2-1658760307 .fill-B5{fill:#EDF0FD;}
+		.d2-518173582 .fill-B5{fill:#EDF0FD;}
-		.d2-1658760307 .fill-B6{fill:#F7F8FE;}
+		.d2-518173582 .fill-B6{fill:#F7F8FE;}
-		.d2-1658760307 .fill-AA2{fill:#4A6FF3;}
+		.d2-518173582 .fill-AA2{fill:#4A6FF3;}
-		.d2-1658760307 .fill-AA4{fill:#EDF0FD;}
+		.d2-518173582 .fill-AA4{fill:#EDF0FD;}
-		.d2-1658760307 .fill-AA5{fill:#F7F8FE;}
+		.d2-518173582 .fill-AA5{fill:#F7F8FE;}
-		.d2-1658760307 .fill-AB4{fill:#EDF0FD;}
+		.d2-518173582 .fill-AB4{fill:#EDF0FD;}
-		.d2-1658760307 .fill-AB5{fill:#F7F8FE;}
+		.d2-518173582 .fill-AB5{fill:#F7F8FE;}
-		.d2-1658760307 .stroke-N1{stroke:#0A0F25;}
+		.d2-518173582 .stroke-N1{stroke:#0A0F25;}
-		.d2-1658760307 .stroke-N2{stroke:#676C7E;}
+		.d2-518173582 .stroke-N2{stroke:#676C7E;}
-		.d2-1658760307 .stroke-N3{stroke:#9499AB;}
+		.d2-518173582 .stroke-N3{stroke:#9499AB;}
-		.d2-1658760307 .stroke-N4{stroke:#CFD2DD;}
+		.d2-518173582 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1658760307 .stroke-N5{stroke:#DEE1EB;}
+		.d2-518173582 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1658760307 .stroke-N6{stroke:#EEF1F8;}
+		.d2-518173582 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1658760307 .stroke-N7{stroke:#FFFFFF;}
+		.d2-518173582 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1658760307 .stroke-B1{stroke:#0D32B2;}
+		.d2-518173582 .stroke-B1{stroke:#0D32B2;}
-		.d2-1658760307 .stroke-B2{stroke:#0D32B2;}
+		.d2-518173582 .stroke-B2{stroke:#0D32B2;}
-		.d2-1658760307 .stroke-B3{stroke:#E3E9FD;}
+		.d2-518173582 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1658760307 .stroke-B4{stroke:#E3E9FD;}
+		.d2-518173582 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1658760307 .stroke-B5{stroke:#EDF0FD;}
+		.d2-518173582 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1658760307 .stroke-B6{stroke:#F7F8FE;}
+		.d2-518173582 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1658760307 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-518173582 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1658760307 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-518173582 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1658760307 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-518173582 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1658760307 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-518173582 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1658760307 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-518173582 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1658760307 .background-color-N1{background-color:#0A0F25;}
+		.d2-518173582 .background-color-N1{background-color:#0A0F25;}
-		.d2-1658760307 .background-color-N2{background-color:#676C7E;}
+		.d2-518173582 .background-color-N2{background-color:#676C7E;}
-		.d2-1658760307 .background-color-N3{background-color:#9499AB;}
+		.d2-518173582 .background-color-N3{background-color:#9499AB;}
-		.d2-1658760307 .background-color-N4{background-color:#CFD2DD;}
+		.d2-518173582 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1658760307 .background-color-N5{background-color:#DEE1EB;}
+		.d2-518173582 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1658760307 .background-color-N6{background-color:#EEF1F8;}
+		.d2-518173582 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1658760307 .background-color-N7{background-color:#FFFFFF;}
+		.d2-518173582 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1658760307 .background-color-B1{background-color:#0D32B2;}
+		.d2-518173582 .background-color-B1{background-color:#0D32B2;}
-		.d2-1658760307 .background-color-B2{background-color:#0D32B2;}
+		.d2-518173582 .background-color-B2{background-color:#0D32B2;}
-		.d2-1658760307 .background-color-B3{background-color:#E3E9FD;}
+		.d2-518173582 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1658760307 .background-color-B4{background-color:#E3E9FD;}
+		.d2-518173582 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1658760307 .background-color-B5{background-color:#EDF0FD;}
+		.d2-518173582 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1658760307 .background-color-B6{background-color:#F7F8FE;}
+		.d2-518173582 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1658760307 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-518173582 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1658760307 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-518173582 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1658760307 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-518173582 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1658760307 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-518173582 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1658760307 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-518173582 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1658760307 .color-N1{color:#0A0F25;}
+		.d2-518173582 .color-N1{color:#0A0F25;}
-		.d2-1658760307 .color-N2{color:#676C7E;}
+		.d2-518173582 .color-N2{color:#676C7E;}
-		.d2-1658760307 .color-N3{color:#9499AB;}
+		.d2-518173582 .color-N3{color:#9499AB;}
-		.d2-1658760307 .color-N4{color:#CFD2DD;}
+		.d2-518173582 .color-N4{color:#CFD2DD;}
-		.d2-1658760307 .color-N5{color:#DEE1EB;}
+		.d2-518173582 .color-N5{color:#DEE1EB;}
-		.d2-1658760307 .color-N6{color:#EEF1F8;}
+		.d2-518173582 .color-N6{color:#EEF1F8;}
-		.d2-1658760307 .color-N7{color:#FFFFFF;}
+		.d2-518173582 .color-N7{color:#FFFFFF;}
-		.d2-1658760307 .color-B1{color:#0D32B2;}
+		.d2-518173582 .color-B1{color:#0D32B2;}
-		.d2-1658760307 .color-B2{color:#0D32B2;}
+		.d2-518173582 .color-B2{color:#0D32B2;}
-		.d2-1658760307 .color-B3{color:#E3E9FD;}
+		.d2-518173582 .color-B3{color:#E3E9FD;}
-		.d2-1658760307 .color-B4{color:#E3E9FD;}
+		.d2-518173582 .color-B4{color:#E3E9FD;}
-		.d2-1658760307 .color-B5{color:#EDF0FD;}
+		.d2-518173582 .color-B5{color:#EDF0FD;}
-		.d2-1658760307 .color-B6{color:#F7F8FE;}
+		.d2-518173582 .color-B6{color:#F7F8FE;}
-		.d2-1658760307 .color-AA2{color:#4A6FF3;}
+		.d2-518173582 .color-AA2{color:#4A6FF3;}
-		.d2-1658760307 .color-AA4{color:#EDF0FD;}
+		.d2-518173582 .color-AA4{color:#EDF0FD;}
-		.d2-1658760307 .color-AA5{color:#F7F8FE;}
+		.d2-518173582 .color-AA5{color:#F7F8FE;}
-		.d2-1658760307 .color-AB4{color:#EDF0FD;}
+		.d2-518173582 .color-AB4{color:#EDF0FD;}
-		.d2-1658760307 .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="hy"><g class="shape" ><rect x="0.000000" y="0.000000" width="98.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="49.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">&amp;∈</text><title>beans &amp; rice</title></g><g transform="translate(82 -16)" class="appendix-icon"><title>beans &amp; rice</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-518173582 .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="hy"><g class="shape" ><rect x="0.000000" y="0.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="33.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">&amp;∈</text><title>beans &amp; rice</title></g><g transform="translate(50 -16)" class="appendix-icon"><title>beans &amp; rice</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3427_35082111)">
 <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="M16 26C21.5228 26 26 21.5228 26 16C26 10.4772 21.5228 6 16 6C10.4772 6 6 10.4772 6 16C6 21.5228 10.4772 26 16 26Z" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@ -105,7 +105,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-1658760307" maskUnits="userSpaceOnUse" x="-1" y="-18" width="117" height="85">
+</g><mask id="d2-518173582" maskUnits="userSpaceOnUse" x="-1" y="-18" width="85" height="85">
-<rect x="-1" y="-18" width="117" height="85" fill="white"></rect>
+<rect x="-1" y="-18" width="85" height="85" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="21" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="21" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
+++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
@ -10,7 +10,7 @@
        "x": 12,
        "y": 12
      },
-      "width": 98,
+      "width": 66,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 117 85"><svg id="d2-svg" class="d2-616571211" width="117" height="85" viewBox="11 -6 117 85"><rect x="11.000000" y="-6.000000" width="117.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 85 85"><svg id="d2-svg" class="d2-940642022" width="85" height="85" viewBox="11 -6 85 85"><rect x="11.000000" y="-6.000000" width="85.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-616571211 .text-bold {
+.d2-940642022 .text-bold {
-	font-family: "d2-616571211-font-bold";
+	font-family: "d2-940642022-font-bold";
 }
@font-face {
-	font-family: d2-616571211-font-bold;
+	font-family: d2-940642022-font-bold;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAAloAAoAAAAADuAAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAZgAAAHwB/wGvZ2x5ZgAAAbwAAAOQAAAEOAzMWydoZWFkAAAFTAAAADYAAAA2G38e1GhoZWEAAAWEAAAAJAAAACQKfwXNaG10eAAABagAAAA4AAAAOBf4Ah5sb2NhAAAF4AAAAB4AAAAeCHIHgG1heHAAAAYAAAAAIAAAACAAJgD3bmFtZQAABiAAAAMoAAAIKgjwVkFwb3N0AAAJSAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icXMw9DkFBAEbRM2+ef4VYgUpvSSIKjQh7kSgkbEsnsY9PIlO55SkuiqpgrnfC0kLVWVnb2Nk7OLokNNs2Oyd555NXnnnknluuv9N/xdRMp+oNDI2MTfgCAAD//wEAAP//x20XnwAAeJxMk09s21Qcx3/v1bW3NFvr+F+cJnHil9hxujltHNtK2zRLkzQDJVW2KW3R6MJ6GKBWm+gKKXDggiYxgTh0h4kDXOAGB8SJSeXCEW6dhISExKSdUQ8RpzRBdle2g6V3sD7f79efZxiHNgDewo9gDM7DJIRAALDYJJu2dJ0wruW6RBpzdcQybRwafvetblCGQWUTj5WPul3UuoUfnezcbG1t/dtdWBh+/fOT4Rfo/hMADNlRHz1FA5CBAEiqZhccV9OISjO641h5UWCJTmjazTuuTdMCL/5Sa396gImhXEnZue357p39AKU0zslpbnVRCa6XVzcmk3pYuB1L3d0dPreiZFfi1gMzsbAEXl5l1MciPgQeFIBxVdMJQ1hLYPwwUeBpWs87doGojCCKqJ6sxqjg/QMqVlMXN3KL3Q3NWbtk8JlgMmHjw++bkdjSe83Oh+X9leaDy7+FLgIAgtSojw7RACJ+gjfJg0uMN0vgRSvvuBJNI7l+r3L1g5rZiNZJwi6XZ8MmN59eC5bev35jrxSXurFm5UpLmHwrMQ1+d4/7DA0g/KL7GdmrzSRF0cp73DGr4AUhpbG7XN1ZaGzmKDz8I7AyZztz2q2vftIvqU5wae/6tb1yebvGpc87VvKNSBzNG3YOAEYjcAHgL3yENQgCAAMX4KG/q+KVQAPgPfeWZJ0JYv1Ahq3sB6hEK3/ttYNYIpoJo+Ny/PL25vB3lHQysjT88QUDfYkGEHqVITHaS8J0UxOigfAFeSpa4tHxen5ufPwTijLyw78BgTDqo2/QAHT/tuiut9qxC5qmm9guvIQJvCjFscDTR3Nva8tqWUnGY2YkvpB5t1NcV5YjhUixqCVKxjtBTXlTnpY4VuQCwVTRqK/p4Q1e1MPyxQlSNKub3rcfA3nUx5/hxzABBSgDcLwoOV4uUWnu1IT7vw/vFjGi94JrnZ4YTdNpWvfcu/7x2USAzIqSrLKN23ONWU6YaTuvr2WW1Gg1JWvBByFbU4oyyXSyxp3PnRnDSNdjnIz+CWV4wUxKUf3kudXJ1zoKqSu5Vq5dy1ZtKVGKJFbNhbvWlED1zqlhhfyaNiNKLcVqvr8VAPQn/tizatkWS2yvIGsJKw97havqTq+H7t0MRPmTQQ/OfMNTdAxjviu2coCOh1OARj/gItzARzABwPp/7OnmtGmm06aJi1lCst4D/wEAAP//AQAA//9cddO5AAEAAAACC4UrPvNzXw889QABA+gAAAAA2F2ghAAAAADdZi82/jf+xAhtA/EAAQADAAIAAAAAAAAAAQAAA9j+7wAACJj+N/43CG0AAQAAAAAAAAAAAAAAAAAAAA4CsgBQAMgAAAIPACoCPQBBAdMAJAIGACQBFAA3AjwAQQGOAEEBuwAVApsAGQIQAEYBFABBAAD/rQAAACwALABkAJYAwgD2AQIBJAFEAYAB4gH6AgYCHAAAAAEAAAAOAJAADABjAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyUz24bVRTGf05s0wrBAkVVuonugkWR6NhUSdU2K4fUikUUB48LQkJIE8/4jzKeGXkmDuEJWPMWvEVXPATPgVij+Xzs2AXRJoqSfHfu+fOdc75zgR3+ZptK9SHwRz0xXGGvfm54iwf1E8PbtOtbhqs8qf1puEZYmxuu83mtZ/gj3lZ/M/yA/epPhh+yW20b/phn1R3Dn2w7/jL8Kfu8XeAKvOBXwxV2yQxvscOPhrd5hMWsVHlE03CNz9gzXGcP6DOhIGZCwgjHkAkjrpgRkeMTMWPCkIgQR4cWMYW+JgRCjtF/fg3wKZgRKOKYAkeMT0xAztgi/iKvlHNlHOo0s7sWBWMCLuRxSUCCI2VESkLEpeIUFGS8okGDnIH4ZhTkeORMiPFImTGiQZc2p/QZMyHH0VakkplPypCCawLld2ZRdmZAREJurK5ICMXTiV8k7w6nOLpksl2PfLoR4Usc38m75JbK9is8/bo1Zpt5l2wC5upnrK7EurnWBMe6LfO2+Fa44BXuXv3ZZPL+HoX6XyjyBVeaf6hJJWKS4NwuLXwpyHePcRzp3MFXR76nQ58Turyhr3OLHj1anNGnw2v5dunh+JouZxzLoyO8uGtLMWf8gOMbOrIpY0fWn8XEIn4mM3Xn4jhTHVMy9bxk7qnWSBXefcLlDqUb6sjlM9AelZZO80u0ZwEjU0UmhlP1cqmN3PoXmiKmqqWc7e19uQ1z273lFt+QaodLtS44lZNbMHrfVL13NHOtH4+AkJQLWQxImdKg4Ea8zwm4IsZxrO6daEsKWiufMs+NVBIxFYMOieLMyPQ3MN34xn2woXtnb0ko/5Lp5aqq+2Rx6tXtjN6oe8s737ocrU2gYVNN19Q0ENfEtB9pp9b5+/LN9bqlPOWIlJjwXy/AMzya7HPAIWNlGOhmbq9DUy9Ek5ccqvpLIlkNpefIIhzg8ZwDDnjJ83f6uGTijItbcVnP3eKYI7ocflAVC/suR7xeffv/rL+LaVO1OJ6uTi/uPcUnd1DrF9qz2/eyp4mVk5hbtNutOCNgWnJxu+s1ucd4/wAAAP//AQAA///0t09ReJxiYGYAg//nGIwYsAAAAAAA//8BAAD//y8BAgMAAAA=");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-616571211 .fill-N1{fill:#0A0F25;}
+		.d2-940642022 .fill-N1{fill:#0A0F25;}
-		.d2-616571211 .fill-N2{fill:#676C7E;}
+		.d2-940642022 .fill-N2{fill:#676C7E;}
-		.d2-616571211 .fill-N3{fill:#9499AB;}
+		.d2-940642022 .fill-N3{fill:#9499AB;}
-		.d2-616571211 .fill-N4{fill:#CFD2DD;}
+		.d2-940642022 .fill-N4{fill:#CFD2DD;}
-		.d2-616571211 .fill-N5{fill:#DEE1EB;}
+		.d2-940642022 .fill-N5{fill:#DEE1EB;}
-		.d2-616571211 .fill-N6{fill:#EEF1F8;}
+		.d2-940642022 .fill-N6{fill:#EEF1F8;}
-		.d2-616571211 .fill-N7{fill:#FFFFFF;}
+		.d2-940642022 .fill-N7{fill:#FFFFFF;}
-		.d2-616571211 .fill-B1{fill:#0D32B2;}
+		.d2-940642022 .fill-B1{fill:#0D32B2;}
-		.d2-616571211 .fill-B2{fill:#0D32B2;}
+		.d2-940642022 .fill-B2{fill:#0D32B2;}
-		.d2-616571211 .fill-B3{fill:#E3E9FD;}
+		.d2-940642022 .fill-B3{fill:#E3E9FD;}
-		.d2-616571211 .fill-B4{fill:#E3E9FD;}
+		.d2-940642022 .fill-B4{fill:#E3E9FD;}
-		.d2-616571211 .fill-B5{fill:#EDF0FD;}
+		.d2-940642022 .fill-B5{fill:#EDF0FD;}
-		.d2-616571211 .fill-B6{fill:#F7F8FE;}
+		.d2-940642022 .fill-B6{fill:#F7F8FE;}
-		.d2-616571211 .fill-AA2{fill:#4A6FF3;}
+		.d2-940642022 .fill-AA2{fill:#4A6FF3;}
-		.d2-616571211 .fill-AA4{fill:#EDF0FD;}
+		.d2-940642022 .fill-AA4{fill:#EDF0FD;}
-		.d2-616571211 .fill-AA5{fill:#F7F8FE;}
+		.d2-940642022 .fill-AA5{fill:#F7F8FE;}
-		.d2-616571211 .fill-AB4{fill:#EDF0FD;}
+		.d2-940642022 .fill-AB4{fill:#EDF0FD;}
-		.d2-616571211 .fill-AB5{fill:#F7F8FE;}
+		.d2-940642022 .fill-AB5{fill:#F7F8FE;}
-		.d2-616571211 .stroke-N1{stroke:#0A0F25;}
+		.d2-940642022 .stroke-N1{stroke:#0A0F25;}
-		.d2-616571211 .stroke-N2{stroke:#676C7E;}
+		.d2-940642022 .stroke-N2{stroke:#676C7E;}
-		.d2-616571211 .stroke-N3{stroke:#9499AB;}
+		.d2-940642022 .stroke-N3{stroke:#9499AB;}
-		.d2-616571211 .stroke-N4{stroke:#CFD2DD;}
+		.d2-940642022 .stroke-N4{stroke:#CFD2DD;}
-		.d2-616571211 .stroke-N5{stroke:#DEE1EB;}
+		.d2-940642022 .stroke-N5{stroke:#DEE1EB;}
-		.d2-616571211 .stroke-N6{stroke:#EEF1F8;}
+		.d2-940642022 .stroke-N6{stroke:#EEF1F8;}
-		.d2-616571211 .stroke-N7{stroke:#FFFFFF;}
+		.d2-940642022 .stroke-N7{stroke:#FFFFFF;}
-		.d2-616571211 .stroke-B1{stroke:#0D32B2;}
+		.d2-940642022 .stroke-B1{stroke:#0D32B2;}
-		.d2-616571211 .stroke-B2{stroke:#0D32B2;}
+		.d2-940642022 .stroke-B2{stroke:#0D32B2;}
-		.d2-616571211 .stroke-B3{stroke:#E3E9FD;}
+		.d2-940642022 .stroke-B3{stroke:#E3E9FD;}
-		.d2-616571211 .stroke-B4{stroke:#E3E9FD;}
+		.d2-940642022 .stroke-B4{stroke:#E3E9FD;}
-		.d2-616571211 .stroke-B5{stroke:#EDF0FD;}
+		.d2-940642022 .stroke-B5{stroke:#EDF0FD;}
-		.d2-616571211 .stroke-B6{stroke:#F7F8FE;}
+		.d2-940642022 .stroke-B6{stroke:#F7F8FE;}
-		.d2-616571211 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-940642022 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-616571211 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-940642022 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-616571211 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-940642022 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-616571211 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-940642022 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-616571211 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-940642022 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-616571211 .background-color-N1{background-color:#0A0F25;}
+		.d2-940642022 .background-color-N1{background-color:#0A0F25;}
-		.d2-616571211 .background-color-N2{background-color:#676C7E;}
+		.d2-940642022 .background-color-N2{background-color:#676C7E;}
-		.d2-616571211 .background-color-N3{background-color:#9499AB;}
+		.d2-940642022 .background-color-N3{background-color:#9499AB;}
-		.d2-616571211 .background-color-N4{background-color:#CFD2DD;}
+		.d2-940642022 .background-color-N4{background-color:#CFD2DD;}
-		.d2-616571211 .background-color-N5{background-color:#DEE1EB;}
+		.d2-940642022 .background-color-N5{background-color:#DEE1EB;}
-		.d2-616571211 .background-color-N6{background-color:#EEF1F8;}
+		.d2-940642022 .background-color-N6{background-color:#EEF1F8;}
-		.d2-616571211 .background-color-N7{background-color:#FFFFFF;}
+		.d2-940642022 .background-color-N7{background-color:#FFFFFF;}
-		.d2-616571211 .background-color-B1{background-color:#0D32B2;}
+		.d2-940642022 .background-color-B1{background-color:#0D32B2;}
-		.d2-616571211 .background-color-B2{background-color:#0D32B2;}
+		.d2-940642022 .background-color-B2{background-color:#0D32B2;}
-		.d2-616571211 .background-color-B3{background-color:#E3E9FD;}
+		.d2-940642022 .background-color-B3{background-color:#E3E9FD;}
-		.d2-616571211 .background-color-B4{background-color:#E3E9FD;}
+		.d2-940642022 .background-color-B4{background-color:#E3E9FD;}
-		.d2-616571211 .background-color-B5{background-color:#EDF0FD;}
+		.d2-940642022 .background-color-B5{background-color:#EDF0FD;}
-		.d2-616571211 .background-color-B6{background-color:#F7F8FE;}
+		.d2-940642022 .background-color-B6{background-color:#F7F8FE;}
-		.d2-616571211 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-940642022 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-616571211 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-940642022 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-616571211 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-940642022 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-616571211 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-940642022 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-616571211 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-940642022 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-616571211 .color-N1{color:#0A0F25;}
+		.d2-940642022 .color-N1{color:#0A0F25;}
-		.d2-616571211 .color-N2{color:#676C7E;}
+		.d2-940642022 .color-N2{color:#676C7E;}
-		.d2-616571211 .color-N3{color:#9499AB;}
+		.d2-940642022 .color-N3{color:#9499AB;}
-		.d2-616571211 .color-N4{color:#CFD2DD;}
+		.d2-940642022 .color-N4{color:#CFD2DD;}
-		.d2-616571211 .color-N5{color:#DEE1EB;}
+		.d2-940642022 .color-N5{color:#DEE1EB;}
-		.d2-616571211 .color-N6{color:#EEF1F8;}
+		.d2-940642022 .color-N6{color:#EEF1F8;}
-		.d2-616571211 .color-N7{color:#FFFFFF;}
+		.d2-940642022 .color-N7{color:#FFFFFF;}
-		.d2-616571211 .color-B1{color:#0D32B2;}
+		.d2-940642022 .color-B1{color:#0D32B2;}
-		.d2-616571211 .color-B2{color:#0D32B2;}
+		.d2-940642022 .color-B2{color:#0D32B2;}
-		.d2-616571211 .color-B3{color:#E3E9FD;}
+		.d2-940642022 .color-B3{color:#E3E9FD;}
-		.d2-616571211 .color-B4{color:#E3E9FD;}
+		.d2-940642022 .color-B4{color:#E3E9FD;}
-		.d2-616571211 .color-B5{color:#EDF0FD;}
+		.d2-940642022 .color-B5{color:#EDF0FD;}
-		.d2-616571211 .color-B6{color:#F7F8FE;}
+		.d2-940642022 .color-B6{color:#F7F8FE;}
-		.d2-616571211 .color-AA2{color:#4A6FF3;}
+		.d2-940642022 .color-AA2{color:#4A6FF3;}
-		.d2-616571211 .color-AA4{color:#EDF0FD;}
+		.d2-940642022 .color-AA4{color:#EDF0FD;}
-		.d2-616571211 .color-AA5{color:#F7F8FE;}
+		.d2-940642022 .color-AA5{color:#F7F8FE;}
-		.d2-616571211 .color-AB4{color:#EDF0FD;}
+		.d2-940642022 .color-AB4{color:#EDF0FD;}
-		.d2-616571211 .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="hy"><g class="shape" ><rect x="12.000000" y="12.000000" width="98.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="61.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">&amp;∈</text><title>beans &amp; rice</title></g><g transform="translate(94 -4)" class="appendix-icon"><title>beans &amp; rice</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-940642022 .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="hy"><g class="shape" ><rect x="12.000000" y="12.000000" width="66.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="45.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">&amp;∈</text><title>beans &amp; rice</title></g><g transform="translate(62 -4)" class="appendix-icon"><title>beans &amp; rice</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3427_35082111)">
 <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="M16 26C21.5228 26 26 21.5228 26 16C26 10.4772 21.5228 6 16 6C10.4772 6 6 10.4772 6 16C6 21.5228 10.4772 26 16 26Z" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@ -105,7 +105,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-616571211" maskUnits="userSpaceOnUse" x="11" y="-6" width="117" height="85">
+</g><mask id="d2-940642022" maskUnits="userSpaceOnUse" x="11" y="-6" width="85" height="85">
-<rect x="11" y="-6" width="117" height="85" fill="white"></rect>
+<rect x="11" y="-6" width="85" height="85" fill="white"></rect>
-<rect x="50.500000" y="34.500000" width="21" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="34.500000" y="34.500000" width="21" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json
+++ b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json
@ -13,7 +13,7 @@
        "x": 0,
        "y": 0
      },
-      "width": 159,
+      "width": 127,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -54,7 +54,7 @@
        "YELLOW"
      ],
      "pos": {
-        "x": 159,
+        "x": 127,
        "y": 0
      },
      "width": 80,
@ -101,7 +101,7 @@
        "x": 0,
        "y": 66
      },
-      "width": 159,
+      "width": 127,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -142,7 +142,7 @@
        "GREEN"
      ],
      "pos": {
-        "x": 159,
+        "x": 127,
        "y": 66
      },
      "width": 80,
--- a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 241 134"><svg id="d2-svg" class="d2-913231368" width="241" height="134" viewBox="-1 -1 241 134"><rect x="-1.000000" y="-1.000000" width="241.000000" height="134.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 134"><svg id="d2-svg" class="d2-2024767174" width="209" height="134" viewBox="-1 -1 209 134"><rect x="-1.000000" y="-1.000000" width="209.000000" height="134.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-913231368 .text-bold {
+.d2-2024767174 .text-bold {
-	font-family: "d2-913231368-font-bold";
+	font-family: "d2-2024767174-font-bold";
 }
@font-face {
-	font-family: d2-913231368-font-bold;
+	font-family: d2-2024767174-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-913231368 .fill-N1{fill:#0A0F25;}
+		.d2-2024767174 .fill-N1{fill:#0A0F25;}
-		.d2-913231368 .fill-N2{fill:#676C7E;}
+		.d2-2024767174 .fill-N2{fill:#676C7E;}
-		.d2-913231368 .fill-N3{fill:#9499AB;}
+		.d2-2024767174 .fill-N3{fill:#9499AB;}
-		.d2-913231368 .fill-N4{fill:#CFD2DD;}
+		.d2-2024767174 .fill-N4{fill:#CFD2DD;}
-		.d2-913231368 .fill-N5{fill:#DEE1EB;}
+		.d2-2024767174 .fill-N5{fill:#DEE1EB;}
-		.d2-913231368 .fill-N6{fill:#EEF1F8;}
+		.d2-2024767174 .fill-N6{fill:#EEF1F8;}
-		.d2-913231368 .fill-N7{fill:#FFFFFF;}
+		.d2-2024767174 .fill-N7{fill:#FFFFFF;}
-		.d2-913231368 .fill-B1{fill:#0D32B2;}
+		.d2-2024767174 .fill-B1{fill:#0D32B2;}
-		.d2-913231368 .fill-B2{fill:#0D32B2;}
+		.d2-2024767174 .fill-B2{fill:#0D32B2;}
-		.d2-913231368 .fill-B3{fill:#E3E9FD;}
+		.d2-2024767174 .fill-B3{fill:#E3E9FD;}
-		.d2-913231368 .fill-B4{fill:#E3E9FD;}
+		.d2-2024767174 .fill-B4{fill:#E3E9FD;}
-		.d2-913231368 .fill-B5{fill:#EDF0FD;}
+		.d2-2024767174 .fill-B5{fill:#EDF0FD;}
-		.d2-913231368 .fill-B6{fill:#F7F8FE;}
+		.d2-2024767174 .fill-B6{fill:#F7F8FE;}
-		.d2-913231368 .fill-AA2{fill:#4A6FF3;}
+		.d2-2024767174 .fill-AA2{fill:#4A6FF3;}
-		.d2-913231368 .fill-AA4{fill:#EDF0FD;}
+		.d2-2024767174 .fill-AA4{fill:#EDF0FD;}
-		.d2-913231368 .fill-AA5{fill:#F7F8FE;}
+		.d2-2024767174 .fill-AA5{fill:#F7F8FE;}
-		.d2-913231368 .fill-AB4{fill:#EDF0FD;}
+		.d2-2024767174 .fill-AB4{fill:#EDF0FD;}
-		.d2-913231368 .fill-AB5{fill:#F7F8FE;}
+		.d2-2024767174 .fill-AB5{fill:#F7F8FE;}
-		.d2-913231368 .stroke-N1{stroke:#0A0F25;}
+		.d2-2024767174 .stroke-N1{stroke:#0A0F25;}
-		.d2-913231368 .stroke-N2{stroke:#676C7E;}
+		.d2-2024767174 .stroke-N2{stroke:#676C7E;}
-		.d2-913231368 .stroke-N3{stroke:#9499AB;}
+		.d2-2024767174 .stroke-N3{stroke:#9499AB;}
-		.d2-913231368 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2024767174 .stroke-N4{stroke:#CFD2DD;}
-		.d2-913231368 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2024767174 .stroke-N5{stroke:#DEE1EB;}
-		.d2-913231368 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2024767174 .stroke-N6{stroke:#EEF1F8;}
-		.d2-913231368 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2024767174 .stroke-N7{stroke:#FFFFFF;}
-		.d2-913231368 .stroke-B1{stroke:#0D32B2;}
+		.d2-2024767174 .stroke-B1{stroke:#0D32B2;}
-		.d2-913231368 .stroke-B2{stroke:#0D32B2;}
+		.d2-2024767174 .stroke-B2{stroke:#0D32B2;}
-		.d2-913231368 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2024767174 .stroke-B3{stroke:#E3E9FD;}
-		.d2-913231368 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2024767174 .stroke-B4{stroke:#E3E9FD;}
-		.d2-913231368 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-B5{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-B6{stroke:#F7F8FE;}
-		.d2-913231368 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2024767174 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-913231368 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-913231368 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-913231368 .background-color-N1{background-color:#0A0F25;}
+		.d2-2024767174 .background-color-N1{background-color:#0A0F25;}
-		.d2-913231368 .background-color-N2{background-color:#676C7E;}
+		.d2-2024767174 .background-color-N2{background-color:#676C7E;}
-		.d2-913231368 .background-color-N3{background-color:#9499AB;}
+		.d2-2024767174 .background-color-N3{background-color:#9499AB;}
-		.d2-913231368 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2024767174 .background-color-N4{background-color:#CFD2DD;}
-		.d2-913231368 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2024767174 .background-color-N5{background-color:#DEE1EB;}
-		.d2-913231368 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2024767174 .background-color-N6{background-color:#EEF1F8;}
-		.d2-913231368 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2024767174 .background-color-N7{background-color:#FFFFFF;}
-		.d2-913231368 .background-color-B1{background-color:#0D32B2;}
+		.d2-2024767174 .background-color-B1{background-color:#0D32B2;}
-		.d2-913231368 .background-color-B2{background-color:#0D32B2;}
+		.d2-2024767174 .background-color-B2{background-color:#0D32B2;}
-		.d2-913231368 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2024767174 .background-color-B3{background-color:#E3E9FD;}
-		.d2-913231368 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2024767174 .background-color-B4{background-color:#E3E9FD;}
-		.d2-913231368 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-B5{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-B6{background-color:#F7F8FE;}
-		.d2-913231368 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2024767174 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-913231368 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-913231368 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-913231368 .color-N1{color:#0A0F25;}
+		.d2-2024767174 .color-N1{color:#0A0F25;}
-		.d2-913231368 .color-N2{color:#676C7E;}
+		.d2-2024767174 .color-N2{color:#676C7E;}
-		.d2-913231368 .color-N3{color:#9499AB;}
+		.d2-2024767174 .color-N3{color:#9499AB;}
-		.d2-913231368 .color-N4{color:#CFD2DD;}
+		.d2-2024767174 .color-N4{color:#CFD2DD;}
-		.d2-913231368 .color-N5{color:#DEE1EB;}
+		.d2-2024767174 .color-N5{color:#DEE1EB;}
-		.d2-913231368 .color-N6{color:#EEF1F8;}
+		.d2-2024767174 .color-N6{color:#EEF1F8;}
-		.d2-913231368 .color-N7{color:#FFFFFF;}
+		.d2-2024767174 .color-N7{color:#FFFFFF;}
-		.d2-913231368 .color-B1{color:#0D32B2;}
+		.d2-2024767174 .color-B1{color:#0D32B2;}
-		.d2-913231368 .color-B2{color:#0D32B2;}
+		.d2-2024767174 .color-B2{color:#0D32B2;}
-		.d2-913231368 .color-B3{color:#E3E9FD;}
+		.d2-2024767174 .color-B3{color:#E3E9FD;}
-		.d2-913231368 .color-B4{color:#E3E9FD;}
+		.d2-2024767174 .color-B4{color:#E3E9FD;}
-		.d2-913231368 .color-B5{color:#EDF0FD;}
+		.d2-2024767174 .color-B5{color:#EDF0FD;}
-		.d2-913231368 .color-B6{color:#F7F8FE;}
+		.d2-2024767174 .color-B6{color:#F7F8FE;}
-		.d2-913231368 .color-AA2{color:#4A6FF3;}
+		.d2-2024767174 .color-AA2{color:#4A6FF3;}
-		.d2-913231368 .color-AA4{color:#EDF0FD;}
+		.d2-2024767174 .color-AA4{color:#EDF0FD;}
-		.d2-913231368 .color-AA5{color:#F7F8FE;}
+		.d2-2024767174 .color-AA5{color:#F7F8FE;}
-		.d2-913231368 .color-AB4{color:#EDF0FD;}
+		.d2-2024767174 .color-AB4{color:#EDF0FD;}
-		.d2-913231368 .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="1" class="RED"><g class="shape" ><rect x="0.000000" y="0.000000" width="159.000000" height="66.000000" stroke="#d14d28" fill="#d14d28" style="stroke-width:2;" /></g><text x="79.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link</text></g><g id="2" class="YELLOW"><g class="shape" ><rect x="159.000000" y="0.000000" width="80.000000" height="66.000000" stroke="#f5df65" fill="#f5df65" style="stroke-width:2;" /></g><text x="199.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g id="3" class="BLUE"><g class="shape" ><rect x="0.000000" y="66.000000" width="159.000000" height="66.000000" stroke="#59c8df" fill="#59c8df" style="stroke-width:2;" /></g><text x="79.500000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link, tooltip</text><title>tooltip</title></g><g id="4" class="GREEN"><g class="shape" ><rect x="159.000000" y="66.000000" width="80.000000" height="66.000000" stroke="#2b9464" fill="#2b9464" style="stroke-width:2;" /></g><text x="199.000000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g transform="translate(143 50)" class="appendix-icon"><title>tooltip</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-2024767174 .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="1" class="RED"><g class="shape" ><rect x="0.000000" y="0.000000" width="127.000000" height="66.000000" stroke="#d14d28" fill="#d14d28" style="stroke-width:2;" /></g><text x="63.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link</text></g><g id="2" class="YELLOW"><g class="shape" ><rect x="127.000000" y="0.000000" width="80.000000" height="66.000000" stroke="#f5df65" fill="#f5df65" style="stroke-width:2;" /></g><text x="167.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g id="3" class="BLUE"><g class="shape" ><rect x="0.000000" y="66.000000" width="127.000000" height="66.000000" stroke="#59c8df" fill="#59c8df" style="stroke-width:2;" /></g><text x="63.500000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link, tooltip</text><title>tooltip</title></g><g id="4" class="GREEN"><g class="shape" ><rect x="127.000000" y="66.000000" width="80.000000" height="66.000000" stroke="#2b9464" fill="#2b9464" style="stroke-width:2;" /></g><text x="167.000000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g transform="translate(111 50)" class="appendix-icon"><title>tooltip</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3427_35082111)">
 <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="M16 26C21.5228 26 26 21.5228 26 16C26 10.4772 21.5228 6 16 6C10.4772 6 6 10.4772 6 16C6 21.5228 10.4772 26 16 26Z" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@ -105,10 +105,10 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-913231368" maskUnits="userSpaceOnUse" x="-1" y="-1" width="241" height="134">
+</g><mask id="d2-2024767174" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="134">
-<rect x="-1" y="-1" width="241" height="134" fill="white"></rect>
+<rect x="-1" y="-1" width="209" height="134" fill="white"></rect>
-<rect x="66.000000" y="22.500000" width="27" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="50.000000" y="22.500000" width="27" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="181.500000" y="22.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="149.500000" y="22.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="38.500000" y="88.500000" width="82" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="88.500000" width="82" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="181.500000" y="88.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="149.500000" y="88.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json
+++ b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json
@ -13,7 +13,7 @@
        "x": 0,
        "y": 0
      },
-      "width": 159,
+      "width": 127,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -54,7 +54,7 @@
        "YELLOW"
      ],
      "pos": {
-        "x": 159,
+        "x": 127,
        "y": 0
      },
      "width": 80,
@ -101,7 +101,7 @@
        "x": 0,
        "y": 66
      },
-      "width": 159,
+      "width": 127,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -142,7 +142,7 @@
        "GREEN"
      ],
      "pos": {
-        "x": 159,
+        "x": 127,
        "y": 66
      },
      "width": 80,
--- a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 241 134"><svg id="d2-svg" class="d2-913231368" width="241" height="134" viewBox="-1 -1 241 134"><rect x="-1.000000" y="-1.000000" width="241.000000" height="134.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 209 134"><svg id="d2-svg" class="d2-2024767174" width="209" height="134" viewBox="-1 -1 209 134"><rect x="-1.000000" y="-1.000000" width="209.000000" height="134.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-913231368 .text-bold {
+.d2-2024767174 .text-bold {
-	font-family: "d2-913231368-font-bold";
+	font-family: "d2-2024767174-font-bold";
 }
@font-face {
-	font-family: d2-913231368-font-bold;
+	font-family: d2-2024767174-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-913231368 .fill-N1{fill:#0A0F25;}
+		.d2-2024767174 .fill-N1{fill:#0A0F25;}
-		.d2-913231368 .fill-N2{fill:#676C7E;}
+		.d2-2024767174 .fill-N2{fill:#676C7E;}
-		.d2-913231368 .fill-N3{fill:#9499AB;}
+		.d2-2024767174 .fill-N3{fill:#9499AB;}
-		.d2-913231368 .fill-N4{fill:#CFD2DD;}
+		.d2-2024767174 .fill-N4{fill:#CFD2DD;}
-		.d2-913231368 .fill-N5{fill:#DEE1EB;}
+		.d2-2024767174 .fill-N5{fill:#DEE1EB;}
-		.d2-913231368 .fill-N6{fill:#EEF1F8;}
+		.d2-2024767174 .fill-N6{fill:#EEF1F8;}
-		.d2-913231368 .fill-N7{fill:#FFFFFF;}
+		.d2-2024767174 .fill-N7{fill:#FFFFFF;}
-		.d2-913231368 .fill-B1{fill:#0D32B2;}
+		.d2-2024767174 .fill-B1{fill:#0D32B2;}
-		.d2-913231368 .fill-B2{fill:#0D32B2;}
+		.d2-2024767174 .fill-B2{fill:#0D32B2;}
-		.d2-913231368 .fill-B3{fill:#E3E9FD;}
+		.d2-2024767174 .fill-B3{fill:#E3E9FD;}
-		.d2-913231368 .fill-B4{fill:#E3E9FD;}
+		.d2-2024767174 .fill-B4{fill:#E3E9FD;}
-		.d2-913231368 .fill-B5{fill:#EDF0FD;}
+		.d2-2024767174 .fill-B5{fill:#EDF0FD;}
-		.d2-913231368 .fill-B6{fill:#F7F8FE;}
+		.d2-2024767174 .fill-B6{fill:#F7F8FE;}
-		.d2-913231368 .fill-AA2{fill:#4A6FF3;}
+		.d2-2024767174 .fill-AA2{fill:#4A6FF3;}
-		.d2-913231368 .fill-AA4{fill:#EDF0FD;}
+		.d2-2024767174 .fill-AA4{fill:#EDF0FD;}
-		.d2-913231368 .fill-AA5{fill:#F7F8FE;}
+		.d2-2024767174 .fill-AA5{fill:#F7F8FE;}
-		.d2-913231368 .fill-AB4{fill:#EDF0FD;}
+		.d2-2024767174 .fill-AB4{fill:#EDF0FD;}
-		.d2-913231368 .fill-AB5{fill:#F7F8FE;}
+		.d2-2024767174 .fill-AB5{fill:#F7F8FE;}
-		.d2-913231368 .stroke-N1{stroke:#0A0F25;}
+		.d2-2024767174 .stroke-N1{stroke:#0A0F25;}
-		.d2-913231368 .stroke-N2{stroke:#676C7E;}
+		.d2-2024767174 .stroke-N2{stroke:#676C7E;}
-		.d2-913231368 .stroke-N3{stroke:#9499AB;}
+		.d2-2024767174 .stroke-N3{stroke:#9499AB;}
-		.d2-913231368 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2024767174 .stroke-N4{stroke:#CFD2DD;}
-		.d2-913231368 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2024767174 .stroke-N5{stroke:#DEE1EB;}
-		.d2-913231368 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2024767174 .stroke-N6{stroke:#EEF1F8;}
-		.d2-913231368 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2024767174 .stroke-N7{stroke:#FFFFFF;}
-		.d2-913231368 .stroke-B1{stroke:#0D32B2;}
+		.d2-2024767174 .stroke-B1{stroke:#0D32B2;}
-		.d2-913231368 .stroke-B2{stroke:#0D32B2;}
+		.d2-2024767174 .stroke-B2{stroke:#0D32B2;}
-		.d2-913231368 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2024767174 .stroke-B3{stroke:#E3E9FD;}
-		.d2-913231368 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2024767174 .stroke-B4{stroke:#E3E9FD;}
-		.d2-913231368 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-B5{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-B6{stroke:#F7F8FE;}
-		.d2-913231368 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2024767174 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-913231368 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-913231368 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2024767174 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-913231368 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2024767174 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-913231368 .background-color-N1{background-color:#0A0F25;}
+		.d2-2024767174 .background-color-N1{background-color:#0A0F25;}
-		.d2-913231368 .background-color-N2{background-color:#676C7E;}
+		.d2-2024767174 .background-color-N2{background-color:#676C7E;}
-		.d2-913231368 .background-color-N3{background-color:#9499AB;}
+		.d2-2024767174 .background-color-N3{background-color:#9499AB;}
-		.d2-913231368 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2024767174 .background-color-N4{background-color:#CFD2DD;}
-		.d2-913231368 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2024767174 .background-color-N5{background-color:#DEE1EB;}
-		.d2-913231368 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2024767174 .background-color-N6{background-color:#EEF1F8;}
-		.d2-913231368 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2024767174 .background-color-N7{background-color:#FFFFFF;}
-		.d2-913231368 .background-color-B1{background-color:#0D32B2;}
+		.d2-2024767174 .background-color-B1{background-color:#0D32B2;}
-		.d2-913231368 .background-color-B2{background-color:#0D32B2;}
+		.d2-2024767174 .background-color-B2{background-color:#0D32B2;}
-		.d2-913231368 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2024767174 .background-color-B3{background-color:#E3E9FD;}
-		.d2-913231368 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2024767174 .background-color-B4{background-color:#E3E9FD;}
-		.d2-913231368 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-B5{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-B6{background-color:#F7F8FE;}
-		.d2-913231368 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2024767174 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-913231368 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-913231368 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2024767174 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-913231368 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2024767174 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-913231368 .color-N1{color:#0A0F25;}
+		.d2-2024767174 .color-N1{color:#0A0F25;}
-		.d2-913231368 .color-N2{color:#676C7E;}
+		.d2-2024767174 .color-N2{color:#676C7E;}
-		.d2-913231368 .color-N3{color:#9499AB;}
+		.d2-2024767174 .color-N3{color:#9499AB;}
-		.d2-913231368 .color-N4{color:#CFD2DD;}
+		.d2-2024767174 .color-N4{color:#CFD2DD;}
-		.d2-913231368 .color-N5{color:#DEE1EB;}
+		.d2-2024767174 .color-N5{color:#DEE1EB;}
-		.d2-913231368 .color-N6{color:#EEF1F8;}
+		.d2-2024767174 .color-N6{color:#EEF1F8;}
-		.d2-913231368 .color-N7{color:#FFFFFF;}
+		.d2-2024767174 .color-N7{color:#FFFFFF;}
-		.d2-913231368 .color-B1{color:#0D32B2;}
+		.d2-2024767174 .color-B1{color:#0D32B2;}
-		.d2-913231368 .color-B2{color:#0D32B2;}
+		.d2-2024767174 .color-B2{color:#0D32B2;}
-		.d2-913231368 .color-B3{color:#E3E9FD;}
+		.d2-2024767174 .color-B3{color:#E3E9FD;}
-		.d2-913231368 .color-B4{color:#E3E9FD;}
+		.d2-2024767174 .color-B4{color:#E3E9FD;}
-		.d2-913231368 .color-B5{color:#EDF0FD;}
+		.d2-2024767174 .color-B5{color:#EDF0FD;}
-		.d2-913231368 .color-B6{color:#F7F8FE;}
+		.d2-2024767174 .color-B6{color:#F7F8FE;}
-		.d2-913231368 .color-AA2{color:#4A6FF3;}
+		.d2-2024767174 .color-AA2{color:#4A6FF3;}
-		.d2-913231368 .color-AA4{color:#EDF0FD;}
+		.d2-2024767174 .color-AA4{color:#EDF0FD;}
-		.d2-913231368 .color-AA5{color:#F7F8FE;}
+		.d2-2024767174 .color-AA5{color:#F7F8FE;}
-		.d2-913231368 .color-AB4{color:#EDF0FD;}
+		.d2-2024767174 .color-AB4{color:#EDF0FD;}
-		.d2-913231368 .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="1" class="RED"><g class="shape" ><rect x="0.000000" y="0.000000" width="159.000000" height="66.000000" stroke="#d14d28" fill="#d14d28" style="stroke-width:2;" /></g><text x="79.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link</text></g><g id="2" class="YELLOW"><g class="shape" ><rect x="159.000000" y="0.000000" width="80.000000" height="66.000000" stroke="#f5df65" fill="#f5df65" style="stroke-width:2;" /></g><text x="199.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g id="3" class="BLUE"><g class="shape" ><rect x="0.000000" y="66.000000" width="159.000000" height="66.000000" stroke="#59c8df" fill="#59c8df" style="stroke-width:2;" /></g><text x="79.500000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link, tooltip</text><title>tooltip</title></g><g id="4" class="GREEN"><g class="shape" ><rect x="159.000000" y="66.000000" width="80.000000" height="66.000000" stroke="#2b9464" fill="#2b9464" style="stroke-width:2;" /></g><text x="199.000000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g transform="translate(143 50)" class="appendix-icon"><title>tooltip</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-2024767174 .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="1" class="RED"><g class="shape" ><rect x="0.000000" y="0.000000" width="127.000000" height="66.000000" stroke="#d14d28" fill="#d14d28" style="stroke-width:2;" /></g><text x="63.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link</text></g><g id="2" class="YELLOW"><g class="shape" ><rect x="127.000000" y="0.000000" width="80.000000" height="66.000000" stroke="#f5df65" fill="#f5df65" style="stroke-width:2;" /></g><text x="167.000000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g id="3" class="BLUE"><g class="shape" ><rect x="0.000000" y="66.000000" width="127.000000" height="66.000000" stroke="#59c8df" fill="#59c8df" style="stroke-width:2;" /></g><text x="63.500000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">link, tooltip</text><title>tooltip</title></g><g id="4" class="GREEN"><g class="shape" ><rect x="127.000000" y="66.000000" width="80.000000" height="66.000000" stroke="#2b9464" fill="#2b9464" style="stroke-width:2;" /></g><text x="167.000000" y="104.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">none</text></g><g transform="translate(111 50)" class="appendix-icon"><title>tooltip</title><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_3427_35082111)">
 <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="M16 26C21.5228 26 26 21.5228 26 16C26 10.4772 21.5228 6 16 6C10.4772 6 6 10.4772 6 16C6 21.5228 10.4772 26 16 26Z" stroke="#2E3346" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@ -105,10 +105,10 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-913231368" maskUnits="userSpaceOnUse" x="-1" y="-1" width="241" height="134">
+</g><mask id="d2-2024767174" maskUnits="userSpaceOnUse" x="-1" y="-1" width="209" height="134">
-<rect x="-1" y="-1" width="241" height="134" fill="white"></rect>
+<rect x="-1" y="-1" width="209" height="134" fill="white"></rect>
-<rect x="66.000000" y="22.500000" width="27" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="50.000000" y="22.500000" width="27" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="181.500000" y="22.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="149.500000" y="22.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="38.500000" y="88.500000" width="82" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="88.500000" width="82" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="181.500000" y="88.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="149.500000" y="88.500000" width="35" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json
+++ b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json
@ -10,7 +10,7 @@
        "x": 0,
        "y": 0
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 104 85"><svg id="d2-svg" class="d2-2121058281" width="104" height="85" viewBox="-1 -18 104 85"><rect x="-1.000000" y="-18.000000" width="104.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 72 85"><svg id="d2-svg" class="d2-591021258" width="72" height="85" viewBox="-1 -18 72 85"><rect x="-1.000000" y="-18.000000" width="72.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-2121058281 .text-bold {
+.d2-591021258 .text-bold {
-	font-family: "d2-2121058281-font-bold";
+	font-family: "d2-591021258-font-bold";
 }
@font-face {
-	font-family: d2-2121058281-font-bold;
+	font-family: d2-591021258-font-bold;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAA0MAAoAAAAAFCgAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAiwAAALACqANhZ2x5ZgAAAeAAAAa2AAAI9DCaJqdoZWFkAAAImAAAADYAAAA2G38e1GhoZWEAAAjQAAAAJAAAACQKfwXcaG10eAAACPQAAAB0AAAAdDX+BPVsb2NhAAAJaAAAADwAAAA8JTIniG1heHAAAAmkAAAAIAAAACAANQD3bmFtZQAACcQAAAMoAAAIKgjwVkFwb3N0AAAM7AAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icbMw9asIAGIDhJ03apm3apv/pBRz9WQXxLA4igoMI3kbRwUM5ZHMQwTt8gmT0XR94kUglKGR2qJRSuZa2jp6+gaGxqbllBI10GxmZmFlExDmOcYpD1FHHPraxiXWsru/bffpR+fLt178/iTupzL0Hj3JPnr0ovHrzrvTBBQAA//8BAAD//2OLH/cAeJxkVU1sG2kZfr+xM9M60ybj+fM4Hv/M2PNjJ3bs8dh1nMRx4yRt6jRJq/wsTZO2h1BINxFtSrILC5dq0S6LEPIKrXoAFFEJqt3DCiHBSuGCBFS7t65YCQnBSitxQCqhWIiDY6Nv7KSp9jCeOXx+n+d5n+d9P+iCOQDiFvEuuOA09IAXeACLiTAxS9dVKm/l86royuuIoeYIb/PRz3XTbZruePi90Otra2hmlXj38M61mVu3/rtWLDZ/8tuPmj9A9z4CICDeqqNPUQMkUAFERbOzubymqQpJ6bmclRF4RtVVksxncnmbJHlO+F1l7kGNUM3QWNRObQytre963KGpU1KMvTwcopdKl5d7IrqPvylHN+82v7AC6l2RXfIkZJ8IGK/cqhMCsQ8chAC6FE1XKZWxeMoBE3iOJPVMzs6qCsULApqIjMtu+l7NLVeU4eXU8NqyllvsNzmDjoRtYv/9ql8e/UZ14bXS7mT1zYGPvWcBAEG0VUf7qAF+BwFLwsVFCsviOcHK5PIiSSJpYqt84ZuV5FRgQg3bpdKgL8kOxRbpkftXrm6PBMU1uVoem+F7boT7wOGut+qoQewDC+GjXjmFdds60SWtA/N8Zau4ljXPSWRt1+P2TxI+3csmODWXor//2vz90YCv+svD8bRf3eWkj71nx6cuTgDhcP8cNcDX6c8RCG4NFREEK4O5u6wsRkGhqbvnx+8Up66n3ETzM89k2s6ltdWHv9L7lRw9un1lfrtU2qiwsdM5K/KKP4iGTDuFtbhAaQ0QFGpACoow7ajR7CwmjwNgH8GKFq+2XVEV3ekdjgRHki5sUkco2/5WFc058nxo9dwU2xf2+c2hVbs/8utZ6nR2OS+HvIo5t3Kz8u1pWddlWdfNzJges6QI3Tfy1H+uf9hwnzFCfZlet7eSGJ416I1uhStMRz09AustjlvzSfQkbuqmYZjxZi0qib0ul08KyOB4XsYGObkC6zhPPKMyDkuKKdeowKXM/MWaHA4YPmL//VekxMb15icokjMksfkhtFqQB4C/Ek8JDScHKOiDt9u1W3XkJfahp+06YzHHIfpTtVhjTndRpJeO0dcuEerhZ6IXoVe7qDYnl4waEHE4iVY7LS8xo47fZTxHk2m7zEam03OXanI4Noh/UuhgLDSQMJT0Ed3B5oed15Fu1Ojo7mCc1L3rcYdnjoWjg1Jw4CXd7cw5WeiBvi9lrj2OHaeRUNqqVLZKpc1KZbM0kEwOJAcGOvMysn31yv2RnZmxchWPTXvWLxACagALQQDxBTsnTpou8uyLUcc85Yv6V24Pr+XCw/6uWS23mIhzxm+IX6T96lv3FnZLfdLsj1D0eNAd7eiHqAHel/pLaS+U91U1PuDxnZF6AyMcOljKpLu6vut2m5nm3wEB36qjn6IG6I6veh5PFxar6UnCzr4oxnOCGCR4jnya/qp2XimFIkE56Q8Wja8tFJZC5/1Zf6GghUfM27QWWpH6RJYRWA8dLZgTi7pvmRN0n3S2Wy0kx6+3s8q06miT2AbR6bZtq3Y+b/EWr55YTrAyW6kyr+/sqDIteUQ2T3998cmr5IMH9/4Yj5HuDZJu1xpu1dH/0AH2/6VsMp2V9Of5i7VgOKAJtd1uV2ia3riOss2/2aZfRheavROxfnCB1KoTbxHvQTdkoQTAcjikbdPZdhryx5nA5lECPpC32l+UpukkqWPYvPP5ebdHHRRESWGmbqanBlk+MZebXjRGlcB4VNLoN722FipIqrEQN9ffySVMMzYhsxJ65jU4PhkRA/rhF9ZCprIQUidCqZnUXCU+bovhEX/4crK4afXy7p1Tii+k/j6W9IcqUUZzdnOsVUf/JL4H3Z0Mt/3jOZxfx1NVca4vAZ1af+ONdfxIhigaks/w+Qz68d7eo0d7e4/vxlaXllYUZWVpaTWG+zsJgP5CfAtoAAuveRsLZyx+8u2d7AXlzs4O2rrmCXCHjZ22HyOtOvwLPoDuoxuizeLHmmVpmmXRtm7YtqHbeN84Z9G/CR3f5qgCJH4DAWarjh4Rj8EPGkBeG3W1vejcyALPnXWJ1IniD0lBj8uxYCDBzau3hnILmWB/3O8ua5kMxvyHWbYHEkIo7OemzUy0WowVBlP56H+OqWDeZ1o3UI74A7gARNZynXly48nPXOuNh5inAnvoGXpOaBCAbSAhAO8c7Vz4FB3g/1iMxZRr6KDZC6j1AVGAq8RT3APmBM1YMhmLJZNEIa6qcfzgGgoS0DP0HVyDtSO8gj5Bwu3bAPB/AAAA//8BAAD//8f/y0sAAAABAAAAAguFbKbp4V8PPPUAAQPoAAAAANhdoIQAAAAA3WYvNv43/sQIbQPxAAEAAwACAAAAAAAAAAEAAAPY/u8AAAiY/jf+NwhtAAEAAAAAAAAAAAAAAAAAAAAdArIAUAIPACoCPQBBAdMAJAI9ACcCBgAkAhYAIgI7AEEBFAA3AR4AQQNZAEECPABBAisAJAI9AEEBjgBBAbsAFQF/ABECOAA8ApsAGQIQACUCEABGASwAPQEsAD0BzwApAVMADQIQACIBFABBAAD/rQIQACIAAAAsAGQAlgDCAPQBKAGQAbIBvgHaAgwCLgJaAooCqgLmAwwDLgOQA7wD1APqA/YEMAQ+BEoEVgRsBHoAAQAAAB0AkAAMAGMABwABAAAAAAAAAAAAAAAAAAQAA3icnJTPbhtVFMZ/TmzTCsECRVW6ie6CRZHo2FRJ1TYrh9SKRRQHjwtCQkgTz/iPMp4ZeSYO4QlY8xa8RVc8BM+BWKP5fOzYBdEmipJ8d+75851zvnOBHf5mm0r1IfBHPTFcYa9+bniLB/UTw9u061uGqzyp/Wm4RlibG67zea1n+CPeVn8z/ID96k+GH7JbbRv+mGfVHcOfbDv+Mvwp+7xd4Aq84FfDFXbJDG+xw4+Gt3mExaxUeUTTcI3P2DNcZw/oM6EgZkLCCMeQCSOumBGR4xMxY8KQiBBHhxYxhb4mBEKO0X9+DfApmBEo4pgCR4xPTEDO2CL+Iq+Uc2Uc6jSzuxYFYwIu5HFJQIIjZURKQsSl4hQUZLyiQYOcgfhmFOR45EyI8UiZMaJBlzan9BkzIcfRVqSSmU/KkIJrAuV3ZlF2ZkBEQm6srkgIxdOJXyTvDqc4umSyXY98uhHhSxzfybvklsr2Kzz9ujVmm3mXbALm6mesrsS6udYEx7ot87b4VrjgFe5e/dlk8v4ehfpfKPIFV5p/qEklYpLg3C4tfCnId49xHOncwVdHvqdDnxO6vKGvc4sePVqc0afDa/l26eH4mi5nHMujI7y4a0sxZ/yA4xs6siljR9afxcQifiYzdefiOFMdUzL1vGTuqdZIFd59wuUOpRvqyOUz0B6Vlk7zS7RnASNTRSaGU/VyqY3c+heaIqaqpZzt7X25DXPbveUW35Bqh0u1LjiVk1swet9UvXc0c60fj4CQlAtZDEiZ0qDgRrzPCbgixnGs7p1oSwpaK58yz41UEjEVgw6J4szI9Dcw3fjGfbChe2dvSSj/kunlqqr7ZHHq1e2M3qh7yzvfuhytTaBhU03X1DQQ18S0H2mn1vn78s31uqU85YiUmPBfL8AzPJrsc8AhY2UY6GZur0NTL0STlxyq+ksiWQ2l58giHODxnAMOeMnzd/q4ZOKMi1txWc/d4pgjuhx+UBUL+y5HvF59+/+sv4tpU7U4nq5OL+49xSd3UOsX2rPb97KniZWTmFu02604I2BacnG76zW5x3j/AAAA//8BAAD///S3T1F4nGJgZgCD/+cYjBiwAAAAAAD//wEAAP//LwECAwAAAA==");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-2121058281 .fill-N1{fill:#0A0F25;}
+		.d2-591021258 .fill-N1{fill:#0A0F25;}
-		.d2-2121058281 .fill-N2{fill:#676C7E;}
+		.d2-591021258 .fill-N2{fill:#676C7E;}
-		.d2-2121058281 .fill-N3{fill:#9499AB;}
+		.d2-591021258 .fill-N3{fill:#9499AB;}
-		.d2-2121058281 .fill-N4{fill:#CFD2DD;}
+		.d2-591021258 .fill-N4{fill:#CFD2DD;}
-		.d2-2121058281 .fill-N5{fill:#DEE1EB;}
+		.d2-591021258 .fill-N5{fill:#DEE1EB;}
-		.d2-2121058281 .fill-N6{fill:#EEF1F8;}
+		.d2-591021258 .fill-N6{fill:#EEF1F8;}
-		.d2-2121058281 .fill-N7{fill:#FFFFFF;}
+		.d2-591021258 .fill-N7{fill:#FFFFFF;}
-		.d2-2121058281 .fill-B1{fill:#0D32B2;}
+		.d2-591021258 .fill-B1{fill:#0D32B2;}
-		.d2-2121058281 .fill-B2{fill:#0D32B2;}
+		.d2-591021258 .fill-B2{fill:#0D32B2;}
-		.d2-2121058281 .fill-B3{fill:#E3E9FD;}
+		.d2-591021258 .fill-B3{fill:#E3E9FD;}
-		.d2-2121058281 .fill-B4{fill:#E3E9FD;}
+		.d2-591021258 .fill-B4{fill:#E3E9FD;}
-		.d2-2121058281 .fill-B5{fill:#EDF0FD;}
+		.d2-591021258 .fill-B5{fill:#EDF0FD;}
-		.d2-2121058281 .fill-B6{fill:#F7F8FE;}
+		.d2-591021258 .fill-B6{fill:#F7F8FE;}
-		.d2-2121058281 .fill-AA2{fill:#4A6FF3;}
+		.d2-591021258 .fill-AA2{fill:#4A6FF3;}
-		.d2-2121058281 .fill-AA4{fill:#EDF0FD;}
+		.d2-591021258 .fill-AA4{fill:#EDF0FD;}
-		.d2-2121058281 .fill-AA5{fill:#F7F8FE;}
+		.d2-591021258 .fill-AA5{fill:#F7F8FE;}
-		.d2-2121058281 .fill-AB4{fill:#EDF0FD;}
+		.d2-591021258 .fill-AB4{fill:#EDF0FD;}
-		.d2-2121058281 .fill-AB5{fill:#F7F8FE;}
+		.d2-591021258 .fill-AB5{fill:#F7F8FE;}
-		.d2-2121058281 .stroke-N1{stroke:#0A0F25;}
+		.d2-591021258 .stroke-N1{stroke:#0A0F25;}
-		.d2-2121058281 .stroke-N2{stroke:#676C7E;}
+		.d2-591021258 .stroke-N2{stroke:#676C7E;}
-		.d2-2121058281 .stroke-N3{stroke:#9499AB;}
+		.d2-591021258 .stroke-N3{stroke:#9499AB;}
-		.d2-2121058281 .stroke-N4{stroke:#CFD2DD;}
+		.d2-591021258 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2121058281 .stroke-N5{stroke:#DEE1EB;}
+		.d2-591021258 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2121058281 .stroke-N6{stroke:#EEF1F8;}
+		.d2-591021258 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2121058281 .stroke-N7{stroke:#FFFFFF;}
+		.d2-591021258 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2121058281 .stroke-B1{stroke:#0D32B2;}
+		.d2-591021258 .stroke-B1{stroke:#0D32B2;}
-		.d2-2121058281 .stroke-B2{stroke:#0D32B2;}
+		.d2-591021258 .stroke-B2{stroke:#0D32B2;}
-		.d2-2121058281 .stroke-B3{stroke:#E3E9FD;}
+		.d2-591021258 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2121058281 .stroke-B4{stroke:#E3E9FD;}
+		.d2-591021258 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2121058281 .stroke-B5{stroke:#EDF0FD;}
+		.d2-591021258 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2121058281 .stroke-B6{stroke:#F7F8FE;}
+		.d2-591021258 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2121058281 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-591021258 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2121058281 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-591021258 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2121058281 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-591021258 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2121058281 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-591021258 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2121058281 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-591021258 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2121058281 .background-color-N1{background-color:#0A0F25;}
+		.d2-591021258 .background-color-N1{background-color:#0A0F25;}
-		.d2-2121058281 .background-color-N2{background-color:#676C7E;}
+		.d2-591021258 .background-color-N2{background-color:#676C7E;}
-		.d2-2121058281 .background-color-N3{background-color:#9499AB;}
+		.d2-591021258 .background-color-N3{background-color:#9499AB;}
-		.d2-2121058281 .background-color-N4{background-color:#CFD2DD;}
+		.d2-591021258 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2121058281 .background-color-N5{background-color:#DEE1EB;}
+		.d2-591021258 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2121058281 .background-color-N6{background-color:#EEF1F8;}
+		.d2-591021258 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2121058281 .background-color-N7{background-color:#FFFFFF;}
+		.d2-591021258 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2121058281 .background-color-B1{background-color:#0D32B2;}
+		.d2-591021258 .background-color-B1{background-color:#0D32B2;}
-		.d2-2121058281 .background-color-B2{background-color:#0D32B2;}
+		.d2-591021258 .background-color-B2{background-color:#0D32B2;}
-		.d2-2121058281 .background-color-B3{background-color:#E3E9FD;}
+		.d2-591021258 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2121058281 .background-color-B4{background-color:#E3E9FD;}
+		.d2-591021258 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2121058281 .background-color-B5{background-color:#EDF0FD;}
+		.d2-591021258 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2121058281 .background-color-B6{background-color:#F7F8FE;}
+		.d2-591021258 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2121058281 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-591021258 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2121058281 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-591021258 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2121058281 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-591021258 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2121058281 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-591021258 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2121058281 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-591021258 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2121058281 .color-N1{color:#0A0F25;}
+		.d2-591021258 .color-N1{color:#0A0F25;}
-		.d2-2121058281 .color-N2{color:#676C7E;}
+		.d2-591021258 .color-N2{color:#676C7E;}
-		.d2-2121058281 .color-N3{color:#9499AB;}
+		.d2-591021258 .color-N3{color:#9499AB;}
-		.d2-2121058281 .color-N4{color:#CFD2DD;}
+		.d2-591021258 .color-N4{color:#CFD2DD;}
-		.d2-2121058281 .color-N5{color:#DEE1EB;}
+		.d2-591021258 .color-N5{color:#DEE1EB;}
-		.d2-2121058281 .color-N6{color:#EEF1F8;}
+		.d2-591021258 .color-N6{color:#EEF1F8;}
-		.d2-2121058281 .color-N7{color:#FFFFFF;}
+		.d2-591021258 .color-N7{color:#FFFFFF;}
-		.d2-2121058281 .color-B1{color:#0D32B2;}
+		.d2-591021258 .color-B1{color:#0D32B2;}
-		.d2-2121058281 .color-B2{color:#0D32B2;}
+		.d2-591021258 .color-B2{color:#0D32B2;}
-		.d2-2121058281 .color-B3{color:#E3E9FD;}
+		.d2-591021258 .color-B3{color:#E3E9FD;}
-		.d2-2121058281 .color-B4{color:#E3E9FD;}
+		.d2-591021258 .color-B4{color:#E3E9FD;}
-		.d2-2121058281 .color-B5{color:#EDF0FD;}
+		.d2-591021258 .color-B5{color:#EDF0FD;}
-		.d2-2121058281 .color-B6{color:#F7F8FE;}
+		.d2-591021258 .color-B6{color:#F7F8FE;}
-		.d2-2121058281 .color-AA2{color:#4A6FF3;}
+		.d2-591021258 .color-AA2{color:#4A6FF3;}
-		.d2-2121058281 .color-AA4{color:#EDF0FD;}
+		.d2-591021258 .color-AA4{color:#EDF0FD;}
-		.d2-2121058281 .color-AA5{color:#F7F8FE;}
+		.d2-591021258 .color-AA5{color:#F7F8FE;}
-		.d2-2121058281 .color-AB4{color:#EDF0FD;}
+		.d2-591021258 .color-AB4{color:#EDF0FD;}
-		.d2-2121058281 .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><a href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1" xlink:href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1"><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="85.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="42.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g></a><g transform="translate(69 -16)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-591021258 .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><a href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1" xlink:href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1"><g id="a"><g class="shape" ><rect x="0.000000" y="0.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="26.500000" y="38.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g></a><g transform="translate(37 -16)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-2121058281" maskUnits="userSpaceOnUse" x="-1" y="-18" width="104" height="85">
+</g><mask id="d2-591021258" maskUnits="userSpaceOnUse" x="-1" y="-18" width="72" height="85">
-<rect x="-1" y="-18" width="104" height="85" fill="white"></rect>
+<rect x="-1" y="-18" width="72" height="85" fill="white"></rect>
-<rect x="38.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="22.500000" y="22.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json
+++ b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json
@ -10,7 +10,7 @@
        "x": 12,
        "y": 12
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg
@ -1,12 +1,12 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 104 85"><svg id="d2-svg" class="d2-2723259281" width="104" height="85" viewBox="11 -6 104 85"><rect x="11.000000" y="-6.000000" width="104.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 72 85"><svg id="d2-svg" class="d2-2019577538" width="72" height="85" viewBox="11 -6 72 85"><rect x="11.000000" y="-6.000000" width="72.000000" height="85.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
 .appendix-icon {
 	filter: drop-shadow(0px 0px 32px rgba(31, 36, 58, 0.1));
 }
-.d2-2723259281 .text-bold {
+.d2-2019577538 .text-bold {
-	font-family: "d2-2723259281-font-bold";
+	font-family: "d2-2019577538-font-bold";
 }
@font-face {
-	font-family: d2-2723259281-font-bold;
+	font-family: d2-2019577538-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -21,78 +21,78 @@
  opacity: 0.5;
 }
-		.d2-2723259281 .fill-N1{fill:#0A0F25;}
+		.d2-2019577538 .fill-N1{fill:#0A0F25;}
-		.d2-2723259281 .fill-N2{fill:#676C7E;}
+		.d2-2019577538 .fill-N2{fill:#676C7E;}
-		.d2-2723259281 .fill-N3{fill:#9499AB;}
+		.d2-2019577538 .fill-N3{fill:#9499AB;}
-		.d2-2723259281 .fill-N4{fill:#CFD2DD;}
+		.d2-2019577538 .fill-N4{fill:#CFD2DD;}
-		.d2-2723259281 .fill-N5{fill:#DEE1EB;}
+		.d2-2019577538 .fill-N5{fill:#DEE1EB;}
-		.d2-2723259281 .fill-N6{fill:#EEF1F8;}
+		.d2-2019577538 .fill-N6{fill:#EEF1F8;}
-		.d2-2723259281 .fill-N7{fill:#FFFFFF;}
+		.d2-2019577538 .fill-N7{fill:#FFFFFF;}
-		.d2-2723259281 .fill-B1{fill:#0D32B2;}
+		.d2-2019577538 .fill-B1{fill:#0D32B2;}
-		.d2-2723259281 .fill-B2{fill:#0D32B2;}
+		.d2-2019577538 .fill-B2{fill:#0D32B2;}
-		.d2-2723259281 .fill-B3{fill:#E3E9FD;}
+		.d2-2019577538 .fill-B3{fill:#E3E9FD;}
-		.d2-2723259281 .fill-B4{fill:#E3E9FD;}
+		.d2-2019577538 .fill-B4{fill:#E3E9FD;}
-		.d2-2723259281 .fill-B5{fill:#EDF0FD;}
+		.d2-2019577538 .fill-B5{fill:#EDF0FD;}
-		.d2-2723259281 .fill-B6{fill:#F7F8FE;}
+		.d2-2019577538 .fill-B6{fill:#F7F8FE;}
-		.d2-2723259281 .fill-AA2{fill:#4A6FF3;}
+		.d2-2019577538 .fill-AA2{fill:#4A6FF3;}
-		.d2-2723259281 .fill-AA4{fill:#EDF0FD;}
+		.d2-2019577538 .fill-AA4{fill:#EDF0FD;}
-		.d2-2723259281 .fill-AA5{fill:#F7F8FE;}
+		.d2-2019577538 .fill-AA5{fill:#F7F8FE;}
-		.d2-2723259281 .fill-AB4{fill:#EDF0FD;}
+		.d2-2019577538 .fill-AB4{fill:#EDF0FD;}
-		.d2-2723259281 .fill-AB5{fill:#F7F8FE;}
+		.d2-2019577538 .fill-AB5{fill:#F7F8FE;}
-		.d2-2723259281 .stroke-N1{stroke:#0A0F25;}
+		.d2-2019577538 .stroke-N1{stroke:#0A0F25;}
-		.d2-2723259281 .stroke-N2{stroke:#676C7E;}
+		.d2-2019577538 .stroke-N2{stroke:#676C7E;}
-		.d2-2723259281 .stroke-N3{stroke:#9499AB;}
+		.d2-2019577538 .stroke-N3{stroke:#9499AB;}
-		.d2-2723259281 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2019577538 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2723259281 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2019577538 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2723259281 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2019577538 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2723259281 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2019577538 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2723259281 .stroke-B1{stroke:#0D32B2;}
+		.d2-2019577538 .stroke-B1{stroke:#0D32B2;}
-		.d2-2723259281 .stroke-B2{stroke:#0D32B2;}
+		.d2-2019577538 .stroke-B2{stroke:#0D32B2;}
-		.d2-2723259281 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2019577538 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2723259281 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2019577538 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2723259281 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2019577538 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2723259281 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2019577538 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2723259281 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2019577538 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2723259281 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2019577538 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2723259281 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2019577538 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2723259281 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2019577538 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2723259281 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2019577538 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2723259281 .background-color-N1{background-color:#0A0F25;}
+		.d2-2019577538 .background-color-N1{background-color:#0A0F25;}
-		.d2-2723259281 .background-color-N2{background-color:#676C7E;}
+		.d2-2019577538 .background-color-N2{background-color:#676C7E;}
-		.d2-2723259281 .background-color-N3{background-color:#9499AB;}
+		.d2-2019577538 .background-color-N3{background-color:#9499AB;}
-		.d2-2723259281 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2019577538 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2723259281 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2019577538 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2723259281 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2019577538 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2723259281 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2019577538 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2723259281 .background-color-B1{background-color:#0D32B2;}
+		.d2-2019577538 .background-color-B1{background-color:#0D32B2;}
-		.d2-2723259281 .background-color-B2{background-color:#0D32B2;}
+		.d2-2019577538 .background-color-B2{background-color:#0D32B2;}
-		.d2-2723259281 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2019577538 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2723259281 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2019577538 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2723259281 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2019577538 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2723259281 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2019577538 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2723259281 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2019577538 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2723259281 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2019577538 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2723259281 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2019577538 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2723259281 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2019577538 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2723259281 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2019577538 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2723259281 .color-N1{color:#0A0F25;}
+		.d2-2019577538 .color-N1{color:#0A0F25;}
-		.d2-2723259281 .color-N2{color:#676C7E;}
+		.d2-2019577538 .color-N2{color:#676C7E;}
-		.d2-2723259281 .color-N3{color:#9499AB;}
+		.d2-2019577538 .color-N3{color:#9499AB;}
-		.d2-2723259281 .color-N4{color:#CFD2DD;}
+		.d2-2019577538 .color-N4{color:#CFD2DD;}
-		.d2-2723259281 .color-N5{color:#DEE1EB;}
+		.d2-2019577538 .color-N5{color:#DEE1EB;}
-		.d2-2723259281 .color-N6{color:#EEF1F8;}
+		.d2-2019577538 .color-N6{color:#EEF1F8;}
-		.d2-2723259281 .color-N7{color:#FFFFFF;}
+		.d2-2019577538 .color-N7{color:#FFFFFF;}
-		.d2-2723259281 .color-B1{color:#0D32B2;}
+		.d2-2019577538 .color-B1{color:#0D32B2;}
-		.d2-2723259281 .color-B2{color:#0D32B2;}
+		.d2-2019577538 .color-B2{color:#0D32B2;}
-		.d2-2723259281 .color-B3{color:#E3E9FD;}
+		.d2-2019577538 .color-B3{color:#E3E9FD;}
-		.d2-2723259281 .color-B4{color:#E3E9FD;}
+		.d2-2019577538 .color-B4{color:#E3E9FD;}
-		.d2-2723259281 .color-B5{color:#EDF0FD;}
+		.d2-2019577538 .color-B5{color:#EDF0FD;}
-		.d2-2723259281 .color-B6{color:#F7F8FE;}
+		.d2-2019577538 .color-B6{color:#F7F8FE;}
-		.d2-2723259281 .color-AA2{color:#4A6FF3;}
+		.d2-2019577538 .color-AA2{color:#4A6FF3;}
-		.d2-2723259281 .color-AA4{color:#EDF0FD;}
+		.d2-2019577538 .color-AA4{color:#EDF0FD;}
-		.d2-2723259281 .color-AA5{color:#F7F8FE;}
+		.d2-2019577538 .color-AA5{color:#F7F8FE;}
-		.d2-2723259281 .color-AB4{color:#EDF0FD;}
+		.d2-2019577538 .color-AB4{color:#EDF0FD;}
-		.d2-2723259281 .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><a href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1" xlink:href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1"><g id="a"><g class="shape" ><rect x="12.000000" y="12.000000" width="85.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="54.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g></a><g transform="translate(81 -4)" class="appendix-icon"><svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		.d2-2019577538 .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><a href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1" xlink:href="https://calendar.google.com/calendar/u/0/r?tab=mc&amp;pli=1"><g id="a"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g></a><g transform="translate(49 -4)" 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"/>
@ -104,7 +104,7 @@
 </clipPath>
 </defs>
 </svg>
-</g><mask id="d2-2723259281" maskUnits="userSpaceOnUse" x="11" y="-6" width="104" height="85">
+</g><mask id="d2-2019577538" maskUnits="userSpaceOnUse" x="11" y="-6" width="72" height="85">
-<rect x="11" y="-6" width="104" height="85" fill="white"></rect>
+<rect x="11" y="-6" width="72" height="85" fill="white"></rect>
-<rect x="50.500000" y="34.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="34.500000" y="34.500000" width="8" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json
+++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json
@ -8,10 +8,10 @@
      "type": "oval",
      "pos": {
        "x": 0,
-        "y": 0
+        "y": 74
      },
-      "width": 619,
+      "width": 437,
-      "height": 619,
+      "height": 437,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -48,8 +48,8 @@
      "id": "circle.a",
      "type": "rectangle",
      "pos": {
-        "x": 236,
+        "x": 145,
-        "y": 223
+        "y": 206
      },
      "width": 53,
      "height": 66,
@ -89,8 +89,8 @@
      "id": "circle.b",
      "type": "rectangle",
      "pos": {
-        "x": 329,
+        "x": 238,
-        "y": 223
+        "y": 206
      },
      "width": 54,
      "height": 66,
@ -130,8 +130,8 @@
      "id": "circle.c",
      "type": "rectangle",
      "pos": {
-        "x": 236,
+        "x": 145,
-        "y": 329
+        "y": 312
      },
      "width": 53,
      "height": 66,
@ -171,8 +171,8 @@
      "id": "circle.d",
      "type": "rectangle",
      "pos": {
-        "x": 329,
+        "x": 238,
-        "y": 329
+        "y": 312
      },
      "width": 54,
      "height": 66,
@ -212,8 +212,8 @@
      "id": "oval",
      "type": "oval",
      "pos": {
-        "x": 679,
+        "x": 497,
-        "y": 103
+        "y": 86
      },
      "width": 619,
      "height": 413,
@ -253,8 +253,8 @@
      "id": "oval.a",
      "type": "rectangle",
      "pos": {
-        "x": 915,
+        "x": 733,
-        "y": 224
+        "y": 207
      },
      "width": 53,
      "height": 66,
@ -294,8 +294,8 @@
      "id": "oval.b",
      "type": "rectangle",
      "pos": {
-        "x": 1008,
+        "x": 826,
-        "y": 224
+        "y": 207
      },
      "width": 54,
      "height": 66,
@ -335,8 +335,8 @@
      "id": "oval.c",
      "type": "rectangle",
      "pos": {
-        "x": 915,
+        "x": 733,
-        "y": 330
+        "y": 313
      },
      "width": 53,
      "height": 66,
@ -376,8 +376,8 @@
      "id": "oval.d",
      "type": "rectangle",
      "pos": {
-        "x": 1008,
+        "x": 826,
-        "y": 330
+        "y": 313
      },
      "width": 54,
      "height": 66,
@ -417,8 +417,8 @@
      "id": "diamond",
      "type": "diamond",
      "pos": {
-        "x": 1358,
+        "x": 1176,
-        "y": 18
+        "y": 0
      },
      "width": 874,
      "height": 584,
@ -458,8 +458,8 @@
      "id": "diamond.a",
      "type": "rectangle",
      "pos": {
-        "x": 1721,
+        "x": 1539,
-        "y": 224
+        "y": 206
      },
      "width": 53,
      "height": 66,
@ -499,8 +499,8 @@
      "id": "diamond.b",
      "type": "rectangle",
      "pos": {
-        "x": 1814,
+        "x": 1632,
-        "y": 224
+        "y": 206
      },
      "width": 54,
      "height": 66,
@ -540,8 +540,8 @@
      "id": "diamond.c",
      "type": "rectangle",
      "pos": {
-        "x": 1721,
+        "x": 1539,
-        "y": 330
+        "y": 312
      },
      "width": 53,
      "height": 66,
@ -581,8 +581,8 @@
      "id": "diamond.d",
      "type": "rectangle",
      "pos": {
-        "x": 1814,
+        "x": 1632,
-        "y": 330
+        "y": 312
      },
      "width": 54,
      "height": 66,
@ -622,8 +622,8 @@
      "id": "square",
      "type": "rectangle",
      "pos": {
-        "x": 2292,
+        "x": 2110,
-        "y": 91
+        "y": 74
      },
      "width": 437,
      "height": 437,
@ -663,8 +663,8 @@
      "id": "square.a",
      "type": "rectangle",
      "pos": {
-        "x": 2437,
+        "x": 2255,
-        "y": 223
+        "y": 206
      },
      "width": 53,
      "height": 66,
@ -704,8 +704,8 @@
      "id": "square.b",
      "type": "rectangle",
      "pos": {
-        "x": 2530,
+        "x": 2348,
-        "y": 223
+        "y": 206
      },
      "width": 54,
      "height": 66,
@ -745,8 +745,8 @@
      "id": "square.c",
      "type": "rectangle",
      "pos": {
-        "x": 2437,
+        "x": 2255,
-        "y": 329
+        "y": 312
      },
      "width": 53,
      "height": 66,
@ -786,8 +786,8 @@
      "id": "square.d",
      "type": "rectangle",
      "pos": {
-        "x": 2530,
+        "x": 2348,
-        "y": 329
+        "y": 312
      },
      "width": 54,
      "height": 66,
@ -827,8 +827,8 @@
      "id": "rect",
      "type": "rectangle",
      "pos": {
-        "x": 2789,
+        "x": 2607,
-        "y": 164
+        "y": 146
      },
      "width": 437,
      "height": 292,
@ -868,8 +868,8 @@
      "id": "rect.a",
      "type": "rectangle",
      "pos": {
-        "x": 2934,
+        "x": 2752,
-        "y": 224
+        "y": 206
      },
      "width": 53,
      "height": 66,
@ -909,8 +909,8 @@
      "id": "rect.b",
      "type": "rectangle",
      "pos": {
-        "x": 3027,
+        "x": 2845,
-        "y": 224
+        "y": 206
      },
      "width": 54,
      "height": 66,
@ -950,8 +950,8 @@
      "id": "rect.c",
      "type": "rectangle",
      "pos": {
-        "x": 2934,
+        "x": 2752,
-        "y": 330
+        "y": 312
      },
      "width": 53,
      "height": 66,
@ -991,8 +991,8 @@
      "id": "rect.d",
      "type": "rectangle",
      "pos": {
-        "x": 3027,
+        "x": 2845,
-        "y": 330
+        "y": 312
      },
      "width": 54,
      "height": 66,
@ -1032,8 +1032,8 @@
      "id": "cloud",
      "type": "cloud",
      "pos": {
-        "x": 3286,
+        "x": 3104,
-        "y": 43
+        "y": 26
      },
      "width": 534,
      "height": 533,
@ -1074,8 +1074,8 @@
      "id": "cloud.a",
      "type": "rectangle",
      "pos": {
-        "x": 3477,
+        "x": 3295,
-        "y": 321
+        "y": 304
      },
      "width": 53,
      "height": 66,
@ -1115,8 +1115,8 @@
      "id": "cloud.b",
      "type": "rectangle",
      "pos": {
-        "x": 3570,
+        "x": 3388,
-        "y": 321
+        "y": 304
      },
      "width": 54,
      "height": 66,
@ -1156,8 +1156,8 @@
      "id": "cloud.c",
      "type": "rectangle",
      "pos": {
-        "x": 3477,
+        "x": 3295,
-        "y": 427
+        "y": 410
      },
      "width": 53,
      "height": 66,
@ -1197,8 +1197,8 @@
      "id": "cloud.d",
      "type": "rectangle",
      "pos": {
-        "x": 3570,
+        "x": 3388,
-        "y": 427
+        "y": 410
      },
      "width": 54,
      "height": 66,
--- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg
--- a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json
+++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json
@ -8,10 +8,10 @@
      "type": "oval",
      "pos": {
        "x": 12,
-        "y": 12
+        "y": 85
      },
-      "width": 619,
+      "width": 437,
-      "height": 619,
+      "height": 437,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -48,8 +48,8 @@
      "id": "circle.a",
      "type": "rectangle",
      "pos": {
-        "x": 248,
+        "x": 157,
-        "y": 235
+        "y": 218
      },
      "width": 53,
      "height": 66,
@ -89,8 +89,8 @@
      "id": "circle.b",
      "type": "rectangle",
      "pos": {
-        "x": 341,
+        "x": 250,
-        "y": 235
+        "y": 218
      },
      "width": 54,
      "height": 66,
@ -130,8 +130,8 @@
      "id": "circle.c",
      "type": "rectangle",
      "pos": {
-        "x": 248,
+        "x": 157,
-        "y": 341
+        "y": 324
      },
      "width": 53,
      "height": 66,
@ -171,8 +171,8 @@
      "id": "circle.d",
      "type": "rectangle",
      "pos": {
-        "x": 341,
+        "x": 250,
-        "y": 341
+        "y": 324
      },
      "width": 54,
      "height": 66,
@ -212,8 +212,8 @@
      "id": "oval",
      "type": "oval",
      "pos": {
-        "x": 651,
+        "x": 469,
-        "y": 115
+        "y": 97
      },
      "width": 619,
      "height": 413,
@ -253,8 +253,8 @@
      "id": "oval.a",
      "type": "rectangle",
      "pos": {
-        "x": 887,
+        "x": 705,
-        "y": 236
+        "y": 218
      },
      "width": 53,
      "height": 66,
@ -294,8 +294,8 @@
      "id": "oval.b",
      "type": "rectangle",
      "pos": {
-        "x": 980,
+        "x": 798,
-        "y": 236
+        "y": 218
      },
      "width": 54,
      "height": 66,
@ -335,8 +335,8 @@
      "id": "oval.c",
      "type": "rectangle",
      "pos": {
-        "x": 887,
+        "x": 705,
-        "y": 342
+        "y": 324
      },
      "width": 53,
      "height": 66,
@ -376,8 +376,8 @@
      "id": "oval.d",
      "type": "rectangle",
      "pos": {
-        "x": 980,
+        "x": 798,
-        "y": 342
+        "y": 324
      },
      "width": 54,
      "height": 66,
@ -417,8 +417,8 @@
      "id": "diamond",
      "type": "diamond",
      "pos": {
-        "x": 1290,
+        "x": 1108,
-        "y": 29
+        "y": 12
      },
      "width": 874,
      "height": 584,
@ -458,8 +458,8 @@
      "id": "diamond.a",
      "type": "rectangle",
      "pos": {
-        "x": 1653,
+        "x": 1471,
-        "y": 235
+        "y": 218
      },
      "width": 53,
      "height": 66,
@ -499,8 +499,8 @@
      "id": "diamond.b",
      "type": "rectangle",
      "pos": {
-        "x": 1746,
+        "x": 1564,
-        "y": 235
+        "y": 218
      },
      "width": 54,
      "height": 66,
@ -540,8 +540,8 @@
      "id": "diamond.c",
      "type": "rectangle",
      "pos": {
-        "x": 1653,
+        "x": 1471,
-        "y": 341
+        "y": 324
      },
      "width": 53,
      "height": 66,
@ -581,8 +581,8 @@
      "id": "diamond.d",
      "type": "rectangle",
      "pos": {
-        "x": 1746,
+        "x": 1564,
-        "y": 341
+        "y": 324
      },
      "width": 54,
      "height": 66,
@ -622,8 +622,8 @@
      "id": "square",
      "type": "rectangle",
      "pos": {
-        "x": 2184,
+        "x": 2002,
-        "y": 103
+        "y": 85
      },
      "width": 437,
      "height": 437,
@ -663,8 +663,8 @@
      "id": "square.a",
      "type": "rectangle",
      "pos": {
-        "x": 2329,
+        "x": 2147,
-        "y": 235
+        "y": 218
      },
      "width": 53,
      "height": 66,
@ -704,8 +704,8 @@
      "id": "square.b",
      "type": "rectangle",
      "pos": {
-        "x": 2422,
+        "x": 2240,
-        "y": 235
+        "y": 218
      },
      "width": 54,
      "height": 66,
@ -745,8 +745,8 @@
      "id": "square.c",
      "type": "rectangle",
      "pos": {
-        "x": 2329,
+        "x": 2147,
-        "y": 341
+        "y": 324
      },
      "width": 53,
      "height": 66,
@ -786,8 +786,8 @@
      "id": "square.d",
      "type": "rectangle",
      "pos": {
-        "x": 2422,
+        "x": 2240,
-        "y": 341
+        "y": 324
      },
      "width": 54,
      "height": 66,
@ -827,8 +827,8 @@
      "id": "rect",
      "type": "rectangle",
      "pos": {
-        "x": 2641,
+        "x": 2459,
-        "y": 175
+        "y": 158
      },
      "width": 437,
      "height": 292,
@ -868,8 +868,8 @@
      "id": "rect.a",
      "type": "rectangle",
      "pos": {
-        "x": 2786,
+        "x": 2604,
-        "y": 235
+        "y": 218
      },
      "width": 53,
      "height": 66,
@ -909,8 +909,8 @@
      "id": "rect.b",
      "type": "rectangle",
      "pos": {
-        "x": 2879,
+        "x": 2697,
-        "y": 235
+        "y": 218
      },
      "width": 54,
      "height": 66,
@ -950,8 +950,8 @@
      "id": "rect.c",
      "type": "rectangle",
      "pos": {
-        "x": 2786,
+        "x": 2604,
-        "y": 341
+        "y": 324
      },
      "width": 53,
      "height": 66,
@ -991,8 +991,8 @@
      "id": "rect.d",
      "type": "rectangle",
      "pos": {
-        "x": 2879,
+        "x": 2697,
-        "y": 341
+        "y": 324
      },
      "width": 54,
      "height": 66,
@ -1032,8 +1032,8 @@
      "id": "cloud",
      "type": "cloud",
      "pos": {
-        "x": 3098,
+        "x": 2916,
-        "y": 55
+        "y": 37
      },
      "width": 534,
      "height": 533,
@ -1074,8 +1074,8 @@
      "id": "cloud.a",
      "type": "rectangle",
      "pos": {
-        "x": 3289,
+        "x": 3107,
-        "y": 333
+        "y": 315
      },
      "width": 53,
      "height": 66,
@ -1115,8 +1115,8 @@
      "id": "cloud.b",
      "type": "rectangle",
      "pos": {
-        "x": 3382,
+        "x": 3200,
-        "y": 333
+        "y": 315
      },
      "width": 54,
      "height": 66,
@ -1156,8 +1156,8 @@
      "id": "cloud.c",
      "type": "rectangle",
      "pos": {
-        "x": 3289,
+        "x": 3107,
-        "y": 439
+        "y": 421
      },
      "width": 53,
      "height": 66,
@ -1197,8 +1197,8 @@
      "id": "cloud.d",
      "type": "rectangle",
      "pos": {
-        "x": 3382,
+        "x": 3200,
-        "y": 439
+        "y": 421
      },
      "width": 54,
      "height": 66,
--- a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 819,
+        "x": 820,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1160,11 +1160,11 @@
        },
        {
          "x": 870,
-          "y": 347.6000061035156
+          "y": 347.79998779296875
        },
        {
          "x": 870,
-          "y": 394
+          "y": 395
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 670,
+        "x": 671,
        "y": 338
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
--- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json
--- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json
--- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 839,
+        "x": 840,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1160,11 +1160,11 @@
        },
        {
          "x": 890,
-          "y": 345.79998779296875
+          "y": 346
        },
        {
          "x": 890,
-          "y": 385
+          "y": 386
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 710,
+        "x": 711,
        "y": 368
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
--- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 819,
+        "x": 820,
-        "y": 394
+        "y": 395
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -1160,11 +1160,11 @@
        },
        {
          "x": 870,
-          "y": 347.6000061035156
+          "y": 347.79998779296875
        },
        {
          "x": 870,
-          "y": 394
+          "y": 395
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
+++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json
@ -581,11 +581,11 @@
      "id": "circle",
      "type": "oval",
      "pos": {
-        "x": 670,
+        "x": 671,
        "y": 338
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
--- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json
+++ b/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json
@ -10,7 +10,7 @@
        "x": 1,
        "y": 0
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -51,7 +51,7 @@
        "x": 0,
        "y": 166
      },
-      "width": 86,
+      "width": 54,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -112,19 +112,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 43,
+          "x": 27,
          "y": 66
        },
        {
-          "x": 43,
+          "x": 27,
          "y": 106
        },
        {
-          "x": 43,
+          "x": 27,
          "y": 126
        },
        {
-          "x": 43,
+          "x": 27,
          "y": 166
        }
      ],
--- a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json
+++ b/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json
@ -10,7 +10,7 @@
        "x": 12,
        "y": 12
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -51,7 +51,7 @@
        "x": 12,
        "y": 148
      },
-      "width": 86,
+      "width": 54,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
@ -112,11 +112,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 55,
+          "x": 39,
          "y": 78
        },
        {
-          "x": 55,
+          "x": 39,
          "y": 148
        }
      ],
--- a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@ -11,7 +11,7 @@
        "y": 23
      },
      "width": 802,
-      "height": 1270,
+      "height": 1273,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -52,7 +52,7 @@
        "y": 64
      },
      "width": 574,
-      "height": 1199,
+      "height": 1202,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -93,7 +93,7 @@
        "y": 691
      },
      "width": 253,
-      "height": 542,
+      "height": 545,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -293,7 +293,7 @@
      "type": "rectangle",
      "pos": {
        "x": 177,
-        "y": 1137
+        "y": 1140
      },
      "width": 63,
      "height": 66,
@ -415,11 +415,11 @@
      "id": "aa.bb.kk",
      "type": "oval",
      "pos": {
-        "x": 450,
+        "x": 447,
        "y": 1131
      },
-      "width": 77,
+      "width": 83,
-      "height": 77,
+      "height": 83,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -539,7 +539,7 @@
      "type": "text",
      "pos": {
        "x": 633,
-        "y": 1159
+        "y": 1162
      },
      "width": 16,
      "height": 21,
@ -579,7 +579,7 @@
      "type": "rectangle",
      "pos": {
        "x": 709,
-        "y": 1137
+        "y": 1140
      },
      "width": 63,
      "height": 66,
@ -697,12 +697,12 @@
          "y": 1058.300048828125
        },
        {
-          "x": 183.51600646972656,
+          "x": 183.57200622558594,
-          "y": 1083.699951171875
+          "y": 1084.300048828125
        },
        {
-          "x": 198.58299255371094,
+          "x": 198.86000061035156,
-          "y": 1136.5
+          "y": 1139.5
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@ -10,7 +10,7 @@
        "x": 12,
        "y": 12
      },
-      "width": 720,
+      "width": 721,
      "height": 1951,
      "opacity": 1,
      "strokeDash": 0,
@ -51,7 +51,7 @@
        "x": 100,
        "y": 466
      },
-      "width": 525,
+      "width": 527,
      "height": 1095,
      "opacity": 1,
      "strokeDash": 0,
@ -89,7 +89,7 @@
      "id": "aa.bb.cc",
      "type": "rectangle",
      "pos": {
-        "x": 241,
+        "x": 242,
        "y": 821
      },
      "width": 334,
@ -130,7 +130,7 @@
      "id": "aa.bb.cc.dd",
      "type": "rectangle",
      "pos": {
-        "x": 291,
+        "x": 292,
        "y": 871
      },
      "width": 193,
@ -171,7 +171,7 @@
      "id": "aa.bb.cc.dd.ee",
      "type": "text",
      "pos": {
-        "x": 341,
+        "x": 342,
        "y": 966
      },
      "width": 16,
@ -211,7 +211,7 @@
      "id": "aa.bb.cc.dd.ff",
      "type": "rectangle",
      "pos": {
-        "x": 377,
+        "x": 378,
        "y": 921
      },
      "width": 57,
@ -252,7 +252,7 @@
      "id": "aa.bb.cc.gg",
      "type": "text",
      "pos": {
-        "x": 396,
+        "x": 398,
        "y": 1213
      },
      "width": 80,
@ -292,7 +292,7 @@
      "id": "aa.bb.cc.hh",
      "type": "rectangle",
      "pos": {
-        "x": 405,
+        "x": 406,
        "y": 1395
      },
      "width": 63,
@ -415,11 +415,11 @@
      "id": "aa.bb.kk",
      "type": "oval",
      "pos": {
-        "x": 322,
+        "x": 320,
-        "y": 587
+        "y": 584
      },
-      "width": 77,
+      "width": 83,
-      "height": 77,
+      "height": 83,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -456,7 +456,7 @@
      "id": "aa.ll",
      "type": "rectangle",
      "pos": {
-        "x": 259,
+        "x": 261,
        "y": 1847
      },
      "width": 120,
@ -497,7 +497,7 @@
      "id": "aa.mm",
      "type": "cylinder",
      "pos": {
-        "x": 313,
+        "x": 314,
        "y": 62
      },
      "width": 160,
@ -538,7 +538,7 @@
      "id": "aa.nn",
      "type": "text",
      "pos": {
-        "x": 493,
+        "x": 494,
        "y": 110
      },
      "width": 16,
@ -578,7 +578,7 @@
      "id": "aa.oo",
      "type": "rectangle",
      "pos": {
-        "x": 529,
+        "x": 530,
        "y": 88
      },
      "width": 63,
@ -642,19 +642,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 349,
+          "x": 350.5,
          "y": 987
        },
        {
-          "x": 349,
+          "x": 350.5,
          "y": 1173
        },
        {
-          "x": 423.1659851074219,
+          "x": 424.6659851074219,
          "y": 1173
        },
        {
-          "x": 423.1659851074219,
+          "x": 424.6659851074219,
          "y": 1213
        }
      ],
@ -688,11 +688,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 436.5,
+          "x": 438,
          "y": 1234
        },
        {
-          "x": 436.5,
+          "x": 438,
          "y": 1395
        }
      ],
@ -734,11 +734,11 @@
          "y": 776
        },
        {
-          "x": 359,
+          "x": 360.5,
          "y": 776
        },
        {
-          "x": 359,
+          "x": 360.5,
          "y": 871
        }
      ],
@ -772,11 +772,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 279.8330078125,
+          "x": 281.3330078125,
          "y": 1847
        },
        {
-          "x": 279.8330078125,
+          "x": 281.3330078125,
          "y": 1807
        },
        {
@ -826,19 +826,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 409,
+          "x": 410,
          "y": 180
        },
        {
-          "x": 409.125,
+          "x": 410.25,
          "y": 270
        },
        {
-          "x": 447.25,
+          "x": 448.75,
          "y": 270
        },
        {
-          "x": 447.25,
+          "x": 448.75,
          "y": 821
        }
      ],
@ -872,27 +872,27 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 441,
+          "x": 442,
          "y": 176
        },
        {
-          "x": 441.125,
+          "x": 442.25,
          "y": 220
        },
        {
-          "x": 680.5,
+          "x": 682,
          "y": 220
        },
        {
-          "x": 680.5,
+          "x": 682,
          "y": 1757
        },
        {
-          "x": 359.8330078125,
+          "x": 361.3330078125,
          "y": 1757
        },
        {
-          "x": 359.8330078125,
+          "x": 361.3330078125,
          "y": 1847
        }
      ],
@ -926,11 +926,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 377,
+          "x": 378,
          "y": 180
        },
        {
-          "x": 377.125,
+          "x": 378.25,
          "y": 466
        }
      ],
@ -964,35 +964,35 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 339.8330078125,
+          "x": 341.3330078125,
          "y": 1847
        },
        {
-          "x": 339.8330078125,
+          "x": 341.3330078125,
          "y": 1707
        },
        {
-          "x": 665,
+          "x": 666.5,
          "y": 1707
        },
        {
-          "x": 665,
+          "x": 666.5,
          "y": 421
        },
        {
-          "x": 524,
+          "x": 525.5,
          "y": 421
        },
        {
-          "x": 524,
+          "x": 525.5,
          "y": 1173
        },
        {
-          "x": 449.8330078125,
+          "x": 451.3330078125,
          "y": 1173
        },
        {
-          "x": 449.8330078125,
+          "x": 451.3330078125,
          "y": 1213
        }
      ],
@ -1026,11 +1026,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 345,
+          "x": 346,
          "y": 176
        },
        {
-          "x": 345.125,
+          "x": 346.25,
          "y": 371
        },
        {
@ -1072,19 +1072,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 309.6659851074219,
+          "x": 310.4159851074219,
          "y": 1511
        },
        {
-          "x": 309.6659851074219,
+          "x": 310.4159851074219,
          "y": 1707
        },
        {
-          "x": 319.8330078125,
+          "x": 321.3330078125,
          "y": 1707
        },
        {
-          "x": 319.8330078125,
+          "x": 321.3330078125,
          "y": 1847
        }
      ],
@ -1126,11 +1126,11 @@
          "y": 1757
        },
        {
-          "x": 299.8330078125,
+          "x": 301.3330078125,
          "y": 1757
        },
        {
-          "x": 299.8330078125,
+          "x": 301.3330078125,
          "y": 1847
        }
      ],
--- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/classes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/classes/dagre/board.exp.json
@ -10,7 +10,7 @@
        "dragon_ball"
      ],
      "pos": {
-        "x": 10,
+        "x": 14,
        "y": 0
      },
      "width": 50,
@ -56,8 +56,8 @@
        "x": 0,
        "y": 171
      },
-      "width": 70,
+      "width": 78,
-      "height": 70,
+      "height": 78,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 0,
@ -98,10 +98,10 @@
      ],
      "pos": {
        "x": 0,
-        "y": 362
+        "y": 370
      },
-      "width": 70,
+      "width": 78,
-      "height": 70,
+      "height": 78,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 0,
@ -164,19 +164,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 35,
+          "x": 39,
          "y": 50
        },
        {
-          "x": 35,
+          "x": 39,
          "y": 98.4000015258789
        },
        {
-          "x": 35,
+          "x": 39,
          "y": 122.5999984741211
        },
        {
-          "x": 35,
+          "x": 39,
          "y": 171
        }
      ],
@ -214,20 +214,20 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 35,
+          "x": 39,
-          "y": 241
+          "y": 249
        },
        {
-          "x": 35,
+          "x": 39,
-          "y": 289.3999938964844
+          "y": 297.3999938964844
        },
        {
-          "x": 35,
+          "x": 39,
-          "y": 313.6000061035156
+          "y": 321.6000061035156
        },
        {
-          "x": 35,
+          "x": 39,
-          "y": 362
+          "y": 370
        }
      ],
      "isCurve": true,
--- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg
@ -1,16 +1,16 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 70 432"><svg id="d2-svg" class="d2-107579682" width="70" height="432" viewBox="0 0 70 432"><rect x="0.000000" y="0.000000" width="70.000000" height="432.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 78 448"><svg id="d2-svg" class="d2-2473957298" width="78" height="448" viewBox="0 0 78 448"><rect x="0.000000" y="0.000000" width="78.000000" height="448.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-107579682 .text-bold {
+.d2-2473957298 .text-bold {
-	font-family: "d2-107579682-font-bold";
+	font-family: "d2-2473957298-font-bold";
 }
@font-face {
-	font-family: d2-107579682-font-bold;
+	font-family: d2-2473957298-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }
-.d2-107579682 .text-italic {
+.d2-2473957298 .text-italic {
-	font-family: "d2-107579682-font-italic";
+	font-family: "d2-2473957298-font-italic";
 }
@font-face {
-	font-family: d2-107579682-font-italic;
+	font-family: d2-2473957298-font-italic;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAAdwAAoAAAAADGwAARhRAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgW1SVeGNtYXAAAAFUAAAAUAAAAFgA/gF2Z2x5ZgAAAaQAAAHgAAACEGgUiVdoZWFkAAADhAAAADYAAAA2G7Ur2mhoZWEAAAO8AAAAJAAAACQLeAiqaG10eAAAA+AAAAAYAAAAGAtFAUBsb2NhAAAD+AAAAA4AAAAOAiwBqm1heHAAAAQIAAAAIAAAACAAHgD2bmFtZQAABCgAAAMmAAAIMgntVzNwb3N0AAAHUAAAACAAAAAg/8YAMgADAeEBkAAFAAACigJY//EASwKKAlgARAFeADIBIwAAAgsFAwMEAwkCBCAAAHcAAAADAAAAAAAAAABBREJPAAEAIP//Au7/BgAAA9gBESAAAZMAAAAAAeYClAAAACAAA3icTMu7DYNAAMbg7x6RUmSSzJI1IlFRMQgNDWIzhvmRrgE3lgujaAo+ut/wW9V9/U1mS8KzcubIni3r+G5eiqrpXAAAAP//AQAA//+PnxBreJxiYGVQYWBgymOawsDMwMnAzyDEIMrAYCysyMxsbG6uLM5srK6uzM5uri4szK7SxHiiaRaLc9RTjQU/deRZ3BtXer9JWM005W8OY0Nsff2/6I7U1PDXr/9pMV57zcDAwMDEoPr/C+N+xk8MUgyqDAziSmqmJnZMxkZiYqIibOyKbGJixkZm5uJsbMzGZmamJmpqykpsT8Iydb1jDMwd5XhY/x3hVHDWkrUUl5MNnPmfiVlIU9k0jicr0bUgSEcvwEjGmM8+QFVS0FhUnlGVW4JXxlA+lIGRQZ6BgfEG0wkGSZA/jNnZjc3MjI3EREXYmZWFQdYoK7GxM8v3+RoIsGgG6diZctj52LCweMh46LkynXhtq6zvaCGv8u8Uo46IBK+3lt6/FTAzGT8xSEDMxG5koj07i2aQHoqJjM88VQwxDGRgYGBksPn/hTGCKYdBBhoyZubCyvZMxuzG7MrMbKIisLDZ6WDCwmjpzu2j4ihdzVNrySyjxCfFLSigz2Ovyy/FyyhkydrWZvfvlZCQnBwXqzk7P8jsWsZljHOZTjLwMTAIq5urm4ubi7Obi7OLs6tvUHCNEEqW1OFIZ09X0zBh3CQbYaihmMWSzactnygeAQAAAP//AQAA//8+Km0MAAEAAAABGFGf6xsFXw889QABA+gAAAAA2F2gzAAAAADdZi83/r3+3QgdA8kAAgADAAIAAAAAAAAAAQAAA9j+7wAACED+vf28CB0D6ADC/9EAAAAAAAAAAAAAAAYCdAAkAeEAJQILAB8CDQAfAUUAPAGTAH0AAAAuAGgAkgC8AOoBCAAAAAEAAAAGAIwADABmAAcAAQAAAAAAAAAAAAAAAAAEAAN4nJyU204bVxSGPwfbbXq6qFBEbtC+TKVkTKMQJeHKlKCMinDqcXqQqkqDPT6I8czIM5iSJ+h136Jvkas+Rp+i6nW1fy+DHUVBIAT8e/Y6/Gutf21gk//YoFa/C/zdnBuusd382fAdvmgeGd5gv/mZ4ToPG/8YbjBovDXc5EGja/gT3tX/NPwpT+q/Gb7LVv3Q8Oc8rm8a/nLD8a/hr3jCuwWuwTP+MFxji8LwHTb51fAG97CYtTr32DHc4Gu2DTfZBnpMqEiZkDHCMWTCiDNmJJREJMyYMCRhgCOkTUqlrxmxkGP0wa8xERUzYkUcU+FIiUiJKRlbxLfyynmtjEOdZnbXpmJMzIk8TonJcOSMyMlIOFWcioqCF7RoUdIX34KKkoCSCSkBOTNGtOhwyBE9xkwocRwqkmcWkTOk4pxY+Z1Z+M70ScgojdUZGQPxdOKXyDvkCEeHQrarkY/WIjzE8aO8Pbdctt8S6NetMFvPu2QTM1c/U3Ul1c25JjjWrc/b5gfhihe4W/Vnncn1PRrof6XIJ5xp/gNNKhOTDOe2aBNJQZG7j2Nf55BIHfmJkB6v6PCGns5tunRpc0yPkJfy7dDF8R0djjmQRyi8uDuUYo75Bcf3hLLxsRPrz2JiCb9TmLpLcZypjimFeu6ZB6o1UYU3n7DfoXxNHaV8+tojb+k0v0x7FjMyVRRiOFUvl9oorX8DU8RUtfjZXt37bZjb7i23+IJcO+zVuuDkJ7dgdN1Ug/c0c66fgJgBOSey6JMzpUXFhXi/JuaMFMeBuvdKW1LRvvTxeS6kkoSpGIRkijOj0N/YdBMZ9/6a7p29JQP5e6anl1XdJotTr65m9EbdW95F1uVkZQItm2q+oqa+uGam/UQ7tco/km+p1y3nEaHiLnb7Q6/ADs/ZZY+xsvR1M7+886+Et9hTB05JZDWUpn0NjwnYJeApu+zynKfv9XLJxhkft8ZnNX+bA/bpsHdtNQvbDvu8XIv28cx/ie2O6nE8ujw9u/U0H9xAtd9o367eza4m56cxt2hX23FMzNRzcVurNbn7BP8DAAD//wEAAP//cqFRQAAAAAMAAP/1AAD/zgAyAAAAAAAAAAAAAAAAAAAAAAAAAAA=");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -25,81 +25,81 @@
  opacity: 0.5;
 }
-		.d2-107579682 .fill-N1{fill:#0A0F25;}
+		.d2-2473957298 .fill-N1{fill:#0A0F25;}
-		.d2-107579682 .fill-N2{fill:#676C7E;}
+		.d2-2473957298 .fill-N2{fill:#676C7E;}
-		.d2-107579682 .fill-N3{fill:#9499AB;}
+		.d2-2473957298 .fill-N3{fill:#9499AB;}
-		.d2-107579682 .fill-N4{fill:#CFD2DD;}
+		.d2-2473957298 .fill-N4{fill:#CFD2DD;}
-		.d2-107579682 .fill-N5{fill:#DEE1EB;}
+		.d2-2473957298 .fill-N5{fill:#DEE1EB;}
-		.d2-107579682 .fill-N6{fill:#EEF1F8;}
+		.d2-2473957298 .fill-N6{fill:#EEF1F8;}
-		.d2-107579682 .fill-N7{fill:#FFFFFF;}
+		.d2-2473957298 .fill-N7{fill:#FFFFFF;}
-		.d2-107579682 .fill-B1{fill:#0D32B2;}
+		.d2-2473957298 .fill-B1{fill:#0D32B2;}
-		.d2-107579682 .fill-B2{fill:#0D32B2;}
+		.d2-2473957298 .fill-B2{fill:#0D32B2;}
-		.d2-107579682 .fill-B3{fill:#E3E9FD;}
+		.d2-2473957298 .fill-B3{fill:#E3E9FD;}
-		.d2-107579682 .fill-B4{fill:#E3E9FD;}
+		.d2-2473957298 .fill-B4{fill:#E3E9FD;}
-		.d2-107579682 .fill-B5{fill:#EDF0FD;}
+		.d2-2473957298 .fill-B5{fill:#EDF0FD;}
-		.d2-107579682 .fill-B6{fill:#F7F8FE;}
+		.d2-2473957298 .fill-B6{fill:#F7F8FE;}
-		.d2-107579682 .fill-AA2{fill:#4A6FF3;}
+		.d2-2473957298 .fill-AA2{fill:#4A6FF3;}
-		.d2-107579682 .fill-AA4{fill:#EDF0FD;}
+		.d2-2473957298 .fill-AA4{fill:#EDF0FD;}
-		.d2-107579682 .fill-AA5{fill:#F7F8FE;}
+		.d2-2473957298 .fill-AA5{fill:#F7F8FE;}
-		.d2-107579682 .fill-AB4{fill:#EDF0FD;}
+		.d2-2473957298 .fill-AB4{fill:#EDF0FD;}
-		.d2-107579682 .fill-AB5{fill:#F7F8FE;}
+		.d2-2473957298 .fill-AB5{fill:#F7F8FE;}
-		.d2-107579682 .stroke-N1{stroke:#0A0F25;}
+		.d2-2473957298 .stroke-N1{stroke:#0A0F25;}
-		.d2-107579682 .stroke-N2{stroke:#676C7E;}
+		.d2-2473957298 .stroke-N2{stroke:#676C7E;}
-		.d2-107579682 .stroke-N3{stroke:#9499AB;}
+		.d2-2473957298 .stroke-N3{stroke:#9499AB;}
-		.d2-107579682 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2473957298 .stroke-N4{stroke:#CFD2DD;}
-		.d2-107579682 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2473957298 .stroke-N5{stroke:#DEE1EB;}
-		.d2-107579682 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2473957298 .stroke-N6{stroke:#EEF1F8;}
-		.d2-107579682 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2473957298 .stroke-N7{stroke:#FFFFFF;}
-		.d2-107579682 .stroke-B1{stroke:#0D32B2;}
+		.d2-2473957298 .stroke-B1{stroke:#0D32B2;}
-		.d2-107579682 .stroke-B2{stroke:#0D32B2;}
+		.d2-2473957298 .stroke-B2{stroke:#0D32B2;}
-		.d2-107579682 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2473957298 .stroke-B3{stroke:#E3E9FD;}
-		.d2-107579682 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2473957298 .stroke-B4{stroke:#E3E9FD;}
-		.d2-107579682 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2473957298 .stroke-B5{stroke:#EDF0FD;}
-		.d2-107579682 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2473957298 .stroke-B6{stroke:#F7F8FE;}
-		.d2-107579682 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2473957298 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-107579682 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2473957298 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-107579682 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2473957298 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-107579682 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2473957298 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-107579682 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2473957298 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-107579682 .background-color-N1{background-color:#0A0F25;}
+		.d2-2473957298 .background-color-N1{background-color:#0A0F25;}
-		.d2-107579682 .background-color-N2{background-color:#676C7E;}
+		.d2-2473957298 .background-color-N2{background-color:#676C7E;}
-		.d2-107579682 .background-color-N3{background-color:#9499AB;}
+		.d2-2473957298 .background-color-N3{background-color:#9499AB;}
-		.d2-107579682 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2473957298 .background-color-N4{background-color:#CFD2DD;}
-		.d2-107579682 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2473957298 .background-color-N5{background-color:#DEE1EB;}
-		.d2-107579682 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2473957298 .background-color-N6{background-color:#EEF1F8;}
-		.d2-107579682 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2473957298 .background-color-N7{background-color:#FFFFFF;}
-		.d2-107579682 .background-color-B1{background-color:#0D32B2;}
+		.d2-2473957298 .background-color-B1{background-color:#0D32B2;}
-		.d2-107579682 .background-color-B2{background-color:#0D32B2;}
+		.d2-2473957298 .background-color-B2{background-color:#0D32B2;}
-		.d2-107579682 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2473957298 .background-color-B3{background-color:#E3E9FD;}
-		.d2-107579682 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2473957298 .background-color-B4{background-color:#E3E9FD;}
-		.d2-107579682 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2473957298 .background-color-B5{background-color:#EDF0FD;}
-		.d2-107579682 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2473957298 .background-color-B6{background-color:#F7F8FE;}
-		.d2-107579682 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2473957298 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-107579682 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2473957298 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-107579682 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2473957298 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-107579682 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2473957298 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-107579682 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2473957298 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-107579682 .color-N1{color:#0A0F25;}
+		.d2-2473957298 .color-N1{color:#0A0F25;}
-		.d2-107579682 .color-N2{color:#676C7E;}
+		.d2-2473957298 .color-N2{color:#676C7E;}
-		.d2-107579682 .color-N3{color:#9499AB;}
+		.d2-2473957298 .color-N3{color:#9499AB;}
-		.d2-107579682 .color-N4{color:#CFD2DD;}
+		.d2-2473957298 .color-N4{color:#CFD2DD;}
-		.d2-107579682 .color-N5{color:#DEE1EB;}
+		.d2-2473957298 .color-N5{color:#DEE1EB;}
-		.d2-107579682 .color-N6{color:#EEF1F8;}
+		.d2-2473957298 .color-N6{color:#EEF1F8;}
-		.d2-107579682 .color-N7{color:#FFFFFF;}
+		.d2-2473957298 .color-N7{color:#FFFFFF;}
-		.d2-107579682 .color-B1{color:#0D32B2;}
+		.d2-2473957298 .color-B1{color:#0D32B2;}
-		.d2-107579682 .color-B2{color:#0D32B2;}
+		.d2-2473957298 .color-B2{color:#0D32B2;}
-		.d2-107579682 .color-B3{color:#E3E9FD;}
+		.d2-2473957298 .color-B3{color:#E3E9FD;}
-		.d2-107579682 .color-B4{color:#E3E9FD;}
+		.d2-2473957298 .color-B4{color:#E3E9FD;}
-		.d2-107579682 .color-B5{color:#EDF0FD;}
+		.d2-2473957298 .color-B5{color:#EDF0FD;}
-		.d2-107579682 .color-B6{color:#F7F8FE;}
+		.d2-2473957298 .color-B6{color:#F7F8FE;}
-		.d2-107579682 .color-AA2{color:#4A6FF3;}
+		.d2-2473957298 .color-AA2{color:#4A6FF3;}
-		.d2-107579682 .color-AA4{color:#EDF0FD;}
+		.d2-2473957298 .color-AA4{color:#EDF0FD;}
-		.d2-107579682 .color-AA5{color:#F7F8FE;}
+		.d2-2473957298 .color-AA5{color:#F7F8FE;}
-		.d2-107579682 .color-AB4{color:#EDF0FD;}
+		.d2-2473957298 .color-AB4{color:#EDF0FD;}
-		.d2-107579682 .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="nostar" class="dragon_ball"><g class="shape" ><ellipse rx="25.000000" ry="25.000000" cx="35.000000" cy="25.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g></g><g id="1star" class="dragon_ball"><g class="shape" ><ellipse rx="35.000000" ry="35.000000" cx="35.000000" cy="206.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="35.000000" y="211.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="2star" class="dragon_ball"><g class="shape" ><ellipse rx="35.000000" ry="35.000000" cx="35.000000" cy="397.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="35.000000" y="402.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">**</text></g><g id="(nostar -&gt; 1star)[0]" class="path"><marker id="mk-3519660172" markerWidth="16.000000" markerHeight="20.000000" refX="10.000000" refY="10.000000" viewBox="0.000000 0.000000 16.000000 20.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 16.000000,10.000000 0.000000,20.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="4" /> </marker><path d="M 35.000000 52.000000 C 35.000000 98.400002 35.000000 122.599998 35.000000 165.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-107579682)" /><text x="35.000000" y="116.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><g id="(1star -&gt; 2star)[0]" class="path"><path d="M 35.000000 243.000000 C 35.000000 289.399994 35.000000 313.600006 35.000000 356.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-107579682)" /><text x="35.000000" y="307.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><mask id="d2-107579682" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="432">
+		.d2-2473957298 .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="nostar" class="dragon_ball"><g class="shape" ><ellipse rx="25.000000" ry="25.000000" cx="39.000000" cy="25.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g></g><g id="1star" class="dragon_ball"><g class="shape" ><ellipse rx="39.000000" ry="39.000000" cx="39.000000" cy="210.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="39.000000" y="215.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="2star" class="dragon_ball"><g class="shape" ><ellipse rx="39.000000" ry="39.000000" cx="39.000000" cy="409.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="39.000000" y="414.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">**</text></g><g id="(nostar -&gt; 1star)[0]" class="path"><marker id="mk-3519660172" markerWidth="16.000000" markerHeight="20.000000" refX="10.000000" refY="10.000000" viewBox="0.000000 0.000000 16.000000 20.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 16.000000,10.000000 0.000000,20.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="4" /> </marker><path d="M 39.000000 52.000000 C 39.000000 98.400002 39.000000 122.599998 39.000000 165.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-2473957298)" /><text x="39.000000" y="116.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><g id="(1star -&gt; 2star)[0]" class="path"><path d="M 39.000000 251.000000 C 39.000000 297.399994 39.000000 321.600006 39.000000 364.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-2473957298)" /><text x="39.000000" y="315.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><mask id="d2-2473957298" maskUnits="userSpaceOnUse" x="0" y="0" width="78" height="448">
-<rect x="0" y="0" width="70" height="432" fill="white"></rect>
+<rect x="0" y="0" width="78" height="448" fill="white"></rect>
-<rect x="31.500000" y="195.500000" width="7" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="35.500000" y="199.500000" width="7" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="27.500000" y="386.500000" width="15" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="31.500000" y="398.500000" width="15" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="20.000000" y="100.000000" width="30" height="21" fill="black"></rect>
+<rect x="24.000000" y="100.000000" width="30" height="21" fill="black"></rect>
-<rect x="20.000000" y="291.000000" width="30" height="21" fill="black"></rect>
+<rect x="24.000000" y="299.000000" width="30" height="21" fill="black"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/stable/classes/elk/board.exp.json
+++ b/e2etests/testdata/stable/classes/elk/board.exp.json
@ -10,7 +10,7 @@
        "dragon_ball"
      ],
      "pos": {
-        "x": 22,
+        "x": 26,
        "y": 12
      },
      "width": 50,
@ -56,8 +56,8 @@
        "x": 12,
        "y": 223
      },
-      "width": 70,
+      "width": 78,
-      "height": 70,
+      "height": 78,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 0,
@ -98,10 +98,10 @@
      ],
      "pos": {
        "x": 12,
-        "y": 454
+        "y": 462
      },
-      "width": 70,
+      "width": 78,
-      "height": 70,
+      "height": 78,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 0,
@ -164,11 +164,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 47,
+          "x": 51,
          "y": 62
        },
        {
-          "x": 47,
+          "x": 51,
          "y": 223
        }
      ],
@ -205,12 +205,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 47,
+          "x": 51,
-          "y": 293
+          "y": 301
        },
        {
-          "x": 47,
+          "x": 51,
-          "y": 454
+          "y": 462
        }
      ],
      "animated": false,
--- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg
@ -1,16 +1,16 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 70 512"><svg id="d2-svg" class="d2-3768899376" width="70" height="512" viewBox="12 12 70 512"><rect x="12.000000" y="12.000000" width="70.000000" height="512.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 78 528"><svg id="d2-svg" class="d2-1772353954" width="78" height="528" viewBox="12 12 78 528"><rect x="12.000000" y="12.000000" width="78.000000" height="528.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-3768899376 .text-bold {
+.d2-1772353954 .text-bold {
-	font-family: "d2-3768899376-font-bold";
+	font-family: "d2-1772353954-font-bold";
 }
@font-face {
-	font-family: d2-3768899376-font-bold;
+	font-family: d2-1772353954-font-bold;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAAc4AAoAAAAADCQAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXxHXrmNtYXAAAAFUAAAAUAAAAFgA/gF2Z2x5ZgAAAaQAAAGlAAAB0AMzDOZoZWFkAAADTAAAADYAAAA2G38e1GhoZWEAAAOEAAAAJAAAACQKfwXFaG10eAAAA6gAAAAYAAAAGAx3AS1sb2NhAAADwAAAAA4AAAAOAewBeG1heHAAAAPQAAAAIAAAACAAHgD3bmFtZQAAA/AAAAMoAAAIKgjwVkFwb3N0AAAHGAAAAB0AAAAg/9EAMgADAioCvAAFAAACigJYAAAASwKKAlgAAAFeADIBKQAAAgsHAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPACAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAfAClAAAACAAA3icTMu7DYNAAMbg7x6RUmSSzJI1IlFRMQgNDWIzhvmRrgE3lgujaAo+ut/wW9V9/U1mS8KzcubIni3r+G5eiqrpXAAAAP//AQAA//+PnxBreJxiYGUIYGBgSmKawsDMwMnAzyDEIMrAYCyoKKhqrK6uzG5ubG6uLM5srs4oyB7AJPRv6RJ1TRZNTRYthRnyVfHxjL5xTFP+5kT7JiV9i7e2/jdv565/vYzFuxgYmBhU/n9hfMj4h0GCQZ6BgVVJTc3UxMzM2EhMTFSEjV1RTMzYyFycjY3Z2ERNWYmNUd69yMk5x9o9Vp+F6d91LjdDUzNDtbhZm9V1lMx47EqCAkvs7bNdhFU5zYwVI6XkGK00TfUZGBgYGBkcQZYx7WUQAbnbWJQdbImooLIg2GB2QcfJ7DLeRoGek2UVZDQkmPauiZTUzo79d4ZR0UxDUvzfRrgZjH+gZogbY5hRwcWi4As3hPGDvZwuuhmC/78w5jGVMIiDfWtqqmxqbm4saiyqLCoiZmxkBvIsI0OMv4uPYFV5ubIsjySXuLA5T1bYyVy2lpbi41qqbCzZbDwQP6kxxjIuZjrBwMfAIKxurm4ubm4sbi7OLs6uPsXWOke8hNeXt1gix9o2gDFWJ8PQQ6KsXNLDMEMnkgEAAAD//wEAAP//hVhh3gAAAAABAAAAAguFZJGzzV8PPPUAAQPoAAAAANhdoIQAAAAA3WYvNv43/sQIbQPxAAEAAwACAAAAAAAAAAEAAAPY/u8AAAiY/jf+NwhtAAEAAAAAAAAAAAAAAAAAAAAGArIAUAIGACQCOwBBAjwAQQF/ABEByQAmAAAALABgAIIApADKAOgAAAABAAAABgCQAAwAYwAHAAEAAAAAAAAAAAAAAAAABAADeJyclM9uG1UUxn9ObNMKwQJFVbqJ7oJFkejYVEnVNiuH1IpFFAePC0JCSBPP+I8ynhl5Jg7hCVjzFrxFVzwEz4FYo/l87NgF0SaKknx37vnznXO+c4Ed/mabSvUh8Ec9MVxhr35ueIsH9RPD27TrW4arPKn9abhGWJsbrvN5rWf4I95WfzP8gP3qT4YfslttG/6YZ9Udw59sO/4y/Cn7vF3gCrzgV8MVdskMb7HDj4a3eYTFrFR5RNNwjc/YM1xnD+gzoSBmQsIIx5AJI66YEZHjEzFjwpCIEEeHFjGFviYEQo7Rf34N8CmYESjimAJHjE9MQM7YIv4ir5RzZRzqNLO7FgVjAi7kcUlAgiNlREpCxKXiFBRkvKJBg5yB+GYU5HjkTIjxSJkxokGXNqf0GTMhx9FWpJKZT8qQgmsC5XdmUXZmQERCbqyuSAjF04lfJO8Opzi6ZLJdj3y6EeFLHN/Ju+SWyvYrPP26NWabeZdsAubqZ6yuxLq51gTHui3ztvhWuOAV7l792WTy/h6F+l8o8gVXmn+oSSVikuDcLi18Kch3j3Ec6dzBV0e+p0OfE7q8oa9zix49WpzRp8Nr+Xbp4fiaLmccy6MjvLhrSzFn/IDjGzqyKWNH1p/FxCJ+JjN15+I4Ux1TMvW8ZO6p1kgV3n3C5Q6lG+rI5TPQHpWWTvNLtGcBI1NFJoZT9XKpjdz6F5oipqqlnO3tfbkNc9u95RbfkGqHS7UuOJWTWzB631S9dzRzrR+PgJCUC1kMSJnSoOBGvM8JuCLGcazunWhLClornzLPjVQSMRWDDonizMj0NzDd+MZ9sKF7Z29JKP+S6eWqqvtkcerV7YzeqHvLO9+6HK1NoGFTTdfUNBDXxLQfaafW+fvyzfW6pTzliJSY8F8vwDM8muxzwCFjZRjoZm6vQ1MvRJOXHKr6SyJZDaXnyCIc4PGcAw54yfN3+rhk4oyLW3FZz93imCO6HH5QFQv7Lke8Xn37/6y/i2lTtTierk4v7j3FJ3dQ6xfas9v3sqeJlZOYW7TbrTgjYFpycbvrNbnHeP8AAAD//wEAAP//9LdPUXicYmBmAIP/5xiMGLAAAAAAAP//AQAA//8vAQIDAAAA");
 }
-.d2-3768899376 .text-italic {
+.d2-1772353954 .text-italic {
-	font-family: "d2-3768899376-font-italic";
+	font-family: "d2-1772353954-font-italic";
 }
@font-face {
-	font-family: d2-3768899376-font-italic;
+	font-family: d2-1772353954-font-italic;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -25,81 +25,81 @@
  opacity: 0.5;
 }
-		.d2-3768899376 .fill-N1{fill:#0A0F25;}
+		.d2-1772353954 .fill-N1{fill:#0A0F25;}
-		.d2-3768899376 .fill-N2{fill:#676C7E;}
+		.d2-1772353954 .fill-N2{fill:#676C7E;}
-		.d2-3768899376 .fill-N3{fill:#9499AB;}
+		.d2-1772353954 .fill-N3{fill:#9499AB;}
-		.d2-3768899376 .fill-N4{fill:#CFD2DD;}
+		.d2-1772353954 .fill-N4{fill:#CFD2DD;}
-		.d2-3768899376 .fill-N5{fill:#DEE1EB;}
+		.d2-1772353954 .fill-N5{fill:#DEE1EB;}
-		.d2-3768899376 .fill-N6{fill:#EEF1F8;}
+		.d2-1772353954 .fill-N6{fill:#EEF1F8;}
-		.d2-3768899376 .fill-N7{fill:#FFFFFF;}
+		.d2-1772353954 .fill-N7{fill:#FFFFFF;}
-		.d2-3768899376 .fill-B1{fill:#0D32B2;}
+		.d2-1772353954 .fill-B1{fill:#0D32B2;}
-		.d2-3768899376 .fill-B2{fill:#0D32B2;}
+		.d2-1772353954 .fill-B2{fill:#0D32B2;}
-		.d2-3768899376 .fill-B3{fill:#E3E9FD;}
+		.d2-1772353954 .fill-B3{fill:#E3E9FD;}
-		.d2-3768899376 .fill-B4{fill:#E3E9FD;}
+		.d2-1772353954 .fill-B4{fill:#E3E9FD;}
-		.d2-3768899376 .fill-B5{fill:#EDF0FD;}
+		.d2-1772353954 .fill-B5{fill:#EDF0FD;}
-		.d2-3768899376 .fill-B6{fill:#F7F8FE;}
+		.d2-1772353954 .fill-B6{fill:#F7F8FE;}
-		.d2-3768899376 .fill-AA2{fill:#4A6FF3;}
+		.d2-1772353954 .fill-AA2{fill:#4A6FF3;}
-		.d2-3768899376 .fill-AA4{fill:#EDF0FD;}
+		.d2-1772353954 .fill-AA4{fill:#EDF0FD;}
-		.d2-3768899376 .fill-AA5{fill:#F7F8FE;}
+		.d2-1772353954 .fill-AA5{fill:#F7F8FE;}
-		.d2-3768899376 .fill-AB4{fill:#EDF0FD;}
+		.d2-1772353954 .fill-AB4{fill:#EDF0FD;}
-		.d2-3768899376 .fill-AB5{fill:#F7F8FE;}
+		.d2-1772353954 .fill-AB5{fill:#F7F8FE;}
-		.d2-3768899376 .stroke-N1{stroke:#0A0F25;}
+		.d2-1772353954 .stroke-N1{stroke:#0A0F25;}
-		.d2-3768899376 .stroke-N2{stroke:#676C7E;}
+		.d2-1772353954 .stroke-N2{stroke:#676C7E;}
-		.d2-3768899376 .stroke-N3{stroke:#9499AB;}
+		.d2-1772353954 .stroke-N3{stroke:#9499AB;}
-		.d2-3768899376 .stroke-N4{stroke:#CFD2DD;}
+		.d2-1772353954 .stroke-N4{stroke:#CFD2DD;}
-		.d2-3768899376 .stroke-N5{stroke:#DEE1EB;}
+		.d2-1772353954 .stroke-N5{stroke:#DEE1EB;}
-		.d2-3768899376 .stroke-N6{stroke:#EEF1F8;}
+		.d2-1772353954 .stroke-N6{stroke:#EEF1F8;}
-		.d2-3768899376 .stroke-N7{stroke:#FFFFFF;}
+		.d2-1772353954 .stroke-N7{stroke:#FFFFFF;}
-		.d2-3768899376 .stroke-B1{stroke:#0D32B2;}
+		.d2-1772353954 .stroke-B1{stroke:#0D32B2;}
-		.d2-3768899376 .stroke-B2{stroke:#0D32B2;}
+		.d2-1772353954 .stroke-B2{stroke:#0D32B2;}
-		.d2-3768899376 .stroke-B3{stroke:#E3E9FD;}
+		.d2-1772353954 .stroke-B3{stroke:#E3E9FD;}
-		.d2-3768899376 .stroke-B4{stroke:#E3E9FD;}
+		.d2-1772353954 .stroke-B4{stroke:#E3E9FD;}
-		.d2-3768899376 .stroke-B5{stroke:#EDF0FD;}
+		.d2-1772353954 .stroke-B5{stroke:#EDF0FD;}
-		.d2-3768899376 .stroke-B6{stroke:#F7F8FE;}
+		.d2-1772353954 .stroke-B6{stroke:#F7F8FE;}
-		.d2-3768899376 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-1772353954 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-3768899376 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-1772353954 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-3768899376 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-1772353954 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-3768899376 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-1772353954 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-3768899376 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-1772353954 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-3768899376 .background-color-N1{background-color:#0A0F25;}
+		.d2-1772353954 .background-color-N1{background-color:#0A0F25;}
-		.d2-3768899376 .background-color-N2{background-color:#676C7E;}
+		.d2-1772353954 .background-color-N2{background-color:#676C7E;}
-		.d2-3768899376 .background-color-N3{background-color:#9499AB;}
+		.d2-1772353954 .background-color-N3{background-color:#9499AB;}
-		.d2-3768899376 .background-color-N4{background-color:#CFD2DD;}
+		.d2-1772353954 .background-color-N4{background-color:#CFD2DD;}
-		.d2-3768899376 .background-color-N5{background-color:#DEE1EB;}
+		.d2-1772353954 .background-color-N5{background-color:#DEE1EB;}
-		.d2-3768899376 .background-color-N6{background-color:#EEF1F8;}
+		.d2-1772353954 .background-color-N6{background-color:#EEF1F8;}
-		.d2-3768899376 .background-color-N7{background-color:#FFFFFF;}
+		.d2-1772353954 .background-color-N7{background-color:#FFFFFF;}
-		.d2-3768899376 .background-color-B1{background-color:#0D32B2;}
+		.d2-1772353954 .background-color-B1{background-color:#0D32B2;}
-		.d2-3768899376 .background-color-B2{background-color:#0D32B2;}
+		.d2-1772353954 .background-color-B2{background-color:#0D32B2;}
-		.d2-3768899376 .background-color-B3{background-color:#E3E9FD;}
+		.d2-1772353954 .background-color-B3{background-color:#E3E9FD;}
-		.d2-3768899376 .background-color-B4{background-color:#E3E9FD;}
+		.d2-1772353954 .background-color-B4{background-color:#E3E9FD;}
-		.d2-3768899376 .background-color-B5{background-color:#EDF0FD;}
+		.d2-1772353954 .background-color-B5{background-color:#EDF0FD;}
-		.d2-3768899376 .background-color-B6{background-color:#F7F8FE;}
+		.d2-1772353954 .background-color-B6{background-color:#F7F8FE;}
-		.d2-3768899376 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-1772353954 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-3768899376 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-1772353954 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-3768899376 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-1772353954 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-3768899376 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-1772353954 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-3768899376 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-1772353954 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-3768899376 .color-N1{color:#0A0F25;}
+		.d2-1772353954 .color-N1{color:#0A0F25;}
-		.d2-3768899376 .color-N2{color:#676C7E;}
+		.d2-1772353954 .color-N2{color:#676C7E;}
-		.d2-3768899376 .color-N3{color:#9499AB;}
+		.d2-1772353954 .color-N3{color:#9499AB;}
-		.d2-3768899376 .color-N4{color:#CFD2DD;}
+		.d2-1772353954 .color-N4{color:#CFD2DD;}
-		.d2-3768899376 .color-N5{color:#DEE1EB;}
+		.d2-1772353954 .color-N5{color:#DEE1EB;}
-		.d2-3768899376 .color-N6{color:#EEF1F8;}
+		.d2-1772353954 .color-N6{color:#EEF1F8;}
-		.d2-3768899376 .color-N7{color:#FFFFFF;}
+		.d2-1772353954 .color-N7{color:#FFFFFF;}
-		.d2-3768899376 .color-B1{color:#0D32B2;}
+		.d2-1772353954 .color-B1{color:#0D32B2;}
-		.d2-3768899376 .color-B2{color:#0D32B2;}
+		.d2-1772353954 .color-B2{color:#0D32B2;}
-		.d2-3768899376 .color-B3{color:#E3E9FD;}
+		.d2-1772353954 .color-B3{color:#E3E9FD;}
-		.d2-3768899376 .color-B4{color:#E3E9FD;}
+		.d2-1772353954 .color-B4{color:#E3E9FD;}
-		.d2-3768899376 .color-B5{color:#EDF0FD;}
+		.d2-1772353954 .color-B5{color:#EDF0FD;}
-		.d2-3768899376 .color-B6{color:#F7F8FE;}
+		.d2-1772353954 .color-B6{color:#F7F8FE;}
-		.d2-3768899376 .color-AA2{color:#4A6FF3;}
+		.d2-1772353954 .color-AA2{color:#4A6FF3;}
-		.d2-3768899376 .color-AA4{color:#EDF0FD;}
+		.d2-1772353954 .color-AA4{color:#EDF0FD;}
-		.d2-3768899376 .color-AA5{color:#F7F8FE;}
+		.d2-1772353954 .color-AA5{color:#F7F8FE;}
-		.d2-3768899376 .color-AB4{color:#EDF0FD;}
+		.d2-1772353954 .color-AB4{color:#EDF0FD;}
-		.d2-3768899376 .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="nostar" class="dragon_ball"><g class="shape" ><ellipse rx="25.000000" ry="25.000000" cx="47.000000" cy="37.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g></g><g id="1star" class="dragon_ball"><g class="shape" ><ellipse rx="35.000000" ry="35.000000" cx="47.000000" cy="258.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="47.000000" y="263.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="2star" class="dragon_ball"><g class="shape" ><ellipse rx="35.000000" ry="35.000000" cx="47.000000" cy="489.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="47.000000" y="494.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">**</text></g><g id="(nostar -&gt; 1star)[0]" class="path"><marker id="mk-3519660172" markerWidth="16.000000" markerHeight="20.000000" refX="10.000000" refY="10.000000" viewBox="0.000000 0.000000 16.000000 20.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 16.000000,10.000000 0.000000,20.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="4" /> </marker><path d="M 47.000000 64.000000 L 47.000000 217.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-3768899376)" /><text x="47.000000" y="148.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><g id="(1star -&gt; 2star)[0]" class="path"><path d="M 47.000000 295.000000 L 47.000000 448.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-3768899376)" /><text x="47.000000" y="379.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><mask id="d2-3768899376" maskUnits="userSpaceOnUse" x="12" y="12" width="70" height="512">
+		.d2-1772353954 .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="nostar" class="dragon_ball"><g class="shape" ><ellipse rx="25.000000" ry="25.000000" cx="51.000000" cy="37.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g></g><g id="1star" class="dragon_ball"><g class="shape" ><ellipse rx="39.000000" ry="39.000000" cx="51.000000" cy="262.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="51.000000" y="267.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">*</text></g><g id="2star" class="dragon_ball"><g class="shape" ><ellipse rx="39.000000" ry="39.000000" cx="51.000000" cy="501.000000" stroke="#0D32B2" fill="orange" class="shape stroke-B1" style="stroke-width:0;" /></g><text x="51.000000" y="506.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">**</text></g><g id="(nostar -&gt; 1star)[0]" class="path"><marker id="mk-3519660172" markerWidth="16.000000" markerHeight="20.000000" refX="10.000000" refY="10.000000" viewBox="0.000000 0.000000 16.000000 20.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 16.000000,10.000000 0.000000,20.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="4" /> </marker><path d="M 51.000000 64.000000 L 51.000000 217.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-1772353954)" /><text x="51.000000" y="148.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><g id="(1star -&gt; 2star)[0]" class="path"><path d="M 51.000000 303.000000 L 51.000000 456.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:4;" marker-end="url(#mk-3519660172)" mask="url(#d2-1772353954)" /><text x="51.000000" y="387.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">then</text></g><mask id="d2-1772353954" maskUnits="userSpaceOnUse" x="12" y="12" width="78" height="528">
-<rect x="12" y="12" width="70" height="512" fill="white"></rect>
+<rect x="12" y="12" width="78" height="528" fill="white"></rect>
-<rect x="43.500000" y="247.500000" width="7" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="47.500000" y="251.500000" width="7" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="39.500000" y="478.500000" width="15" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="43.500000" y="490.500000" width="15" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="32.000000" y="132.000000" width="30" height="21" fill="black"></rect>
+<rect x="36.000000" y="132.000000" width="30" height="21" fill="black"></rect>
-<rect x="32.000000" y="363.000000" width="30" height="21" fill="black"></rect>
+<rect x="36.000000" y="371.000000" width="30" height="21" fill="black"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/stable/investigate/dagre/board.exp.json
+++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json
--- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@ -215,7 +215,7 @@
        "x": 273,
        "y": 1889
      },
-      "width": 284,
+      "width": 288,
      "height": 388,
      "opacity": 1,
      "strokeDash": 0,
@ -458,11 +458,11 @@
      "id": "ll",
      "type": "rectangle",
      "pos": {
-        "x": 249,
+        "x": 247,
        "y": 2468
      },
-      "width": 268,
+      "width": 272,
-      "height": 320,
+      "height": 324,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -499,11 +499,11 @@
      "id": "ll.mm",
      "type": "oval",
      "pos": {
-        "x": 299,
+        "x": 297,
        "y": 2518
      },
-      "width": 84,
+      "width": 88,
-      "height": 84,
+      "height": 88,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -541,10 +541,10 @@
      "type": "oval",
      "pos": {
        "x": 423,
-        "y": 1943
+        "y": 1941
      },
-      "width": 84,
+      "width": 88,
-      "height": 84,
+      "height": 88,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -581,8 +581,8 @@
      "id": "nn",
      "type": "cylinder",
      "pos": {
-        "x": 79,
+        "x": 80,
-        "y": 3472
+        "y": 3476
      },
      "width": 327,
      "height": 210,
@ -622,8 +622,8 @@
      "id": "nn.oo",
      "type": "rectangle",
      "pos": {
-        "x": 129,
+        "x": 130,
-        "y": 3566
+        "y": 3570
      },
      "width": 63,
      "height": 66,
@ -663,7 +663,7 @@
      "id": "ff.pp",
      "type": "rectangle",
      "pos": {
-        "x": 404,
+        "x": 406,
        "y": 2161
      },
      "width": 63,
@ -704,8 +704,8 @@
      "id": "ll.qq",
      "type": "rectangle",
      "pos": {
-        "x": 403,
+        "x": 405,
-        "y": 2527
+        "y": 2529
      },
      "width": 64,
      "height": 66,
@ -745,8 +745,8 @@
      "id": "ll.rr",
      "type": "rectangle",
      "pos": {
-        "x": 406,
+        "x": 408,
-        "y": 2672
+        "y": 2676
      },
      "width": 58,
      "height": 66,
@ -1004,7 +1004,7 @@
      "type": "rectangle",
      "pos": {
        "x": 113,
-        "y": 2637
+        "y": 2640
      },
      "width": 80,
      "height": 66,
@ -1044,8 +1044,8 @@
      "id": "nn.xx",
      "type": "rectangle",
      "pos": {
-        "x": 212,
+        "x": 213,
-        "y": 3566
+        "y": 3570
      },
      "width": 62,
      "height": 66,
@ -1085,8 +1085,8 @@
      "id": "yy",
      "type": "rectangle",
      "pos": {
-        "x": 312,
+        "x": 315,
-        "y": 2978
+        "y": 2982
      },
      "width": 238,
      "height": 354,
@ -1126,8 +1126,8 @@
      "id": "yy.zz",
      "type": "queue",
      "pos": {
-        "x": 362,
+        "x": 365,
-        "y": 3028
+        "y": 3032
      },
      "width": 138,
      "height": 118,
@ -1179,8 +1179,8 @@
      "id": "yy.ab",
      "type": "rectangle",
      "pos": {
-        "x": 399,
+        "x": 402,
-        "y": 3216
+        "y": 3220
      },
      "width": 63,
      "height": 66,
@ -1220,8 +1220,8 @@
      "id": "nn.ac",
      "type": "rectangle",
      "pos": {
-        "x": 294,
+        "x": 295,
-        "y": 3566
+        "y": 3570
      },
      "width": 62,
      "height": 66,
@ -1261,8 +1261,8 @@
      "id": "ad",
      "type": "parallelogram",
      "pos": {
-        "x": 268,
+        "x": 269,
-        "y": 3757
+        "y": 3761
      },
      "width": 115,
      "height": 66,
@ -1669,12 +1669,12 @@
          "y": 1646
        },
        {
-          "x": 443.3330078125,
+          "x": 444.3330078125,
          "y": 1646
        },
        {
-          "x": 443,
+          "x": 444,
-          "y": 1949
+          "y": 1947
        }
      ],
      "animated": false,
@ -1707,20 +1707,20 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 465,
+          "x": 467,
-          "y": 2027
+          "y": 2029
        },
        {
-          "x": 465.1659851074219,
+          "x": 467.1659851074219,
          "y": 2121
        },
        {
-          "x": 352.4159851074219,
+          "x": 353.4159851074219,
          "y": 2121
        },
        {
-          "x": 352,
+          "x": 353,
-          "y": 2519
+          "y": 2520
        }
      ],
      "animated": false,
@ -1754,27 +1754,27 @@
      "route": [
        {
          "x": 342,
-          "y": 2602
+          "y": 2606
        },
        {
          "x": 341.6659851074219,
-          "y": 2883
+          "y": 2887
        },
        {
          "x": 94.66600036621094,
-          "y": 2883
+          "y": 2887
        },
        {
          "x": 94.66600036621094,
-          "y": 3427
+          "y": 3431
        },
        {
-          "x": 161.33299255371094,
+          "x": 162.33299255371094,
-          "y": 3427
+          "y": 3431
        },
        {
-          "x": 161.33299255371094,
+          "x": 162.33299255371094,
-          "y": 3566
+          "y": 3570
        }
      ],
      "animated": false,
@ -1815,11 +1815,11 @@
          "y": 2071
        },
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
          "y": 2071
        },
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
          "y": 2161
        }
      ],
@ -1853,12 +1853,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
          "y": 2227
        },
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
-          "y": 2527
+          "y": 2529
        }
      ],
      "animated": false,
@ -1891,12 +1891,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
-          "y": 2593
+          "y": 2595
        },
        {
-          "x": 435.6659851074219,
+          "x": 437.6659851074219,
-          "y": 2672
+          "y": 2676
        }
      ],
      "animated": false,
@ -2102,7 +2102,7 @@
        },
        {
          "x": 153,
-          "y": 2637
+          "y": 2640
        }
      ],
      "animated": false,
@ -2136,19 +2136,19 @@
      "route": [
        {
          "x": 139.66600036621094,
-          "y": 2703
+          "y": 2706
        },
        {
          "x": 139.66600036621094,
-          "y": 3377
+          "y": 3381
        },
        {
-          "x": 243.83299255371094,
+          "x": 244.83299255371094,
-          "y": 3377
+          "y": 3381
        },
        {
-          "x": 243.83299255371094,
+          "x": 244.83299255371094,
-          "y": 3566
+          "y": 3570
        }
      ],
      "animated": false,
@ -2181,12 +2181,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 454.0830078125,
+          "x": 437.6659851074219,
-          "y": 2738
+          "y": 2742
        },
        {
-          "x": 454,
+          "x": 438,
-          "y": 3028
+          "y": 3032
        }
      ],
      "animated": false,
@ -2220,19 +2220,19 @@
      "route": [
        {
          "x": 166.33299255371094,
-          "y": 2703
+          "y": 2706
        },
        {
          "x": 166.33299255371094,
-          "y": 2833
+          "y": 2837
        },
        {
-          "x": 408.0830078125,
+          "x": 411.0830078125,
-          "y": 2833
+          "y": 2837
        },
        {
-          "x": 408,
+          "x": 411,
-          "y": 3028
+          "y": 3032
        }
      ],
      "animated": false,
@ -2265,12 +2265,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 431,
+          "x": 434,
-          "y": 3146
+          "y": 3150
        },
        {
-          "x": 431,
+          "x": 434,
-          "y": 3216
+          "y": 3220
        }
      ],
      "animated": false,
@ -2303,20 +2303,20 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 431.0830078125,
+          "x": 434.0830078125,
-          "y": 3282
+          "y": 3286
        },
        {
-          "x": 431.0830078125,
+          "x": 434.0830078125,
-          "y": 3377
+          "y": 3381
        },
        {
-          "x": 325.8330078125,
+          "x": 326.8330078125,
-          "y": 3377
+          "y": 3381
        },
        {
-          "x": 325.8330078125,
+          "x": 326.8330078125,
-          "y": 3566
+          "y": 3570
        }
      ],
      "animated": false,
@ -2349,12 +2349,12 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 325.8330078125,
+          "x": 326.8330078125,
-          "y": 3632
+          "y": 3636
        },
        {
-          "x": 326,
+          "x": 327,
-          "y": 3757
+          "y": 3761
        }
      ],
      "animated": false,
--- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/links/dagre/board.exp.json
+++ b/e2etests/testdata/stable/links/dagre/board.exp.json
@ -7,10 +7,10 @@
      "id": "x",
      "type": "rectangle",
      "pos": {
-        "x": 17,
+        "x": 33,
        "y": 0
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/links/elk/board.exp.json
+++ b/e2etests/testdata/stable/links/elk/board.exp.json
@ -7,10 +7,10 @@
      "id": "x",
      "type": "rectangle",
      "pos": {
-        "x": 28,
+        "x": 44,
        "y": 12
      },
-      "width": 85,
+      "width": 53,
      "height": 66,
      "opacity": 1,
      "strokeDash": 0,
--- a/e2etests/testdata/stable/links/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json
@ -92,7 +92,7 @@
        "x": 166,
        "y": 0
      },
-      "width": 157,
+      "width": 163,
      "height": 192,
      "opacity": 1,
      "strokeDash": 0,
@ -131,10 +131,10 @@
      "type": "oval",
      "pos": {
        "x": 206,
-        "y": 58
+        "y": 55
      },
-      "width": 77,
+      "width": 83,
-      "height": 77,
+      "height": 83,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
--- a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg
@ -1,16 +1,16 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 325 234"><svg id="d2-svg" class="d2-2175518901" width="325" height="234" viewBox="-1 -41 325 234"><rect x="-1.000000" y="-41.000000" width="325.000000" height="234.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 331 234"><svg id="d2-svg" class="d2-1354711061" width="331" height="234" viewBox="-1 -41 331 234"><rect x="-1.000000" y="-41.000000" width="331.000000" height="234.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-2175518901 .text {
+.d2-1354711061 .text {
-	font-family: "d2-2175518901-font-regular";
+	font-family: "d2-1354711061-font-regular";
 }
@font-face {
-	font-family: d2-2175518901-font-regular;
+	font-family: d2-1354711061-font-regular;
 	src: url("data:application/font-woff;base64,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");
 }
-.d2-2175518901 .text-bold {
+.d2-1354711061 .text-bold {
-	font-family: "d2-2175518901-font-bold";
+	font-family: "d2-1354711061-font-bold";
 }
@font-face {
-	font-family: d2-2175518901-font-bold;
+	font-family: d2-1354711061-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -25,81 +25,81 @@
  opacity: 0.5;
 }
-		.d2-2175518901 .fill-N1{fill:#0A0F25;}
+		.d2-1354711061 .fill-N1{fill:#0A0F25;}
-		.d2-2175518901 .fill-N2{fill:#676C7E;}
+		.d2-1354711061 .fill-N2{fill:#676C7E;}
-		.d2-2175518901 .fill-N3{fill:#9499AB;}
+		.d2-1354711061 .fill-N3{fill:#9499AB;}
-		.d2-2175518901 .fill-N4{fill:#CFD2DD;}
+		.d2-1354711061 .fill-N4{fill:#CFD2DD;}
-		.d2-2175518901 .fill-N5{fill:#DEE1EB;}
+		.d2-1354711061 .fill-N5{fill:#DEE1EB;}
-		.d2-2175518901 .fill-N6{fill:#EEF1F8;}
+		.d2-1354711061 .fill-N6{fill:#EEF1F8;}
-		.d2-2175518901 .fill-N7{fill:#FFFFFF;}
+		.d2-1354711061 .fill-N7{fill:#FFFFFF;}
-		.d2-2175518901 .fill-B1{fill:#0D32B2;}
+		.d2-1354711061 .fill-B1{fill:#0D32B2;}
-		.d2-2175518901 .fill-B2{fill:#0D32B2;}
+		.d2-1354711061 .fill-B2{fill:#0D32B2;}
-		.d2-2175518901 .fill-B3{fill:#E3E9FD;}
+		.d2-1354711061 .fill-B3{fill:#E3E9FD;}
-		.d2-2175518901 .fill-B4{fill:#E3E9FD;}
+		.d2-1354711061 .fill-B4{fill:#E3E9FD;}
-		.d2-2175518901 .fill-B5{fill:#EDF0FD;}
+		.d2-1354711061 .fill-B5{fill:#EDF0FD;}
-		.d2-2175518901 .fill-B6{fill:#F7F8FE;}
+		.d2-1354711061 .fill-B6{fill:#F7F8FE;}
-		.d2-2175518901 .fill-AA2{fill:#4A6FF3;}
+		.d2-1354711061 .fill-AA2{fill:#4A6FF3;}
-		.d2-2175518901 .fill-AA4{fill:#EDF0FD;}
+		.d2-1354711061 .fill-AA4{fill:#EDF0FD;}
-		.d2-2175518901 .fill-AA5{fill:#F7F8FE;}
+		.d2-1354711061 .fill-AA5{fill:#F7F8FE;}
-		.d2-2175518901 .fill-AB4{fill:#EDF0FD;}
+		.d2-1354711061 .fill-AB4{fill:#EDF0FD;}
-		.d2-2175518901 .fill-AB5{fill:#F7F8FE;}
+		.d2-1354711061 .fill-AB5{fill:#F7F8FE;}
-		.d2-2175518901 .stroke-N1{stroke:#0A0F25;}
+		.d2-1354711061 .stroke-N1{stroke:#0A0F25;}
-		.d2-2175518901 .stroke-N2{stroke:#676C7E;}
+		.d2-1354711061 .stroke-N2{stroke:#676C7E;}
-		.d2-2175518901 .stroke-N3{stroke:#9499AB;}
+		.d2-1354711061 .stroke-N3{stroke:#9499AB;}
-		.d2-2175518901 .stroke-N4{stroke:#CFD2DD;}
+		.d2-1354711061 .stroke-N4{stroke:#CFD2DD;}
-		.d2-2175518901 .stroke-N5{stroke:#DEE1EB;}
+		.d2-1354711061 .stroke-N5{stroke:#DEE1EB;}
-		.d2-2175518901 .stroke-N6{stroke:#EEF1F8;}
+		.d2-1354711061 .stroke-N6{stroke:#EEF1F8;}
-		.d2-2175518901 .stroke-N7{stroke:#FFFFFF;}
+		.d2-1354711061 .stroke-N7{stroke:#FFFFFF;}
-		.d2-2175518901 .stroke-B1{stroke:#0D32B2;}
+		.d2-1354711061 .stroke-B1{stroke:#0D32B2;}
-		.d2-2175518901 .stroke-B2{stroke:#0D32B2;}
+		.d2-1354711061 .stroke-B2{stroke:#0D32B2;}
-		.d2-2175518901 .stroke-B3{stroke:#E3E9FD;}
+		.d2-1354711061 .stroke-B3{stroke:#E3E9FD;}
-		.d2-2175518901 .stroke-B4{stroke:#E3E9FD;}
+		.d2-1354711061 .stroke-B4{stroke:#E3E9FD;}
-		.d2-2175518901 .stroke-B5{stroke:#EDF0FD;}
+		.d2-1354711061 .stroke-B5{stroke:#EDF0FD;}
-		.d2-2175518901 .stroke-B6{stroke:#F7F8FE;}
+		.d2-1354711061 .stroke-B6{stroke:#F7F8FE;}
-		.d2-2175518901 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-1354711061 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-2175518901 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-1354711061 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-2175518901 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-1354711061 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-2175518901 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-1354711061 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-2175518901 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-1354711061 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-2175518901 .background-color-N1{background-color:#0A0F25;}
+		.d2-1354711061 .background-color-N1{background-color:#0A0F25;}
-		.d2-2175518901 .background-color-N2{background-color:#676C7E;}
+		.d2-1354711061 .background-color-N2{background-color:#676C7E;}
-		.d2-2175518901 .background-color-N3{background-color:#9499AB;}
+		.d2-1354711061 .background-color-N3{background-color:#9499AB;}
-		.d2-2175518901 .background-color-N4{background-color:#CFD2DD;}
+		.d2-1354711061 .background-color-N4{background-color:#CFD2DD;}
-		.d2-2175518901 .background-color-N5{background-color:#DEE1EB;}
+		.d2-1354711061 .background-color-N5{background-color:#DEE1EB;}
-		.d2-2175518901 .background-color-N6{background-color:#EEF1F8;}
+		.d2-1354711061 .background-color-N6{background-color:#EEF1F8;}
-		.d2-2175518901 .background-color-N7{background-color:#FFFFFF;}
+		.d2-1354711061 .background-color-N7{background-color:#FFFFFF;}
-		.d2-2175518901 .background-color-B1{background-color:#0D32B2;}
+		.d2-1354711061 .background-color-B1{background-color:#0D32B2;}
-		.d2-2175518901 .background-color-B2{background-color:#0D32B2;}
+		.d2-1354711061 .background-color-B2{background-color:#0D32B2;}
-		.d2-2175518901 .background-color-B3{background-color:#E3E9FD;}
+		.d2-1354711061 .background-color-B3{background-color:#E3E9FD;}
-		.d2-2175518901 .background-color-B4{background-color:#E3E9FD;}
+		.d2-1354711061 .background-color-B4{background-color:#E3E9FD;}
-		.d2-2175518901 .background-color-B5{background-color:#EDF0FD;}
+		.d2-1354711061 .background-color-B5{background-color:#EDF0FD;}
-		.d2-2175518901 .background-color-B6{background-color:#F7F8FE;}
+		.d2-1354711061 .background-color-B6{background-color:#F7F8FE;}
-		.d2-2175518901 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-1354711061 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-2175518901 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-1354711061 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-2175518901 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-1354711061 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-2175518901 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-1354711061 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-2175518901 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-1354711061 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-2175518901 .color-N1{color:#0A0F25;}
+		.d2-1354711061 .color-N1{color:#0A0F25;}
-		.d2-2175518901 .color-N2{color:#676C7E;}
+		.d2-1354711061 .color-N2{color:#676C7E;}
-		.d2-2175518901 .color-N3{color:#9499AB;}
+		.d2-1354711061 .color-N3{color:#9499AB;}
-		.d2-2175518901 .color-N4{color:#CFD2DD;}
+		.d2-1354711061 .color-N4{color:#CFD2DD;}
-		.d2-2175518901 .color-N5{color:#DEE1EB;}
+		.d2-1354711061 .color-N5{color:#DEE1EB;}
-		.d2-2175518901 .color-N6{color:#EEF1F8;}
+		.d2-1354711061 .color-N6{color:#EEF1F8;}
-		.d2-2175518901 .color-N7{color:#FFFFFF;}
+		.d2-1354711061 .color-N7{color:#FFFFFF;}
-		.d2-2175518901 .color-B1{color:#0D32B2;}
+		.d2-1354711061 .color-B1{color:#0D32B2;}
-		.d2-2175518901 .color-B2{color:#0D32B2;}
+		.d2-1354711061 .color-B2{color:#0D32B2;}
-		.d2-2175518901 .color-B3{color:#E3E9FD;}
+		.d2-1354711061 .color-B3{color:#E3E9FD;}
-		.d2-2175518901 .color-B4{color:#E3E9FD;}
+		.d2-1354711061 .color-B4{color:#E3E9FD;}
-		.d2-2175518901 .color-B5{color:#EDF0FD;}
+		.d2-1354711061 .color-B5{color:#EDF0FD;}
-		.d2-2175518901 .color-B6{color:#F7F8FE;}
+		.d2-1354711061 .color-B6{color:#F7F8FE;}
-		.d2-2175518901 .color-AA2{color:#4A6FF3;}
+		.d2-1354711061 .color-AA2{color:#4A6FF3;}
-		.d2-2175518901 .color-AA4{color:#EDF0FD;}
+		.d2-1354711061 .color-AA4{color:#EDF0FD;}
-		.d2-2175518901 .color-AA5{color:#F7F8FE;}
+		.d2-1354711061 .color-AA5{color:#F7F8FE;}
-		.d2-2175518901 .color-AB4{color:#EDF0FD;}
+		.d2-1354711061 .color-AB4{color:#EDF0FD;}
-		.d2-2175518901 .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="aa"><g class="shape" ><path d="M 0 0 L 73 0 L 73 38 L 146 38 L 146 192 L 0 192 Z" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-AA4" style="stroke-width:2;" /></g><text x="73.000000" y="-13.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">aa</text></g><g id="cc"><g class="shape" ><path d="M 245 192 C 244 192 244 192 244 191 L 167 98 C 166 97 166 96 167 95 L 243 1 C 244 0 245 0 246 1 L 322 95 C 323 96 323 97 322 98 L 246 191 C 246 192 245 192 245 192 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="244.500000" y="-13.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">cc</text></g><g id="aa.bb"><g class="shape" ><path d="M 73 142 C 73 142 73 142 72 142 L 40 97 C 40 97 40 96 40 95 L 72 50 C 72 50 73 50 73 50 L 105 95 C 105 95 105 96 105 97 L 74 142 C 73 142 73 142 73 142 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="73.000000" y="101.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">bb</text></g><g id="cc.dd"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="244.500000" cy="96.500000" stroke="#0D32B2" fill="#EDF0FD" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="244.500000" y="102.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">dd</text></g><mask id="d2-2175518901" maskUnits="userSpaceOnUse" x="-1" y="-41" width="325" height="234">
+		.d2-1354711061 .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="aa"><g class="shape" ><path d="M 0 0 L 73 0 L 73 38 L 146 38 L 146 192 L 0 192 Z" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-AA4" style="stroke-width:2;" /></g><text x="73.000000" y="-13.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">aa</text></g><g id="cc"><g class="shape" ><path d="M 248 192 C 247 192 247 192 247 191 L 167 98 C 166 97 166 96 167 95 L 246 1 C 247 0 248 0 249 1 L 328 95 C 329 96 329 97 328 98 L 249 191 C 249 192 248 192 248 192 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="247.500000" y="-13.000000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">cc</text></g><g id="aa.bb"><g class="shape" ><path d="M 73 142 C 73 142 73 142 72 142 L 40 97 C 40 97 40 96 40 95 L 72 50 C 72 50 73 50 73 50 L 105 95 C 105 95 105 96 105 97 L 74 142 C 73 142 73 142 73 142 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="73.000000" y="101.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">bb</text></g><g id="cc.dd"><g class="shape" ><ellipse rx="41.500000" ry="41.500000" cx="247.500000" cy="96.500000" stroke="#0D32B2" fill="#EDF0FD" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="247.500000" y="102.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">dd</text></g><mask id="d2-1354711061" maskUnits="userSpaceOnUse" x="-1" y="-41" width="331" height="234">
-<rect x="-1" y="-41" width="325" height="234" fill="white"></rect>
+<rect x="-1" y="-41" width="331" height="234" fill="white"></rect>
 <rect x="59.500000" y="-41.000000" width="27" height="36" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="232.000000" y="-41.000000" width="25" height="36" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="235.000000" y="-41.000000" width="25" height="36" fill="rgba(0,0,0,0.75)"></rect>
 <rect x="64.000000" y="85.500000" width="18" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="235.000000" y="86.000000" width="19" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="238.000000" y="86.000000" width="19" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json
@ -8,7 +8,7 @@
      "type": "package",
      "pos": {
        "x": 12,
-        "y": 18
+        "y": 22
      },
      "width": 166,
      "height": 234,
@ -49,7 +49,7 @@
      "type": "diamond",
      "pos": {
        "x": 62,
-        "y": 110
+        "y": 114
      },
      "width": 66,
      "height": 92,
@ -92,8 +92,8 @@
        "x": 198,
        "y": 12
      },
-      "width": 177,
+      "width": 183,
-      "height": 247,
+      "height": 255,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -131,10 +131,10 @@
      "type": "oval",
      "pos": {
        "x": 248,
-        "y": 120
+        "y": 121
      },
-      "width": 77,
+      "width": 83,
-      "height": 77,
+      "height": 83,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
--- a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg
@ -1,16 +1,16 @@
-<?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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 365 249"><svg id="d2-svg" class="d2-1759373644" width="365" height="249" viewBox="11 11 365 249"><rect x="11.000000" y="11.000000" width="365.000000" height="249.000000" rx="0.000000" fill="#FFFFFF" 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.6.7-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 371 257"><svg id="d2-svg" class="d2-2242629650" width="371" height="257" viewBox="11 11 371 257"><rect x="11.000000" y="11.000000" width="371.000000" height="257.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
-.d2-1759373644 .text {
+.d2-2242629650 .text {
-	font-family: "d2-1759373644-font-regular";
+	font-family: "d2-2242629650-font-regular";
 }
@font-face {
-	font-family: d2-1759373644-font-regular;
+	font-family: d2-2242629650-font-regular;
 	src: url("data:application/font-woff;base64,d09GRgABAAAAAAdEAAoAAAAADAQAAguFAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAGAAAABgXd/Vo2NtYXAAAAFUAAAANgAAADYAEACnZ2x5ZgAAAYwAAAHWAAAB8M6gF+loZWFkAAADZAAAADYAAAA2G4Ue32hoZWEAAAOcAAAAJAAAACQKhAXHaG10eAAAA8AAAAAUAAAAFAqhATxsb2NhAAAD1AAAAAwAAAAMASoBvG1heHAAAAPgAAAAIAAAACAAHQD2bmFtZQAABAAAAAMjAAAIFAbDVU1wb3N0AAAHJAAAAB0AAAAg/9EAMgADAgkBkAAFAAACigJYAAAASwKKAlgAAAFeADIBIwAAAgsFAwMEAwICBGAAAvcAAAADAAAAAAAAAABBREJPAEAAIP//Au7/BgAAA9gBESAAAZ8AAAAAAeYClAAAACAAAwAAAAEAAwABAAAADAAEACoAAAAEAAQAAQAAAGT//wAAAGH///+gAAEAAAAAAAEAAgADAAQAAAAAeJw80Etr1Fwcx/H/yUwTHhgoaSfJ05J0knPaOZ1RjOZ25hLT6bQpjAiTTih2LFjqLEbwAlawzMZuvKxEF935IsS1u4LQlUtBcC0Fd2UWgjSRSalv4Pfh+4Mp6ANwLncEOfgPpmEGJABbNMQlg1IiMJsxouQYRaLQRz+S9wh1nLzn5W+0f7VHh4do+wV3dP6o8XI4/HLv4CB5+/M0sdDXU+DAScfoEzqDeVgEUHDZdTzmlMsE8wL1PNuSJZFQwvPU8pjL81JRPr65+e6DeGW5ekvT8aDRj9aFHN6USUBGe1ahsxptiaUa0Yt1ufJ4J/nWUKttXHoz7ZuVJeCgl47RH+4EZkEHmMJlSgQi2pJwYRUzyHUyX5JlVMEdPSe0e5zRXd6939zd8LvNsNQi+krB0Czu5Hhbo6+fxs+DcHg3GmA9VRUAAATX0jH6iM5AzZRJ1gRQhCxtkmFbHlN4Hs20HvirD4Pr4VxVMrWrIY3XcENeNKKCvx/19n2seLP/m1u1eKgVmWYAcGCmY/T9suHis2ycuvblWcz9B/3eedLcY9VAz8frQk69PdfyS/UFulLeKLwadZ8FC/Px5/NaXa2Ea4mqmHHtzuAvAAAA//8BAAD//xBcbR0AAAABAAAAAguF222lF18PPPUAAwPoAAAAANhdoKEAAAAA3WYvNv46/tsIbwPIAAAAAwACAAAAAAAAAAEAAAPY/u8AAAiY/jr+OghvAAEAAAAAAAAAAAAAAAAAAAAFAo0AWQH4ADQCKQBSAcgALgIrAC8AAAAsAGQAmADGAPgAAQAAAAUAjAAMAGYABwABAAAAAAAAAAAAAAAAAAQAA3icnJTdThtXFIU/B9ttVDUXFYrIDTqXbZWM3QiiBK5MCYpVhFOP0x+pqjR4xj9iPDPyDFCqPkCv+xZ9i1z1OfoQVa+rs7wNNqoUgRCwzpy991lnr7UPsMm/bFCrPwT+av5guMZ2c8/wAx41nxre4Ljxt+H6SkyDuPGb4SZfNvqGP+J9/Q/DH7NT/9nwQ7bqR4Y/4Xl90/CnG45/DD9ih/cLXIOX/G64xhaF4Qds8pPhDR5jNWt1HtM23OAztg032QYGTKlImZIxxjFiyphz5iSUhCTMmTIiIcbRpUNKpa8ZkZBj/L9fI0Iq5kSqOKHCkRKSElEysYq/KivnrU4caTW3vQ4VEyJOlXFGRIYjZ0xORsKZ6lRUFOzRokXJUHwLKkoCSqakBOTMGdOixxHHDJgwpcRxpEqeWUjOiIpLIp3vLMJ3ZkhCRmmszsmIxdOJX6LsLsc4ehSKXa18vFbhKY7vlO255Yr9ikC/boXZ+rlLNhEX6meqrqTauZSCE+36czt8K1yxh7tXf9aZfLhHsf5XqnzKufSPpVQmJhnObdEhlINC9wTHgdZdQnXke7oMeEOPdwy07tCnT4cTBnR5rdwefRxf0+OEQ2V0hRd7R3LMCT/i+IauYnztxPqzUCzhFwpzdymOc91jRqGee+aB7prohndX2M9QvuaOUjlDzZGPdNIv05xFjM0VhRjO1MulN0rrX2yOmOkuXtubfT8NFzZ7yym+ItcMe7cuOHnlFow+pGpwyzOX+gmIiMk5VcSQnBktKq7E+y0R56Q4DtW9N5qSis51jj/nSi5JmIlBl0x15hT6G5lvQuM+XPO9s7ckVr5nenZ9q/uc4tSrG43eqXvLvdC6nKwo0DJV8xU3DcU1M+8nmqlV/qFyS71uOc/ok0j1VDe4/Q48J6DNDrvsM9E5Q+1c2BvR1jvR5hX76sEZiaJGcnViFXYJeMEuu7zixVrNDocc0GP/DhwXWT0OeH1rZ12nZRVndf4Um7b4Op5dr17eW6/P7+DLLzRRNy9jX9r4bl9YtRv/nxAx81zc1uqd3BOC/wAAAP//AQAA//8HW0wwAHicYmBmAIP/5xiMGLAAAAAAAP//AQAA//8vAQIDAAAA");
 }
-.d2-1759373644 .text-bold {
+.d2-2242629650 .text-bold {
-	font-family: "d2-1759373644-font-bold";
+	font-family: "d2-2242629650-font-bold";
 }
@font-face {
-	font-family: d2-1759373644-font-bold;
+	font-family: d2-2242629650-font-bold;
 	src: url("data:application/font-woff;base64,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");
 }]]></style><style type="text/css"><![CDATA[.shape {
  shape-rendering: geometricPrecision;
@ -25,81 +25,81 @@
  opacity: 0.5;
 }
-		.d2-1759373644 .fill-N1{fill:#0A0F25;}
+		.d2-2242629650 .fill-N1{fill:#0A0F25;}
-		.d2-1759373644 .fill-N2{fill:#676C7E;}
+		.d2-2242629650 .fill-N2{fill:#676C7E;}
-		.d2-1759373644 .fill-N3{fill:#9499AB;}
+		.d2-2242629650 .fill-N3{fill:#9499AB;}
-		.d2-1759373644 .fill-N4{fill:#CFD2DD;}
+		.d2-2242629650 .fill-N4{fill:#CFD2DD;}
-		.d2-1759373644 .fill-N5{fill:#DEE1EB;}
+		.d2-2242629650 .fill-N5{fill:#DEE1EB;}
-		.d2-1759373644 .fill-N6{fill:#EEF1F8;}
+		.d2-2242629650 .fill-N6{fill:#EEF1F8;}
-		.d2-1759373644 .fill-N7{fill:#FFFFFF;}
+		.d2-2242629650 .fill-N7{fill:#FFFFFF;}
-		.d2-1759373644 .fill-B1{fill:#0D32B2;}
+		.d2-2242629650 .fill-B1{fill:#0D32B2;}
-		.d2-1759373644 .fill-B2{fill:#0D32B2;}
+		.d2-2242629650 .fill-B2{fill:#0D32B2;}
-		.d2-1759373644 .fill-B3{fill:#E3E9FD;}
+		.d2-2242629650 .fill-B3{fill:#E3E9FD;}
-		.d2-1759373644 .fill-B4{fill:#E3E9FD;}
+		.d2-2242629650 .fill-B4{fill:#E3E9FD;}
-		.d2-1759373644 .fill-B5{fill:#EDF0FD;}
+		.d2-2242629650 .fill-B5{fill:#EDF0FD;}
-		.d2-1759373644 .fill-B6{fill:#F7F8FE;}
+		.d2-2242629650 .fill-B6{fill:#F7F8FE;}
-		.d2-1759373644 .fill-AA2{fill:#4A6FF3;}
+		.d2-2242629650 .fill-AA2{fill:#4A6FF3;}
-		.d2-1759373644 .fill-AA4{fill:#EDF0FD;}
+		.d2-2242629650 .fill-AA4{fill:#EDF0FD;}
-		.d2-1759373644 .fill-AA5{fill:#F7F8FE;}
+		.d2-2242629650 .fill-AA5{fill:#F7F8FE;}
-		.d2-1759373644 .fill-AB4{fill:#EDF0FD;}
+		.d2-2242629650 .fill-AB4{fill:#EDF0FD;}
-		.d2-1759373644 .fill-AB5{fill:#F7F8FE;}
+		.d2-2242629650 .fill-AB5{fill:#F7F8FE;}
-		.d2-1759373644 .stroke-N1{stroke:#0A0F25;}
+		.d2-2242629650 .stroke-N1{stroke:#0A0F25;}
-		.d2-1759373644 .stroke-N2{stroke:#676C7E;}
+		.d2-2242629650 .stroke-N2{stroke:#676C7E;}
-		.d2-1759373644 .stroke-N3{stroke:#9499AB;}
+		.d2-2242629650 .stroke-N3{stroke:#9499AB;}
-		.d2-1759373644 .stroke-N4{stroke:#CFD2DD;}
+		.d2-2242629650 .stroke-N4{stroke:#CFD2DD;}
-		.d2-1759373644 .stroke-N5{stroke:#DEE1EB;}
+		.d2-2242629650 .stroke-N5{stroke:#DEE1EB;}
-		.d2-1759373644 .stroke-N6{stroke:#EEF1F8;}
+		.d2-2242629650 .stroke-N6{stroke:#EEF1F8;}
-		.d2-1759373644 .stroke-N7{stroke:#FFFFFF;}
+		.d2-2242629650 .stroke-N7{stroke:#FFFFFF;}
-		.d2-1759373644 .stroke-B1{stroke:#0D32B2;}
+		.d2-2242629650 .stroke-B1{stroke:#0D32B2;}
-		.d2-1759373644 .stroke-B2{stroke:#0D32B2;}
+		.d2-2242629650 .stroke-B2{stroke:#0D32B2;}
-		.d2-1759373644 .stroke-B3{stroke:#E3E9FD;}
+		.d2-2242629650 .stroke-B3{stroke:#E3E9FD;}
-		.d2-1759373644 .stroke-B4{stroke:#E3E9FD;}
+		.d2-2242629650 .stroke-B4{stroke:#E3E9FD;}
-		.d2-1759373644 .stroke-B5{stroke:#EDF0FD;}
+		.d2-2242629650 .stroke-B5{stroke:#EDF0FD;}
-		.d2-1759373644 .stroke-B6{stroke:#F7F8FE;}
+		.d2-2242629650 .stroke-B6{stroke:#F7F8FE;}
-		.d2-1759373644 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-2242629650 .stroke-AA2{stroke:#4A6FF3;}
-		.d2-1759373644 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-2242629650 .stroke-AA4{stroke:#EDF0FD;}
-		.d2-1759373644 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-2242629650 .stroke-AA5{stroke:#F7F8FE;}
-		.d2-1759373644 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-2242629650 .stroke-AB4{stroke:#EDF0FD;}
-		.d2-1759373644 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-2242629650 .stroke-AB5{stroke:#F7F8FE;}
-		.d2-1759373644 .background-color-N1{background-color:#0A0F25;}
+		.d2-2242629650 .background-color-N1{background-color:#0A0F25;}
-		.d2-1759373644 .background-color-N2{background-color:#676C7E;}
+		.d2-2242629650 .background-color-N2{background-color:#676C7E;}
-		.d2-1759373644 .background-color-N3{background-color:#9499AB;}
+		.d2-2242629650 .background-color-N3{background-color:#9499AB;}
-		.d2-1759373644 .background-color-N4{background-color:#CFD2DD;}
+		.d2-2242629650 .background-color-N4{background-color:#CFD2DD;}
-		.d2-1759373644 .background-color-N5{background-color:#DEE1EB;}
+		.d2-2242629650 .background-color-N5{background-color:#DEE1EB;}
-		.d2-1759373644 .background-color-N6{background-color:#EEF1F8;}
+		.d2-2242629650 .background-color-N6{background-color:#EEF1F8;}
-		.d2-1759373644 .background-color-N7{background-color:#FFFFFF;}
+		.d2-2242629650 .background-color-N7{background-color:#FFFFFF;}
-		.d2-1759373644 .background-color-B1{background-color:#0D32B2;}
+		.d2-2242629650 .background-color-B1{background-color:#0D32B2;}
-		.d2-1759373644 .background-color-B2{background-color:#0D32B2;}
+		.d2-2242629650 .background-color-B2{background-color:#0D32B2;}
-		.d2-1759373644 .background-color-B3{background-color:#E3E9FD;}
+		.d2-2242629650 .background-color-B3{background-color:#E3E9FD;}
-		.d2-1759373644 .background-color-B4{background-color:#E3E9FD;}
+		.d2-2242629650 .background-color-B4{background-color:#E3E9FD;}
-		.d2-1759373644 .background-color-B5{background-color:#EDF0FD;}
+		.d2-2242629650 .background-color-B5{background-color:#EDF0FD;}
-		.d2-1759373644 .background-color-B6{background-color:#F7F8FE;}
+		.d2-2242629650 .background-color-B6{background-color:#F7F8FE;}
-		.d2-1759373644 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-2242629650 .background-color-AA2{background-color:#4A6FF3;}
-		.d2-1759373644 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-2242629650 .background-color-AA4{background-color:#EDF0FD;}
-		.d2-1759373644 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-2242629650 .background-color-AA5{background-color:#F7F8FE;}
-		.d2-1759373644 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-2242629650 .background-color-AB4{background-color:#EDF0FD;}
-		.d2-1759373644 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-2242629650 .background-color-AB5{background-color:#F7F8FE;}
-		.d2-1759373644 .color-N1{color:#0A0F25;}
+		.d2-2242629650 .color-N1{color:#0A0F25;}
-		.d2-1759373644 .color-N2{color:#676C7E;}
+		.d2-2242629650 .color-N2{color:#676C7E;}
-		.d2-1759373644 .color-N3{color:#9499AB;}
+		.d2-2242629650 .color-N3{color:#9499AB;}
-		.d2-1759373644 .color-N4{color:#CFD2DD;}
+		.d2-2242629650 .color-N4{color:#CFD2DD;}
-		.d2-1759373644 .color-N5{color:#DEE1EB;}
+		.d2-2242629650 .color-N5{color:#DEE1EB;}
-		.d2-1759373644 .color-N6{color:#EEF1F8;}
+		.d2-2242629650 .color-N6{color:#EEF1F8;}
-		.d2-1759373644 .color-N7{color:#FFFFFF;}
+		.d2-2242629650 .color-N7{color:#FFFFFF;}
-		.d2-1759373644 .color-B1{color:#0D32B2;}
+		.d2-2242629650 .color-B1{color:#0D32B2;}
-		.d2-1759373644 .color-B2{color:#0D32B2;}
+		.d2-2242629650 .color-B2{color:#0D32B2;}
-		.d2-1759373644 .color-B3{color:#E3E9FD;}
+		.d2-2242629650 .color-B3{color:#E3E9FD;}
-		.d2-1759373644 .color-B4{color:#E3E9FD;}
+		.d2-2242629650 .color-B4{color:#E3E9FD;}
-		.d2-1759373644 .color-B5{color:#EDF0FD;}
+		.d2-2242629650 .color-B5{color:#EDF0FD;}
-		.d2-1759373644 .color-B6{color:#F7F8FE;}
+		.d2-2242629650 .color-B6{color:#F7F8FE;}
-		.d2-1759373644 .color-AA2{color:#4A6FF3;}
+		.d2-2242629650 .color-AA2{color:#4A6FF3;}
-		.d2-1759373644 .color-AA4{color:#EDF0FD;}
+		.d2-2242629650 .color-AA4{color:#EDF0FD;}
-		.d2-1759373644 .color-AA5{color:#F7F8FE;}
+		.d2-2242629650 .color-AA5{color:#F7F8FE;}
-		.d2-1759373644 .color-AB4{color:#EDF0FD;}
+		.d2-2242629650 .color-AB4{color:#EDF0FD;}
-		.d2-1759373644 .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="aa"><g class="shape" ><path d="M 12 18 L 95 18 L 95 65 L 178 65 L 178 252 L 12 252 Z" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-AA4" style="stroke-width:2;" /></g><text x="95.000000" y="97.800000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">aa</text></g><g id="cc"><g class="shape" ><path d="M 287 259 C 286 259 286 259 285 258 L 199 138 C 198 137 198 135 199 134 L 285 13 C 286 12 287 12 288 13 L 374 133 C 375 134 375 136 374 137 L 288 258 C 288 259 287 259 287 259 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="286.500000" y="106.750000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">cc</text></g><g id="aa.bb"><g class="shape" ><path d="M 95 202 C 95 202 95 202 94 202 L 62 157 C 62 157 62 156 62 155 L 94 110 C 94 110 95 110 95 110 L 127 155 C 127 155 127 156 127 157 L 96 202 C 95 202 95 202 95 202 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="95.000000" y="161.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">bb</text></g><g id="cc.dd"><g class="shape" ><ellipse rx="38.500000" ry="38.500000" cx="286.500000" cy="158.500000" stroke="#0D32B2" fill="#EDF0FD" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="286.500000" y="164.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">dd</text></g><mask id="d2-1759373644" maskUnits="userSpaceOnUse" x="11" y="11" width="365" height="249">
+		.d2-2242629650 .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="aa"><g class="shape" ><path d="M 12 22 L 95 22 L 95 69 L 178 69 L 178 256 L 12 256 Z" stroke="#0D32B2" fill="#EDF0FD" class=" stroke-B1 fill-AA4" style="stroke-width:2;" /></g><text x="95.000000" y="101.800000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">aa</text></g><g id="cc"><g class="shape" ><path d="M 290 267 C 289 267 289 267 288 266 L 199 142 C 198 141 198 139 199 137 L 288 13 C 289 12 290 12 291 13 L 380 137 C 381 138 381 140 380 142 L 291 266 C 291 267 290 267 290 267 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="289.500000" y="108.750000" fill="#0A0F25" class="text fill-N1" style="text-anchor:middle;font-size:28px">cc</text></g><g id="aa.bb"><g class="shape" ><path d="M 95 206 C 95 206 95 206 94 206 L 62 161 C 62 161 62 160 62 159 L 94 114 C 94 114 95 114 95 114 L 127 159 C 127 159 127 160 127 161 L 96 206 C 95 206 95 206 95 206 Z" stroke="#0D32B2" fill="#CFD2DD" class=" stroke-B1 fill-N4" style="stroke-width:2;" /></g><text x="95.000000" y="165.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">bb</text></g><g id="cc.dd"><g class="shape" ><ellipse rx="41.500000" ry="41.500000" cx="289.500000" cy="162.500000" stroke="#0D32B2" fill="#EDF0FD" class="shape stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="289.500000" y="168.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">dd</text></g><mask id="d2-2242629650" maskUnits="userSpaceOnUse" x="11" y="11" width="371" height="257">
-<rect x="11" y="11" width="365" height="249" fill="white"></rect>
+<rect x="11" y="11" width="371" height="257" fill="white"></rect>
-<rect x="81.500000" y="69.800000" width="27" height="36" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="81.500000" y="73.800000" width="27" height="36" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="274.000000" y="78.750000" width="25" height="36" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="277.000000" y="80.750000" width="25" height="36" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="86.000000" y="145.500000" width="18" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="86.000000" y="149.500000" width="18" height="21" fill="rgba(0,0,0,0.75)"></rect>
-<rect x="277.000000" y="148.000000" width="19" height="21" fill="rgba(0,0,0,0.75)"></rect>
+<rect x="280.000000" y="152.000000" width="19" height="21" fill="rgba(0,0,0,0.75)"></rect>
 </mask></svg></svg>
--- a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json
+++ b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json
--- a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/nesting_power/elk/board.exp.json
+++ b/e2etests/testdata/stable/nesting_power/elk/board.exp.json
--- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
@ -48,11 +48,11 @@
      "id": "b",
      "type": "oval",
      "pos": {
-        "x": 278,
+        "x": 279,
-        "y": 133
+        "y": 135
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -89,7 +89,7 @@
      "id": "c",
      "type": "class",
      "pos": {
-        "x": 421,
+        "x": 420,
        "y": 52
      },
      "width": 302,
@ -144,7 +144,7 @@
      "id": "d",
      "type": "cloud",
      "pos": {
-        "x": 763,
+        "x": 762,
        "y": 152
      },
      "width": 140,
@ -186,7 +186,7 @@
      "id": "e",
      "type": "code",
      "pos": {
-        "x": 943,
+        "x": 942,
        "y": 158
      },
      "width": 199,
@ -227,7 +227,7 @@
      "id": "f",
      "type": "cylinder",
      "pos": {
-        "x": 1164,
+        "x": 1163,
        "y": 118
      },
      "width": 100,
@ -268,7 +268,7 @@
      "id": "g",
      "type": "diamond",
      "pos": {
-        "x": 1314,
+        "x": 1313,
        "y": 144
      },
      "width": 100,
@ -309,7 +309,7 @@
      "id": "h",
      "type": "document",
      "pos": {
-        "x": 1464,
+        "x": 1463,
        "y": 160
      },
      "width": 100,
@ -350,7 +350,7 @@
      "id": "i",
      "type": "hexagon",
      "pos": {
-        "x": 1604,
+        "x": 1603,
        "y": 167
      },
      "width": 146,
@ -391,7 +391,7 @@
      "id": "j",
      "type": "image",
      "pos": {
-        "x": 1790,
+        "x": 1789,
        "y": 87
      },
      "width": 128,
@ -444,7 +444,7 @@
      "id": "k",
      "type": "oval",
      "pos": {
-        "x": 1956,
+        "x": 1955,
        "y": 163
      },
      "width": 100,
@ -485,7 +485,7 @@
      "id": "l",
      "type": "package",
      "pos": {
-        "x": 2106,
+        "x": 2105,
        "y": 163
      },
      "width": 100,
@ -526,7 +526,7 @@
      "id": "m",
      "type": "page",
      "pos": {
-        "x": 2250,
+        "x": 2249,
        "y": 149
      },
      "width": 113,
@ -567,7 +567,7 @@
      "id": "n",
      "type": "parallelogram",
      "pos": {
-        "x": 2403,
+        "x": 2402,
        "y": 154
      },
      "width": 169,
@ -608,7 +608,7 @@
      "id": "o",
      "type": "person",
      "pos": {
-        "x": 2592,
+        "x": 2591,
        "y": 64
      },
      "width": 100,
@ -649,7 +649,7 @@
      "id": "p",
      "type": "queue",
      "pos": {
-        "x": 2732,
+        "x": 2731,
        "y": 170
      },
      "width": 151,
@ -690,7 +690,7 @@
      "id": "q",
      "type": "rectangle",
      "pos": {
-        "x": 2923,
+        "x": 2922,
        "y": 133
      },
      "width": 103,
@ -731,7 +731,7 @@
      "id": "r",
      "type": "step",
      "pos": {
-        "x": 3066,
+        "x": 3065,
        "y": 135
      },
      "width": 187,
@ -772,7 +772,7 @@
      "id": "s",
      "type": "stored_data",
      "pos": {
-        "x": 3291,
+        "x": 3290,
        "y": 170
      },
      "width": 100,
@ -813,7 +813,7 @@
      "id": "t",
      "type": "sql_table",
      "pos": {
-        "x": 3431,
+        "x": 3430,
        "y": 128
      },
      "width": 161,
@ -1003,7 +1003,7 @@
          "y": 406
        },
        {
-          "x": 572,
+          "x": 571,
          "y": 406
        }
      ],
@ -1037,11 +1037,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 572,
+          "x": 571,
          "y": 486
        },
        {
-          "x": 833,
+          "x": 832,
          "y": 486
        }
      ],
@ -1075,11 +1075,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 833,
+          "x": 832,
          "y": 556
        },
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 556
        }
      ],
@ -1113,11 +1113,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 626
        },
        {
-          "x": 1214,
+          "x": 1213,
          "y": 626
        }
      ],
@ -1151,11 +1151,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1214,
+          "x": 1213,
          "y": 696
        },
        {
-          "x": 1364,
+          "x": 1363,
          "y": 696
        }
      ],
@ -1189,11 +1189,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1364,
+          "x": 1363,
          "y": 766
        },
        {
-          "x": 1514,
+          "x": 1513,
          "y": 766
        }
      ],
@ -1227,11 +1227,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1514,
+          "x": 1513,
          "y": 836
        },
        {
-          "x": 1677,
+          "x": 1676,
          "y": 836
        }
      ],
@ -1265,11 +1265,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1677,
+          "x": 1676,
          "y": 906
        },
        {
-          "x": 1854,
+          "x": 1853,
          "y": 906
        }
      ],
@ -1303,11 +1303,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1854,
+          "x": 1853,
          "y": 976
        },
        {
-          "x": 2006,
+          "x": 2005,
          "y": 976
        }
      ],
@ -1341,11 +1341,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2006,
+          "x": 2005,
          "y": 1046
        },
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1046
        }
      ],
@ -1379,11 +1379,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1116
        },
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1116
        }
      ],
@ -1417,11 +1417,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1186
        },
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1186
        }
      ],
@ -1455,11 +1455,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1256
        },
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1256
        }
      ],
@ -1493,11 +1493,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1326
        },
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1326
        }
      ],
@ -1531,11 +1531,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1396
        },
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1396
        }
      ],
@ -1569,11 +1569,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1466
        },
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1466
        }
      ],
@ -1607,11 +1607,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1536
        },
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1536
        }
      ],
@ -1645,11 +1645,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1606
        },
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 1606
        }
      ],
@ -1759,11 +1759,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 572,
+          "x": 571,
          "y": 236
        },
        {
-          "x": 572,
+          "x": 571,
          "y": 1676
        }
      ],
@ -1797,11 +1797,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 833,
+          "x": 832,
          "y": 236
        },
        {
-          "x": 833,
+          "x": 832,
          "y": 1676
        }
      ],
@ -1835,11 +1835,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 236
        },
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 1676
        }
      ],
@ -1873,11 +1873,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1214,
+          "x": 1213,
          "y": 236
        },
        {
-          "x": 1214,
+          "x": 1213,
          "y": 1676
        }
      ],
@ -1911,11 +1911,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1364,
+          "x": 1363,
          "y": 236
        },
        {
-          "x": 1364,
+          "x": 1363,
          "y": 1676
        }
      ],
@ -1949,11 +1949,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1514,
+          "x": 1513,
          "y": 236
        },
        {
-          "x": 1514,
+          "x": 1513,
          "y": 1676
        }
      ],
@ -1987,11 +1987,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1677,
+          "x": 1676,
          "y": 236
        },
        {
-          "x": 1677,
+          "x": 1676,
          "y": 1676
        }
      ],
@ -2025,11 +2025,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1854,
+          "x": 1853,
          "y": 241
        },
        {
-          "x": 1854,
+          "x": 1853,
          "y": 1676
        }
      ],
@ -2063,11 +2063,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2006,
+          "x": 2005,
          "y": 236
        },
        {
-          "x": 2006,
+          "x": 2005,
          "y": 1676
        }
      ],
@ -2101,11 +2101,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2156,
+          "x": 2155,
          "y": 236
        },
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1676
        }
      ],
@ -2139,11 +2139,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 236
        },
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1676
        }
      ],
@ -2177,11 +2177,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 236
        },
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1676
        }
      ],
@ -2215,11 +2215,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2642,
+          "x": 2641,
          "y": 241
        },
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1676
        }
      ],
@ -2253,11 +2253,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 236
        },
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1676
        }
      ],
@ -2291,11 +2291,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 236
        },
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1676
        }
      ],
@ -2329,11 +2329,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 236
        },
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1676
        }
      ],
@ -2367,11 +2367,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3341,
+          "x": 3340,
          "y": 236
        },
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1676
        }
      ],
@ -2405,11 +2405,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 236
        },
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 1676
        }
      ],
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json
@ -48,11 +48,11 @@
      "id": "b",
      "type": "oval",
      "pos": {
-        "x": 278,
+        "x": 279,
-        "y": 133
+        "y": 135
      },
-      "width": 103,
+      "width": 101,
-      "height": 103,
+      "height": 101,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -89,7 +89,7 @@
      "id": "c",
      "type": "class",
      "pos": {
-        "x": 421,
+        "x": 420,
        "y": 52
      },
      "width": 302,
@ -144,7 +144,7 @@
      "id": "d",
      "type": "cloud",
      "pos": {
-        "x": 763,
+        "x": 762,
        "y": 152
      },
      "width": 140,
@ -186,7 +186,7 @@
      "id": "e",
      "type": "code",
      "pos": {
-        "x": 943,
+        "x": 942,
        "y": 158
      },
      "width": 199,
@ -227,7 +227,7 @@
      "id": "f",
      "type": "cylinder",
      "pos": {
-        "x": 1164,
+        "x": 1163,
        "y": 118
      },
      "width": 100,
@ -268,7 +268,7 @@
      "id": "g",
      "type": "diamond",
      "pos": {
-        "x": 1314,
+        "x": 1313,
        "y": 144
      },
      "width": 100,
@ -309,7 +309,7 @@
      "id": "h",
      "type": "document",
      "pos": {
-        "x": 1464,
+        "x": 1463,
        "y": 160
      },
      "width": 100,
@ -350,7 +350,7 @@
      "id": "i",
      "type": "hexagon",
      "pos": {
-        "x": 1604,
+        "x": 1603,
        "y": 167
      },
      "width": 146,
@ -391,7 +391,7 @@
      "id": "j",
      "type": "image",
      "pos": {
-        "x": 1790,
+        "x": 1789,
        "y": 87
      },
      "width": 128,
@ -444,7 +444,7 @@
      "id": "k",
      "type": "oval",
      "pos": {
-        "x": 1956,
+        "x": 1955,
        "y": 163
      },
      "width": 100,
@ -485,7 +485,7 @@
      "id": "l",
      "type": "package",
      "pos": {
-        "x": 2106,
+        "x": 2105,
        "y": 163
      },
      "width": 100,
@ -526,7 +526,7 @@
      "id": "m",
      "type": "page",
      "pos": {
-        "x": 2250,
+        "x": 2249,
        "y": 149
      },
      "width": 113,
@ -567,7 +567,7 @@
      "id": "n",
      "type": "parallelogram",
      "pos": {
-        "x": 2403,
+        "x": 2402,
        "y": 154
      },
      "width": 169,
@ -608,7 +608,7 @@
      "id": "o",
      "type": "person",
      "pos": {
-        "x": 2592,
+        "x": 2591,
        "y": 64
      },
      "width": 100,
@ -649,7 +649,7 @@
      "id": "p",
      "type": "queue",
      "pos": {
-        "x": 2732,
+        "x": 2731,
        "y": 170
      },
      "width": 151,
@ -690,7 +690,7 @@
      "id": "q",
      "type": "rectangle",
      "pos": {
-        "x": 2923,
+        "x": 2922,
        "y": 133
      },
      "width": 103,
@ -731,7 +731,7 @@
      "id": "r",
      "type": "step",
      "pos": {
-        "x": 3066,
+        "x": 3065,
        "y": 135
      },
      "width": 187,
@ -772,7 +772,7 @@
      "id": "s",
      "type": "stored_data",
      "pos": {
-        "x": 3291,
+        "x": 3290,
        "y": 170
      },
      "width": 100,
@ -813,7 +813,7 @@
      "id": "t",
      "type": "sql_table",
      "pos": {
-        "x": 3431,
+        "x": 3430,
        "y": 128
      },
      "width": 161,
@ -1003,7 +1003,7 @@
          "y": 406
        },
        {
-          "x": 572,
+          "x": 571,
          "y": 406
        }
      ],
@ -1037,11 +1037,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 572,
+          "x": 571,
          "y": 486
        },
        {
-          "x": 833,
+          "x": 832,
          "y": 486
        }
      ],
@ -1075,11 +1075,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 833,
+          "x": 832,
          "y": 556
        },
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 556
        }
      ],
@ -1113,11 +1113,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 626
        },
        {
-          "x": 1214,
+          "x": 1213,
          "y": 626
        }
      ],
@ -1151,11 +1151,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1214,
+          "x": 1213,
          "y": 696
        },
        {
-          "x": 1364,
+          "x": 1363,
          "y": 696
        }
      ],
@ -1189,11 +1189,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1364,
+          "x": 1363,
          "y": 766
        },
        {
-          "x": 1514,
+          "x": 1513,
          "y": 766
        }
      ],
@ -1227,11 +1227,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1514,
+          "x": 1513,
          "y": 836
        },
        {
-          "x": 1677,
+          "x": 1676,
          "y": 836
        }
      ],
@ -1265,11 +1265,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1677,
+          "x": 1676,
          "y": 906
        },
        {
-          "x": 1854,
+          "x": 1853,
          "y": 906
        }
      ],
@ -1303,11 +1303,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1854,
+          "x": 1853,
          "y": 976
        },
        {
-          "x": 2006,
+          "x": 2005,
          "y": 976
        }
      ],
@ -1341,11 +1341,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2006,
+          "x": 2005,
          "y": 1046
        },
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1046
        }
      ],
@ -1379,11 +1379,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1116
        },
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1116
        }
      ],
@ -1417,11 +1417,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1186
        },
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1186
        }
      ],
@ -1455,11 +1455,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1256
        },
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1256
        }
      ],
@ -1493,11 +1493,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1326
        },
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1326
        }
      ],
@ -1531,11 +1531,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1396
        },
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1396
        }
      ],
@ -1569,11 +1569,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1466
        },
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1466
        }
      ],
@ -1607,11 +1607,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1536
        },
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1536
        }
      ],
@ -1645,11 +1645,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1606
        },
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 1606
        }
      ],
@ -1759,11 +1759,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 572,
+          "x": 571,
          "y": 236
        },
        {
-          "x": 572,
+          "x": 571,
          "y": 1676
        }
      ],
@ -1797,11 +1797,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 833,
+          "x": 832,
          "y": 236
        },
        {
-          "x": 833,
+          "x": 832,
          "y": 1676
        }
      ],
@ -1835,11 +1835,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 236
        },
        {
-          "x": 1042.5,
+          "x": 1041.5,
          "y": 1676
        }
      ],
@ -1873,11 +1873,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1214,
+          "x": 1213,
          "y": 236
        },
        {
-          "x": 1214,
+          "x": 1213,
          "y": 1676
        }
      ],
@ -1911,11 +1911,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1364,
+          "x": 1363,
          "y": 236
        },
        {
-          "x": 1364,
+          "x": 1363,
          "y": 1676
        }
      ],
@ -1949,11 +1949,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1514,
+          "x": 1513,
          "y": 236
        },
        {
-          "x": 1514,
+          "x": 1513,
          "y": 1676
        }
      ],
@ -1987,11 +1987,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1677,
+          "x": 1676,
          "y": 236
        },
        {
-          "x": 1677,
+          "x": 1676,
          "y": 1676
        }
      ],
@ -2025,11 +2025,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1854,
+          "x": 1853,
          "y": 241
        },
        {
-          "x": 1854,
+          "x": 1853,
          "y": 1676
        }
      ],
@ -2063,11 +2063,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2006,
+          "x": 2005,
          "y": 236
        },
        {
-          "x": 2006,
+          "x": 2005,
          "y": 1676
        }
      ],
@ -2101,11 +2101,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2156,
+          "x": 2155,
          "y": 236
        },
        {
-          "x": 2156,
+          "x": 2155,
          "y": 1676
        }
      ],
@ -2139,11 +2139,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 236
        },
        {
-          "x": 2306.5,
+          "x": 2305.5,
          "y": 1676
        }
      ],
@ -2177,11 +2177,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 236
        },
        {
-          "x": 2487.5,
+          "x": 2486.5,
          "y": 1676
        }
      ],
@ -2215,11 +2215,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2642,
+          "x": 2641,
          "y": 241
        },
        {
-          "x": 2642,
+          "x": 2641,
          "y": 1676
        }
      ],
@ -2253,11 +2253,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 236
        },
        {
-          "x": 2807.5,
+          "x": 2806.5,
          "y": 1676
        }
      ],
@ -2291,11 +2291,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 236
        },
        {
-          "x": 2974.5,
+          "x": 2973.5,
          "y": 1676
        }
      ],
@ -2329,11 +2329,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 236
        },
        {
-          "x": 3159.5,
+          "x": 3158.5,
          "y": 1676
        }
      ],
@ -2367,11 +2367,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3341,
+          "x": 3340,
          "y": 236
        },
        {
-          "x": 3341,
+          "x": 3340,
          "y": 1676
        }
      ],
@ -2405,11 +2405,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 236
        },
        {
-          "x": 3511.5,
+          "x": 3510.5,
          "y": 1676
        }
      ],
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json
--- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json
--- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg
--- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
@ -8,10 +8,10 @@
      "type": "rectangle",
      "pos": {
        "x": 0,
-        "y": 194
+        "y": 193
      },
-      "width": 302,
+      "width": 303,
-      "height": 520,
+      "height": 523,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -47,7 +47,7 @@
      "id": "via",
      "type": "rectangle",
      "pos": {
-        "x": 573,
+        "x": 574,
        "y": 149
      },
      "width": 236,
@ -87,7 +87,7 @@
      "id": "teleport",
      "type": "rectangle",
      "pos": {
-        "x": 1080,
+        "x": 1081,
        "y": 303
      },
      "width": 473,
@ -128,7 +128,7 @@
      "id": "jita",
      "type": "rectangle",
      "pos": {
-        "x": 2055,
+        "x": 2056,
        "y": 0
      },
      "width": 820,
@ -169,7 +169,7 @@
      "id": "infra",
      "type": "rectangle",
      "pos": {
-        "x": 2174,
+        "x": 2175,
        "y": 272
      },
      "width": 582,
@ -210,7 +210,7 @@
      "id": "identity provider",
      "type": "rectangle",
      "pos": {
-        "x": 2365,
+        "x": 2366,
        "y": 676
      },
      "width": 201,
@ -264,10 +264,10 @@
      "type": "oval",
      "pos": {
        "x": 60,
-        "y": 254
+        "y": 253
      },
-      "width": 182,
+      "width": 183,
-      "height": 182,
+      "height": 183,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -319,8 +319,8 @@
        "x": 60,
        "y": 476
      },
-      "width": 182,
+      "width": 183,
-      "height": 178,
+      "height": 180,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -369,7 +369,7 @@
      "id": "via.https",
      "type": "rectangle",
      "pos": {
-        "x": 633,
+        "x": 634,
        "y": 209
      },
      "width": 116,
@ -410,7 +410,7 @@
      "id": "via.kubectl",
      "type": "rectangle",
      "pos": {
-        "x": 633,
+        "x": 634,
        "y": 315
      },
      "width": 116,
@ -451,7 +451,7 @@
      "id": "via.tsh",
      "type": "rectangle",
      "pos": {
-        "x": 633,
+        "x": 634,
        "y": 421
      },
      "width": 116,
@ -492,7 +492,7 @@
      "id": "via.api",
      "type": "rectangle",
      "pos": {
-        "x": 633,
+        "x": 634,
        "y": 527
      },
      "width": 116,
@ -533,7 +533,7 @@
      "id": "via.db clients",
      "type": "rectangle",
      "pos": {
-        "x": 633,
+        "x": 634,
        "y": 633
      },
      "width": 116,
@ -574,7 +574,7 @@
      "id": "teleport.inp",
      "type": "text",
      "pos": {
-        "x": 1140,
+        "x": 1141,
        "y": 363
      },
      "width": 353,
@ -614,7 +614,7 @@
      "id": "teleport.Audit Log",
      "type": "rectangle",
      "pos": {
-        "x": 1140,
+        "x": 1141,
        "y": 454
      },
      "width": 140,
@ -667,7 +667,7 @@
      "id": "teleport.Cert Authority",
      "type": "rectangle",
      "pos": {
-        "x": 1320,
+        "x": 1321,
        "y": 454
      },
      "width": 173,
@ -720,7 +720,7 @@
      "id": "jita.Slack",
      "type": "rectangle",
      "pos": {
-        "x": 2115,
+        "x": 2116,
        "y": 60
      },
      "width": 110,
@ -773,7 +773,7 @@
      "id": "jita.Mattermost",
      "type": "rectangle",
      "pos": {
-        "x": 2265,
+        "x": 2266,
        "y": 60
      },
      "width": 128,
@ -814,7 +814,7 @@
      "id": "jita.Jira",
      "type": "rectangle",
      "pos": {
-        "x": 2433,
+        "x": 2434,
        "y": 60
      },
      "width": 72,
@ -855,7 +855,7 @@
      "id": "jita.Pagerduty",
      "type": "rectangle",
      "pos": {
-        "x": 2545,
+        "x": 2546,
        "y": 60
      },
      "width": 119,
@ -896,7 +896,7 @@
      "id": "jita.Email",
      "type": "rectangle",
      "pos": {
-        "x": 2704,
+        "x": 2705,
        "y": 60
      },
      "width": 111,
@ -949,7 +949,7 @@
      "id": "infra.ssh",
      "type": "rectangle",
      "pos": {
-        "x": 2234,
+        "x": 2235,
        "y": 332
      },
      "width": 103,
@ -1002,7 +1002,7 @@
      "id": "infra.Kubernetes",
      "type": "rectangle",
      "pos": {
-        "x": 2377,
+        "x": 2378,
        "y": 332
      },
      "width": 152,
@ -1055,7 +1055,7 @@
      "id": "infra.My SQL",
      "type": "rectangle",
      "pos": {
-        "x": 2569,
+        "x": 2570,
        "y": 332
      },
      "width": 126,
@ -1108,7 +1108,7 @@
      "id": "infra.MongoDB",
      "type": "rectangle",
      "pos": {
-        "x": 2234,
+        "x": 2235,
        "y": 464
      },
      "width": 138,
@ -1161,7 +1161,7 @@
      "id": "infra.PSQL",
      "type": "rectangle",
      "pos": {
-        "x": 2412,
+        "x": 2413,
        "y": 464
      },
      "width": 108,
@ -1214,7 +1214,7 @@
      "id": "infra.Windows",
      "type": "rectangle",
      "pos": {
-        "x": 2560,
+        "x": 2561,
        "y": 464
      },
      "width": 136,
@ -1290,19 +1290,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 301.5,
+          "x": 302.5,
          "y": 454
        },
        {
-          "x": 410.29998779296875,
+          "x": 411.29998779296875,
          "y": 454
        },
        {
-          "x": 464.70001220703125,
+          "x": 465.70001220703125,
          "y": 454
        },
        {
-          "x": 573.5,
+          "x": 574.5,
          "y": 454
        }
      ],
@ -1337,19 +1337,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 808.5,
+          "x": 809.5,
          "y": 454
        },
        {
-          "x": 917.2999877929688,
+          "x": 918.2999877929688,
          "y": 454
        },
        {
-          "x": 971.7000122070312,
+          "x": 972.7000122070312,
          "y": 454
        },
        {
-          "x": 1080.5,
+          "x": 1081.5,
          "y": 454
        }
      ],
@ -1384,19 +1384,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1528.72998046875,
+          "x": 1529.72998046875,
          "y": 302.5
        },
        {
-          "x": 1748.946044921875,
+          "x": 1749.946044921875,
          "y": 145.2989959716797
        },
        {
-          "x": 1854.199951171875,
+          "x": 1855.199951171875,
          "y": 106
        },
        {
-          "x": 2055,
+          "x": 2056,
          "y": 106
        }
      ],
@ -1431,19 +1431,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1553,
+          "x": 1554,
          "y": 449
        },
        {
-          "x": 1753.800048828125,
+          "x": 1754.800048828125,
          "y": 445
        },
        {
-          "x": 1878,
+          "x": 1879,
          "y": 444
        },
        {
-          "x": 2174,
+          "x": 2175,
          "y": 444
        }
      ],
@ -1478,19 +1478,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1553,
+          "x": 1554,
          "y": 521
        },
        {
-          "x": 1753.800048828125,
+          "x": 1754.800048828125,
          "y": 578.5999755859375
        },
        {
-          "x": 1916.0999755859375,
+          "x": 1917.0999755859375,
          "y": 621.0770263671875
        },
        {
-          "x": 2364.5,
+          "x": 2365.5,
          "y": 733.385986328125
        }
      ],
@ -1525,19 +1525,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1553,
+          "x": 1554,
          "y": 589
        },
        {
-          "x": 1753.800048828125,
+          "x": 1754.800048828125,
          "y": 728.2000122070312
        },
        {
-          "x": 1916.0999755859375,
+          "x": 1917.0999755859375,
          "y": 761.3040161132812
        },
        {
-          "x": 2364.5,
+          "x": 2365.5,
          "y": 754.52001953125
        }
      ],
--- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
--- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
@ -8,10 +8,10 @@
      "type": "rectangle",
      "pos": {
        "x": 12,
-        "y": 167
+        "y": 165
      },
-      "width": 302,
+      "width": 303,
-      "height": 520,
+      "height": 523,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -47,7 +47,7 @@
      "id": "via",
      "type": "rectangle",
      "pos": {
-        "x": 384,
+        "x": 385,
        "y": 122
      },
      "width": 236,
@ -87,7 +87,7 @@
      "id": "teleport",
      "type": "rectangle",
      "pos": {
-        "x": 690,
+        "x": 691,
        "y": 275
      },
      "width": 473,
@ -128,7 +128,7 @@
      "id": "jita",
      "type": "rectangle",
      "pos": {
-        "x": 1945,
+        "x": 1946,
        "y": 12
      },
      "width": 820,
@ -169,7 +169,7 @@
      "id": "infra",
      "type": "rectangle",
      "pos": {
-        "x": 1293,
+        "x": 1294,
        "y": 150
      },
      "width": 582,
@ -210,7 +210,7 @@
      "id": "identity provider",
      "type": "rectangle",
      "pos": {
-        "x": 1293,
+        "x": 1294,
        "y": 514
      },
      "width": 201,
@ -264,10 +264,10 @@
      "type": "oval",
      "pos": {
        "x": 72,
-        "y": 227
+        "y": 225
      },
-      "width": 182,
+      "width": 183,
-      "height": 182,
+      "height": 183,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -317,10 +317,10 @@
      "type": "oval",
      "pos": {
        "x": 72,
-        "y": 449
+        "y": 448
      },
-      "width": 182,
+      "width": 183,
-      "height": 178,
+      "height": 180,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -369,7 +369,7 @@
      "id": "via.https",
      "type": "rectangle",
      "pos": {
-        "x": 444,
+        "x": 445,
        "y": 182
      },
      "width": 116,
@ -410,7 +410,7 @@
      "id": "via.kubectl",
      "type": "rectangle",
      "pos": {
-        "x": 444,
+        "x": 445,
        "y": 288
      },
      "width": 116,
@ -451,7 +451,7 @@
      "id": "via.tsh",
      "type": "rectangle",
      "pos": {
-        "x": 444,
+        "x": 445,
        "y": 394
      },
      "width": 116,
@ -492,7 +492,7 @@
      "id": "via.api",
      "type": "rectangle",
      "pos": {
-        "x": 444,
+        "x": 445,
        "y": 500
      },
      "width": 116,
@ -533,7 +533,7 @@
      "id": "via.db clients",
      "type": "rectangle",
      "pos": {
-        "x": 444,
+        "x": 445,
        "y": 606
      },
      "width": 116,
@ -574,7 +574,7 @@
      "id": "teleport.inp",
      "type": "text",
      "pos": {
-        "x": 750,
+        "x": 751,
        "y": 335
      },
      "width": 353,
@ -614,7 +614,7 @@
      "id": "teleport.Audit Log",
      "type": "rectangle",
      "pos": {
-        "x": 750,
+        "x": 751,
        "y": 426
      },
      "width": 140,
@ -667,7 +667,7 @@
      "id": "teleport.Cert Authority",
      "type": "rectangle",
      "pos": {
-        "x": 930,
+        "x": 931,
        "y": 426
      },
      "width": 173,
@ -720,7 +720,7 @@
      "id": "jita.Slack",
      "type": "rectangle",
      "pos": {
-        "x": 2005,
+        "x": 2006,
        "y": 72
      },
      "width": 110,
@ -773,7 +773,7 @@
      "id": "jita.Mattermost",
      "type": "rectangle",
      "pos": {
-        "x": 2155,
+        "x": 2156,
        "y": 72
      },
      "width": 128,
@ -814,7 +814,7 @@
      "id": "jita.Jira",
      "type": "rectangle",
      "pos": {
-        "x": 2323,
+        "x": 2324,
        "y": 72
      },
      "width": 72,
@ -855,7 +855,7 @@
      "id": "jita.Pagerduty",
      "type": "rectangle",
      "pos": {
-        "x": 2435,
+        "x": 2436,
        "y": 72
      },
      "width": 119,
@ -896,7 +896,7 @@
      "id": "jita.Email",
      "type": "rectangle",
      "pos": {
-        "x": 2594,
+        "x": 2595,
        "y": 72
      },
      "width": 111,
@ -949,7 +949,7 @@
      "id": "infra.ssh",
      "type": "rectangle",
      "pos": {
-        "x": 1353,
+        "x": 1354,
        "y": 210
      },
      "width": 103,
@ -1002,7 +1002,7 @@
      "id": "infra.Kubernetes",
      "type": "rectangle",
      "pos": {
-        "x": 1496,
+        "x": 1497,
        "y": 210
      },
      "width": 152,
@ -1055,7 +1055,7 @@
      "id": "infra.My SQL",
      "type": "rectangle",
      "pos": {
-        "x": 1688,
+        "x": 1689,
        "y": 210
      },
      "width": 126,
@ -1108,7 +1108,7 @@
      "id": "infra.MongoDB",
      "type": "rectangle",
      "pos": {
-        "x": 1353,
+        "x": 1354,
        "y": 342
      },
      "width": 138,
@ -1161,7 +1161,7 @@
      "id": "infra.PSQL",
      "type": "rectangle",
      "pos": {
-        "x": 1531,
+        "x": 1532,
        "y": 342
      },
      "width": 108,
@ -1214,7 +1214,7 @@
      "id": "infra.Windows",
      "type": "rectangle",
      "pos": {
-        "x": 1679,
+        "x": 1680,
        "y": 342
      },
      "width": 136,
@ -1290,11 +1290,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 314,
+          "x": 315,
          "y": 427.0329895019531
        },
        {
-          "x": 384,
+          "x": 385,
          "y": 427.0329895019531
        }
      ],
@ -1328,11 +1328,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 620,
+          "x": 621,
          "y": 427.0329895019531
        },
        {
-          "x": 690,
+          "x": 691,
          "y": 427.0329895019531
        }
      ],
@ -1366,19 +1366,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1163,
+          "x": 1164,
          "y": 336.13299560546875
        },
        {
-          "x": 1203,
+          "x": 1204,
          "y": 336.13299560546875
        },
        {
-          "x": 1203,
+          "x": 1204,
          "y": 118
        },
        {
-          "x": 1945,
+          "x": 1946,
          "y": 118
        }
      ],
@ -1412,11 +1412,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1163,
+          "x": 1164,
          "y": 396.7330017089844
        },
        {
-          "x": 1293,
+          "x": 1294,
          "y": 396.7330017089844
        }
      ],
@ -1450,19 +1450,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1163,
+          "x": 1164,
          "y": 457.3330078125
        },
        {
-          "x": 1253,
+          "x": 1254,
          "y": 457.3330078125
        },
        {
-          "x": 1253,
+          "x": 1254,
          "y": 553.3330078125
        },
        {
-          "x": 1293,
+          "x": 1294,
          "y": 553.3330078125
        }
      ],
@ -1496,19 +1496,19 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1163,
+          "x": 1164,
          "y": 517.9329833984375
        },
        {
-          "x": 1203,
+          "x": 1204,
          "y": 517.9329833984375
        },
        {
-          "x": 1203,
+          "x": 1204,
          "y": 592.666015625
        },
        {
-          "x": 1293,
+          "x": 1294,
          "y": 592.666015625
        }
      ],
--- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
--- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
@ -10,7 +10,7 @@
        "x": 12,
        "y": 12
      },
-      "width": 1428,
+      "width": 1388,
      "height": 411,
      "opacity": 1,
      "strokeDash": 0,
@ -49,10 +49,10 @@
      "type": "oval",
      "pos": {
        "x": 62,
-        "y": 83
+        "y": 108
      },
-      "width": 268,
+      "width": 228,
-      "height": 268,
+      "height": 218,
      "opacity": 1,
      "strokeDash": 0,
      "strokeWidth": 2,
@ -89,8 +89,8 @@
      "id": "containers.circle container.diamond",
      "type": "diamond",
      "pos": {
-        "x": 132,
+        "x": 112,
-        "y": 206
+        "y": 185
      },
      "width": 128,
      "height": 64,
@ -130,7 +130,7 @@
      "id": "containers.diamond container",
      "type": "diamond",
      "pos": {
-        "x": 350,
+        "x": 310,
        "y": 62
      },
      "width": 414,
@ -171,7 +171,7 @@
      "id": "containers.diamond container.circle",
      "type": "oval",
      "pos": {
-        "x": 493,
+        "x": 453,
        "y": 174
      },
      "width": 128,
@ -212,7 +212,7 @@
      "id": "containers.oval container",
      "type": "oval",
      "pos": {
-        "x": 784,
+        "x": 744,
        "y": 125
      },
      "width": 266,
@ -253,7 +253,7 @@
      "id": "containers.oval container.hexagon",
      "type": "hexagon",
      "pos": {
-        "x": 853,
+        "x": 813,
        "y": 195
      },
      "width": 128,
@ -294,7 +294,7 @@
      "id": "containers.hexagon container",
      "type": "hexagon",
      "pos": {
-        "x": 1070,
+        "x": 1030,
        "y": 124
      },
      "width": 320,
@ -335,7 +335,7 @@
      "id": "containers.hexagon container.oval",
      "type": "oval",
      "pos": {
-        "x": 1166,
+        "x": 1126,
        "y": 197
      },
      "width": 128,
@ -376,7 +376,7 @@
      "id": "cloud",
      "type": "cloud",
      "pos": {
-        "x": 1460,
+        "x": 1420,
        "y": 167
      },
      "width": 512,
@ -418,7 +418,7 @@
      "id": "tall cylinder",
      "type": "cylinder",
      "pos": {
-        "x": 1588,
+        "x": 1548,
        "y": 1363
      },
      "width": 256,
@ -459,7 +459,7 @@
      "id": "class2",
      "type": "class",
      "pos": {
-        "x": 1316,
+        "x": 1276,
        "y": 693
      },
      "width": 800,
@ -534,7 +534,7 @@
      "id": "users",
      "type": "sql_table",
      "pos": {
-        "x": 1316,
+        "x": 1276,
        "y": 1945
      },
      "width": 800,
@ -718,7 +718,7 @@
      "id": "container",
      "type": "rectangle",
      "pos": {
-        "x": 2279,
+        "x": 2239,
        "y": 357
      },
      "width": 114,
@ -759,7 +759,7 @@
      "id": "text",
      "type": "text",
      "pos": {
-        "x": 2136,
+        "x": 2096,
        "y": 493
      },
      "width": 400,
@ -799,7 +799,7 @@
      "id": "code",
      "type": "code",
      "pos": {
-        "x": 2136,
+        "x": 2096,
        "y": 1469
      },
      "width": 400,
@ -839,7 +839,7 @@
      "id": "small code",
      "type": "code",
      "pos": {
-        "x": 2236,
+        "x": 2196,
        "y": 1945
      },
      "width": 199,
@ -902,11 +902,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1716,
+          "x": 1676,
          "y": 422
        },
        {
-          "x": 1716,
+          "x": 1676,
          "y": 693
        }
      ],
@ -940,11 +940,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1716,
+          "x": 1676,
          "y": 1093
        },
        {
-          "x": 1716,
+          "x": 1676,
          "y": 1363
        }
      ],
@ -978,11 +978,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 1716,
+          "x": 1676,
          "y": 1875
        },
        {
-          "x": 1716,
+          "x": 1676,
          "y": 1945
        }
      ],
@ -1016,11 +1016,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2336,
+          "x": 2296,
          "y": 423
        },
        {
-          "x": 2336,
+          "x": 2296,
          "y": 493
        }
      ],
@ -1054,11 +1054,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2336,
+          "x": 2296,
          "y": 1293
        },
        {
-          "x": 2336,
+          "x": 2296,
          "y": 1469
        }
      ],
@ -1092,11 +1092,11 @@
      "labelPercentage": 0,
      "route": [
        {
-          "x": 2336,
+          "x": 2296,
          "y": 1769
        },
        {
-          "x": 2336,
+          "x": 2296,
          "y": 1945
        }
      ],
--- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
+++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
--- a/lib/shape/shape_circle.go
+++ b/lib/shape/shape_circle.go
@ -37,18 +37,22 @@ func (s shapeCircle) AspectRatio1() bool {
 }
 func (s shapeCircle) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) {
-	length := math.Max(width+paddingX, height+paddingY)
+	effectiveWidth := width + 2*paddingX
-	diameter := math.Ceil(math.Sqrt2 * length)
+	effectiveHeight := height + 2*paddingY
 	diameter := math.Ceil(math.Max(effectiveWidth, effectiveHeight))
 	return diameter, diameter
 }
 func (s shapeCircle) GetInsidePlacement(width, height, paddingX, paddingY float64) geo.Point {
-	project45 := 1 / math.Sqrt2
+	centerX := s.Box.TopLeft.X + paddingX
-	r := s.Box.Width / 2
+	centerY := s.Box.TopLeft.Y + paddingY
-	// we want to offset r-padding/2 away from the center
+	r := s.Box.Width / 2.
 	x := centerX - r
 	y := centerY - r
 	return geo.Point{
-		X: s.Box.TopLeft.X + math.Ceil(r-project45*(r-paddingX/2)),
+		X: math.Ceil(x),
-		Y: s.Box.TopLeft.Y + math.Ceil(r-project45*(r-paddingY/2)),
+		Y: math.Ceil(y),
 	}
 }