From c5f047805f124682b6e57bae965fa7277e8b38e9 Mon Sep 17 00:00:00 2001
From: Gavin Nishizawa <gavin@terrastruct.com>
Date: Wed, 9 Nov 2022 11:45:26 -0800
Subject: [PATCH] use a group when a shape has multiple paths

---
 d2renderers/d2svg/d2svg.go                           | 12 ++++++++++--
 e2etests/testdata/stable/all_shapes/sketch.exp.svg   |  2 +-
 .../stable/all_shapes_multiple/sketch.exp.svg        |  2 +-
 e2etests/testdata/stable/chaos1/sketch.exp.svg       |  2 +-
 e2etests/testdata/stable/chaos2/sketch.exp.svg       |  2 +-
 e2etests/testdata/stable/investigate/sketch.exp.svg  |  2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index 6a76331b3..7120d318d 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -520,8 +520,16 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) error {
 				fmt.Fprintf(writer, `<path class="shape" d="%s" style="%s" %s/>`, pathData, style, shadowAttr)
 			}
 		}
-		for _, pathData := range s.GetSVGPathData() {
-			fmt.Fprintf(writer, `<path class="shape" d="%s" style="%s" %s/>`, pathData, style, shadowAttr)
+
+		paths := s.GetSVGPathData()
+		if len(paths) == 1 {
+			fmt.Fprintf(writer, `<path class="shape" d="%s" style="%s" %s/>`, paths[0], style, shadowAttr)
+		} else {
+			fmt.Fprintf(writer, `<g class="shape" style="%s" %s>`, style, shadowAttr)
+			for _, pathData := range paths {
+				fmt.Fprintf(writer, `<path class="shape" d="%s"/>`, pathData)
+			}
+			fmt.Fprintf(writer, `</g>`)
 		}
 	}
 
diff --git a/e2etests/testdata/stable/all_shapes/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/sketch.exp.svg
index 3c83a55c5..34e7ec310 100644
--- a/e2etests/testdata/stable/all_shapes/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes/sketch.exp.svg
@@ -12,7 +12,7 @@ width="1539" height="824" viewBox="-100 -100 1539 824"><style type="text/css">
 	stroke-linejoin: round;
 }
 ]]>
