diff --git a/gallery/platypus.png b/gallery/platypus.png
index 7e0a912..cd954d8 100644
Binary files a/gallery/platypus.png and b/gallery/platypus.png differ
diff --git a/gallery/test.png b/gallery/test.png
index c4e9480..2c5d0c6 100644
Binary files a/gallery/test.png and b/gallery/test.png differ
diff --git a/gallery/test2.png b/gallery/test2.png
index c4e9480..2c5d0c6 100644
Binary files a/gallery/test2.png and b/gallery/test2.png differ
diff --git a/gallery/test3.png b/gallery/test3.png
index 8af0ba5..ac6032a 100644
Binary files a/gallery/test3.png and b/gallery/test3.png differ
diff --git a/gallery/test4.png b/gallery/test4.png
index 4f36ffc..57ae67b 100644
Binary files a/gallery/test4.png and b/gallery/test4.png differ
diff --git a/gallery/test5.png b/gallery/test5.png
index e23a31f..ecb2eec 100644
Binary files a/gallery/test5.png and b/gallery/test5.png differ
diff --git a/gallery/test6.png b/gallery/test6.png
index 409663e..eb67604 100644
Binary files a/gallery/test6.png and b/gallery/test6.png differ
diff --git a/gallery/test7.png b/gallery/test7.png
index cfe3ee4..99d3505 100644
Binary files a/gallery/test7.png and b/gallery/test7.png differ
diff --git a/manual.pdf b/manual.pdf
index f4e1052..40efecb 100644
Binary files a/manual.pdf and b/manual.pdf differ
diff --git a/src/cetz.typ b/src/cetz.typ
index 980a619..adb796c 100644
--- a/src/cetz.typ
+++ b/src/cetz.typ
@@ -1 +1 @@
-#import "@preview/cetz:0.3.4": *
\ No newline at end of file
+#import "@preview/cetz:0.5.2": *
\ No newline at end of file
diff --git a/src/util.typ b/src/util.typ
index a444434..56af6a6 100644
--- a/src/util.typ
+++ b/src/util.typ
@@ -73,4 +73,45 @@
 #let valid-anchors = (
   "center", "north", "east", "west", "south",
   "north-east", "north-west", "south-east", "south-west"
-)
\ No newline at end of file
+)
+
+/// Normalizes a coordinate so that 2D points (x, y) are padded
+/// to (x, y, 0) as required by CeTZ's coordinate resolver.
+/// Also handles function-based and dictionary-based coordinates
+/// recursively.
+///
+/// - coord (any): A CeTZ-compatible coordinate
+/// -> any
+#let normalize-coord(coord) = {
+  if type(coord) == array {
+    if coord.len() == 2 {
+      let (a, b) = coord
+      // Raw 2D point: (x, y) -> (x, y, 0)
+      if type(a) in (int, float) and type(b) in (int, float) {
+        return (a, b, 0)
+      }
+      // Function-based coordinate: (fn, point)
+      if type(a) == function {
+        let orig = a
+        return (v => {
+          let result = orig(v)
+          if type(result) == array and result.len() == 2 {
+            let (rx, ry) = result
+            if type(rx) in (int, float) and type(ry) in (int, float) {
+              return (rx, ry, 0)
+            }
+          }
+          return result
+        }, b)
+      }
+    }
+  }
+  if type(coord) == dictionary {
+    let result = (:)
+    for (key, value) in coord {
+      result.insert(key, normalize-coord(value))
+    }
+    return result
+  }
+  return coord
+}
\ No newline at end of file
diff --git a/src/wire.typ b/src/wire.typ
index cbf7c4b..f6fd158 100644
--- a/src/wire.typ
+++ b/src/wire.typ
@@ -1,5 +1,5 @@
 #import "/src/cetz.typ": draw, coordinate
-#import "util.typ": opposite-anchor
+#import "util.typ": opposite-anchor, normalize-coord
 
 /// List of valid wire styles
 /// #examples.wires
@@ -68,8 +68,8 @@
   
   let (ctx, p0) = coordinate.resolve(ctx, start)
   let (ctx, p3) = coordinate.resolve(ctx, end)
-  p0 = (x: p0.first(), y: p0.last())
-  p3 = (x: p3.first(), y: p3.last())
+  p0 = (x: p0.first(), y: p0.at(1))
+  p3 = (x: p3.first(), y: p3.at(1))
 
   let dx1 = margin-start
   let dx2 = margin-end
@@ -86,13 +86,13 @@
   if side-end == "east" {
     dx2 *= -1
   }
-  p1 = (p0.x + dx1, p0.y)
-  p2 = (p3.x - dx2, p0.y)
+  p1 = (p0.x + dx1, p0.y, 0)
+  p2 = (p3.x - dx2, p0.y, 0)
 
   let points = (
     start,
     (horizontal: p1, vertical: ()),
-    (horizontal: (), vertical: (0, dodge-y)),
+    (horizontal: (), vertical: (0, dodge-y, 0)),
     (horizontal: p2, vertical: ()),
     (horizontal: (), vertical: end),
     end
@@ -147,18 +147,18 @@
 
 
   // points that are closest to the edge points
-  let p1 = (p0.x + dx1, p0.y + dy1)
-  let p5 = (p6.x + dx2, p6.y + dy2)
+  let p1 = (p0.x + dx1, p0.y + dy1, 0)
+  let p5 = (p6.x + dx2, p6.y + dy2, 0)
 
 
   // middle point
   let center_x = p0.x + box_width * center_horizontal / 100%
   let center_y = p0.y + box_height * center_vertical / 100%
-  let p3 = (center_x, center_y)
+  let p3 = (center_x, center_y, 0)
 
   // setting up the points for that touch the guides
-  let p2 = (0,0)
-  let p4 = (0,0)
+  let p2 = (0, 0, 0)
+  let p4 = (0, 0, 0)
   if side-start in ("north", "south") {
     p2 = (horizontal: p3, vertical: p1)
   } else {
@@ -240,6 +240,9 @@
   if pts.len() != 2 {
     panic("Wrong number of points (got " + str(pts.len()) + " instead of 2)")
   }
+
+  // Normalize user-provided coordinates: (x, y) -> (x, y, 0)
+  let pts = pts.map(normalize-coord)
   
   let stroke = (
     paint: color,