diff --git a/Cargo.lock b/Cargo.lock
index bb8e2ab28..81f1697f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,7 +79,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
 [[package]]
 name = "acadrust"
 version = "0.5.4"
-source = "git+https://github.com/HakanSeven12/cadcodec.git?rev=91e52521863ef2941e186b03e1679a35cf24a23c#91e52521863ef2941e186b03e1679a35cf24a23c"
+source = "git+https://github.com/HakanSeven12/cadcodec.git?rev=f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4#f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4"
 dependencies = [
  "ahash 0.8.12",
  "anyhow",
@@ -894,7 +894,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 [[package]]
 name = "cadkernel"
 version = "0.1.0"
-source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=fa0ed5ab83fb82eec0e13ddfb522d49246814f5e#fa0ed5ab83fb82eec0e13ddfb522d49246814f5e"
+source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=7c5048ba179e861288a6d1f6a50da6b5b9147838#7c5048ba179e861288a6d1f6a50da6b5b9147838"
 dependencies = [
  "acadrust",
  "cavalier_contours",
@@ -905,7 +905,7 @@ dependencies = [
 [[package]]
 name = "cadkernel-constraints"
 version = "0.1.0"
-source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=fa0ed5ab83fb82eec0e13ddfb522d49246814f5e#fa0ed5ab83fb82eec0e13ddfb522d49246814f5e"
+source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=7c5048ba179e861288a6d1f6a50da6b5b9147838#7c5048ba179e861288a6d1f6a50da6b5b9147838"
 dependencies = [
  "nalgebra",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f9c23dd94..a62f15648 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,9 +30,9 @@ glam = { version = "0.33", features = ["bytemuck"] }
 rfd = "0.17"
 clap = { version = "4", features = ["derive", "string"] }
 env_logger = "0.11"
-acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "91e52521863ef2941e186b03e1679a35cf24a23c", features = ["serde"] }
-cadkernel = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "fa0ed5ab83fb82eec0e13ddfb522d49246814f5e", features = ["acis", "offset"] }
-cadkernel-constraints = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "fa0ed5ab83fb82eec0e13ddfb522d49246814f5e" }
+acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4", features = ["serde"] }
+cadkernel = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "7c5048ba179e861288a6d1f6a50da6b5b9147838", features = ["acis", "offset"] }
+cadkernel-constraints = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "7c5048ba179e861288a6d1f6a50da6b5b9147838" }
 dwg-thumbnailer = { path = "crates/dwg-thumbnailer" }
 flate2 = "1"
 image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp", "tiff"] }
diff --git a/crates/ocs_plugin_api/Cargo.toml b/crates/ocs_plugin_api/Cargo.toml
index 02c4daefa..ae1b7d3a1 100644
--- a/crates/ocs_plugin_api/Cargo.toml
+++ b/crates/ocs_plugin_api/Cargo.toml
@@ -14,7 +14,7 @@ serde = { version = "1", features = ["derive"] }
 # Pulled in only by the `host` feature, which adds the `acadrust`-typed
 # `HostApi` runtime surface. The default crate stays dependency-free so engine
 # crates and external tooling can depend on the manifest/ribbon contract cheaply.
-acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "91e52521863ef2941e186b03e1679a35cf24a23c", optional = true, features = ["serde"] }
+acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4", optional = true, features = ["serde"] }
 
 # Runtime IPC and serialization (host feature only).
 interprocess = { version = "2", optional = true }
@@ -38,7 +38,7 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 cargo-lock = "11"
 # acadrust is scanned at build time to generate the embedded type registry.
-acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "91e52521863ef2941e186b03e1679a35cf24a23c", features = ["serde"] }
+acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4", features = ["serde"] }
 
 [dev-dependencies]
 serde_json = "1"
diff --git a/crates/ocs_web_worker/Cargo.toml b/crates/ocs_web_worker/Cargo.toml
index 0f5d63cd3..b96691b7f 100644
--- a/crates/ocs_web_worker/Cargo.toml
+++ b/crates/ocs_web_worker/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "91e52521863ef2941e186b03e1679a35cf24a23c", features = ["serde"] }
+acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4", features = ["serde"] }
 bincode = "1.3"
 serde = { version = "1", features = ["derive"] }
 console_error_panic_hook = "0.1"
diff --git a/crates/plugin-template-api2/Cargo.toml b/crates/plugin-template-api2/Cargo.toml
index d726f57e6..b749df0e4 100644
--- a/crates/plugin-template-api2/Cargo.toml
+++ b/crates/plugin-template-api2/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 ocs_plugin_api = { path = "../ocs_plugin_api", features = ["host"] }
-acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "91e52521863ef2941e186b03e1679a35cf24a23c", features = ["serde"] }
+acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "f30dcc84ebfc3f48bdc1eb888d6b8eda65c3e6f4", features = ["serde"] }