-</style><rect class="shape" x="0" y="0" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">rectangle</text><rect class="shape" x="9" y="226" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="86.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">square</text><path class="shape" d="M 17.053 489 H 111.1594 C 113.6252 489 115.9937 489.7278 117.7625 491.0288 L 152.1259 516.3053 C 153.9632 517.6569 155 519.514 155 521.4538 V 614.2025 C 155 614.6429 154.5285 615 153.947 615 H 17.053 C 16.4715 615 16 614.6429 16 614.2025 V 489.7975 C 16 489.357 16.4715 489 17.053 489 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 152.7213 615 H 18.2787 C 16.9115 615 16 614.3096 16 613.274 V 490.726 C 16 489.6904 16.9115 489 18.2787 489 H 110.7935 C 112.1607 489 113.0722 489.6904 113.0722 490.726 V 517.9972 C 113.0722 520.0684 114.8952 521.7945 118.0853 521.7945 H 152.7213 C 154.0885 521.7945 155 522.4849 155 523.5205 V 613.274 C 155 614.3096 154.0885 615 152.7213 615 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">page</text><path class="shape" d="M 257 0 L 435 0 L 409 126 L 231 126 L 231 126 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">parallelogram</text><path class="shape" d="M 245 348.5231 L 245 240 L 422 240 L 422 348.5231 C 392.5 325.2206 363 325.2206 333.5 348.5231 C 304 371.8256 274.5 371.8256 245 348.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">document</text><path class="shape" d="M 251 513 C 251 489 324.8 489 333 489 C 341.2 489 415 489 415 513 V 591 C 415 615 341.2 615 333 615 C 324.8 615 251 615 251 591 V 513 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 251 513 C 251 537 324.8 537 333 537 C 341.2 537 415 537 415 513" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="567.000000" style="text-anchor:middle;font-size:16px;fill:black">cylinder</text><path class="shape" d="M 519 0 H 620 C 644 0 644 56.7 644 63 C 644 69.3 644 126 620 126 H 519 C 495 126 495 69.3 495 63 C 495 56.7 495 0 519 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 620 0 C 596 0 596 56.7 596 63 C 596 69.3 596 126 620 126" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="557.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">queue</text><path class="shape" d="M 488 240 L 569.5 240 L 569.5 274 L 651 274 L 651 366 L 488 366 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="569.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">package</text><path class="shape" d="M 502 489 L 603 489 L 638 552 L 603 615 L 502 615 L 537 552 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="570.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">step</text><path class="shape" d="M 729 0 V 81 H 806.5 V 126 L 836.5 81 H 884 V 0 H 729 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="43.500000" style="text-anchor:middle;font-size:16px;fill:black">callout</text><path class="shape" d="M 726 240 H 902 C 897.95 240 887 274.02 887 303 C 887 331.98 897.95 366 902 366 H 726 C 721.95 366 711 331.98 711 303 C 711 274.02 721.95 240 726 240 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">stored_data</text><path class="shape" d="M 883 615 H 730 V 613.2093 C 730 591.7209 746.8009 572.3488 773.2343 563.0698 C 758.6735 555.5814 749.937 543.3721 749.937 530.0233 C 749.937 507.3953 775.2504 489 806.388 489 C 837.5256 489 862.839 507.3953 862.839 530.0233 C 862.839 543.3721 854.3266 555.4186 839.5418 563.2326 C 865.9752 572.5117 882.7761 591.8838 882.7761 613.3721 V 615 H 883 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">person</text><path class="shape" d="M 1030 126 C 1029.3455 126 1028.9091 125.8362 1028.4727 125.5085 L 946.6545 64.2289 C 945.7818 63.5735 945.7818 62.5904 946.6545 61.935 L 1028.4727 0.4915 C 1029.3454 -0.1639 1030.6545 -0.1639 1031.5272 0.4915 L 1113.3454 61.9349 C 1114.2181 62.5903 1114.2181 63.5734 1113.3454 64.2288 L 1031.5273 125.5085 C 1031.0909 125.8362 1030.6545 126 1030 126 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">diamond</text><ellipse class="shape" cx="1030.000000" cy="303.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">oval</text><ellipse class="shape" cx="1030.000000" cy="552.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">circle</text><path class="shape" d="M 1215.25 0 L 1174 62.9278 L 1215.25 126 L 1297.75 126 L 1339 62.9278 L 1297.75 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">hexagon</text><path class="shape" d="M 1207.9638 284.0477 C 1207.9638 285.3862 1206.9978 286.7245 1206.032 286.7245 C 1193.7169 288.3974 1184.0579 305.4626 1184.0579 326.2083 C 1184.0579 348.2925 1194.9242 366.0267 1208.6883 366.0267 H 1302.1385 C 1316.8685 366.0267 1328.9421 346.954 1328.9421 323.8661 C 1328.9421 301.7819 1317.8341 283.3784 1303.8289 282.0401 C 1302.8629 282.0401 1301.8971 281.0362 1301.6556 279.3633 C 1298.5164 256.9447 1284.0278 240.2142 1267.1249 240.2142 C 1256.0171 240.2142 1246.1166 247.241 1239.8385 258.283 C 1239.114 259.6215 1237.9067 259.9562 1237.1823 259.6215 C 1234.7675 258.283 1232.1115 257.6139 1229.2137 257.6139 C 1218.1058 257.2791 1208.9297 268.9904 1207.9638 284.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">cloud</text><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 85.500000 128.000000 C 85.500000 166.000000 85.500000 186.000000 85.500000 222.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 85.500000 382.000000 C 85.500000 420.000000 85.400000 441.800000 85.033897 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 128.000000 C 333.000000 166.000000 333.000000 188.800000 333.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 351.000000 C 333.000000 413.800000 333.000000 441.800000 333.000000 485.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.019999 127.999900 C 569.400000 166.000000 569.600000 188.800000 569.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.015625 367.999939 C 569.400000 417.200000 569.600000 441.800000 569.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.980001 127.999900 C 806.600000 166.000000 806.600000 188.800000 806.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.015625 367.999939 C 806.400000 417.200000 806.600000 441.800000 806.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 128.000000 C 1030.000000 166.000000 1030.000000 188.800000 1030.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 368.000000 C 1030.000000 417.200000 1030.000000 440.000000 1030.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1256.019999 127.999900 C 1256.400000 166.000000 1256.600000 189.200000 1256.969698 238.000115" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><style type="text/css"><![CDATA[
+</style><rect class="shape" x="0" y="0" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">rectangle</text><rect class="shape" x="9" y="226" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="86.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">square</text><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 17.053 489 H 111.1594 C 113.6252 489 115.9937 489.7278 117.7625 491.0288 L 152.1259 516.3053 C 153.9632 517.6569 155 519.514 155 521.4538 V 614.2025 C 155 614.6429 154.5285 615 153.947 615 H 17.053 C 16.4715 615 16 614.6429 16 614.2025 V 489.7975 C 16 489.357 16.4715 489 17.053 489 Z"/><path class="shape" d="M 152.7213 615 H 18.2787 C 16.9115 615 16 614.3096 16 613.274 V 490.726 C 16 489.6904 16.9115 489 18.2787 489 H 110.7935 C 112.1607 489 113.0722 489.6904 113.0722 490.726 V 517.9972 C 113.0722 520.0684 114.8952 521.7945 118.0853 521.7945 H 152.7213 C 154.0885 521.7945 155 522.4849 155 523.5205 V 613.274 C 155 614.3096 154.0885 615 152.7213 615 Z"/></g><text class="text-bold" x="85.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">page</text><path class="shape" d="M 257 0 L 435 0 L 409 126 L 231 126 L 231 126 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">parallelogram</text><path class="shape" d="M 245 348.5231 L 245 240 L 422 240 L 422 348.5231 C 392.5 325.2206 363 325.2206 333.5 348.5231 C 304 371.8256 274.5 371.8256 245 348.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">document</text><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 251 513 C 251 489 324.8 489 333 489 C 341.2 489 415 489 415 513 V 591 C 415 615 341.2 615 333 615 C 324.8 615 251 615 251 591 V 513 Z"/><path class="shape" d="M 251 513 C 251 537 324.8 537 333 537 C 341.2 537 415 537 415 513"/></g><text class="text-bold" x="333.000000" y="567.000000" style="text-anchor:middle;font-size:16px;fill:black">cylinder</text><g class="shape" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 519 0 H 620 C 644 0 644 56.7 644 63 C 644 69.3 644 126 620 126 H 519 C 495 126 495 69.3 495 63 C 495 56.7 495 0 519 0 Z"/><path class="shape" d="M 620 0 C 596 0 596 56.7 596 63 C 596 69.3 596 126 620 126"/></g><text class="text-bold" x="557.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">queue</text><path class="shape" d="M 488 240 L 569.5 240 L 569.5 274 L 651 274 L 651 366 L 488 366 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="569.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">package</text><path class="shape" d="M 502 489 L 603 489 L 638 552 L 603 615 L 502 615 L 537 552 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="570.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">step</text><path class="shape" d="M 729 0 V 81 H 806.5 V 126 L 836.5 81 H 884 V 0 H 729 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="43.500000" style="text-anchor:middle;font-size:16px;fill:black">callout</text><path class="shape" d="M 726 240 H 902 C 897.95 240 887 274.02 887 303 C 887 331.98 897.95 366 902 366 H 726 C 721.95 366 711 331.98 711 303 C 711 274.02 721.95 240 726 240 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">stored_data</text><path class="shape" d="M 883 615 H 730 V 613.2093 C 730 591.7209 746.8009 572.3488 773.2343 563.0698 C 758.6735 555.5814 749.937 543.3721 749.937 530.0233 C 749.937 507.3953 775.2504 489 806.388 489 C 837.5256 489 862.839 507.3953 862.839 530.0233 C 862.839 543.3721 854.3266 555.4186 839.5418 563.2326 C 865.9752 572.5117 882.7761 591.8838 882.7761 613.3721 V 615 H 883 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">person</text><path class="shape" d="M 1030 126 C 1029.3455 126 1028.9091 125.8362 1028.4727 125.5085 L 946.6545 64.2289 C 945.7818 63.5735 945.7818 62.5904 946.6545 61.935 L 1028.4727 0.4915 C 1029.3454 -0.1639 1030.6545 -0.1639 1031.5272 0.4915 L 1113.3454 61.9349 C 1114.2181 62.5903 1114.2181 63.5734 1113.3454 64.2288 L 1031.5273 125.5085 C 1031.0909 125.8362 1030.6545 126 1030 126 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">diamond</text><ellipse class="shape" cx="1030.000000" cy="303.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">oval</text><ellipse class="shape" cx="1030.000000" cy="552.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">circle</text><path class="shape" d="M 1215.25 0 L 1174 62.9278 L 1215.25 126 L 1297.75 126 L 1339 62.9278 L 1297.75 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">hexagon</text><path class="shape" d="M 1207.9638 284.0477 C 1207.9638 285.3862 1206.9978 286.7245 1206.032 286.7245 C 1193.7169 288.3974 1184.0579 305.4626 1184.0579 326.2083 C 1184.0579 348.2925 1194.9242 366.0267 1208.6883 366.0267 H 1302.1385 C 1316.8685 366.0267 1328.9421 346.954 1328.9421 323.8661 C 1328.9421 301.7819 1317.8341 283.3784 1303.8289 282.0401 C 1302.8629 282.0401 1301.8971 281.0362 1301.6556 279.3633 C 1298.5164 256.9447 1284.0278 240.2142 1267.1249 240.2142 C 1256.0171 240.2142 1246.1166 247.241 1239.8385 258.283 C 1239.114 259.6215 1237.9067 259.9562 1237.1823 259.6215 C 1234.7675 258.283 1232.1115 257.6139 1229.2137 257.6139 C 1218.1058 257.2791 1208.9297 268.9904 1207.9638 284.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">cloud</text><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 85.500000 128.000000 C 85.500000 166.000000 85.500000 186.000000 85.500000 222.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 85.500000 382.000000 C 85.500000 420.000000 85.400000 441.800000 85.033897 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 128.000000 C 333.000000 166.000000 333.000000 188.800000 333.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 351.000000 C 333.000000 413.800000 333.000000 441.800000 333.000000 485.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.019999 127.999900 C 569.400000 166.000000 569.600000 188.800000 569.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.015625 367.999939 C 569.400000 417.200000 569.600000 441.800000 569.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.980001 127.999900 C 806.600000 166.000000 806.600000 188.800000 806.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.015625 367.999939 C 806.400000 417.200000 806.600000 441.800000 806.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 128.000000 C 1030.000000 166.000000 1030.000000 188.800000 1030.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 368.000000 C 1030.000000 417.200000 1030.000000 440.000000 1030.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1256.019999 127.999900 C 1256.400000 166.000000 1256.600000 189.200000 1256.969698 238.000115" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><style type="text/css"><![CDATA[
 .text-bold {
 	font-family: "font-bold";
 }
diff --git a/e2etests/testdata/stable/all_shapes_multiple/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/sketch.exp.svg
index 83cc2e9dd..9ec418c8e 100644
--- a/e2etests/testdata/stable/all_shapes_multiple/sketch.exp.svg
+++ b/e2etests/testdata/stable/all_shapes_multiple/sketch.exp.svg
@@ -12,7 +12,7 @@ width="1539" height="824" viewBox="-100 -100 1539 824"><style type="text/css">
 	stroke-linejoin: round;
 }
 ]]>
