diff --git a/Cargo.lock b/Cargo.lock
index 37b2e13..26eab40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1268,8 +1268,6 @@ dependencies = [
 [[package]]
 name = "bevy_trenchbroom"
 version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f3bbd97c4b9cf5af46e1225c96c87f45000d2ef7edba213f282dbc4db47e76"
 dependencies = [
  "anyhow",
  "bevy",
@@ -1296,8 +1294,6 @@ dependencies = [
 [[package]]
 name = "bevy_trenchbroom_macros"
 version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72fe0b23812d20e5efbaeb89f087daa797bc67a1fe12dad6a1daf343fbf31517"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 877779e..19ef496 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,6 @@ bevy_trenchbroom = { version = "0.6.2", features = ["auto_register"] }
 bevy_flycam = "0.15.0"
 nil = "0.14.0"
 bevy-inspector-egui = "0.29.1"
+
+[patch.crates-io]
+bevy_trenchbroom = { path = "../../extern/bevy_trenchbroom" }
diff --git a/trenchbroom/hedz/hedz.fgd b/trenchbroom/hedz/hedz.fgd
index be41aca..499f7fb 100644
--- a/trenchbroom/hedz/hedz.fgd
+++ b/trenchbroom/hedz/hedz.fgd
@@ -1,10 +1,3 @@
-@BaseClass = transform
-[
-	origin(vector) : "Translation/Origin" : "0 0 0" : ""
-	angles(vector) : "Rotation (pitch yaw roll) in degrees" : "0 0 0" : ""
-	scale(vector) : "Scale" : "1 1 1" : ""
-]
-
 @BaseClass = bsp_solid_entity
 [
 	_lmscale(integer) : "_lmscale" :  : "Generates an `LMSHIFT` BSPX lump for use by a light util. Note that both scaled and unscaled lighting will normally be used."
@@ -63,12 +56,19 @@
  NOTE: Changing to 2, for example, will cause the bmodel to initially be solid black. You’ll need to add minlight or lights with _light_channel_mask 2."
 ]
 
-@SolidClass = worldspawn
-[
-]
-
 @SolidClass = my_base_class
 [
 	my_value(integer) : "my_value" : 0 : "MY AWESOME VALUE!!"
 ]
 
+@BaseClass = transform
+[
+	origin(vector) : "Translation/Origin" : "0 0 0" : ""
+	angles(vector) : "Rotation (pitch yaw roll) in degrees" : "0 0 0" : ""
+	scale(vector) : "Scale" : "1 1 1" : ""
+]
+
+@SolidClass = worldspawn
+[
+]
+