diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg
index 4faf61487..8d6c9227a 100644
--- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg
@@ -853,7 +853,7 @@
 <li>Staging</li>
 <li>Dispatch to Site</li>
 </ul>
-</div></foreignObject></g></g><g id="(OEM Factory -&gt; OEM Warehouse)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M216.643710 62.385406 M216.643710 62.385406 C113.181942 105.134326, 86.581585 175.719938, 86.202656 212.428631 M215.778628 61.988609 C112.414643 105.833847, 85.189168 176.330748, 86.245209 211.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(86.000000 212.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(86.000000 212.000000) rotate(90.00000250447816)" /></g><g id="(OEM Factory -&gt; Distributor Warehouse)[0]"><path d="M313.942673 66.860316 M313.942673 66.860316 C339.656641 105.840123, 346.081585 175.719938, 345.702656 212.428631 M313.077591 66.463519 C338.889342 106.539644, 344.689168 176.330748, 345.745209 211.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(345.500000 212.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(345.500000 212.000000) rotate(90.00000250447816)" /></g><g id="(OEM Factory -&gt; company Warehouse)[0]"><path d="M368.450257 49.270194 M368.450257 49.270194 C601.381942 102.571454, 659.831585 125.719938, 659.452656 162.428631 M367.585175 48.873397 C600.614643 103.270975, 658.439168 126.330748, 659.495209 161.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(659.250000 162.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(659.250000 162.000000) rotate(90.00000250447816)" /></g><g id="company Warehouse.(Master -&gt; Regional-1)[0]"><path d="M710.480552 300.432767 M710.480552 300.432767 C784.431942 343.092130, 803.081585 363.719938, 802.702656 400.428631 M709.615470 300.035970 C783.664643 343.791651, 801.689168 364.330748, 802.745209 399.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(802.500000 400.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(802.500000 400.000000) rotate(90.00000250447816)" /></g><g id="company Warehouse.(Master -&gt; Regional-2)[0]"><path d="M640.440909 304.950257 M640.440909 304.950257 C622.352424 343.840123, 617.331585 370.319938, 616.952656 395.928631 M639.575827 304.553460 C621.585125 344.539644, 615.939168 370.930748, 616.995209 394.516898 M616.995209 394.516898 C616.836392 420.644026, 621.369625 530.752815, 641.344041 567.264832 M616.170232 394.055176 C615.656604 421.086815, 622.718911 531.119025, 641.189717 567.411573" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(640.904589 566.451133) rotate(62.52556656810188)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(640.904589 566.451133) rotate(62.52556656810188)" /></g><g id="company Warehouse.(Master -&gt; Regional-N)[0]"><path d="M614.934056 304.410321 M614.934056 304.410321 C567.382544 343.840123, 554.831585 370.319938, 554.452656 395.928631 M614.068974 304.013524 C566.615245 344.539644, 553.439168 370.930748, 554.495209 394.516898 M554.495209 394.516898 C554.336392 420.644026, 553.669625 454.352815, 554.689452 479.313699 M553.670232 394.055176 C553.156604 421.086815, 555.018911 454.719025, 554.535128 479.460440 M554.535128 479.460440 C553.815322 503.083957, 554.564793 536.009092, 553.429604 562.195273 M554.832806 478.661166 C553.331954 503.434140, 554.758596 537.040304, 554.552540 560.424853 M554.552540 560.424853 C555.239259 586.926400, 562.999303 704.815214, 595.944412 774.160583 M554.456026 559.583056 C553.997797 587.348907, 562.809679 704.443073, 596.327342 775.047239" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(596.787688 773.899454) rotate(64.17599981876542)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(596.787688 773.899454) rotate(64.17599981876542)" /></g><g id="company Warehouse.(Regional-1 -&gt; Regional-2)[0]"><path d="M779.557415 470.860316 M779.557415 470.860316 C756.807243 509.840123, 739.581585 529.719938, 698.162416 567.737940 M778.692333 470.463519 C756.039944 510.539644, 738.189168 530.330748, 698.204969 566.326207" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(697.959760 567.309309) rotate(137.72631132996827)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(697.959760 567.309309) rotate(137.72631132996827)" /></g><g id="company Warehouse.(Regional-2 -&gt; Regional-N)[0]"><path d="M658.250044 637.170064 M658.250044 637.170064 C659.731942 675.840123, 653.253874 704.019938, 627.917106 774.164407 M657.384962 636.773267 C658.964643 676.539644, 651.861457 704.630748, 627.959659 772.752674" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(627.714450 773.735776) rotate(109.77035388729526)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(627.714450 773.735776) rotate(109.77035388729526)" /></g><g id="company Warehouse.(Regional-N -&gt; Regional-1)[0]"><path d="M676.222750 775.717990 M676.222750 775.717990 C811.174713 704.140123, 845.081585 669.119938, 844.702656 644.928631 M675.357668 775.321193 C810.407414 704.839644, 843.689168 669.730748, 844.745209 643.516898 M844.745209 643.516898 C844.586392 619.844026, 838.919625 510.752815, 821.728306 474.391408 M843.920232 643.055176 C843.406604 620.286815, 840.268911 511.119025, 821.573982 474.538149" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-1390338334)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(821.288854 473.577709) rotate(-116.56504656419145)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(821.288854 473.577709) rotate(-116.56504656419145)" /></g><mask id="d2-1390338334" maskUnits="userSpaceOnUse" x="-101" y="-155" width="1191" height="1169">
+</div></foreignObject></g></g><g id="(OEM Factory -&gt; OEM Warehouse)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M216.643710 62.385406 M216.643710 62.385406 C113.181942 105.134326, 86.581585 175.719938, 86.202656 212.428631 M215.778628 61.988609 C112.414643 105.833847, 85.189168 176.330748, 86.245209 211.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(86.000000 212.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(86.000000 212.000000) rotate(90.00000250447816)" /></g><g id="(OEM Factory -&gt; Distributor Warehouse)[0]"><path d="M313.942673 66.860316 M313.942673 66.860316 C339.656641 105.840123, 346.081585 175.719938, 345.702656 212.428631 M313.077591 66.463519 C338.889342 106.539644, 344.689168 176.330748, 345.745209 211.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(345.500000 212.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(345.500000 212.000000) rotate(90.00000250447816)" /></g><g id="(OEM Factory -&gt; company Warehouse)[0]"><path d="M368.450257 49.270194 M368.450257 49.270194 C601.381942 102.571454, 659.831585 125.719938, 659.452656 162.428631 M367.585175 48.873397 C600.614643 103.270975, 658.439168 126.330748, 659.495209 161.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(659.250000 162.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(659.250000 162.000000) rotate(90.00000250447816)" /></g><g id="company Warehouse.(Master -&gt; Regional-1)[0]"><path d="M710.480552 300.432767 M710.480552 300.432767 C784.431942 343.092130, 803.081585 363.719938, 802.702656 400.428631 M709.615470 300.035970 C783.664643 343.791651, 801.689168 364.330748, 802.745209 399.016898" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(802.500000 400.000000) rotate(90.00000250447816)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(802.500000 400.000000) rotate(90.00000250447816)" /></g><g id="company Warehouse.(Master -&gt; Regional-2)[0]"><path d="M640.440909 304.950257 M640.440909 304.950257 C622.352424 343.840123, 617.331585 370.319938, 616.952656 395.928631 M639.575827 304.553460 C621.585125 344.539644, 615.939168 370.930748, 616.995209 394.516898 M616.995209 394.516898 C616.836392 420.644026, 621.369625 530.752815, 641.344041 567.264832 M616.170232 394.055176 C615.656604 421.086815, 622.718911 531.119025, 641.189717 567.411573" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(640.904589 566.451133) rotate(62.52556656810188)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(640.904589 566.451133) rotate(62.52556656810188)" /></g><g id="company Warehouse.(Master -&gt; Regional-N)[0]"><path d="M614.934056 304.410321 M614.934056 304.410321 C567.382544 343.840123, 554.831585 370.319938, 554.452656 395.928631 M614.068974 304.013524 C566.615245 344.539644, 553.439168 370.930748, 554.495209 394.516898 M554.495209 394.516898 C554.336392 420.644026, 553.669625 454.352815, 554.689452 479.313699 M553.670232 394.055176 C553.156604 421.086815, 555.018911 454.719025, 554.535128 479.460440 M554.535128 479.460440 C553.815322 503.083957, 554.564793 536.009092, 553.429604 562.195273 M554.832806 478.661166 C553.331954 503.434140, 554.758596 537.040304, 554.552540 560.424853 M554.552540 560.424853 C555.239259 586.926400, 562.999303 704.815214, 595.944412 774.160583 M554.456026 559.583056 C553.997797 587.348907, 562.809679 704.443073, 596.327342 775.047239" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(596.787688 773.899454) rotate(64.17599981876542)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(596.787688 773.899454) rotate(64.17599981876542)" /></g><g id="company Warehouse.(Regional-1 -&gt; Regional-2)[0]"><path d="M779.557415 470.860316 M779.557415 470.860316 C756.807243 509.840123, 739.581585 529.719938, 698.162416 567.737940 M778.692333 470.463519 C756.039944 510.539644, 738.189168 530.330748, 698.204969 566.326207" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(697.959760 567.309309) rotate(137.72631132996827)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(697.959760 567.309309) rotate(137.72631132996827)" /></g><g id="company Warehouse.(Regional-2 -&gt; Regional-N)[0]"><path d="M658.250044 637.170064 M658.250044 637.170064 C659.731942 675.840123, 653.253874 704.019938, 627.917106 774.164407 M657.384962 636.773267 C658.964643 676.539644, 651.861457 704.630748, 627.959659 772.752674" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(627.714450 773.735776) rotate(109.77035388729526)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(627.714450 773.735776) rotate(109.77035388729526)" /></g><g id="company Warehouse.(Regional-N -&gt; Regional-1)[0]"><path d="M676.222750 775.717990 M676.222750 775.717990 C811.174713 704.140123, 845.081585 669.119938, 844.702656 644.928631 M675.357668 775.321193 C810.407414 704.839644, 843.689168 669.730748, 844.745209 643.516898 M844.745209 643.516898 C844.586392 619.844026, 838.919625 510.752815, 821.728306 474.391408 M843.920232 643.055176 C843.406604 620.286815, 840.268911 511.119025, 821.573982 474.538149" fill="none" class="connection stroke-B1" style="stroke-width:2;" mask="url(#d2-2692925945)" /><path d="M-8.527627 -3.097061 L1.749550 0.558791 L-8.562935 4.521533" stroke="none" class="connection fill-B1" style="stroke-width:0;" transform="translate(821.288854 473.577709) rotate(-116.56504656419145)" /> <path d="M-10.153731 -4.038897 C-7.293657 -2.964754, -5.552453 -3.126871, 0.222305 -0.654474 M-10.160117 -4.253535 C-7.616436 -2.677663, -5.569656 -2.320404, -0.086565 0.272291 M0.578048 -0.807164 C-2.240460 1.133634, -3.845699 1.135504, -9.579367 4.140709 M-0.217907 -0.322328 C-3.660571 0.941126, -7.003142 2.167050, -10.100296 3.840861 M-9.957758 4.629247 C-9.937438 2.794817, -10.508655 0.509238, -9.330834 -3.522818 M-10.354741 4.285014 C-9.712366 0.996453, -9.805329 -1.235319, -9.648840 -4.366524" fill="none" class="connection stroke-B1" style="stroke-width:2;" transform="translate(821.288854 473.577709) rotate(-116.56504656419145)" /></g><mask id="d2-2692925945" maskUnits="userSpaceOnUse" x="-101" y="-155" width="1191" height="1169">
 <rect x="-101" y="-155" width="1191" height="1169" fill="white"></rect>
 
 </mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg
index 6e9a30423..8b3e0fee7 100644
--- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg
@@ -838,7 +838,7 @@
 .md .contains-task-list:dir(rtl) .task-list-item-checkbox {
   margin: 0 -1.6em 0.25em 0.2em;
 }
-</style><style type="text/css"><![CDATA[@keyframes d2Transition-d2-1015877328-0 {
+</style><style type="text/css"><![CDATA[@keyframes d2Transition-d2-3751819762-0 {
 		0%, 0.000000% {
 				opacity: 0;
 		}
@@ -848,7 +848,7 @@
 		25.000000%, 100% {
 				opacity: 0;
 		}
-}@keyframes d2Transition-d2-1015877328-1 {
+}@keyframes d2Transition-d2-3751819762-1 {
 		0%, 24.982143% {
 				opacity: 0;
 		}
@@ -858,7 +858,7 @@
 		50.000000%, 100% {
 				opacity: 0;
 		}
-}@keyframes d2Transition-d2-1015877328-2 {
+}@keyframes d2Transition-d2-3751819762-2 {
 		0%, 49.982143% {
 				opacity: 0;
 		}
@@ -868,23 +868,23 @@
 		75.000000%, 100% {
 				opacity: 0;
 		}
-}@keyframes d2Transition-d2-1015877328-3 {
+}@keyframes d2Transition-d2-3751819762-3 {
 		0%, 74.982143% {
 				opacity: 0;
 		}
 		75.000000%, 100.000000% {
 				opacity: 1;
 		}
-}]]></style><g style="animation: d2Transition-d2-1015877328-0 5600ms infinite"  class="d2-1015877328" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-1015877328" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
+}]]></style><g style="animation: d2Transition-d2-3751819762-0 5600ms infinite"  class="d2-3751819762" width="412" height="247" viewBox="-206 -166 412 247"><rect x="-206.000000" y="-166.000000" width="412.000000" height="247.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="0.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-3751819762" maskUnits="userSpaceOnUse" x="-206" y="-166" width="412" height="247">
 <rect x="-206" y="-166" width="412" height="247" fill="white"></rect>
 
-</mask></g><g style="animation: d2Transition-d2-1015877328-1 5600ms infinite"  class="d2-1015877328" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-1041619556" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
+</mask></g><g style="animation: d2Transition-d2-3751819762-1 5600ms infinite"  class="d2-3751819762" width="412" height="333" viewBox="-131 -166 412 333"><rect x="-131.000000" y="-166.000000" width="412.000000" height="333.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><mask id="d2-3302893893" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="333">
 <rect x="-131" y="-166" width="412" height="333" fill="white"></rect>
 
-</mask></g><g style="animation: d2Transition-d2-1015877328-2 5600ms infinite"  class="d2-1015877328" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="(Approach road -&gt; Cross road)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-681643259)" /></g><mask id="d2-681643259" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
+</mask></g><g style="animation: d2Transition-d2-3751819762-2 5600ms infinite"  class="d2-3751819762" width="412" height="499" viewBox="-131 -166 412 499"><rect x="-131.000000" y="-166.000000" width="412.000000" height="499.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="0.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="15.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="75.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="75.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="(Approach road -&gt; Cross road)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 75.000000 68.000000 C 75.000000 106.000000 75.000000 126.000000 75.000000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2369911030)" /></g><mask id="d2-2369911030" maskUnits="userSpaceOnUse" x="-131" y="-166" width="412" height="499">
 <rect x="-131" y="-166" width="412" height="499" fill="white"></rect>
 