-</style><rect class="shape" x="10" y="-10" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><rect class="shape" x="0" y="0" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">rectangle</text><rect class="shape" x="19" y="216" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><rect class="shape" x="9" y="226" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="86.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">square</text><path class="shape" d="M 27.053 479 H 121.1594 C 123.6252 479 125.9937 479.7278 127.7625 481.0288 L 162.1259 506.3053 C 163.9632 507.6569 165 509.514 165 511.4538 V 604.2025 C 165 604.6429 164.5285 605 163.947 605 H 27.053 C 26.4715 605 26 604.6429 26 604.2025 V 479.7975 C 26 479.357 26.4715 479 27.053 479 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 162.7213 605 H 28.2787 C 26.9115 605 26 604.3096 26 603.274 V 480.726 C 26 479.6904 26.9115 479 28.2787 479 H 120.7935 C 122.1607 479 123.0722 479.6904 123.0722 480.726 V 507.9972 C 123.0722 510.0684 124.8952 511.7945 128.0853 511.7945 H 162.7213 C 164.0885 511.7945 165 512.4849 165 513.5205 V 603.274 C 165 604.3096 164.0885 605 162.7213 605 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 17.053 489 H 111.1594 C 113.6252 489 115.9937 489.7278 117.7625 491.0288 L 152.1259 516.3053 C 153.9632 517.6569 155 519.514 155 521.4538 V 614.2025 C 155 614.6429 154.5285 615 153.947 615 H 17.053 C 16.4715 615 16 614.6429 16 614.2025 V 489.7975 C 16 489.357 16.4715 489 17.053 489 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 152.7213 615 H 18.2787 C 16.9115 615 16 614.3096 16 613.274 V 490.726 C 16 489.6904 16.9115 489 18.2787 489 H 110.7935 C 112.1607 489 113.0722 489.6904 113.0722 490.726 V 517.9972 C 113.0722 520.0684 114.8952 521.7945 118.0853 521.7945 H 152.7213 C 154.0885 521.7945 155 522.4849 155 523.5205 V 613.274 C 155 614.3096 154.0885 615 152.7213 615 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">page</text><path class="shape" d="M 267 -10 L 445 -10 L 419 116 L 241 116 L 241 116 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 257 0 L 435 0 L 409 126 L 231 126 L 231 126 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">parallelogram</text><path class="shape" d="M 255 338.5231 L 255 230 L 432 230 L 432 338.5231 C 402.5 315.2206 373 315.2206 343.5 338.5231 C 314 361.8256 284.5 361.8256 255 338.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 245 348.5231 L 245 240 L 422 240 L 422 348.5231 C 392.5 325.2206 363 325.2206 333.5 348.5231 C 304 371.8256 274.5 371.8256 245 348.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">document</text><path class="shape" d="M 261 503 C 261 479 334.8 479 343 479 C 351.2 479 425 479 425 503 V 581 C 425 605 351.2 605 343 605 C 334.8 605 261 605 261 581 V 503 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 261 503 C 261 527 334.8 527 343 527 C 351.2 527 425 527 425 503" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 251 513 C 251 489 324.8 489 333 489 C 341.2 489 415 489 415 513 V 591 C 415 615 341.2 615 333 615 C 324.8 615 251 615 251 591 V 513 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 251 513 C 251 537 324.8 537 333 537 C 341.2 537 415 537 415 513" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="567.000000" style="text-anchor:middle;font-size:16px;fill:black">cylinder</text><path class="shape" d="M 529 -10 H 630 C 654 -10 654 46.7 654 53 C 654 59.3 654 116 630 116 H 529 C 505 116 505 59.3 505 53 C 505 46.7 505 -10 529 -10 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 630 -10 C 606 -10 606 46.7 606 53 C 606 59.3 606 116 630 116" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 519 0 H 620 C 644 0 644 56.7 644 63 C 644 69.3 644 126 620 126 H 519 C 495 126 495 69.3 495 63 C 495 56.7 495 0 519 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 620 0 C 596 0 596 56.7 596 63 C 596 69.3 596 126 620 126" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="557.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">queue</text><path class="shape" d="M 498 230 L 579.5 230 L 579.5 264 L 661 264 L 661 356 L 498 356 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 488 240 L 569.5 240 L 569.5 274 L 651 274 L 651 366 L 488 366 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="569.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">package</text><path class="shape" d="M 512 479 L 613 479 L 648 542 L 613 605 L 512 605 L 547 542 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 502 489 L 603 489 L 638 552 L 603 615 L 502 615 L 537 552 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="570.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">step</text><path class="shape" d="M 739 -10 V 71 H 816.5 V 116 L 846.5 71 H 894 V -10 H 739 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 729 0 V 81 H 806.5 V 126 L 836.5 81 H 884 V 0 H 729 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="43.500000" style="text-anchor:middle;font-size:16px;fill:black">callout</text><path class="shape" d="M 736 230 H 912 C 907.95 230 897 264.02 897 293 C 897 321.98 907.95 356 912 356 H 736 C 731.95 356 721 321.98 721 293 C 721 264.02 731.95 230 736 230 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 726 240 H 902 C 897.95 240 887 274.02 887 303 C 887 331.98 897.95 366 902 366 H 726 C 721.95 366 711 331.98 711 303 C 711 274.02 721.95 240 726 240 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">stored_data</text><path class="shape" d="M 893 605 H 740 V 603.2093 C 740 581.7209 756.8009 562.3488 783.2343 553.0698 C 768.6735 545.5814 759.937 533.3721 759.937 520.0233 C 759.937 497.3953 785.2504 479 816.388 479 C 847.5256 479 872.839 497.3953 872.839 520.0233 C 872.839 533.3721 864.3266 545.4186 849.5418 553.2326 C 875.9752 562.5117 892.7761 581.8838 892.7761 603.3721 V 605 H 893 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 883 615 H 730 V 613.2093 C 730 591.7209 746.8009 572.3488 773.2343 563.0698 C 758.6735 555.5814 749.937 543.3721 749.937 530.0233 C 749.937 507.3953 775.2504 489 806.388 489 C 837.5256 489 862.839 507.3953 862.839 530.0233 C 862.839 543.3721 854.3266 555.4186 839.5418 563.2326 C 865.9752 572.5117 882.7761 591.8838 882.7761 613.3721 V 615 H 883 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">person</text><path class="shape" d="M 1040 116 C 1039.3455 116 1038.9091 115.8362 1038.4727 115.5085 L 956.6545 54.2289 C 955.7818 53.5735 955.7818 52.5904 956.6545 51.935 L 1038.4727 -9.5085 C 1039.3454 -10.1639 1040.6545 -10.1639 1041.5272 -9.5085 L 1123.3454 51.9349 C 1124.2181 52.5903 1124.2181 53.5734 1123.3454 54.2288 L 1041.5273 115.5085 C 1041.0909 115.8362 1040.6545 116 1040 116 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1030 126 C 1029.3455 126 1028.9091 125.8362 1028.4727 125.5085 L 946.6545 64.2289 C 945.7818 63.5735 945.7818 62.5904 946.6545 61.935 L 1028.4727 0.4915 C 1029.3454 -0.1639 1030.6545 -0.1639 1031.5272 0.4915 L 1113.3454 61.9349 C 1114.2181 62.5903 1114.2181 63.5734 1113.3454 64.2288 L 1031.5273 125.5085 C 1031.0909 125.8362 1030.6545 126 1030 126 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">diamond</text><ellipse class="shape" cx="1040.000000" cy="293.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><ellipse class="shape" cx="1030.000000" cy="303.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">oval</text><ellipse class="shape" cx="1040.000000" cy="542.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><ellipse class="shape" cx="1030.000000" cy="552.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">circle</text><path class="shape" d="M 1225.25 -10 L 1184 52.9278 L 1225.25 116 L 1307.75 116 L 1349 52.9278 L 1307.75 -10 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1215.25 0 L 1174 62.9278 L 1215.25 126 L 1297.75 126 L 1339 62.9278 L 1297.75 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">hexagon</text><path class="shape" d="M 1217.9638 274.0477 C 1217.9638 275.3862 1216.9978 276.7245 1216.032 276.7245 C 1203.7169 278.3974 1194.0579 295.4626 1194.0579 316.2083 C 1194.0579 338.2925 1204.9242 356.0267 1218.6883 356.0267 H 1312.1385 C 1326.8685 356.0267 1338.9421 336.954 1338.9421 313.8661 C 1338.9421 291.7819 1327.8341 273.3784 1313.8289 272.0401 C 1312.8629 272.0401 1311.8971 271.0362 1311.6556 269.3633 C 1308.5164 246.9447 1294.0278 230.2142 1277.1249 230.2142 C 1266.0171 230.2142 1256.1166 237.241 1249.8385 248.283 C 1249.114 249.6215 1247.9067 249.9562 1247.1823 249.6215 C 1244.7675 248.283 1242.1115 247.6139 1239.2137 247.6139 C 1228.1058 247.2791 1218.9297 258.9904 1217.9638 274.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1207.9638 284.0477 C 1207.9638 285.3862 1206.9978 286.7245 1206.032 286.7245 C 1193.7169 288.3974 1184.0579 305.4626 1184.0579 326.2083 C 1184.0579 348.2925 1194.9242 366.0267 1208.6883 366.0267 H 1302.1385 C 1316.8685 366.0267 1328.9421 346.954 1328.9421 323.8661 C 1328.9421 301.7819 1317.8341 283.3784 1303.8289 282.0401 C 1302.8629 282.0401 1301.8971 281.0362 1301.6556 279.3633 C 1298.5164 256.9447 1284.0278 240.2142 1267.1249 240.2142 C 1256.0171 240.2142 1246.1166 247.241 1239.8385 258.283 C 1239.114 259.6215 1237.9067 259.9562 1237.1823 259.6215 C 1234.7675 258.283 1232.1115 257.6139 1229.2137 257.6139 C 1218.1058 257.2791 1208.9297 268.9904 1207.9638 284.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">cloud</text><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 85.500000 128.000000 C 85.500000 166.000000 85.500000 186.000000 85.500000 222.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 85.500000 382.000000 C 85.500000 420.000000 85.400000 441.800000 85.033897 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 128.000000 C 333.000000 166.000000 333.000000 188.800000 333.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 351.000000 C 333.000000 413.800000 333.000000 441.800000 333.000000 485.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.019999 127.999900 C 569.400000 166.000000 569.600000 188.800000 569.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.015625 367.999939 C 569.400000 417.200000 569.600000 441.800000 569.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.980001 127.999900 C 806.600000 166.000000 806.600000 188.800000 806.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.015625 367.999939 C 806.400000 417.200000 806.600000 441.800000 806.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 128.000000 C 1030.000000 166.000000 1030.000000 188.800000 1030.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 368.000000 C 1030.000000 417.200000 1030.000000 440.000000 1030.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1256.019999 127.999900 C 1256.400000 166.000000 1256.600000 189.200000 1256.969698 238.000115" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><style type="text/css"><![CDATA[
+</style><rect class="shape" x="10" y="-10" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><rect class="shape" x="0" y="0" width="171" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="85.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">rectangle</text><rect class="shape" x="19" y="216" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><rect class="shape" x="9" y="226" width="154" height="154" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="86.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">square</text><path class="shape" d="M 27.053 479 H 121.1594 C 123.6252 479 125.9937 479.7278 127.7625 481.0288 L 162.1259 506.3053 C 163.9632 507.6569 165 509.514 165 511.4538 V 604.2025 C 165 604.6429 164.5285 605 163.947 605 H 27.053 C 26.4715 605 26 604.6429 26 604.2025 V 479.7975 C 26 479.357 26.4715 479 27.053 479 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 162.7213 605 H 28.2787 C 26.9115 605 26 604.3096 26 603.274 V 480.726 C 26 479.6904 26.9115 479 28.2787 479 H 120.7935 C 122.1607 479 123.0722 479.6904 123.0722 480.726 V 507.9972 C 123.0722 510.0684 124.8952 511.7945 128.0853 511.7945 H 162.7213 C 164.0885 511.7945 165 512.4849 165 513.5205 V 603.274 C 165 604.3096 164.0885 605 162.7213 605 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 17.053 489 H 111.1594 C 113.6252 489 115.9937 489.7278 117.7625 491.0288 L 152.1259 516.3053 C 153.9632 517.6569 155 519.514 155 521.4538 V 614.2025 C 155 614.6429 154.5285 615 153.947 615 H 17.053 C 16.4715 615 16 614.6429 16 614.2025 V 489.7975 C 16 489.357 16.4715 489 17.053 489 Z"/><path class="shape" d="M 152.7213 615 H 18.2787 C 16.9115 615 16 614.3096 16 613.274 V 490.726 C 16 489.6904 16.9115 489 18.2787 489 H 110.7935 C 112.1607 489 113.0722 489.6904 113.0722 490.726 V 517.9972 C 113.0722 520.0684 114.8952 521.7945 118.0853 521.7945 H 152.7213 C 154.0885 521.7945 155 522.4849 155 523.5205 V 613.274 C 155 614.3096 154.0885 615 152.7213 615 Z"/></g><text class="text-bold" x="85.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">page</text><path class="shape" d="M 267 -10 L 445 -10 L 419 116 L 241 116 L 241 116 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 257 0 L 435 0 L 409 126 L 231 126 L 231 126 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">parallelogram</text><path class="shape" d="M 255 338.5231 L 255 230 L 432 230 L 432 338.5231 C 402.5 315.2206 373 315.2206 343.5 338.5231 C 314 361.8256 284.5 361.8256 255 338.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 245 348.5231 L 245 240 L 422 240 L 422 348.5231 C 392.5 325.2206 363 325.2206 333.5 348.5231 C 304 371.8256 274.5 371.8256 245 348.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="333.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">document</text><path class="shape" d="M 261 503 C 261 479 334.8 479 343 479 C 351.2 479 425 479 425 503 V 581 C 425 605 351.2 605 343 605 C 334.8 605 261 605 261 581 V 503 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 261 503 C 261 527 334.8 527 343 527 C 351.2 527 425 527 425 503" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 251 513 C 251 489 324.8 489 333 489 C 341.2 489 415 489 415 513 V 591 C 415 615 341.2 615 333 615 C 324.8 615 251 615 251 591 V 513 Z"/><path class="shape" d="M 251 513 C 251 537 324.8 537 333 537 C 341.2 537 415 537 415 513"/></g><text class="text-bold" x="333.000000" y="567.000000" style="text-anchor:middle;font-size:16px;fill:black">cylinder</text><path class="shape" d="M 529 -10 H 630 C 654 -10 654 46.7 654 53 C 654 59.3 654 116 630 116 H 529 C 505 116 505 59.3 505 53 C 505 46.7 505 -10 529 -10 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 630 -10 C 606 -10 606 46.7 606 53 C 606 59.3 606 116 630 116" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><g class="shape" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 519 0 H 620 C 644 0 644 56.7 644 63 C 644 69.3 644 126 620 126 H 519 C 495 126 495 69.3 495 63 C 495 56.7 495 0 519 0 Z"/><path class="shape" d="M 620 0 C 596 0 596 56.7 596 63 C 596 69.3 596 126 620 126"/></g><text class="text-bold" x="557.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">queue</text><path class="shape" d="M 498 230 L 579.5 230 L 579.5 264 L 661 264 L 661 356 L 498 356 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 488 240 L 569.5 240 L 569.5 274 L 651 274 L 651 366 L 488 366 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="569.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">package</text><path class="shape" d="M 512 479 L 613 479 L 648 542 L 613 605 L 512 605 L 547 542 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 502 489 L 603 489 L 638 552 L 603 615 L 502 615 L 537 552 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="570.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">step</text><path class="shape" d="M 739 -10 V 71 H 816.5 V 116 L 846.5 71 H 894 V -10 H 739 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 729 0 V 81 H 806.5 V 126 L 836.5 81 H 884 V 0 H 729 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="43.500000" style="text-anchor:middle;font-size:16px;fill:black">callout</text><path class="shape" d="M 736 230 H 912 C 907.95 230 897 264.02 897 293 C 897 321.98 907.95 356 912 356 H 736 C 731.95 356 721 321.98 721 293 C 721 264.02 731.95 230 736 230 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 726 240 H 902 C 897.95 240 887 274.02 887 303 C 887 331.98 897.95 366 902 366 H 726 C 721.95 366 711 331.98 711 303 C 711 274.02 721.95 240 726 240 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">stored_data</text><path class="shape" d="M 893 605 H 740 V 603.2093 C 740 581.7209 756.8009 562.3488 783.2343 553.0698 C 768.6735 545.5814 759.937 533.3721 759.937 520.0233 C 759.937 497.3953 785.2504 479 816.388 479 C 847.5256 479 872.839 497.3953 872.839 520.0233 C 872.839 533.3721 864.3266 545.4186 849.5418 553.2326 C 875.9752 562.5117 892.7761 581.8838 892.7761 603.3721 V 605 H 893 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 883 615 H 730 V 613.2093 C 730 591.7209 746.8009 572.3488 773.2343 563.0698 C 758.6735 555.5814 749.937 543.3721 749.937 530.0233 C 749.937 507.3953 775.2504 489 806.388 489 C 837.5256 489 862.839 507.3953 862.839 530.0233 C 862.839 543.3721 854.3266 555.4186 839.5418 563.2326 C 865.9752 572.5117 882.7761 591.8838 882.7761 613.3721 V 615 H 883 Z" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="806.500000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">person</text><path class="shape" d="M 1040 116 C 1039.3455 116 1038.9091 115.8362 1038.4727 115.5085 L 956.6545 54.2289 C 955.7818 53.5735 955.7818 52.5904 956.6545 51.935 L 1038.4727 -9.5085 C 1039.3454 -10.1639 1040.6545 -10.1639 1041.5272 -9.5085 L 1123.3454 51.9349 C 1124.2181 52.5903 1124.2181 53.5734 1123.3454 54.2288 L 1041.5273 115.5085 C 1041.0909 115.8362 1040.6545 116 1040 116 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1030 126 C 1029.3455 126 1028.9091 125.8362 1028.4727 125.5085 L 946.6545 64.2289 C 945.7818 63.5735 945.7818 62.5904 946.6545 61.935 L 1028.4727 0.4915 C 1029.3454 -0.1639 1030.6545 -0.1639 1031.5272 0.4915 L 1113.3454 61.9349 C 1114.2181 62.5903 1114.2181 63.5734 1113.3454 64.2288 L 1031.5273 125.5085 C 1031.0909 125.8362 1030.6545 126 1030 126 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">diamond</text><ellipse class="shape" cx="1040.000000" cy="293.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><ellipse class="shape" cx="1030.000000" cy="303.000000" rx="68.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">oval</text><ellipse class="shape" cx="1040.000000" cy="542.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><ellipse class="shape" cx="1030.000000" cy="552.000000" rx="72.000000" ry="72.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1030.000000" y="555.000000" style="text-anchor:middle;font-size:16px;fill:black">circle</text><path class="shape" d="M 1225.25 -10 L 1184 52.9278 L 1225.25 116 L 1307.75 116 L 1349 52.9278 L 1307.75 -10 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1215.25 0 L 1174 62.9278 L 1215.25 126 L 1297.75 126 L 1339 62.9278 L 1297.75 0 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">hexagon</text><path class="shape" d="M 1217.9638 274.0477 C 1217.9638 275.3862 1216.9978 276.7245 1216.032 276.7245 C 1203.7169 278.3974 1194.0579 295.4626 1194.0579 316.2083 C 1194.0579 338.2925 1204.9242 356.0267 1218.6883 356.0267 H 1312.1385 C 1326.8685 356.0267 1338.9421 336.954 1338.9421 313.8661 C 1338.9421 291.7819 1327.8341 273.3784 1313.8289 272.0401 C 1312.8629 272.0401 1311.8971 271.0362 1311.6556 269.3633 C 1308.5164 246.9447 1294.0278 230.2142 1277.1249 230.2142 C 1266.0171 230.2142 1256.1166 237.241 1249.8385 248.283 C 1249.114 249.6215 1247.9067 249.9562 1247.1823 249.6215 C 1244.7675 248.283 1242.1115 247.6139 1239.2137 247.6139 C 1228.1058 247.2791 1218.9297 258.9904 1217.9638 274.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 1207.9638 284.0477 C 1207.9638 285.3862 1206.9978 286.7245 1206.032 286.7245 C 1193.7169 288.3974 1184.0579 305.4626 1184.0579 326.2083 C 1184.0579 348.2925 1194.9242 366.0267 1208.6883 366.0267 H 1302.1385 C 1316.8685 366.0267 1328.9421 346.954 1328.9421 323.8661 C 1328.9421 301.7819 1317.8341 283.3784 1303.8289 282.0401 C 1302.8629 282.0401 1301.8971 281.0362 1301.6556 279.3633 C 1298.5164 256.9447 1284.0278 240.2142 1267.1249 240.2142 C 1256.0171 240.2142 1246.1166 247.241 1239.8385 258.283 C 1239.114 259.6215 1237.9067 259.9562 1237.1823 259.6215 C 1234.7675 258.283 1232.1115 257.6139 1229.2137 257.6139 C 1218.1058 257.2791 1208.9297 268.9904 1207.9638 284.0477 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1256.500000" y="306.000000" style="text-anchor:middle;font-size:16px;fill:black">cloud</text><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 85.500000 128.000000 C 85.500000 166.000000 85.500000 186.000000 85.500000 222.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 85.500000 382.000000 C 85.500000 420.000000 85.400000 441.800000 85.033897 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 128.000000 C 333.000000 166.000000 333.000000 188.800000 333.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 333.000000 351.000000 C 333.000000 413.800000 333.000000 441.800000 333.000000 485.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.019999 127.999900 C 569.400000 166.000000 569.600000 188.800000 569.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 569.015625 367.999939 C 569.400000 417.200000 569.600000 441.800000 569.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.980001 127.999900 C 806.600000 166.000000 806.600000 188.800000 806.968751 236.000122" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 806.015625 367.999939 C 806.400000 417.200000 806.600000 441.800000 806.966103 485.000144" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 128.000000 C 1030.000000 166.000000 1030.000000 188.800000 1030.000000 236.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1030.000000 368.000000 C 1030.000000 417.200000 1030.000000 440.000000 1030.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><path d="M 1256.019999 127.999900 C 1256.400000 166.000000 1256.600000 189.200000 1256.969698 238.000115" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /><style type="text/css"><![CDATA[
 .text-bold {
 	font-family: "font-bold";
 }
diff --git a/e2etests/testdata/stable/chaos1/sketch.exp.svg b/e2etests/testdata/stable/chaos1/sketch.exp.svg
index ccf764085..d45243238 100644
--- a/e2etests/testdata/stable/chaos1/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos1/sketch.exp.svg
@@ -12,7 +12,7 @@ width="634" height="652" viewBox="-100 -100 634 652"><style type="text/css">
 	stroke-linejoin: round;
 }
 ]]>
