diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d657a2b25..bc58d0fc7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ slf4j = "2.0.6"
 spock = "2.3-groovy-4.0"
 spring-asciidoctor = "0.6.1"
 sunjaxb = "4.0.2"
-svgbuilder = "0.4.1"
+svgbuilder = "0.5.0"
 
 [libraries]
 activation = { module = "javax.activation:activation", version.ref = "activation" }
diff --git a/grooves-diagrams/src/test/resources/ConcurrentEvents.esdiag.svg b/grooves-diagrams/src/test/resources/ConcurrentEvents.esdiag.svg
index f2b1fe2ee..650ecd05f 100644
--- a/grooves-diagrams/src/test/resources/ConcurrentEvents.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/ConcurrentEvents.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">John Lennon</text>
-        <line x1="110" y1="65" x2="450.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="450.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/DisjoinExample.esdiag.svg b/grooves-diagrams/src/test/resources/DisjoinExample.esdiag.svg
index 758af6bcb..d454373d4 100644
--- a/grooves-diagrams/src/test/resources/DisjoinExample.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/DisjoinExample.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Department</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Science</text>
-        <line x1="110" y1="65" x2="600.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="600.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -139,7 +139,7 @@
         <text x="15" y="163" class="type">Department</text>
         <text x="15" y="181" class="id">2</text>
         <text x="10" y="140" class="description">Command</text>
-        <line x1="110" y1="165" x2="600.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="600.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_6">
         <circle cx="210" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -155,7 +155,7 @@
         <text x="15" y="263" class="type">Employee</text>
         <text x="15" y="281" class="id">5</text>
         <text x="10" y="240" class="description">Mr Spock</text>
-        <line x1="110" y1="265" x2="600.0" y2="265" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="265" x2="600.0" y2="265" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_9">
         <circle cx="360" cy="265" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/JoinExample.esdiag.svg b/grooves-diagrams/src/test/resources/JoinExample.esdiag.svg
index 758af6bcb..d454373d4 100644
--- a/grooves-diagrams/src/test/resources/JoinExample.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/JoinExample.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Department</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Science</text>
-        <line x1="110" y1="65" x2="600.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="600.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -139,7 +139,7 @@
         <text x="15" y="163" class="type">Department</text>
         <text x="15" y="181" class="id">2</text>
         <text x="10" y="140" class="description">Command</text>
-        <line x1="110" y1="165" x2="600.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="600.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_6">
         <circle cx="210" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -155,7 +155,7 @@
         <text x="15" y="263" class="type">Employee</text>
         <text x="15" y="281" class="id">5</text>
         <text x="10" y="240" class="description">Mr Spock</text>
-        <line x1="110" y1="265" x2="600.0" y2="265" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="265" x2="600.0" y2="265" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_9">
         <circle cx="360" cy="265" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/MergeAggregates.esdiag.svg b/grooves-diagrams/src/test/resources/MergeAggregates.esdiag.svg
index 0f8b37773..3be86fb4e 100644
--- a/grooves-diagrams/src/test/resources/MergeAggregates.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/MergeAggregates.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">4</text>
         <text x="10" y="40" class="description">Farrokh Bulsara</text>
-        <line x1="110" y1="65" x2="700.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="700.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -146,7 +146,7 @@
         <text x="15" y="163" class="type">Patient</text>
         <text x="15" y="181" class="id">5</text>
         <text x="10" y="140" class="description">Freddie Mercury</text>
-        <line x1="110" y1="165" x2="700.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="700.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_7">
         <circle cx="360" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/MergeAggregatesEffective.esdiag.svg b/grooves-diagrams/src/test/resources/MergeAggregatesEffective.esdiag.svg
index 9ed355b2a..554167487 100644
--- a/grooves-diagrams/src/test/resources/MergeAggregatesEffective.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/MergeAggregatesEffective.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">4</text>
         <text x="10" y="40" class="description">Farrokh Bulsara</text>
-        <line x1="110" y1="65" x2="700.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="700.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/ParallelEvents.esdiag.svg b/grooves-diagrams/src/test/resources/ParallelEvents.esdiag.svg
index 8ac8cf352..f6b91b82c 100644
--- a/grooves-diagrams/src/test/resources/ParallelEvents.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/ParallelEvents.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">John Lennon</text>
-        <line x1="110" y1="65" x2="850.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="850.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -146,7 +146,7 @@
         <text x="15" y="163" class="type">Patient</text>
         <text x="15" y="181" class="id">1</text>
         <text x="10" y="140" class="description">Ringo Starr</text>
