diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
index c87384a302..1d53ea94a0 100644
--- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
@@ -108,7 +108,7 @@
-11223344556677889910101111none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required box box-filled
+11223344556677889910101111none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required box box-filled
diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg
index 6af9f6c6b6..d40a9e8663 100644
--- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg
@@ -1,9 +1,9 @@
\ No newline at end of file
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index 7ac3239e4a..a2c352488f 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ
diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf
index b839b3c1a0..3554d37c72 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf differ
diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf
index 84b3f1abd3..d06a9103be 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf differ
diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf
index f9ceb8d718..21851b9754 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf differ
diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg
index 0f3ba542cd..0cd5331a22 100644
--- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg
@@ -103,7 +103,7 @@
.d2-1889584350 .color-AA4{color:#EDF0FD;}
.d2-1889584350 .color-AA5{color:#F7F8FE;}
.d2-1889584350 .color-AB4{color:#EDF0FD;}
- .d2-1889584350 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15
+ .d2-1889584350 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15
diff --git a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg
index d4c7a5a896..57768cd0c3 100644
--- a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg
@@ -103,7 +103,7 @@
.d2-3645959140 .color-AA4{color:#EDF0FD;}
.d2-3645959140 .color-AA5{color:#F7F8FE;}
.d2-3645959140 .color-AB4{color:#EDF0FD;}
- .d2-3645959140 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15
+ .d2-3645959140 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15