-</style><rect class="shape" x="0" y="0" width="251" height="452" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="125.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:black">aaa</text><path class="shape" d="M 301 74 C 301 50 360.85 50 367.5 50 C 374.15 50 434 50 434 74 V 152 C 434 176 374.15 176 367.5 176 C 360.85 176 301 176 301 152 V 74 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 301 74 C 301 98 360.85 98 367.5 98 C 374.15 98 434 98 434 74" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="367.500000" y="128.000000" style="text-anchor:middle;font-size:16px;fill:black">ddd</text><path class="shape" d="M 301 384.5231 L 301 276 L 431 276 L 431 384.5231 C 409.3333 361.2206 387.6667 361.2206 366 384.5231 C 344.3333 407.8256 322.6667 407.8256 301 384.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="366.000000" y="342.000000" style="text-anchor:middle;font-size:16px;fill:black">eee</text><path class="shape" d="M 50 276 V 357 H 116 V 402 L 146 357 H 182 V 276 H 50 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="319.500000" style="text-anchor:middle;font-size:16px;fill:black">bbb</text><rect class="shape" x="72" y="50" width="128" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="136.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:black">ccc</text><mask id="mask-3626742025" maskUnits="userSpaceOnUse" x="105.000000" y="174.000000" width="23.000000" height="104.000000">
+</style><rect class="shape" x="0" y="0" width="251" height="452" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="125.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:black">aaa</text><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 301 74 C 301 50 360.85 50 367.5 50 C 374.15 50 434 50 434 74 V 152 C 434 176 374.15 176 367.5 176 C 360.85 176 301 176 301 152 V 74 Z"/><path class="shape" d="M 301 74 C 301 98 360.85 98 367.5 98 C 374.15 98 434 98 434 74"/></g><text class="text-bold" x="367.500000" y="128.000000" style="text-anchor:middle;font-size:16px;fill:black">ddd</text><path class="shape" d="M 301 384.5231 L 301 276 L 431 276 L 431 384.5231 C 409.3333 361.2206 387.6667 361.2206 366 384.5231 C 344.3333 407.8256 322.6667 407.8256 301 384.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="366.000000" y="342.000000" style="text-anchor:middle;font-size:16px;fill:black">eee</text><path class="shape" d="M 50 276 V 357 H 116 V 402 L 146 357 H 182 V 276 H 50 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="319.500000" style="text-anchor:middle;font-size:16px;fill:black">bbb</text><rect class="shape" x="72" y="50" width="128" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="136.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:black">ccc</text><mask id="mask-3626742025" maskUnits="userSpaceOnUse" x="105.000000" y="174.000000" width="23.000000" height="104.000000">
 <rect x="105.000000" y="174.000000" width="23.000000" height="104.000000" fill="white"></rect>
 <rect x="105.000000" y="215.000000" width="23" height="21" fill="black"></rect>
 </mask><path d="M 124.500993 177.969391 C 117.769912 216.000000 116.000000 236.000000 116.000000 274.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#mask-3626742025)" /><text class="text-italic" x="116.500000" y="231.000000" style="text-anchor:middle;font-size:16px;fill:black">111</text><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><mask id="mask-2957989372" maskUnits="userSpaceOnUse" x="145.000000" y="162.000000" width="168.000000" height="153.000000">