-</mask></g><g style="animation: d2Transition-d2-1015877328-3 5600ms infinite"  class="d2-1015877328" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="(Approach road -&gt; Cross road)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2302375566)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-2302375566)" /></g><mask id="d2-2302375566" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
+</mask></g><g style="animation: d2Transition-d2-3751819762-3 5600ms infinite"  class="d2-3751819762" width="412" height="665" viewBox="-104 -166 412 665"><rect x="-104.000000" y="-166.000000" width="412.000000" height="665.000000" rx="0.000000" class=" fill-N7" stroke-width="0" /><g id="Approach road"><g class="shape" ><rect x="27.000000" y="0.000000" width="150.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Approach road</text></g><g id="Cross road"><g class="shape" ><rect x="42.000000" y="166.000000" width="120.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="204.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Cross road</text></g><g id="Make you wonder why"><g class="shape" ><rect x="0.000000" y="332.000000" width="203.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="101.500000" y="370.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">Make you wonder why</text></g><g id="&#34;Chicken&#39;s plan&#34;"><g class="shape" ></g><text x="102.000000" y="-30.000000" class="text fill-N1" style="text-anchor:middle;font-size:35px">Chicken&#39;s plan</text></g><g id="(Approach road -&gt; Cross road)[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" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 101.500000 68.000000 C 101.500000 106.000000 101.500000 126.000000 101.500000 162.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1488407051)" /></g><g id="(Cross road -&gt; Make you wonder why)[0]"><path d="M 101.500000 234.000000 C 101.500000 272.000000 101.500000 292.000000 101.500000 328.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#d2-1488407051)" /></g><mask id="d2-1488407051" maskUnits="userSpaceOnUse" x="-104" y="-166" width="412" height="665">
 <rect x="-104" y="-166" width="412" height="665" fill="white"></rect>
 
 </mask></g></svg></svg>
\ No newline at end of file