-        <line x1="110" y1="165" x2="850.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="850.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_7">
         <circle cx="560" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertEvent.esdiag.svg b/grooves-diagrams/src/test/resources/RevertEvent.esdiag.svg
index 764db9f99..78e33a54c 100644
--- a/grooves-diagrams/src/test/resources/RevertEvent.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertEvent.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Paul McCartney</text>
-        <line x1="110" y1="65" x2="600.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="600.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertEventEffective.esdiag.svg b/grooves-diagrams/src/test/resources/RevertEventEffective.esdiag.svg
index 5be0e4fbb..031819e03 100644
--- a/grooves-diagrams/src/test/resources/RevertEventEffective.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertEventEffective.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Paul McCartney</text>
-        <line x1="110" y1="65" x2="600.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="600.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertMergeAfter.esdiag.svg b/grooves-diagrams/src/test/resources/RevertMergeAfter.esdiag.svg
index 9c72f796a..ba98c05b0 100644
--- a/grooves-diagrams/src/test/resources/RevertMergeAfter.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertMergeAfter.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">4</text>
         <text x="10" y="40" class="description">Tina Fey</text>
-        <line x1="110" y1="65" x2="750.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="750.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -151,7 +151,7 @@
         <text x="15" y="163" class="type">Patient</text>
         <text x="15" y="181" class="id">5</text>
         <text x="10" y="140" class="description">Sarah Palin</text>
-        <line x1="110" y1="165" x2="750.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="750.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_8">
         <circle cx="360" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertMergeBefore.esdiag.svg b/grooves-diagrams/src/test/resources/RevertMergeBefore.esdiag.svg
index 9f9f47a7e..7240e4ee9 100644
--- a/grooves-diagrams/src/test/resources/RevertMergeBefore.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertMergeBefore.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">4</text>
         <text x="10" y="40" class="description">Tina Fey</text>
-        <line x1="110" y1="65" x2="700.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="700.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
@@ -146,7 +146,7 @@
         <text x="15" y="163" class="type">Patient</text>
         <text x="15" y="181" class="id">5</text>
         <text x="10" y="140" class="description">Sarah Palin</text>
-        <line x1="110" y1="165" x2="700.0" y2="165" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="165" x2="700.0" y2="165" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_7">
         <circle cx="360" cy="165" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertOnRevert.esdiag.svg b/grooves-diagrams/src/test/resources/RevertOnRevert.esdiag.svg
index c5178fbf1..cd2f54a55 100644
--- a/grooves-diagrams/src/test/resources/RevertOnRevert.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertOnRevert.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Paul McCartney</text>
-        <line x1="110" y1="65" x2="650.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="650.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/RevertOnRevertEffective.esdiag.svg b/grooves-diagrams/src/test/resources/RevertOnRevertEffective.esdiag.svg
index 665961beb..b4ece8c84 100644
--- a/grooves-diagrams/src/test/resources/RevertOnRevertEffective.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/RevertOnRevertEffective.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Patient</text>
         <text x="15" y="81" class="id">1</text>
         <text x="10" y="40" class="description">Paul McCartney</text>
-        <line x1="110" y1="65" x2="650.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="650.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>
diff --git a/grooves-diagrams/src/test/resources/SimpleEvents.esdiag.svg b/grooves-diagrams/src/test/resources/SimpleEvents.esdiag.svg
index a24b56216..a3c1bd1e5 100644
--- a/grooves-diagrams/src/test/resources/SimpleEvents.esdiag.svg
+++ b/grooves-diagrams/src/test/resources/SimpleEvents.esdiag.svg
@@ -118,7 +118,7 @@
         <text x="15" y="63" class="type">Type</text>
         <text x="15" y="81" class="id">ID</text>
         <text x="10" y="40" class="description">Description</text>
-        <line x1="110" y1="65" x2="450.0" y2="65" class="eventLine" marker-end="url(#triangle)"/>
+        <line x1="110" y1="65" x2="450.0" y2="65" marker-end="url(#triangle)" class="eventLine"/>
     </g>
     <g class="event Normal " id="event_1">
         <circle cx="210" cy="65" r="14" class="eventCreated Normal" stroke-dasharray="2, 5"/>