diff --git a/e2etests/testdata/stable/chaos2/sketch.exp.svg b/e2etests/testdata/stable/chaos2/sketch.exp.svg
index 195c0f5f6..049910b68 100644
--- a/e2etests/testdata/stable/chaos2/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos2/sketch.exp.svg
@@ -788,7 +788,7 @@ width="1317" height="1854" viewBox="-100 -100 1317 1854"><style type="text/css">
 .md .contains-task-list:dir(rtl) .task-list-item-checkbox {
   margin: 0 -1.6em 0.25em 0.2em;
 }
-</style><rect class="shape" x="0" y="0" width="1117" height="1654" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="558.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:black">aa</text><rect class="shape" x="40" y="50" width="776" height="1554" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="428.000000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:black">bb</text><rect class="shape" x="915" y="652" width="114" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="972.000000" y="718.000000" style="text-anchor:middle;font-size:16px;fill:black">ll</text><path class="shape" d="M 902 450 C 902 426 960.95 426 967.5 426 C 974.05 426 1033 426 1033 450 V 528 C 1033 552 974.05 552 967.5 552 C 960.95 552 902 552 902 528 V 450 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 902 450 C 902 474 960.95 474 967.5 474 C 974.05 474 1033 474 1033 450" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="967.500000" y="504.000000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="867.000000" y="1429.000000" width="18" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>nn</p>
+</style><rect class="shape" x="0" y="0" width="1117" height="1654" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="558.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:black">aa</text><rect class="shape" x="40" y="50" width="776" height="1554" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="428.000000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:black">bb</text><rect class="shape" x="915" y="652" width="114" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="972.000000" y="718.000000" style="text-anchor:middle;font-size:16px;fill:black">ll</text><g class="shape" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 902 450 C 902 426 960.95 426 967.5 426 C 974.05 426 1033 426 1033 450 V 528 C 1033 552 974.05 552 967.5 552 C 960.95 552 902 552 902 528 V 450 Z"/><path class="shape" d="M 902 450 C 902 474 960.95 474 967.5 474 C 974.05 474 1033 474 1033 450"/></g><text class="text-bold" x="967.500000" y="504.000000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="867.000000" y="1429.000000" width="18" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>nn</p>
 </div></foreignObject></g><rect class="shape" x="945" y="1378" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="1006.500000" y="1444.000000" style="text-anchor:middle;font-size:16px;fill:black">oo</text><rect class="shape" x="80" y="878" width="510" height="676" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="335.000000" y="903.000000" style="text-anchor:middle;font-size:20px;fill:black">cc</text><path class="shape" d="M 106 100 L 256 100 L 256 145.2 L 473 145.2 L 473 326 L 106 326 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="289.500000" y="125.000000" style="text-anchor:middle;font-size:20px;fill:black">ii</text><ellipse class="shape" cx="704.000000" cy="1441.000000" rx="63.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="704.000000" y="1444.000000" style="text-anchor:middle;font-size:16px;fill:black">kk</text><rect class="shape" x="120" y="928" width="355" height="226" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="297.500000" y="949.000000" style="text-anchor:middle;font-size:16px;fill:black">dd</text><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="409.000000" y="1254.000000" width="17" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>gg</p>
 </div></foreignObject></g><rect class="shape" x="356" y="1378" width="123" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="417.500000" y="1444.000000" style="text-anchor:middle;font-size:16px;fill:black">hh</text><path class="shape" d="M 300.5 276 C 300.0519 276 299.7532 275.8362 299.4545 275.5085 L 243.4481 214.2289 C 242.8507 213.5735 242.8507 212.5904 243.4481 211.935 L 299.4545 150.4915 C 300.0519 149.8361 300.948 149.8361 301.5454 150.4915 L 357.5519 211.9349 C 358.1493 212.5903 358.1493 213.5734 357.5519 214.2288 L 301.5455 275.5085 C 301.2468 275.8362 300.9481 276 300.5 276 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="300.500000" y="216.000000" style="text-anchor:middle;font-size:16px;fill:black">jj</text><g><foreignObject requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" x="232.000000" y="1029.000000" width="16" height="24"><div xmlns="http://www.w3.org/1999/xhtml" class="md"><p>ee</p>
 </div></foreignObject></g><rect class="shape" x="308" y="978" width="117" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="366.500000" y="1044.000000" style="text-anchor:middle;font-size:16px;fill:black">ff</text><mask id="mask-3834907066" maskUnits="userSpaceOnUse" x="238.000000" y="1051.000000" width="173.000000" height="214.000000">
