diff --git a/Cargo.lock b/Cargo.lock
index 581b395..765814f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -890,7 +890,7 @@ dependencies = [
 
 [[package]]
 name = "bevy_mod_openxr"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "android_system_properties",
  "ash",
@@ -918,14 +918,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_mod_xr"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_openxr_android"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "bevy",
  "bevy_mod_openxr",
@@ -1388,7 +1388,7 @@ dependencies = [
 
 [[package]]
 name = "bevy_xr_utils"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "bevy",
  "bevy_mod_openxr",
diff --git a/Cargo.toml b/Cargo.toml
index 61ed4fe..ad93697 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 description = "Community crate for XR in Bevy"
 repository = "https://github.com/awtterpip/bevy_oxr"
@@ -18,9 +18,9 @@ bevy = { version = "0.16.0", default-features = false, features = [
 	"bevy_window",
 	"x11",
 ] }
-bevy_mod_xr = { path = "crates/bevy_xr", version = "0.2.1" }
-bevy_mod_openxr = { path = "crates/bevy_openxr", version = "0.2.1" }
-bevy_xr_utils = { path = "crates/bevy_xr_utils", version = "0.2.1" }
+bevy_mod_xr = { path = "crates/bevy_xr", version = "0.3.0" }
+bevy_mod_openxr = { path = "crates/bevy_openxr", version = "0.3.0" }
+bevy_xr_utils = { path = "crates/bevy_xr_utils", version = "0.3.0" }
 openxr = "0.19.0"
 thiserror = "2.0.3"
 wgpu = "24.0.1"
diff --git a/crates/bevy_openxr/examples/actions.rs b/crates/bevy_openxr/examples/actions.rs
index c06fbcd..0f58fb5 100644
--- a/crates/bevy_openxr/examples/actions.rs
+++ b/crates/bevy_openxr/examples/actions.rs
@@ -10,7 +10,7 @@ use bevy_xr_utils::xr_utils_actions::{
 fn main() {
     App::new()
         .add_plugins(add_xr_plugins(DefaultPlugins))
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_systems(Startup, setup_scene)
         .add_systems(
             Startup,
diff --git a/crates/bevy_openxr/examples/overlay.rs b/crates/bevy_openxr/examples/overlay.rs
index a2beb3e..9c1bf2f 100644
--- a/crates/bevy_openxr/examples/overlay.rs
+++ b/crates/bevy_openxr/examples/overlay.rs
@@ -28,7 +28,7 @@ fn main() {
             ..OxrSessionConfig::default()
         })
         .insert_resource(ClearColor(Color::NONE))
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_systems(Startup, setup)
         .add_systems(Update, handle_input)
         .add_systems(Update, print_main_session_changes)
diff --git a/crates/bevy_openxr/examples/sessions.rs b/crates/bevy_openxr/examples/sessions.rs
index c8e981e..b8fac4f 100644
--- a/crates/bevy_openxr/examples/sessions.rs
+++ b/crates/bevy_openxr/examples/sessions.rs
@@ -7,7 +7,7 @@ use bevy_mod_xr::session::{XrSessionPlugin, XrState};
 fn main() -> AppExit {
     App::new()
         .add_plugins(add_xr_plugins(DefaultPlugins).set(XrSessionPlugin { auto_handle: true }))
-        .add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
+        .add_plugins(bevy_mod_xr::hand_debug_gizmos::HandGizmosPlugin)
         .add_systems(Startup, setup)
         .add_systems(Update, handle_input)
         .insert_resource(AmbientLight::default())
diff --git a/crates/bevy_xr/Cargo.toml b/crates/bevy_xr/Cargo.toml
index 2103bd6..cbfee0b 100644
--- a/crates/bevy_xr/Cargo.toml
+++ b/crates/bevy_xr/Cargo.toml
@@ -8,6 +8,9 @@ repository.workspace = true
 keywords = ["gamedev", "bevy", "Xr", "Vr"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = ["gizmos"]
+gizmos = ["bevy/bevy_gizmos"]
 
 [dependencies]
 bevy = { workspace = true, features = ["bevy_log"] }
diff --git a/crates/bevy_xr/src/lib.rs b/crates/bevy_xr/src/lib.rs
index 87692d1..5bf2335 100644
--- a/crates/bevy_xr/src/lib.rs
+++ b/crates/bevy_xr/src/lib.rs
@@ -1,7 +1,8 @@
 pub mod actions;
 pub mod camera;
+#[cfg(feature = "gizmos")]
+pub mod hand_debug_gizmos;
 pub mod hands;
 pub mod session;
-pub mod types;
 pub mod spaces;
-pub mod hand_debug_gizmos;
+pub mod types;