diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go
index 5c5ce2d3b..9f450f0ed 100644
--- a/d2renderers/d2sketch/sketch.go
+++ b/d2renderers/d2sketch/sketch.go
@@ -191,10 +191,15 @@ func Connection(r *Runner, connection d2target.Connection, path, attrs string) (
 		return "", err
 	}
 	output := ""
+	animatedClass := ""
+	if connection.Animated {
+		animatedClass = " animated-connection"
+	}
+
 	pathEl := svg_style.NewThemableElement("path")
 	pathEl.Fill = color.None
 	pathEl.Stroke = svg_style.ConnectionTheme(connection)
-	pathEl.Class = "connection"
+	pathEl.Class = fmt.Sprintf("connection%s", animatedClass)
 	pathEl.Style = connection.CSSStyle()
 	pathEl.Attributes = attrs
 	for _, p := range paths {
@@ -527,12 +532,6 @@ type roughPath struct {
 
 func (rp roughPath) StyleCSS() string {
 	style := ""
-	if rp.Style.Fill != "" {
-		style += fmt.Sprintf("fill:%s;", rp.Style.Fill)
-	}
-	if rp.Style.Stroke != "" {
-		style += fmt.Sprintf("stroke:%s;", rp.Style.Stroke)
-	}
 	if rp.Style.StrokeWidth != "" {
 		style += fmt.Sprintf("stroke-width:%s;", rp.Style.StrokeWidth)
 	}
@@ -682,13 +681,15 @@ func Arrowheads(r *Runner, connection d2target.Connection, srcAdj, dstAdj *geo.P
 			roughPaths = append(roughPaths, extraPaths...)
 		}
 
+		pathEl := svg_style.NewThemableElement("path")
+		pathEl.Class = "connection"
+		pathEl.Attributes = transform
 		for _, rp := range roughPaths {
-			pathStr := fmt.Sprintf(`<path class="connection" d="%s" style="%s" %s/>`,
-				rp.Attrs.D,
-				rp.StyleCSS(),
-				transform,
-			)
-			arrowPaths = append(arrowPaths, pathStr)
+			pathEl.D = rp.Attrs.D
+			pathEl.Fill = rp.Style.Fill
+			pathEl.Stroke = rp.Style.Stroke
+			pathEl.Style = rp.StyleCSS()
+			arrowPaths = append(arrowPaths, pathEl.Render())
 		}
 	}
 
@@ -719,13 +720,15 @@ func Arrowheads(r *Runner, connection d2target.Connection, srcAdj, dstAdj *geo.P
 			roughPaths = append(roughPaths, extraPaths...)
 		}
 
+		pathEl := svg_style.NewThemableElement("path")
+		pathEl.Class = "connection"
+		pathEl.Attributes = transform
 		for _, rp := range roughPaths {
-			pathStr := fmt.Sprintf(`<path class="connection" d="%s" style="%s" %s/>`,
-				rp.Attrs.D,
-				rp.StyleCSS(),
-				transform,
-			)
-			arrowPaths = append(arrowPaths, pathStr)
+			pathEl.D = rp.Attrs.D
+			pathEl.Fill = rp.Style.Fill
+			pathEl.Stroke = rp.Style.Stroke
+			pathEl.Style = rp.StyleCSS()
+			arrowPaths = append(arrowPaths, pathEl.Render())
 		}
 	}
 
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index c79089f43..5a0c3bc37 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -128,6 +128,7 @@ func arrowheadMarker(isTarget bool, id string, bgColor string, connection d2targ
 	case d2target.ArrowArrowhead:
 		polygonEl := svg_style.NewThemableElement("polygon")
 		polygonEl.Fill = svg_style.ConnectionTheme(connection)
+		polygonEl.Class = "connection"
 		polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
 
 		if isTarget {
@@ -149,6 +150,7 @@ func arrowheadMarker(isTarget bool, id string, bgColor string, connection d2targ
 	case d2target.TriangleArrowhead:
 		polygonEl := svg_style.NewThemableElement("polygon")
 		polygonEl.Fill = svg_style.ConnectionTheme(connection)
+		polygonEl.Class = "connection"
 		polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
 
 		if isTarget {
@@ -168,6 +170,7 @@ func arrowheadMarker(isTarget bool, id string, bgColor string, connection d2targ
 	case d2target.LineArrowhead:
 		polylineEl := svg_style.NewThemableElement("polyline")
 		polylineEl.Fill = color.None
+		polylineEl.Class = "connection"
 		polylineEl.Stroke = svg_style.ConnectionTheme(connection)
 		polylineEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
 
@@ -187,6 +190,7 @@ func arrowheadMarker(isTarget bool, id string, bgColor string, connection d2targ
 		path = polylineEl.Render()
 	case d2target.FilledDiamondArrowhead:
 		polygonEl := svg_style.NewThemableElement("polygon")
+		polygonEl.Class = "connection"
 		polygonEl.Fill = svg_style.ConnectionTheme(connection)
 		polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
 
@@ -208,6 +212,7 @@ func arrowheadMarker(isTarget bool, id string, bgColor string, connection d2targ
 		path = polygonEl.Render()
 	case d2target.DiamondArrowhead:
 		polygonEl := svg_style.NewThemableElement("polygon")
+		polygonEl.Class = "connection"
 		polygonEl.Fill = bgColor
 		polygonEl.Stroke = svg_style.ConnectionTheme(connection)
 		polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
@@ -490,11 +495,16 @@ func drawConnection(writer io.Writer, bgColor string, fgColor string, labelMaskI
 		}
 		fmt.Fprint(writer, arrowPaths)
 	} else {
+		animatedClass := ""
+		if connection.Animated {
+			animatedClass = " animated-connection"
+		}
+
 		pathEl := svg_style.NewThemableElement("path")
 		pathEl.D = path
 		pathEl.Fill = color.None
 		pathEl.Stroke = svg_style.ConnectionTheme(connection)
-		pathEl.Class = "connection animated-connection"
+		pathEl.Class = fmt.Sprintf("connection%s", animatedClass)
 		pathEl.Style = connection.CSSStyle()
 		pathEl.Attributes = fmt.Sprintf("%s%s%s", markerStart, markerEnd, mask)
 		fmt.Fprint(writer, pathEl.Render())