diff --git a/e2etests/testdata/stable/investigate/sketch.exp.svg b/e2etests/testdata/stable/investigate/sketch.exp.svg
index 36993ddab..5acd68c1f 100644
--- a/e2etests/testdata/stable/investigate/sketch.exp.svg
+++ b/e2etests/testdata/stable/investigate/sketch.exp.svg
@@ -12,7 +12,7 @@ width="1011" height="4426" viewBox="-100 -100 1011 4426"><style type="text/css">
 	stroke-linejoin: round;
 }
 ]]>
-</style><path class="shape" d="M 151 0 L 238 0 L 273 63 L 238 126 L 151 126 L 186 63 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="212.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">aa</text><path class="shape" d="M 466 226 L 554 226 L 589 289 L 554 352 L 466 352 L 501 289 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="527.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:black">bb</text><path class="shape" d="M 410 452 L 496 452 L 531 515 L 496 578 L 410 578 L 445 515 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="470.500000" y="518.000000" style="text-anchor:middle;font-size:16px;fill:black">cc</text><rect class="shape" x="5" y="678" width="577" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="293.500000" y="711.000000" style="text-anchor:middle;font-size:28px;fill:black">dd</text><rect class="shape" x="0" y="2665" width="545" height="457" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="272.500000" y="2698.000000" style="text-anchor:middle;font-size:28px;fill:black">ll</text><rect class="shape" x="0" y="2108" width="567" height="457" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="283.500000" y="2141.000000" style="text-anchor:middle;font-size:28px;fill:black">ff</text><path class="shape" d="M 577 1882 H 660 C 684 1882 684 1938.7 684 1945 C 684 1951.3 684 2008 660 2008 H 577 C 553 2008 553 1951.3 553 1945 C 553 1938.7 553 1882 577 1882 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 660 1882 C 636 1882 636 1938.7 636 1945 C 636 1951.3 636 2008 660 2008" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><image href="https://icons.terrastruct.com/essentials/time.svg" x="591.500000" y="1930.000000" width="30" height="30" /><text class="text-bold" x="606.500000" y="1948.000000" style="text-anchor:middle;font-size:16px;fill:black">ww</text><rect class="shape" x="465" y="3222" width="323" height="452" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="626.500000" y="3255.000000" style="text-anchor:middle;font-size:28px;fill:black">yy</text><path class="shape" d="M 627 4100 L 724 4100 L 698 4226 L 601 4226 L 601 4226 Z" style="fill:red;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.500000" y="4166.000000" style="text-anchor:middle;font-size:16px;fill:black">ad</text><path class="shape" d="M 4 3798 C 4 3774 350.05 3774 388.5 3774 C 426.95 3774 773 3774 773 3798 V 3976 C 773 4000 426.95 4000 388.5 4000 C 350.05 4000 4 4000 4 3976 V 3798 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 4 3798 C 4 3822 350.05 3822 388.5 3822 C 426.95 3822 773 3822 773 3798" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="388.500000" y="3855.000000" style="text-anchor:middle;font-size:28px;fill:black">nn</text><rect class="shape" x="59" y="1004" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="1070.000000" style="text-anchor:middle;font-size:16px;fill:black">ii</text><rect class="shape" x="58" y="1280" width="115" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="1346.000000" style="text-anchor:middle;font-size:16px;fill:black">jj</text><rect class="shape" x="55" y="1606" width="122" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="1672.000000" style="text-anchor:middle;font-size:16px;fill:black">kk</text><rect class="shape" x="590" y="1230" width="218" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.000000" y="1263.000000" style="text-anchor:middle;font-size:28px;fill:black">ss</text><rect class="shape" x="588" y="1556" width="223" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.500000" y="1589.000000" style="text-anchor:middle;font-size:28px;fill:black">uu</text><rect class="shape" x="616" y="2944" width="124" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="678.000000" y="3010.000000" style="text-anchor:middle;font-size:16px;fill:black">rm</text><path class="shape" d="M 116 854 C 115.5247 854 115.2078 853.8362 114.8909 853.5085 L 55.4753 792.2289 C 54.8415 791.5735 54.8415 790.5904 55.4753 789.935 L 114.8909 728.4915 C 115.5247 727.8361 116.4753 727.8361 117.1091 728.4915 L 176.5247 789.9349 C 177.1585 790.5903 177.1585 791.5734 176.5247 792.2288 L 117.1091 853.5085 C 116.7922 853.8362 116.4753 854 116 854 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="794.000000" style="text-anchor:middle;font-size:16px;fill:black">ee</text><ellipse class="shape" cx="115.500000" cy="3006.500000" rx="65.500000" ry="65.500000" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="3009.500000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><ellipse class="shape" cx="115.500000" cy="2449.500000" rx="65.500000" ry="65.500000" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="2452.500000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><path class="shape" d="M 433.5 2284 C 433.0208 2284 432.7013 2283.8362 432.3818 2283.5085 L 372.4792 2222.2289 C 371.8402 2221.5735 371.8402 2220.5904 372.4792 2219.935 L 432.3818 2158.4915 C 433.0208 2157.8361 433.9792 2157.8361 434.6182 2158.4915 L 494.5208 2219.9349 C 495.1598 2220.5903 495.1598 2221.5734 494.5208 2222.2288 L 434.6182 2283.5085 C 434.2987 2283.8362 433.9792 2284 433.5 2284 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="433.500000" y="2224.000000" style="text-anchor:middle;font-size:16px;fill:black">gg</text><path class="shape" d="M 470.5 854 C 470.0208 854 469.7013 853.8362 469.3818 853.5085 L 409.4792 792.2289 C 408.8402 791.5735 408.8402 790.5904 409.4792 789.935 L 469.3818 728.4915 C 470.0208 727.8361 470.9792 727.8361 471.6182 728.4915 L 531.5208 789.9349 C 532.1598 790.5903 532.1598 791.5734 531.5208 792.2288 L 471.6182 853.5085 C 471.2987 853.8362 470.9792 854 470.5 854 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="470.500000" y="794.000000" style="text-anchor:middle;font-size:16px;fill:black">hh</text><path class="shape" d="M 626 3272 H 698 C 722 3272 722 3328.7 722 3335 C 722 3341.3 722 3398 698 3398 H 626 C 602 3398 602 3341.3 602 3335 C 602 3328.7 602 3272 626 3272 Z" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path class="shape" d="M 698 3272 C 674 3272 674 3328.7 674 3335 C 674 3341.3 674 3398 698 3398" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><image href="https://icons.terrastruct.com/essentials/time.svg" x="638.000000" y="3323.000000" width="24" height="24" /><text class="text-bold" x="650.000000" y="3338.000000" style="text-anchor:middle;font-size:16px;fill:black">zz</text><rect class="shape" x="54" y="3824" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">oo</text><rect class="shape" x="372" y="2387" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="433.500000" y="2453.000000" style="text-anchor:middle;font-size:16px;fill:black">pp</text><rect class="shape" x="372" y="2715" width="124" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="434.000000" y="2781.000000" style="text-anchor:middle;font-size:16px;fill:black">qq</text><rect class="shape" x="375" y="2944" width="118" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="434.000000" y="3010.000000" style="text-anchor:middle;font-size:16px;fill:black">rr</text><rect class="shape" x="640" y="1280" width="118" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.000000" y="1346.000000" style="text-anchor:middle;font-size:16px;fill:black">tt</text><rect class="shape" x="638" y="1606" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.500000" y="1672.000000" style="text-anchor:middle;font-size:16px;fill:black">vv</text><rect class="shape" x="338" y="3824" width="122" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="399.000000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">xx</text><rect class="shape" x="601" y="3498" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.500000" y="3564.000000" style="text-anchor:middle;font-size:16px;fill:black">ab</text><rect class="shape" x="601" y="3824" width="122" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.000000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">ac</text><path d="M 264.882273 81.676053 C 474.600000 157.000000 527.600000 186.000000 527.980001 224.000100" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path d="M 494.105573 353.788854 C 475.000000 392.000000 470.000000 412.000000 470.000000 450.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><mask id="mask-210088629" maskUnits="userSpaceOnUse" x="103.500000" y="112.000000" width="66.500000" height="630.000000">
+</style><path class="shape" d="M 151 0 L 238 0 L 273 63 L 238 126 L 151 126 L 186 63 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="212.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:black">aa</text><path class="shape" d="M 466 226 L 554 226 L 589 289 L 554 352 L 466 352 L 501 289 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="527.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:black">bb</text><path class="shape" d="M 410 452 L 496 452 L 531 515 L 496 578 L 410 578 L 445 515 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="470.500000" y="518.000000" style="text-anchor:middle;font-size:16px;fill:black">cc</text><rect class="shape" x="5" y="678" width="577" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="293.500000" y="711.000000" style="text-anchor:middle;font-size:28px;fill:black">dd</text><rect class="shape" x="0" y="2665" width="545" height="457" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="272.500000" y="2698.000000" style="text-anchor:middle;font-size:28px;fill:black">ll</text><rect class="shape" x="0" y="2108" width="567" height="457" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="283.500000" y="2141.000000" style="text-anchor:middle;font-size:28px;fill:black">ff</text><g class="shape" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 577 1882 H 660 C 684 1882 684 1938.7 684 1945 C 684 1951.3 684 2008 660 2008 H 577 C 553 2008 553 1951.3 553 1945 C 553 1938.7 553 1882 577 1882 Z"/><path class="shape" d="M 660 1882 C 636 1882 636 1938.7 636 1945 C 636 1951.3 636 2008 660 2008"/></g><image href="https://icons.terrastruct.com/essentials/time.svg" x="591.500000" y="1930.000000" width="30" height="30" /><text class="text-bold" x="606.500000" y="1948.000000" style="text-anchor:middle;font-size:16px;fill:black">ww</text><rect class="shape" x="465" y="3222" width="323" height="452" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="626.500000" y="3255.000000" style="text-anchor:middle;font-size:28px;fill:black">yy</text><path class="shape" d="M 627 4100 L 724 4100 L 698 4226 L 601 4226 L 601 4226 Z" style="fill:red;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.500000" y="4166.000000" style="text-anchor:middle;font-size:16px;fill:black">ad</text><g class="shape" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 4 3798 C 4 3774 350.05 3774 388.5 3774 C 426.95 3774 773 3774 773 3798 V 3976 C 773 4000 426.95 4000 388.5 4000 C 350.05 4000 4 4000 4 3976 V 3798 Z"/><path class="shape" d="M 4 3798 C 4 3822 350.05 3822 388.5 3822 C 426.95 3822 773 3822 773 3798"/></g><text class="text-bold" x="388.500000" y="3855.000000" style="text-anchor:middle;font-size:28px;fill:black">nn</text><rect class="shape" x="59" y="1004" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="1070.000000" style="text-anchor:middle;font-size:16px;fill:black">ii</text><rect class="shape" x="58" y="1280" width="115" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="1346.000000" style="text-anchor:middle;font-size:16px;fill:black">jj</text><rect class="shape" x="55" y="1606" width="122" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="1672.000000" style="text-anchor:middle;font-size:16px;fill:black">kk</text><rect class="shape" x="590" y="1230" width="218" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.000000" y="1263.000000" style="text-anchor:middle;font-size:28px;fill:black">ss</text><rect class="shape" x="588" y="1556" width="223" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.500000" y="1589.000000" style="text-anchor:middle;font-size:28px;fill:black">uu</text><rect class="shape" x="616" y="2944" width="124" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="678.000000" y="3010.000000" style="text-anchor:middle;font-size:16px;fill:black">rm</text><path class="shape" d="M 116 854 C 115.5247 854 115.2078 853.8362 114.8909 853.5085 L 55.4753 792.2289 C 54.8415 791.5735 54.8415 790.5904 55.4753 789.935 L 114.8909 728.4915 C 115.5247 727.8361 116.4753 727.8361 117.1091 728.4915 L 176.5247 789.9349 C 177.1585 790.5903 177.1585 791.5734 176.5247 792.2288 L 117.1091 853.5085 C 116.7922 853.8362 116.4753 854 116 854 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="116.000000" y="794.000000" style="text-anchor:middle;font-size:16px;fill:black">ee</text><ellipse class="shape" cx="115.500000" cy="3006.500000" rx="65.500000" ry="65.500000" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="3009.500000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><ellipse class="shape" cx="115.500000" cy="2449.500000" rx="65.500000" ry="65.500000" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="2452.500000" style="text-anchor:middle;font-size:16px;fill:black">mm</text><path class="shape" d="M 433.5 2284 C 433.0208 2284 432.7013 2283.8362 432.3818 2283.5085 L 372.4792 2222.2289 C 371.8402 2221.5735 371.8402 2220.5904 372.4792 2219.935 L 432.3818 2158.4915 C 433.0208 2157.8361 433.9792 2157.8361 434.6182 2158.4915 L 494.5208 2219.9349 C 495.1598 2220.5903 495.1598 2221.5734 494.5208 2222.2288 L 434.6182 2283.5085 C 434.2987 2283.8362 433.9792 2284 433.5 2284 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="433.500000" y="2224.000000" style="text-anchor:middle;font-size:16px;fill:black">gg</text><path class="shape" d="M 470.5 854 C 470.0208 854 469.7013 853.8362 469.3818 853.5085 L 409.4792 792.2289 C 408.8402 791.5735 408.8402 790.5904 409.4792 789.935 L 469.3818 728.4915 C 470.0208 727.8361 470.9792 727.8361 471.6182 728.4915 L 531.5208 789.9349 C 532.1598 790.5903 532.1598 791.5734 531.5208 792.2288 L 471.6182 853.5085 C 471.2987 853.8362 470.9792 854 470.5 854 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="470.500000" y="794.000000" style="text-anchor:middle;font-size:16px;fill:black">hh</text><g class="shape" style="fill:#F0F3F9;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" ><path class="shape" d="M 626 3272 H 698 C 722 3272 722 3328.7 722 3335 C 722 3341.3 722 3398 698 3398 H 626 C 602 3398 602 3341.3 602 3335 C 602 3328.7 602 3272 626 3272 Z"/><path class="shape" d="M 698 3272 C 674 3272 674 3328.7 674 3335 C 674 3341.3 674 3398 698 3398"/></g><image href="https://icons.terrastruct.com/essentials/time.svg" x="638.000000" y="3323.000000" width="24" height="24" /><text class="text-bold" x="650.000000" y="3338.000000" style="text-anchor:middle;font-size:16px;fill:black">zz</text><rect class="shape" x="54" y="3824" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="115.500000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">oo</text><rect class="shape" x="372" y="2387" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="433.500000" y="2453.000000" style="text-anchor:middle;font-size:16px;fill:black">pp</text><rect class="shape" x="372" y="2715" width="124" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="434.000000" y="2781.000000" style="text-anchor:middle;font-size:16px;fill:black">qq</text><rect class="shape" x="375" y="2944" width="118" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="434.000000" y="3010.000000" style="text-anchor:middle;font-size:16px;fill:black">rr</text><rect class="shape" x="640" y="1280" width="118" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.000000" y="1346.000000" style="text-anchor:middle;font-size:16px;fill:black">tt</text><rect class="shape" x="638" y="1606" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="699.500000" y="1672.000000" style="text-anchor:middle;font-size:16px;fill:black">vv</text><rect class="shape" x="338" y="3824" width="122" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="399.000000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">xx</text><rect class="shape" x="601" y="3498" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.500000" y="3564.000000" style="text-anchor:middle;font-size:16px;fill:black">ab</text><rect class="shape" x="601" y="3824" width="122" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><text class="text-bold" x="662.000000" y="3890.000000" style="text-anchor:middle;font-size:16px;fill:black">ac</text><path d="M 264.882273 81.676053 C 474.600000 157.000000 527.600000 186.000000 527.980001 224.000100" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><path d="M 494.105573 353.788854 C 475.000000 392.000000 470.000000 412.000000 470.000000 450.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><mask id="mask-210088629" maskUnits="userSpaceOnUse" x="103.500000" y="112.000000" width="66.500000" height="630.000000">
 <rect x="103.500000" y="112.000000" width="66.500000" height="630.000000" fill="white"></rect>
 <rect x="112.000000" y="410.000000" width="7" height="21" fill="black"></rect>
 </mask><path d="M 156.704703 127.523879 C 124.000000 166.000000 115.500000 198.600000 115.500000 232.500000 C 115.500000 266.400000 115.500000 311.600000 115.500000 345.500000 C 115.500000 379.400000 115.500000 424.600000 115.500000 458.500000 C 115.500000 492.400000 115.500000 537.600000 115.500000 571.500000 C 115.500000 605.400000 115.600000 688.000000 115.960002 724.000200" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#mask-210088629)" /><text class="text-italic" x="115.500000" y="426.000000" style="text-anchor:middle;font-size:16px;fill:black">1</text><mask id="mask-1664815215" maskUnits="userSpaceOnUse" x="366.750000" y="319.000000" width="266.750000" height="1874.000000">