diff --git a/Cargo.toml b/Cargo.toml
index 9db1575..6de7f27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,9 +8,10 @@ authors = [""]
 
 [features]
 default = ["development", "debug_features", "gamecube-adapter"]
-development = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy/embedded_watcher", "bevy/bevy_dev_tools"]
+development = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy/embedded_watcher", "hitbox-viewer"]
 debug_features = ["bevy/free_camera"]
 gamecube-adapter = ["dep:gc-adapter-neo"]
+hitbox-viewer = ["bevy/bevy_dev_tools", "dep:egui_extras"]
 
 [dependencies]
 bevy = { version = "0.19.1", features = ["asset_processor", "basis-universal", "compressed_image_saver", "bevy_settings"] }
@@ -21,7 +22,7 @@ avian3d = "0.7"
 arrayvec = "0.7.8"
 bevy-inspector-egui = "0.37.0"
 bevy_egui = "0.40.0"
-egui_extras = "0.34.3"
+egui_extras = { version =  "0.34.3", optional = true}
 bevy_ggrs = { git = "https://github.com/gschup/bevy_ggrs" }
 serde = "1.0.229"
 serde_json = "1.0.145"
@@ -51,3 +52,8 @@ strip = "symbols"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 gc-adapter-neo = { version = "1.1.1", features = ["libusb"], optional = true }
+
+[[bin]]
+name = "hitbox-editor"
+path = "src/bin/hitbox-editor.rs"
+required-features = ["hitbox-viewer"]
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 4db5f7f..f64b841 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -48,6 +48,7 @@ pub mod fighter;
 pub mod filled_gizmos;
 pub mod game_settings;
 pub mod input;
+#[cfg(feature = "hitbox-viewer")]
 pub mod hitbox_viewer;
 pub mod match_loading;
 pub mod match_runtime;