diff --git a/README.md b/README.md
index d320d4ac..6abb6917 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,7 @@ Pair this with a crate like [`egui_dock`](https://docs.rs/egui_dock/latest/egui_
 
 | bevy | bevy-inspector-egui |
 | ---- | ------------------- |
+| 0.15 | 0.28                |
 | 0.14 | 0.27                |
 | 0.14 | 0.26                |
 | 0.14 | 0.25                |
diff --git a/crates/bevy-inspector-egui-derive/Cargo.toml b/crates/bevy-inspector-egui-derive/Cargo.toml
index de86b251..ec3b6dd0 100644
--- a/crates/bevy-inspector-egui-derive/Cargo.toml
+++ b/crates/bevy-inspector-egui-derive/Cargo.toml
@@ -17,7 +17,7 @@ quote = "1.0"
 proc-macro2 = "1.0"
 
 [dev-dependencies]
-bevy_ecs = { version = "0.14.0", default-features = false }
-bevy_math = { version = "0.14.0", default-features = false }
-bevy_reflect = { version = "0.14.0", default-features = false }
+bevy_ecs = { version = "0.15.0-rc.3", default-features = false }
+bevy_math = { version = "0.15.0-rc.3", default-features = false }
+bevy_reflect = { version = "0.15.0-rc.3", default-features = false }
 bevy-inspector-egui = { path = "../bevy-inspector-egui" }
diff --git a/crates/bevy-inspector-egui/Cargo.toml b/crates/bevy-inspector-egui/Cargo.toml
index f33a4bad..ac143806 100644
--- a/crates/bevy-inspector-egui/Cargo.toml
+++ b/crates/bevy-inspector-egui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy-inspector-egui"
-version = "0.27.0"
+version = "0.28.0"
 edition = "2021"
 repository = "https://github.com/jakobhellermann/bevy-inspector-egui/"
 readme = "README.md"
@@ -16,7 +16,13 @@ categories = [
 ]
 
 [features]
-default = ["bevy_pbr", "bevy_render", "egui_clipboard", "egui_open_url"]
+default = [
+    "bevy_pbr",
+    "bevy_image",
+    "bevy_render",
+    "egui_clipboard",
+    "egui_open_url",
+]
 bevy_render = ["dep:bevy_render", "dep:bevy_core_pipeline", "bevy_egui/render"]
 egui_clipboard = ["bevy_egui/manage_clipboard"]
 egui_open_url = ["bevy_egui/open_url"]
@@ -29,26 +35,27 @@ features = ["winit/x11"]
 winit = { version = "0.30.0", default-features = false }
 
 bevy-inspector-egui-derive = { version = "0.27.0", path = "../bevy-inspector-egui-derive" }
-bevy_app = { version = "0.14.0" }
-bevy_asset = { version = "0.14.0" }
-bevy_color = { version = "0.14.0" }
-bevy_core = { version = "0.14.0" }
-bevy_ecs = { version = "0.14.0" }
-bevy_hierarchy = { version = "0.14.0" }
-bevy_log = { version = "0.14.0" }
-bevy_math = { version = "0.14.0" }
-bevy_reflect = { version = "0.14.0" }
-bevy_state = { version = "0.14.0" }
-bevy_time = { version = "0.14.0" }
-bevy_utils = { version = "0.14.0" }
-bevy_window = { version = "0.14.0" }
-
-bevy_render = { version = "0.14", optional = true }
-bevy_core_pipeline = { version = "0.14", optional = true }
-bevy_pbr = { version = "0.14", optional = true }
+bevy_app = { version = "0.15.0" }
+bevy_asset = { version = "0.15.0" }
+bevy_color = { version = "0.15.0" }
+bevy_core = { version = "0.15.0" }
+bevy_ecs = { version = "0.15.0" }
+bevy_hierarchy = { version = "0.15.0" }
+bevy_log = { version = "0.15.0" }
+bevy_math = { version = "0.15.0" }
+bevy_reflect = { version = "0.15.0" }
+bevy_state = { version = "0.15.0" }
+bevy_time = { version = "0.15.0" }
+bevy_utils = { version = "0.15.0" }
+bevy_window = { version = "0.15.0" }
+
+bevy_render = { version = "0.15.0", optional = true }
+bevy_core_pipeline = { version = "0.15.0", optional = true }
+bevy_pbr = { version = "0.15.0", optional = true }
+bevy_image = { version = "0.15.0", optional = true }
 
 egui = "0.29"
-bevy_egui = { version = "0.30", default-features = false }
+bevy_egui = { version = "0.31", default-features = false }
 
 bytemuck = "1.16.0"
 image = { version = "0.25", default-features = false }
@@ -58,9 +65,10 @@ smallvec = "1.10"
 fuzzy-matcher = "0.3.7"
 
 [dev-dependencies]
-bevy = { version = "0.14.0", default-features = false, features = [
+bevy = { version = "0.15.0", default-features = false, features = [
     "x11",
     "bevy_winit",
+    "bevy_window",
     "bevy_pbr",
     "bevy_sprite",
     "bevy_core_pipeline",
@@ -122,4 +130,3 @@ path = "examples/integrations/side_panel.rs"
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(egui_dock_gizmo)'] }
-
diff --git a/crates/bevy-inspector-egui/examples/basic/inspector_options.rs b/crates/bevy-inspector-egui/examples/basic/inspector_options.rs
index 602268fa..57904d66 100644
--- a/crates/bevy-inspector-egui/examples/basic/inspector_options.rs
+++ b/crates/bevy-inspector-egui/examples/basic/inspector_options.rs
@@ -79,7 +79,7 @@ fn main() {
 }
 
 fn setup(mut commands: Commands, mut ui_data: ResMut<UiData>) {
-    let entity = commands.spawn(PbrBundle::default()).id();
+    let entity = commands.spawn(Mesh3d::default()).id();
     ui_data.entity = Some(entity);
 }
 
diff --git a/crates/bevy-inspector-egui/examples/basic/resource_inspector_manual.rs b/crates/bevy-inspector-egui/examples/basic/resource_inspector_manual.rs
index d882aa5b..b9b2716d 100644
--- a/crates/bevy-inspector-egui/examples/basic/resource_inspector_manual.rs
+++ b/crates/bevy-inspector-egui/examples/basic/resource_inspector_manual.rs
@@ -62,31 +62,29 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
     // cube
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-        transform: Transform::from_xyz(0.0, 0.5, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 2_000_000.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/integrations/egui_dock.rs b/crates/bevy-inspector-egui/examples/integrations/egui_dock.rs
index e0c2a687..49e2670a 100644
--- a/crates/bevy-inspector-egui/examples/integrations/egui_dock.rs
+++ b/crates/bevy-inspector-egui/examples/integrations/egui_dock.rs
@@ -12,7 +12,7 @@ use std::any::TypeId;
 use bevy_egui::EguiSet;
 use bevy_reflect::TypeRegistry;
 use bevy_render::camera::{CameraProjection, Viewport};
-use bevy_window::PrimaryWindow;
+use bevy_window::{PrimaryWindow, Window};
 use egui_dock::{DockArea, DockState, NodeIndex, Style};
 
 #[cfg(egui_dock_gizmo)]
@@ -411,71 +411,67 @@ fn setup(
     // left - red
     let mut transform = Transform::from_xyz(-box_offset, box_offset, 0.0);
     transform.rotate(Quat::from_rotation_z(std::f32::consts::FRAC_PI_2));
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(box_size, box_thickness, box_size)),
-        transform,
-        material: materials.add(StandardMaterial {
+
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(box_size, box_thickness, box_size))),
+        MeshMaterial3d(materials.add(StandardMaterial {
             base_color: Color::srgb(0.63, 0.065, 0.05),
             ..Default::default()
-        }),
-        ..Default::default()
-    });
+        })),
+        transform,
+    ));
     // right - green
     let mut transform = Transform::from_xyz(box_offset, box_offset, 0.0);
     transform.rotate(Quat::from_rotation_z(std::f32::consts::FRAC_PI_2));
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(box_size, box_thickness, box_size)),
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(box_size, box_thickness, box_size))),
         transform,
-        material: materials.add(StandardMaterial {
+        MeshMaterial3d(materials.add(StandardMaterial {
             base_color: Color::srgb(0.14, 0.45, 0.091),
             ..Default::default()
-        }),
-        ..Default::default()
-    });
+        })),
+    ));
     // bottom - white
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(
             box_size + 2.0 * box_thickness,
             box_thickness,
             box_size,
-        )),
-        material: materials.add(StandardMaterial {
+        ))),
+        MeshMaterial3d(materials.add(StandardMaterial {
             base_color: Color::srgb(0.725, 0.71, 0.68),
             ..Default::default()
-        }),
-        ..Default::default()
-    });
+        })),
+    ));
     // top - white
     let transform = Transform::from_xyz(0.0, 2.0 * box_offset, 0.0);
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(
             box_size + 2.0 * box_thickness,
             box_thickness,
             box_size,
-        )),
+        ))),
         transform,
-        material: materials.add(StandardMaterial {
+        MeshMaterial3d(materials.add(StandardMaterial {
             base_color: Color::srgb(0.725, 0.71, 0.68),
             ..Default::default()
-        }),
-        ..Default::default()
-    });
+        })),
+    ));
     // back - white
     let mut transform = Transform::from_xyz(0.0, box_offset, -box_offset);
     transform.rotate(Quat::from_rotation_x(std::f32::consts::FRAC_PI_2));
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(
             box_size + 2.0 * box_thickness,
             box_thickness,
             box_size + 2.0 * box_thickness,
-        )),
+        ))),
         transform,
-        material: materials.add(StandardMaterial {
+        MeshMaterial3d(materials.add(StandardMaterial {
             base_color: Color::srgb(0.725, 0.71, 0.68),
             ..Default::default()
-        }),
-        ..Default::default()
-    });
+        })),
+    ));
 
     // ambient light
     commands.insert_resource(AmbientLight {
@@ -484,48 +480,43 @@ fn setup(
     });
     // top light
     commands
-        .spawn(PbrBundle {
-            mesh: meshes.add(Plane3d::default().mesh().size(0.4, 0.4)),
-            transform: Transform::from_matrix(Mat4::from_scale_rotation_translation(
+        .spawn((
+            Mesh3d(meshes.add(Plane3d::default().mesh().size(0.4, 0.4))),
+            Transform::from_matrix(Mat4::from_scale_rotation_translation(
                 Vec3::ONE,
                 Quat::from_rotation_x(std::f32::consts::PI),
                 Vec3::new(0.0, box_size + 0.5 * box_thickness, 0.0),
             )),
-            material: materials.add(StandardMaterial {
+            MeshMaterial3d(materials.add(StandardMaterial {
                 base_color: Color::WHITE,
                 emissive: LinearRgba::WHITE * 100.0,
                 ..Default::default()
-            }),
-            ..Default::default()
-        })
+            })),
+        ))
         .with_children(|builder| {
-            builder.spawn(PointLightBundle {
-                point_light: PointLight {
+            builder.spawn((
+                PointLight {
                     color: Color::WHITE,
                     intensity: 25000.0,
                     ..Default::default()
                 },
-                transform: Transform::from_translation((box_thickness + 0.05) * Vec3::Y),
-                ..Default::default()
-            });
+                Transform::from_translation((box_thickness + 0.05) * Vec3::Y),
+            ));
         });
     // directional light
-    commands.spawn(DirectionalLightBundle {
-        directional_light: DirectionalLight {
+    commands.spawn((
+        DirectionalLight {
             illuminance: 2000.0,
             ..default()
         },
-        transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::PI / 2.0)),
-        ..Default::default()
-    });
+        Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::PI / 2.0)),
+    ));
 
     // camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_xyz(0.0, box_offset, 4.0)
-                .looking_at(Vec3::new(0.0, box_offset, 0.0), Vec3::Y),
-            ..Default::default()
-        },
+        Camera3d::default(),
+        Transform::from_xyz(0.0, box_offset, 4.0)
+            .looking_at(Vec3::new(0.0, box_offset, 0.0), Vec3::Y),
         MainCamera,
         // PickRaycastSource,
     ));
diff --git a/crates/bevy-inspector-egui/examples/integrations/side_panel.rs b/crates/bevy-inspector-egui/examples/integrations/side_panel.rs
index cab22c58..be48a32f 100644
--- a/crates/bevy-inspector-egui/examples/integrations/side_panel.rs
+++ b/crates/bevy-inspector-egui/examples/integrations/side_panel.rs
@@ -68,7 +68,7 @@ struct Rotator;
 
 fn rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<Rotator>>) {
     for mut transform in &mut query {
-        transform.rotate_x(3.0 * time.delta_seconds());
+        transform.rotate_x(3.0 * time.delta_secs());
     }
 }
 
@@ -86,31 +86,24 @@ fn setup(
     // parent cube
     commands
         .spawn((
-            PbrBundle {
-                mesh: cube_handle.clone(),
-                material: cube_material_handle.clone(),
-                transform: Transform::from_xyz(0.0, 0.0, 1.0),
-                ..default()
-            },
+            Mesh3d(cube_handle.clone()),
+            MeshMaterial3d(cube_material_handle.clone()),
+            Transform::from_xyz(0.0, 0.0, 1.0),
             Rotator,
         ))
         .with_children(|parent| {
             // child cube
-            parent.spawn(PbrBundle {
-                mesh: cube_handle,
-                material: cube_material_handle,
-                transform: Transform::from_xyz(0.0, 0.0, 3.0),
-                ..default()
-            });
+            parent.spawn((
+                Mesh3d(cube_handle),
+                MeshMaterial3d(cube_material_handle),
+                Transform::from_xyz(0.0, 0.0, 3.0),
+            ));
         });
     // light
-    commands.spawn(PointLightBundle {
-        transform: Transform::from_xyz(4.0, 5.0, -4.0),
-        ..default()
-    });
+    commands.spawn((PointLight::default(), Transform::from_xyz(4.0, 5.0, -4.0)));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(5.0, 10.0, 10.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(5.0, 10.0, 10.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/quick/asset_inspector.rs b/crates/bevy-inspector-egui/examples/quick/asset_inspector.rs
index f3af64a0..2d891204 100644
--- a/crates/bevy-inspector-egui/examples/quick/asset_inspector.rs
+++ b/crates/bevy-inspector-egui/examples/quick/asset_inspector.rs
@@ -16,31 +16,29 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+        Transform::from_xyz(0.0, 0.0, 1.0),
+    ));
     // cube
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-        transform: Transform::from_xyz(0.0, 0.5, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 2_000_000.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/quick/filter_query_inspector.rs b/crates/bevy-inspector-egui/examples/quick/filter_query_inspector.rs
index 81a2db06..b6efd36c 100644
--- a/crates/bevy-inspector-egui/examples/quick/filter_query_inspector.rs
+++ b/crates/bevy-inspector-egui/examples/quick/filter_query_inspector.rs
@@ -16,31 +16,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+    ));
     // cube
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-        transform: Transform::from_xyz(0.0, 0.5, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 2_000_000.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/quick/resource_inspector.rs b/crates/bevy-inspector-egui/examples/quick/resource_inspector.rs
index 1d814ef9..3b676201 100644
--- a/crates/bevy-inspector-egui/examples/quick/resource_inspector.rs
+++ b/crates/bevy-inspector-egui/examples/quick/resource_inspector.rs
@@ -2,6 +2,7 @@ use bevy::input::common_conditions::input_toggle_active;
 use bevy::prelude::*;
 use bevy_inspector_egui::prelude::*;
 use bevy_inspector_egui::quick::ResourceInspectorPlugin;
+use bevy_utils::hashbrown::HashSet;
 
 #[derive(Reflect, Resource, Default, InspectorOptions)]
 #[reflect(Resource, InspectorOptions)]
@@ -9,6 +10,7 @@ struct Configuration {
     name: String,
     #[inspector(min = 0.0, max = 1.0)]
     option: f32,
+    set: HashSet<String>,
 }
 
 fn main() {
@@ -18,7 +20,15 @@ fn main() {
             ResourceInspectorPlugin::<Configuration>::default()
                 .run_if(input_toggle_active(true, KeyCode::Escape)),
         )
-        .init_resource::<Configuration>()
+        //.init_resource::<Configuration>()
+        .insert_resource(Configuration {
+            set: HashSet::from([
+                "Einar".to_string(),
+                "Olaf".to_string(),
+                "Harald".to_string(),
+            ]),
+            ..default()
+        })
         .register_type::<Configuration>()
         .add_systems(Startup, setup)
         .run();
@@ -31,31 +41,28 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(0.5, 0.5)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(0.5, 0.5))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+    ));
     // cube
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-        transform: Transform::from_xyz(0.0, 0.5, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
+    ));
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 2_000_000.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/quick/state_inspector.rs b/crates/bevy-inspector-egui/examples/quick/state_inspector.rs
index fd2f4821..26ebf4cb 100644
--- a/crates/bevy-inspector-egui/examples/quick/state_inspector.rs
+++ b/crates/bevy-inspector-egui/examples/quick/state_inspector.rs
@@ -31,17 +31,15 @@ enum AppState {
 struct TheSquare;
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d::default());
 
-    commands
-        .spawn(SpriteBundle {
-            sprite: Sprite {
-                custom_size: Some(Vec2::splat(100.)),
-                ..default()
-            },
+    commands.spawn((
+        Sprite {
+            custom_size: Some(Vec2::splat(100.)),
             ..default()
-        })
-        .insert(TheSquare);
+        },
+        TheSquare,
+    ));
 }
 
 fn set_color<const R: u8, const G: u8, const B: u8>(
diff --git a/crates/bevy-inspector-egui/examples/quick/world_inspector.rs b/crates/bevy-inspector-egui/examples/quick/world_inspector.rs
index f60eca24..710accf2 100644
--- a/crates/bevy-inspector-egui/examples/quick/world_inspector.rs
+++ b/crates/bevy-inspector-egui/examples/quick/world_inspector.rs
@@ -19,34 +19,29 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
-        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+    ));
     // cube
     commands.spawn((
         Name::new("My Cube"),
-        PbrBundle {
-            mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-            material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
-            transform: Transform::from_xyz(0.0, 0.5, 0.0),
-            ..default()
-        },
+        Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::from_xyz(0.0, 0.5, 0.0),
     ));
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 2_000_000.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/examples/quick/world_inspector_assets.rs b/crates/bevy-inspector-egui/examples/quick/world_inspector_assets.rs
index d261c967..c51b22d1 100644
--- a/crates/bevy-inspector-egui/examples/quick/world_inspector_assets.rs
+++ b/crates/bevy-inspector-egui/examples/quick/world_inspector_assets.rs
@@ -56,31 +56,26 @@ fn setup(
     });
 
     // textured quad - normal
-    commands.spawn(PbrBundle {
-        mesh: quad_handle.clone(),
-        material: material_handle,
-        transform: Transform::from_xyz(0.0, 0.0, 1.5)
-            .with_rotation(Quat::from_rotation_x(-PI / 5.0)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(quad_handle.clone()),
+        MeshMaterial3d(material_handle),
+        Transform::from_xyz(0.0, 0.0, 1.5).with_rotation(Quat::from_rotation_x(-PI / 5.0)),
+    ));
     // textured quad - modulated
-    commands.spawn(PbrBundle {
-        mesh: quad_handle.clone(),
-        material: red_material_handle,
-        transform: Transform::from_rotation(Quat::from_rotation_x(-PI / 5.0)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(quad_handle.clone()),
+        MeshMaterial3d(red_material_handle),
+        Transform::from_rotation(Quat::from_rotation_x(-PI / 5.0)),
+    ));
     // textured quad - modulated
-    commands.spawn(PbrBundle {
-        mesh: quad_handle,
-        material: blue_material_handle,
-        transform: Transform::from_xyz(0.0, 0.0, -1.5)
-            .with_rotation(Quat::from_rotation_x(-PI / 5.0)),
-        ..default()
-    });
+    commands.spawn((
+        Mesh3d(quad_handle),
+        MeshMaterial3d(blue_material_handle),
+        Transform::from_xyz(0.0, 0.0, 1.5).with_rotation(Quat::from_rotation_x(-PI / 5.0)),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(3.0, 5.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(3.0, 5.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/crates/bevy-inspector-egui/src/bevy_inspector/mod.rs b/crates/bevy-inspector-egui/src/bevy_inspector/mod.rs
index 6eaa7f31..a6d4ab66 100644
--- a/crates/bevy-inspector-egui/src/bevy_inspector/mod.rs
+++ b/crates/bevy-inspector-egui/src/bevy_inspector/mod.rs
@@ -7,7 +7,7 @@
 //! # use bevy_ecs::prelude::*;
 //! # use bevy_state::prelude::States;
 //! # use bevy_reflect::Reflect;
-//! # use bevy_render::prelude::Msaa;
+//! # use bevy_time::Time;
 //! # use bevy_math::Vec3;
 //!
 //! #[derive(States, Debug, Clone, Eq, PartialEq, Hash, Reflect, Default)]
@@ -17,8 +17,8 @@
 //!     let mut any_reflect_value = Vec3::new(1.0, 2.0, 3.0);
 //!     bevy_inspector::ui_for_value(&mut any_reflect_value, ui, world);
 //!
-//!     ui.heading("Msaa resource");
-//!     bevy_inspector::ui_for_resource::<Msaa>(world, ui);
+//!     ui.heading("Time resource");
+//!     bevy_inspector::ui_for_resource::<Time>(world, ui);
 //!
 //!     ui.heading("App State");
 //!     bevy_inspector::ui_for_state::<AppState>(world, ui);
@@ -75,7 +75,7 @@ pub fn ui_for_value(value: &mut dyn Reflect, ui: &mut egui::Ui, world: &mut Worl
         queue: Some(&mut queue),
     };
     let mut env = InspectorUi::for_bevy(&type_registry, &mut cx);
-    let changed = env.ui_for_reflect(value, ui);
+    let changed = env.ui_for_reflect(value.as_partial_reflect_mut(), ui);
     queue.apply(world);
     changed
 }
@@ -367,15 +367,17 @@ fn self_or_children_satisfy_filter(
         name.to_lowercase().contains(filter)
     };
     self_matches || {
-        world
+        let Ok(children) = world
             .query::<&Children>()
             .get(world, entity)
             .map(|children| children.to_vec())
-            .is_ok_and(|children| {
-                children
-                    .iter()
-                    .any(|child| self_or_children_satisfy_filter(world, *child, filter, is_fuzzy))
-            })
+        else {
+            return false;
+        };
+
+        children
+            .iter()
+            .any(|child| self_or_children_satisfy_filter(world, *child, filter, is_fuzzy))
     }
 }
 
@@ -504,7 +506,7 @@ pub(crate) fn ui_for_entity_components(
             queue: queue.as_deref_mut(),
         };
 
-        let (value, is_changed, set_changed) = match component_view.get_entity_component_reflect(
+        let mut value = match component_view.get_entity_component_reflect(
             entity,
             component_type_id,
             type_registry,
@@ -516,7 +518,7 @@ pub(crate) fn ui_for_entity_components(
             }
         };
 
-        if is_changed {
+        if value.is_changed() {
             #[cfg(feature = "highlight_changes")]
             set_highlight_style(ui);
         }
@@ -525,10 +527,15 @@ pub(crate) fn ui_for_entity_components(
             ui.reset_style();
 
             let inspector_changed = InspectorUi::for_bevy(type_registry, &mut cx)
-                .ui_for_reflect_with_options(value, ui, id.with(component_id), &());
+                .ui_for_reflect_with_options(
+                    value.bypass_change_detection().as_partial_reflect_mut(),
+                    ui,
+                    id.with(component_id),
+                    &(),
+                );
 
             if inspector_changed {
-                set_changed();
+                value.set_changed();
             }
         });
         ui.reset_style();
@@ -626,7 +633,6 @@ pub fn ui_for_entities_shared_components(
                 };
 
                 let mut values = Vec::with_capacity(entities.len());
-                let mut mark_changeds = Vec::with_capacity(entities.len());
 
                 for (i, &entity) in entities.iter().enumerate() {
                     // skip duplicate entities
@@ -642,9 +648,8 @@ pub fn ui_for_entities_shared_components(
                             &type_registry,
                         )
                     } {
-                        Ok((value, mark_changed)) => {
+                        Ok(value) => {
                             values.push(value);
-                            mark_changeds.push(mark_changed);
                         }
                         Err(error) => {
                             errors::show_error(error, ui, &name);
@@ -653,17 +658,23 @@ pub fn ui_for_entities_shared_components(
                     }
                 }
 
+                let mut values_reflect: Vec<_> = values
+                    .iter_mut()
+                    .map(|value| value.bypass_change_detection().as_partial_reflect_mut())
+                    .collect();
                 let changed = env.ui_for_reflect_many_with_options(
                     component_type_id,
                     &name,
                     ui,
                     id.with(component_id),
                     &(),
-                    values.as_mut_slice(),
+                    values_reflect.as_mut_slice(),
                     &|a| a,
                 );
                 if changed {
-                    mark_changeds.into_iter().for_each(|f| f());
+                    for value in values.iter_mut() {
+                        value.set_changed();
+                    }
                 }
             });
     }
@@ -708,16 +719,19 @@ pub mod by_type_id {
             };
             let mut env = InspectorUi::for_bevy(type_registry, &mut cx);
 
-            let (resource, set_changed) = match resource_view
+            let mut resource = match resource_view
                 .get_resource_reflect_mut_by_id(resource_type_id, type_registry)
             {
                 Ok(resource) => resource,
                 Err(err) => return errors::show_error(err, ui, name_of_type),
             };
 
-            let changed = env.ui_for_reflect(resource, ui);
+            let changed = env.ui_for_reflect(
+                resource.bypass_change_detection().as_partial_reflect_mut(),
+                ui,
+            );
             if changed {
-                set_changed();
+                resource.set_changed();
             }
         }
 
@@ -769,7 +783,9 @@ pub mod by_type_id {
 
         for handle_id in ids {
             let id = egui::Id::new(handle_id);
-            let mut handle = reflect_handle.typed(UntypedHandle::Weak(handle_id));
+            let mut handle = reflect_handle
+                .typed(UntypedHandle::Weak(handle_id))
+                .into_partial_reflect();
 
             egui::CollapsingHeader::new(handle_name(handle_id, asset_server.as_ref()))
                 .id_salt(id)
@@ -828,7 +844,9 @@ pub mod by_type_id {
         };
 
         let id = egui::Id::new(handle);
-        let mut handle = reflect_handle.typed(UntypedHandle::Weak(handle));
+        let mut handle = reflect_handle
+            .typed(UntypedHandle::Weak(handle))
+            .into_partial_reflect();
 
         let mut env = InspectorUi::for_bevy(type_registry, &mut cx);
         let changed = env.ui_for_reflect_with_options(&mut *handle, ui, id, &());
@@ -878,19 +896,23 @@ pub mod short_circuit {
     use std::any::{Any, TypeId};
 
     use bevy_asset::ReflectAsset;
-    use bevy_reflect::Reflect;
+    use bevy_reflect::PartialReflect;
 
-    use crate::reflect_inspector::{Context, InspectorUi};
+    use crate::reflect_inspector::{Context, InspectorUi, ProjectorReflect};
 
     use super::errors::{self, name_of_type};
 
     pub fn short_circuit(
         env: &mut InspectorUi,
-        value: &mut dyn Reflect,
+        value: &mut dyn PartialReflect,
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
     ) -> Option<bool> {
+        let Some(value) = value.try_as_reflect() else {
+            return None;
+        };
+
         if let Some(reflect_handle) = env
             .type_registry
             .get_type_data::<bevy_asset::ReflectHandle>(Any::type_id(value))
@@ -950,7 +972,7 @@ pub mod short_circuit {
                 short_circuit_many: env.short_circuit_many,
             };
             return Some(restricted_env.ui_for_reflect_with_options(
-                asset_value,
+                asset_value.as_partial_reflect_mut(),
                 ui,
                 id.with("asset"),
                 options,
@@ -967,8 +989,8 @@ pub mod short_circuit {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: &dyn ProjectorReflect,
     ) -> Option<bool> {
         if let Some(reflect_handle) = env
             .type_registry
@@ -1003,6 +1025,11 @@ pub mod short_circuit {
 
             for value in values {
                 let handle = projector(*value);
+                let Some(handle) = handle.try_as_reflect() else {
+                    // Edge case, continue as normal:
+                    // this for loop should only work if we're multi-editing a bunch of Handles
+                    return None;
+                };
                 let handle = reflect_handle
                     .downcast_handle_untyped(handle.as_any())
                     .unwrap();
@@ -1028,7 +1055,7 @@ pub mod short_circuit {
                     }
                 };
 
-                new_values.push(asset_value);
+                new_values.push(asset_value.as_partial_reflect_mut());
             }
 
             let mut restricted_env = InspectorUi {
@@ -1057,11 +1084,14 @@ pub mod short_circuit {
 
     pub fn short_circuit_readonly(
         env: &mut InspectorUi,
-        value: &dyn Reflect,
+        value: &dyn PartialReflect,
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
     ) -> Option<()> {
+        let Some(value) = value.try_as_reflect() else {
+            return None;
+        };
         if let Some(reflect_handle) = env
             .type_registry
             .get_type_data::<bevy_asset::ReflectHandle>(Any::type_id(value))
@@ -1108,7 +1138,8 @@ pub mod short_circuit {
                         return Some(());
                     }
                 }
-            };
+            }
+            .as_partial_reflect();
 
             let mut restricted_env = InspectorUi {
                 type_registry: env.type_registry,
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/bevy_impls.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/bevy_impls.rs
index 6cc6a935..4e5e3295 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/bevy_impls.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/bevy_impls.rs
@@ -107,7 +107,7 @@ impl InspectorPrimitive for Handle<Mesh> {
             }
         };
         let Some(mesh) = meshes.get_mut(handle) else {
-            dead_asset_handle(ui, handle.into());
+            dead_asset_handle(ui, handle.id().untyped());
             return false;
         };
 
@@ -140,7 +140,7 @@ impl InspectorPrimitive for Handle<Mesh> {
             Err(error) => return show_error(error, ui, "Assets<Mesh>"),
         };
         let Some(mesh) = meshes.get(self) else {
-            return dead_asset_handle(ui, self.into());
+            return dead_asset_handle(ui, self.id().untyped());
         };
 
         mesh_ui_inner(mesh, ui);
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/glam_impls.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/glam_impls.rs
index 7a73aff9..626d41f8 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/glam_impls.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/glam_impls.rs
@@ -1,10 +1,11 @@
 use std::any::Any;
 
 use bevy_math::{prelude::*, DMat2, DMat3, DMat4, DVec2, DVec3, DVec4, Mat3A, Vec3A};
-use bevy_reflect::Reflect;
+use bevy_reflect::PartialReflect;
 
 use crate::inspector_options::std_options::NumberOptions;
 use crate::reflect_inspector::InspectorUi;
+use crate::reflect_inspector::ProjectorReflect;
 
 macro_rules! vec_ui_many {
     ($name_many:ident $ty:ty>$elem_ty:ty: $count:literal $($component:ident)*) => {
@@ -13,8 +14,8 @@ macro_rules! vec_ui_many {
             _: &dyn Any,
             id: egui::Id,
             _env: InspectorUi<'_, '_>,
-            values: &mut [&mut dyn Reflect],
-            projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+            values: &mut [&mut dyn PartialReflect],
+            projector: &dyn ProjectorReflect,
         ) -> bool {
             let mut changed = false;
             ui.scope(|ui| {
@@ -25,14 +26,15 @@ macro_rules! vec_ui_many {
                         $(
 
                             let same = super::iter_all_eq(values.iter_mut().map(|value| {
-                                projector(*value).downcast_ref::<$ty>().unwrap().$component
+                                // FIXME: scary to change a macro
+                                projector(*value).try_downcast_ref::<$ty>().unwrap().$component
                             }));
 
                             let id = id.with(stringify!($component));
                             changed |= crate::inspector_egui_impls::change_slider($component, id, same, |change, overwrite| {
                                 for value in values.iter_mut() {
                                     let value = projector(*value);
-                                    let value = value.downcast_mut::<$ty>().unwrap();
+                                    let value = value.try_downcast_mut::<$ty>().unwrap();
 
                                     if false { value.$component = change };
                                     if overwrite {
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/image.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/image.rs
index 8a4b5676..19f401fe 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/image.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/image.rs
@@ -7,8 +7,8 @@ use std::{
 
 use bevy_asset::{Assets, Handle};
 use bevy_egui::EguiUserTextures;
+use bevy_image::Image;
 use bevy_reflect::DynamicTypePath;
-use bevy_render::texture::Image;
 use egui::load::SizedTexture;
 use pretty_type_name::pretty_type_name;
 
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/image/image_texture_conversion.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/image/image_texture_conversion.rs
index 342f516e..58ccdd13 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/image/image_texture_conversion.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/image/image_texture_conversion.rs
@@ -1,7 +1,7 @@
+use bevy_image::{Image, TextureFormatPixelInfo};
 use bevy_render::{
     render_asset::RenderAssetUsages,
     render_resource::{Extent3d, TextureDimension, TextureFormat},
-    texture::{Image, TextureFormatPixelInfo},
 };
 use bytemuck::cast_slice;
 use image::{DynamicImage, ImageBuffer};
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/mod.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/mod.rs
index 25c2f4ac..112cebdc 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/mod.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/mod.rs
@@ -1,7 +1,7 @@
 //! Custom UI implementations for specific types. Check [`InspectorPrimitive`] for an example.
 
-use crate::reflect_inspector::{errors::no_multiedit, InspectorUi};
-use bevy_reflect::{FromType, Reflect, TypePath, TypeRegistry};
+use crate::reflect_inspector::{errors::no_multiedit, InspectorUi, ProjectorReflect};
+use bevy_reflect::{FromType, PartialReflect, Reflect, TypePath, TypeRegistry};
 use bevy_utils::Instant;
 use std::{
     any::{Any, TypeId},
@@ -11,7 +11,7 @@ use std::{
 
 mod bevy_impls;
 mod glam_impls;
-#[cfg(feature = "bevy_render")]
+#[cfg(feature = "bevy_image")]
 mod image;
 mod std_impls;
 
@@ -24,8 +24,8 @@ type InspectorEguiImplFnMany = for<'a> fn(
     &dyn Any,
     egui::Id,
     InspectorUi<'_, '_>,
-    &mut [&mut dyn Reflect],
-    &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+    &mut [&mut dyn PartialReflect],
+    &dyn ProjectorReflect,
 ) -> bool;
 
 /// Custom UI implementation for a concrete type.
@@ -86,19 +86,21 @@ fn ui_many_vtable<T: Reflect + PartialEq + Clone + Default + InspectorPrimitive>
     options: &dyn Any,
     id: egui::Id,
     env: InspectorUi<'_, '_>,
-    values: &mut [&mut dyn bevy_reflect::Reflect],
-    projector: &dyn Fn(&mut dyn bevy_reflect::Reflect) -> &mut dyn bevy_reflect::Reflect,
+    values: &mut [&mut dyn bevy_reflect::PartialReflect],
+    projector: &dyn ProjectorReflect,
 ) -> bool {
-    let same = crate::inspector_egui_impls::iter_all_eq(
-        values
-            .iter_mut()
-            .map(|value| projector(*value).downcast_ref::<T>().unwrap()),
-    );
+    let same = crate::inspector_egui_impls::iter_all_eq(values.iter_mut().map(|value| {
+        projector(*value)
+            .try_downcast_mut::<T>()
+            .expect("non-fully-reflected value passed to ui_many_vtable")
+    }));
 
     let mut temp = same.cloned().unwrap_or_default();
     if T::ui(&mut temp, ui, options, id, env) {
         for value in values.iter_mut() {
-            let value = projector(*value).downcast_mut::<T>().unwrap();
+            let value = projector(*value)
+                .try_downcast_mut::<T>()
+                .expect("non-fully-reflected value passed to ui_many_vtable");
             *value = temp.clone();
         }
 
@@ -200,8 +202,8 @@ impl InspectorEguiImpl {
         options: &dyn Any,
         id: egui::Id,
         env: InspectorUi<'_, '_>,
-        values: &mut [&mut dyn Reflect],
-        projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: &dyn ProjectorReflect,
     ) -> bool {
         (self.fn_many)(ui, options, id, env, values, projector)
     }
@@ -212,8 +214,8 @@ fn many_unimplemented<T: Any>(
     _options: &dyn Any,
     _id: egui::Id,
     _env: InspectorUi<'_, '_>,
-    _values: &mut [&mut dyn Reflect],
-    _projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+    _values: &mut [&mut dyn PartialReflect],
+    _projector: &dyn ProjectorReflect,
 ) -> bool {
     no_multiedit(ui, &pretty_type_name::pretty_type_name::<T>());
     false
@@ -262,6 +264,7 @@ pub fn register_std_impls(type_registry: &mut TypeRegistry) {
     add::<bool>(type_registry);
     add::<String>(type_registry);
     add::<Cow<str>>(type_registry);
+    type_registry.register::<PathBuf>();
     add::<PathBuf>(type_registry);
 
     type_registry.register::<std::ops::Range<f64>>();
@@ -314,10 +317,13 @@ pub fn register_bevy_impls(type_registry: &mut TypeRegistry) {
 
     #[cfg(feature = "bevy_render")] 
     {
-      add_of_with_many::<bevy_asset::Handle<bevy_render::texture::Image>>(type_registry, many_unimplemented::<bevy_asset::Handle<bevy_render::texture::Image>>);
       add_of_with_many::<bevy_asset::Handle<bevy_render::mesh::Mesh>>(type_registry, many_unimplemented::<bevy_asset::Handle<bevy_render::mesh::Mesh>>);
       add::<bevy_render::view::RenderLayers>(type_registry);
     }
+    #[cfg(feature = "bevy_image")]
+    {
+      add_of_with_many::<bevy_asset::Handle<bevy_image::Image>>(type_registry, many_unimplemented::<bevy_asset::Handle<bevy_image::Image>>);
+    }
 }
 
 pub(crate) fn change_slider<T>(
@@ -375,19 +381,19 @@ macro_rules! many_ui {
             options: &dyn Any,
             id: egui::Id,
             env: InspectorUi<'_, '_>,
-            values: &mut [&mut dyn bevy_reflect::Reflect],
-            projector: &dyn Fn(&mut dyn bevy_reflect::Reflect) -> &mut dyn bevy_reflect::Reflect,
+            values: &mut [&mut dyn bevy_reflect::PartialReflect],
+            projector: &dyn crate::reflect_inspector::ProjectorReflect,
         ) -> bool {
             let same = $crate::inspector_egui_impls::iter_all_eq(
                 values
                     .iter_mut()
-                    .map(|value| projector(*value).downcast_ref::<$ty>().unwrap()),
+                    .map(|value| projector(*value).try_downcast_ref::<$ty>().unwrap()),
             );
 
             let mut temp = same.cloned().unwrap_or_default();
             if $inner(&mut temp, ui, options, id, env) {
                 for value in values.iter_mut() {
-                    let value = projector(*value).downcast_mut::<$ty>().unwrap();
+                    let value = projector(*value).try_downcast_mut::<$ty>().unwrap();
                     *value = temp.clone();
                 }
 
diff --git a/crates/bevy-inspector-egui/src/inspector_egui_impls/std_impls.rs b/crates/bevy-inspector-egui/src/inspector_egui_impls/std_impls.rs
index 57955a7a..025a6771 100644
--- a/crates/bevy-inspector-egui/src/inspector_egui_impls/std_impls.rs
+++ b/crates/bevy-inspector-egui/src/inspector_egui_impls/std_impls.rs
@@ -1,13 +1,16 @@
 use std::{borrow::Cow, ops::AddAssign, path::PathBuf};
 
-use bevy_reflect::{Reflect, TypePath};
+use bevy_reflect::{PartialReflect, Reflect, TypePath};
 use bevy_utils::Instant;
 use egui::{DragValue, RichText, TextBuffer};
 
 use super::{change_slider, iter_all_eq, InspectorPrimitive, InspectorUi};
-use crate::inspector_options::{
-    std_options::{NumberDisplay, NumberOptions, RangeOptions},
-    InspectorOptionsType,
+use crate::{
+    inspector_options::{
+        std_options::{NumberDisplay, NumberOptions, RangeOptions},
+        InspectorOptionsType,
+    },
+    reflect_inspector::ProjectorReflect,
 };
 use std::{any::Any, time::Duration};
 
@@ -170,8 +173,8 @@ pub fn number_ui_many<T>(
     _: &dyn Any,
     id: egui::Id,
     _env: InspectorUi<'_, '_>,
-    values: &mut [&mut dyn Reflect],
-    projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+    values: &mut [&mut dyn PartialReflect],
+    projector: &dyn ProjectorReflect,
 ) -> bool
 where
     T: Reflect + egui::emath::Numeric + AddAssign<T>,
@@ -179,13 +182,15 @@ where
     let same = iter_all_eq(
         values
             .iter_mut()
-            .map(|value| *projector(*value).downcast_ref::<T>().unwrap()),
+            .map(|value| *projector(*value).try_downcast_ref::<T>().unwrap()),
     )
     .map(T::to_f64);
 
     change_slider(ui, id, same, |change, overwrite| {
         for value in values.iter_mut() {
-            let value = projector(*value).downcast_mut::<T>().unwrap();
+            let value = projector(*value)
+                .try_downcast_mut::<T>()
+                .expect("non-fully-reflected value passed to number_ui_many");
             let change = T::from_f64(change);
             if overwrite {
                 *value = change;
diff --git a/crates/bevy-inspector-egui/src/reflect_inspector/mod.rs b/crates/bevy-inspector-egui/src/reflect_inspector/mod.rs
index ef5799f0..b38660f8 100644
--- a/crates/bevy-inspector-egui/src/reflect_inspector/mod.rs
+++ b/crates/bevy-inspector-egui/src/reflect_inspector/mod.rs
@@ -66,18 +66,27 @@ use crate::{
     restricted_world_view::RestrictedWorldView,
 };
 use bevy_ecs::world::CommandQueue;
-use bevy_reflect::{std_traits::ReflectDefault, DynamicStruct};
+use bevy_reflect::{
+    std_traits::ReflectDefault, DynamicStruct, OpaqueInfo, PartialReflect, Set, SetInfo,
+};
 use bevy_reflect::{
     Array, DynamicEnum, DynamicTuple, DynamicVariant, Enum, EnumInfo, List, ListInfo, Map, Reflect,
     ReflectMut, ReflectRef, Struct, StructInfo, Tuple, TupleInfo, TupleStruct, TupleStructInfo,
-    TypeInfo, TypeRegistry, ValueInfo, VariantInfo, VariantType,
+    TypeInfo, TypeRegistry, VariantInfo, VariantType,
 };
 use egui::{Grid, WidgetText};
-use std::any::{Any, TypeId};
 use std::borrow::Cow;
+use std::{
+    any::{Any, TypeId},
+    borrow::Borrow,
+};
 
 pub(crate) mod errors;
 
+pub trait ProjectorReflect: Fn(&mut dyn PartialReflect) -> &mut dyn PartialReflect {}
+
+impl<T> ProjectorReflect for T where T: Fn(&mut dyn PartialReflect) -> &mut dyn PartialReflect {}
+
 /// Display the value without any [`Context`] or short circuiting behaviour.
 ///
 /// This means that for example bevy's `Handle<StandardMaterial>` values cannot be displayed,
@@ -85,7 +94,7 @@ pub(crate) mod errors;
 ///
 /// Use [`InspectorUi::new`] instead to provide context or use one of the methods in [`bevy_inspector`](crate::bevy_inspector).
 pub fn ui_for_value(
-    value: &mut dyn Reflect,
+    value: &mut dyn PartialReflect,
     ui: &mut egui::Ui,
     type_registry: &TypeRegistry,
 ) -> bool {
@@ -99,7 +108,11 @@ pub fn ui_for_value(
 /// as they would need to have access to the `World`.
 ///
 /// Use [`InspectorUi::new`] instead to provide context or use one of the methods in [`bevy_inspector`](crate::bevy_inspector).
-pub fn ui_for_value_readonly(value: &dyn Reflect, ui: &mut egui::Ui, type_registry: &TypeRegistry) {
+pub fn ui_for_value_readonly(
+    value: &dyn PartialReflect,
+    ui: &mut egui::Ui,
+    type_registry: &TypeRegistry,
+) {
     InspectorUi::new_no_short_circuit(type_registry, &mut Context::default())
         .ui_for_reflect_readonly(value, ui);
 }
@@ -117,7 +130,7 @@ pub struct Context<'a> {
 /// and changed if the boolean is true.
 pub type ShortCircuitFn = fn(
     &mut InspectorUi<'_, '_>,
-    value: &mut dyn Reflect,
+    value: &mut dyn PartialReflect,
     ui: &mut egui::Ui,
     id: egui::Id,
     options: &dyn Any,
@@ -129,7 +142,7 @@ pub type ShortCircuitFn = fn(
 /// and changed if the boolean is true.
 pub type ShortCircuitFnReadonly = fn(
     &mut InspectorUi<'_, '_>,
-    value: &dyn Reflect,
+    value: &dyn PartialReflect,
     ui: &mut egui::Ui,
     id: egui::Id,
     options: &dyn Any,
@@ -146,8 +159,8 @@ pub type ShortCircuitFnMany = fn(
     ui: &mut egui::Ui,
     id: egui::Id,
     options: &dyn Any,
-    values: &mut [&mut dyn Reflect],
-    projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+    values: &mut [&mut dyn PartialReflect],
+    projector: &dyn ProjectorReflect,
 ) -> Option<bool>;
 
 pub struct InspectorUi<'a, 'c> {
@@ -191,12 +204,12 @@ impl<'a, 'c> InspectorUi<'a, 'c> {
 
 impl InspectorUi<'_, '_> {
     /// Draws the inspector UI for the given value.
-    pub fn ui_for_reflect(&mut self, value: &mut dyn Reflect, ui: &mut egui::Ui) -> bool {
+    pub fn ui_for_reflect(&mut self, value: &mut dyn PartialReflect, ui: &mut egui::Ui) -> bool {
         self.ui_for_reflect_with_options(value, ui, egui::Id::NULL, &())
     }
 
     /// Draws the inspector UI for the given value in a read-only way.
-    pub fn ui_for_reflect_readonly(&mut self, value: &dyn Reflect, ui: &mut egui::Ui) {
+    pub fn ui_for_reflect_readonly(&mut self, value: &dyn PartialReflect, ui: &mut egui::Ui) {
         self.ui_for_reflect_readonly_with_options(value, ui, egui::Id::NULL, &());
     }
 
@@ -207,7 +220,7 @@ impl InspectorUi<'_, '_> {
     /// by leaf types like `f32` or `Vec3`,
     pub fn ui_for_reflect_with_options(
         &mut self,
-        value: &mut dyn Reflect,
+        value: &mut dyn PartialReflect,
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
@@ -222,15 +235,15 @@ impl InspectorUi<'_, '_> {
             }
         }
 
-        if let Some(s) = self
-            .type_registry
-            .get_type_data::<InspectorEguiImpl>(Any::type_id(value))
-        {
-            return s.execute(value.as_any_mut(), ui, options, id, self.reborrow());
-        }
-
-        if let Some(changed) = (self.short_circuit)(self, value, ui, id, options) {
-            return changed;
+        if let Some(reflected) = value.try_as_reflect_mut() {
+            if let Some(s) = self
+                .type_registry
+                .get_type_data::<InspectorEguiImpl>(reflected.reflect_type_info().type_id())
+            {
+                if let Some(value) = value.try_as_reflect_mut() {
+                    return s.execute(value.as_any_mut(), ui, options, id, self.reborrow());
+                }
+            }
         }
 
         match value.reflect_mut() {
@@ -241,7 +254,8 @@ impl InspectorUi<'_, '_> {
             ReflectMut::Array(value) => self.ui_for_array(value, ui, id, options),
             ReflectMut::Map(value) => self.ui_for_reflect_map(value, ui, id, options),
             ReflectMut::Enum(value) => self.ui_for_enum(value, ui, id, options),
-            ReflectMut::Value(value) => self.ui_for_value(value, ui, id, options),
+            ReflectMut::Opaque(value) => self.ui_for_value(value, ui, id, options),
+            ReflectMut::Set(value) => self.ui_for_set(value, ui, id, options),
         }
     }
 
@@ -252,27 +266,33 @@ impl InspectorUi<'_, '_> {
     /// by leaf types like `f32` or `Vec3`,
     pub fn ui_for_reflect_readonly_with_options(
         &mut self,
-        value: &dyn Reflect,
+        value: &dyn PartialReflect,
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
     ) {
         let mut options = options;
         if options.is::<()>() {
-            if let Some(data) = self
-                .type_registry
-                .get_type_data::<ReflectInspectorOptions>(Any::type_id(value))
-            {
-                options = &data.0;
+            if let Some(value_reflect) = value.try_as_reflect() {
+                if let Some(data) = self
+                    .type_registry
+                    .get_type_data::<ReflectInspectorOptions>(value_reflect.type_id())
+                {
+                    options = &data.0;
+                }
             }
         }
 
-        if let Some(s) = self
-            .type_registry
-            .get_type_data::<InspectorEguiImpl>(Any::type_id(value))
-        {
-            s.execute_readonly(value.as_any(), ui, options, id, self.reborrow());
-            return;
+        if let Some(value_reflect) = value.try_as_reflect() {
+            if let Some(s) = self
+                .type_registry
+                .get_type_data::<InspectorEguiImpl>(value_reflect.type_id())
+            {
+                if let Some(value) = value.try_as_reflect() {
+                    s.execute_readonly(value.as_any(), ui, options, id, self.reborrow());
+                    return;
+                }
+            }
         }
 
         if let Some(()) = (self.short_circuit_readonly)(self, value, ui, id, options) {
@@ -289,7 +309,8 @@ impl InspectorUi<'_, '_> {
             ReflectRef::Array(value) => self.ui_for_array_readonly(value, ui, id, options),
             ReflectRef::Map(value) => self.ui_for_reflect_map_readonly(value, ui, id, options),
             ReflectRef::Enum(value) => self.ui_for_enum_readonly(value, ui, id, options),
-            ReflectRef::Value(value) => self.ui_for_value_readonly(value, ui, id, options),
+            ReflectRef::Opaque(value) => self.ui_for_value_readonly(value, ui, id, options),
+            ReflectRef::Set(value) => self.ui_for_set_readonly(value, ui, id, options),
         }
     }
 
@@ -299,8 +320,8 @@ impl InspectorUi<'_, '_> {
         name: &str,
         ui: &mut egui::Ui,
         id: egui::Id,
-        values: &mut [&mut dyn Reflect],
-        projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: &dyn ProjectorReflect,
     ) -> bool {
         self.ui_for_reflect_many_with_options(type_id, name, ui, id, &(), values, projector)
     }
@@ -312,8 +333,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: &dyn Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: &dyn ProjectorReflect,
     ) -> bool {
         let Some(registration) = self.type_registry.get(type_id) else {
             errors::not_in_type_registry(ui, name);
@@ -370,7 +391,8 @@ impl InspectorUi<'_, '_> {
                 false
             }
             TypeInfo::Enum(info) => self.ui_for_enum_many(info, ui, id, options, values, projector),
-            TypeInfo::Value(info) => self.ui_for_value_many(info, ui, id, options),
+            TypeInfo::Opaque(info) => self.ui_for_value_many(info, ui, id, options),
+            TypeInfo::Set(info) => self.ui_for_set_many(info, ui, id, options, values, projector),
         }
     }
 }
@@ -382,6 +404,11 @@ enum ListOp {
     MoveElementDown(usize),
 }
 
+enum SetOp {
+    RemoveElement(Box<dyn PartialReflect>),
+    AddElement(Box<dyn PartialReflect>),
+}
+
 fn ui_for_empty_collection(ui: &mut egui::Ui, label: impl Into<WidgetText>) -> bool {
     let mut add = false;
     ui.vertical_centered(|ui| {
@@ -423,9 +450,13 @@ fn ui_for_list_controls(ui: &mut egui::Ui, index: usize, len: usize) -> Option<L
     op
 }
 
+fn ui_for_empty_set(ui: &mut egui::Ui) {
+    ui.vertical_centered(|ui| ui.label("(Empty Set)"));
+}
+
 struct MapDraftElement {
-    key: Box<dyn Reflect>,
-    value: Box<dyn Reflect>,
+    key: Box<dyn PartialReflect>,
+    value: Box<dyn PartialReflect>,
 }
 impl Clone for MapDraftElement {
     fn clone(&self) -> Self {
@@ -436,6 +467,14 @@ impl Clone for MapDraftElement {
     }
 }
 
+struct SetDraftElement(Box<dyn PartialReflect>);
+
+impl Clone for SetDraftElement {
+    fn clone(&self) -> Self {
+        Self(self.0.clone_value())
+    }
+}
+
 impl InspectorUi<'_, '_> {
     fn ui_for_struct(
         &mut self,
@@ -489,8 +528,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: impl Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: impl ProjectorReflect,
     ) -> bool {
         let mut changed = false;
         Grid::new(id).show(ui, |ui| {
@@ -571,8 +610,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: impl Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: impl ProjectorReflect,
     ) -> bool {
         maybe_grid(info.field_len(), ui, id, |ui, label| {
             info.iter()
@@ -657,8 +696,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: impl Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: impl ProjectorReflect,
     ) -> bool {
         maybe_grid(info.field_len(), ui, id, |ui, label| {
             info.iter()
@@ -705,8 +744,9 @@ impl InspectorUi<'_, '_> {
             match op {
                 AddElement(i) => {
                     let default = self
-                        .get_default_value_for(info.item_type_id())
-                        .or_else(|| list.get(i).map(Reflect::clone_value));
+                        .get_default_value_for(info.item_ty().id())
+                        .map(|def| def.into_partial_reflect())
+                        .or_else(|| list.get(i).map(|v| v.clone_value()));
                     if let Some(new_value) = default {
                         list.insert(i, new_value);
                     } else {
@@ -832,8 +872,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: impl Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: impl ProjectorReflect,
     ) -> bool {
         use ListOp::*;
         let mut changed = false;
@@ -861,7 +901,7 @@ impl InspectorUi<'_, '_> {
             }
 
             for i in 0..len {
-                let mut items_at_i: Vec<&mut dyn Reflect> = values
+                let mut items_at_i: Vec<&mut dyn PartialReflect> = values
                     .iter_mut()
                     .map(|value| match projector(*value).reflect_mut() {
                         ReflectMut::List(list) => list.get_mut(i).unwrap(),
@@ -873,7 +913,7 @@ impl InspectorUi<'_, '_> {
                     ui.label(i.to_string());
                     ui.horizontal_top(|ui| {
                         changed |= self.ui_for_reflect_many_with_options(
-                            info.item_type_id(),
+                            info.item_ty().id(),
                             info.type_path(),
                             ui,
                             id.with(i),
@@ -956,10 +996,13 @@ impl InspectorUi<'_, '_> {
                         // Insert a temporary 'draft' key-value pair into UI state.
                         if let Some(TypeInfo::Map(map_info)) = map.get_represented_type_info() {
                             let op = Option::zip(
-                                self.get_default_value_for(map_info.key_type_id()),
-                                self.get_default_value_for(map_info.value_type_id()),
+                                self.get_default_value_for(map_info.key_ty().id()),
+                                self.get_default_value_for(map_info.value_ty().id()),
                             )
-                            .map(|(k, v)| MapDraftElement { key: k, value: v });
+                            .map(|(k, v)| MapDraftElement {
+                                key: k.into_partial_reflect(),
+                                value: v.into_partial_reflect(),
+                            });
                             if op.is_some() {
                                 ui.data_mut(|data| data.insert_temp(map_draft_id, op));
                             }
@@ -1028,6 +1071,305 @@ impl InspectorUi<'_, '_> {
         });
     }
 
+    /// Mutate one or more lists based on a [`SetOp`], generated by some user interaction.
+    fn respond_to_sets_op<'a>(
+        &mut self,
+        sets: impl Iterator<Item = &'a mut dyn Set>,
+        op: SetOp,
+    ) -> bool {
+        let mut changed = false;
+
+        for set in sets {
+            changed |= self.respond_to_set_op(set, &op);
+        }
+        changed
+    }
+    fn respond_to_set_op<'a>(&mut self, set: &'a mut dyn Set, op: &SetOp) -> bool {
+        use SetOp::*;
+        match &op {
+            AddElement(new_value) => {
+                set.insert_boxed(new_value.clone_value());
+                return true;
+            }
+            RemoveElement(val) => {
+                set.remove(&**val);
+                return true;
+            }
+        }
+    }
+
+    fn ui_for_set(
+        &mut self,
+        set: &mut dyn Set,
+        ui: &mut egui::Ui,
+        id: egui::Id,
+        options: &dyn Any,
+    ) -> bool {
+        use SetOp::*;
+        let mut changed = false;
+
+        ui.vertical(|ui| {
+            let mut op = None;
+
+            let len = set.len();
+            if len == 0 {
+                ui_for_empty_set(ui);
+            }
+
+            for (i, val) in set.iter().enumerate() {
+                egui::Grid::new((id, i)).show(ui, |ui| {
+                    ui.horizontal_top(|ui| {
+                        self.ui_for_reflect_readonly_with_options(val, ui, id.with(i), options);
+                    });
+                    ui.horizontal_top(|ui| {
+                        if remove_button(ui).on_hover_text("Remove element").clicked() {
+                            let copy = val.clone_value();
+                            op = Some(RemoveElement(copy));
+                        }
+                    });
+                    ui.end_row();
+                });
+
+                if i != len - 1 {
+                    ui.separator();
+                }
+            }
+            let Some(TypeInfo::Set(set_info)) = set.get_represented_type_info() else {
+                return;
+            };
+            let value_type = set_info.value_ty();
+            let (new_op, new_changed) =
+                self.ui_to_insert_set_element_with_options(value_type, ui, id, options);
+            if new_op.is_some() {
+                op = new_op;
+            }
+            changed |= new_changed;
+
+            ui.end_row();
+
+            let error_id = id.with("error");
+
+            // Respond to control interaction
+            if let Some(op) = op {
+                changed |= self.respond_to_set_op(set, &op);
+            }
+
+            let error = ui.data_mut(|data| *data.get_temp_mut_or_default::<bool>(error_id));
+            if error {
+                errors::no_default_value(ui, set_info.type_path());
+            }
+            if ui.input(|input| input.pointer.any_down()) {
+                ui.data_mut(|data| data.insert_temp::<bool>(error_id, false));
+            }
+        });
+
+        changed
+    }
+
+    #[must_use]
+    fn ui_to_insert_set_element_with_options<'a>(
+        &mut self,
+        value_type: bevy_reflect::Type,
+        ui: &mut egui::Ui,
+        id: egui::Id,
+        options: &dyn Any,
+    ) -> (Option<SetOp>, bool) {
+        let mut changed = false;
+        let mut op = None;
+        ui.vertical(|ui| {
+            ui.label("New element");
+            let set_draft_id = id.with("set_draft");
+            let draft_clone = ui.data_mut(|data| {
+                data.get_temp_mut_or_default::<Option<SetDraftElement>>(set_draft_id)
+                    .to_owned()
+            });
+            ui.end_row();
+            match draft_clone {
+                None => {
+                    // If no draft element exists, show a button to create one.
+                    if add_button(ui).clicked() {
+                        // Insert a temporary 'draft' value into UI state, once inserted, we cannot modify it.
+                        let maybe_default = self
+                            .get_default_value_for(value_type.id())
+                            .map(|v| SetDraftElement(v.into_partial_reflect()));
+                        if maybe_default.is_some() {
+                            ui.data_mut(|data| data.insert_temp(set_draft_id, maybe_default));
+                        }
+                    }
+                    ui.end_row();
+                }
+                Some(SetDraftElement(mut v)) => {
+                    ui.end_row();
+                    // Show controls for editing our draft element.
+                    // FIXME: is the id passed here correct?
+                    let value_changed =
+                        self.ui_for_reflect_with_options(v.as_mut(), ui, id, options);
+                    // If the clone changed, update the data in UI state.
+                    if value_changed {
+                        let next_draft = SetDraftElement(v);
+                        ui.data_mut(|data| data.insert_temp(set_draft_id, Some(next_draft)));
+                    }
+                    // Show controls to insert the draft into the set, or remove it.
+                    if ui.button("Insert").clicked() {
+                        let draft = ui
+                            .data_mut(|data| data.get_temp::<Option<SetDraftElement>>(set_draft_id))
+                            .flatten();
+                        if let Some(draft) = draft {
+                            op = Some(SetOp::AddElement(draft.0));
+                            ui.data_mut(|data| data.remove_by_type::<Option<SetDraftElement>>());
+                        }
+                        changed = true;
+                    }
+                    if ui.button("Cancel").clicked() {
+                        ui.data_mut(|data| data.remove_by_type::<Option<SetDraftElement>>());
+                        changed = true;
+                    }
+                    ui.end_row();
+                }
+            }
+        });
+
+        (op, changed)
+    }
+
+    fn ui_for_set_readonly(
+        &mut self,
+        set: &dyn Set,
+        ui: &mut egui::Ui,
+        id: egui::Id,
+        options: &dyn Any,
+    ) {
+        let len = set.len();
+        ui.vertical(|ui| {
+            for (i, val) in set.iter().enumerate() {
+                ui.horizontal_top(|ui| {
+                    self.ui_for_reflect_readonly_with_options(val, ui, id.with(i), options)
+                });
+
+                if i != len - 1 {
+                    ui.separator();
+                }
+            }
+        });
+    }
+
+    fn ui_for_set_many(
+        &mut self,
+        info: &SetInfo,
+        ui: &mut egui::Ui,
+        id: egui::Id,
+        options: &dyn Any,
+        values: &mut [&mut dyn PartialReflect],
+        projector: impl ProjectorReflect,
+    ) -> bool {
+        use SetOp::*;
+        let mut changed = false;
+
+        let same_len =
+            iter_all_eq(
+                values
+                    .iter_mut()
+                    .map(|value| match projector(*value).reflect_mut() {
+                        ReflectMut::List(l) => l.len(),
+                        _ => unreachable!(),
+                    }),
+            );
+
+        let Some(len) = same_len else {
+            ui.label("lists have different sizes, cannot multiedit");
+            return changed;
+        };
+
+        ui.vertical(|ui| {
+            let mut op = None;
+
+            if len == 0 {
+                ui_for_empty_set(ui)
+            }
+
+            let set0 = match projector(values[0]).reflect_mut() {
+                ReflectMut::Set(set) => set,
+                _ => unreachable!(),
+            };
+            let Some(TypeInfo::Set(set_info)) = set0.get_represented_type_info() else {
+                return;
+            };
+            let value_type = set_info.value_ty();
+            let reflected_values: Vec<Box<dyn PartialReflect>> =
+                set0.iter().map(|v| v.clone_value()).collect();
+
+            for (i, value_to_check) in reflected_values.iter().enumerate() {
+                let value_type_id = value_to_check.type_id();
+                egui::Grid::new((value_type_id, i)).show(ui, |ui| {
+                    // Do all sets contain this value ?
+                    if len == 1
+                        || values[1..].iter_mut().all(|set_to_compare| {
+                            let set_to_compare = match projector(*set_to_compare).reflect_mut() {
+                                ReflectMut::Set(set) => set,
+                                _ => unreachable!(),
+                            };
+                            set_to_compare
+                                .iter()
+                                .find(|value| {
+                                    value.reflect_partial_eq(value_to_check.borrow()) == Some(true)
+                                })
+                                .is_some()
+                        })
+                    {
+                        // All sets contain this value: Show value
+                        ui.horizontal_top(|ui| {
+                            self.ui_for_reflect_readonly_with_options(
+                                value_to_check.borrow(),
+                                ui,
+                                // FIXME: is the id passed here correct?
+                                id.with(i),
+                                options,
+                            );
+                        });
+                        ui.horizontal_top(|ui| {
+                            if remove_button(ui).on_hover_text("Remove element").clicked() {
+                                let copy = value_to_check.clone_value();
+                                op = Some(RemoveElement(copy));
+                            }
+                        });
+                    } else {
+                        ui.label("Different values");
+                    }
+
+                    ui.end_row();
+                });
+                if i != len - 1 {
+                    ui.separator();
+                }
+            }
+            let (op, new_changed) =
+                self.ui_to_insert_set_element_with_options(value_type, ui, id, options);
+            changed |= new_changed;
+
+            ui.end_row();
+
+            let error_id = id.with("error");
+            let error = ui.data_mut(|data| *data.get_temp_mut_or_default::<bool>(error_id));
+            if error {
+                errors::no_default_value(ui, info.type_path());
+            }
+            if ui.input(|input| input.pointer.any_down()) {
+                ui.data_mut(|data| data.insert_temp::<bool>(error_id, false));
+            }
+            if let Some(op) = op {
+                let sets = values
+                    .iter_mut()
+                    .map(|l| match projector(*l).reflect_mut() {
+                        ReflectMut::Set(list) => list,
+                        _ => unreachable!(),
+                    });
+                changed |= self.respond_to_sets_op(sets, op);
+            }
+        });
+
+        changed
+    }
+
     fn ui_for_array(
         &mut self,
         array: &mut dyn Array,
@@ -1140,8 +1482,8 @@ impl InspectorUi<'_, '_> {
         ui: &mut egui::Ui,
         id: egui::Id,
         options: &dyn Any,
-        values: &mut [&mut dyn Reflect],
-        projector: impl Fn(&mut dyn Reflect) -> &mut dyn Reflect,
+        values: &mut [&mut dyn PartialReflect],
+        projector: &dyn ProjectorReflect,
     ) -> bool {
         let mut changed = false;
 
@@ -1184,7 +1526,7 @@ impl InspectorUi<'_, '_> {
                                 ui.label(field_name);
                             }
 
-                            let mut variants_across: Vec<&mut dyn Reflect> = values
+                            let mut variants_across: Vec<&mut dyn PartialReflect> = values
                                 .iter_mut()
                                 .map(|value| match projector(*value).reflect_mut() {
                                     ReflectMut::Enum(value) => {
@@ -1361,7 +1703,7 @@ impl InspectorUi<'_, '_> {
 
     fn ui_for_value(
         &mut self,
-        value: &mut dyn Reflect,
+        value: &mut dyn PartialReflect,
         ui: &mut egui::Ui,
         _id: egui::Id,
         _options: &dyn Any,
@@ -1372,7 +1714,7 @@ impl InspectorUi<'_, '_> {
 
     fn ui_for_value_readonly(
         &mut self,
-        value: &dyn Reflect,
+        value: &dyn PartialReflect,
         ui: &mut egui::Ui,
         _id: egui::Id,
         _options: &dyn Any,
@@ -1382,7 +1724,7 @@ impl InspectorUi<'_, '_> {
 
     fn ui_for_value_many(
         &mut self,
-        info: &ValueInfo,
+        info: &OpaqueInfo,
         ui: &mut egui::Ui,
         _id: egui::Id,
         _options: &dyn Any,
@@ -1427,7 +1769,7 @@ impl<'a, 'c> InspectorUi<'a, 'c> {
                             return Err(());
                         }
                     };
-                    dynamic_struct.insert_boxed(field.name(), field_default_value);
+                    dynamic_struct.insert_boxed(field.name(), field_default_value.clone_value());
                 }
                 DynamicVariant::Struct(dynamic_struct)
             }
@@ -1441,7 +1783,7 @@ impl<'a, 'c> InspectorUi<'a, 'c> {
                             return Err(());
                         }
                     };
-                    dynamic_tuple.insert_boxed(field_default_value);
+                    dynamic_tuple.insert_boxed(field_default_value.clone_value());
                 }
                 DynamicVariant::Tuple(dynamic_tuple)
             }
diff --git a/crates/bevy-inspector-egui/src/restricted_world_view.rs b/crates/bevy-inspector-egui/src/restricted_world_view.rs
index cd162778..b321cfbc 100644
--- a/crates/bevy-inspector-egui/src/restricted_world_view.rs
+++ b/crates/bevy-inspector-egui/src/restricted_world_view.rs
@@ -316,7 +316,7 @@ impl<'w> RestrictedWorldView<'w> {
         &mut self,
         type_id: TypeId,
         type_registry: &TypeRegistry,
-    ) -> Result<(&'_ mut dyn Reflect, impl FnOnce() + '_), Error> {
+    ) -> Result<Mut<'_, dyn Reflect>, Error> {
         if !self.allows_access_to_resource(type_id) {
             return Err(Error::NoAccessToResource(type_id));
         }
@@ -350,7 +350,7 @@ impl<'w> RestrictedWorldView<'w> {
         entity: Entity,
         component: TypeId,
         type_registry: &TypeRegistry,
-    ) -> Result<(&'_ mut dyn Reflect, bool, impl FnOnce() + '_), Error> {
+    ) -> Result<Mut<'_, dyn Reflect>, Error> {
         if !self.allows_access_to_component((entity, component)) {
             return Err(Error::NoAccessToComponent((entity, component)));
         }
@@ -370,12 +370,10 @@ impl<'w> RestrictedWorldView<'w> {
                 .get_mut_by_id(component_id)
                 .ok_or(Error::ComponentDoesNotExist((entity, component)))?
         };
-        let changed = value.is_changed();
 
-        let (value, set_changed) =
-            // SAFETY: value is of type component
-            unsafe { mut_untyped_to_reflect(value, type_registry, component) }?;
-        Ok((value, changed, set_changed))
+        // SAFETY: value is of type component
+        let value = unsafe { mut_untyped_to_reflect(value, type_registry, component) }?;
+        Ok(value)
     }
 
     // SAFETY: must ensure distinct access
@@ -384,7 +382,7 @@ impl<'w> RestrictedWorldView<'w> {
         entity: Entity,
         component: TypeId,
         type_registry: &TypeRegistry,
-    ) -> Result<(&'_ mut dyn Reflect, impl FnOnce() + '_), Error> {
+    ) -> Result<Mut<'_, dyn Reflect>, Error> {
         if !self.allows_access_to_component((entity, component)) {
             return Err(Error::NoAccessToComponent((entity, component)));
         }
@@ -415,7 +413,7 @@ unsafe fn mut_untyped_to_reflect<'a>(
     value: MutUntyped<'a>,
     type_registry: &TypeRegistry,
     type_id: TypeId,
-) -> Result<(&'a mut dyn Reflect, impl FnOnce() + 'a), Error> {
+) -> Result<Mut<'a, dyn Reflect>, Error> {
     let registration = type_registry
         .get(type_id)
         .ok_or(Error::NoTypeRegistration(type_id))?;
@@ -423,12 +421,14 @@ unsafe fn mut_untyped_to_reflect<'a>(
         .data::<ReflectFromPtr>()
         .ok_or(Error::NoTypeData(type_id, "ReflectFromPtr"))?;
 
-    let (ptr, set_changed) = crate::utils::mut_untyped_split(value);
     assert_eq!(reflect_from_ptr.type_id(), type_id);
-    // SAFETY: ptr is of type type_id as required in safety contract, type_id was checked above
-    let value = unsafe { reflect_from_ptr.as_reflect_mut(ptr) };
 
-    Ok((value, set_changed))
+    let value = value.map_unchanged(|ptr| {
+        // SAFETY: ptr is of type type_id as required in safety contract, type_id was checked above
+        unsafe { reflect_from_ptr.as_reflect_mut(ptr) }
+    });
+
+    Ok(value)
 }
 
 #[cfg(test)]
@@ -476,12 +476,12 @@ mod tests {
 
         let mut type_registry = TypeRegistry::empty();
         type_registry.register::<B>();
-        let b = world
+        let mut b = world
             .get_resource_reflect_mut_by_id(TypeId::of::<B>(), &type_registry)
             .unwrap();
 
         a.0.clear();
-        b.0.downcast_mut::<B>().unwrap().0.clear();
+        b.downcast_mut::<B>().unwrap().0.clear();
     }
 
     #[test]
@@ -531,12 +531,12 @@ mod tests {
 
         let (mut component_view, mut world) =
             world.split_off_component((entity, TypeId::of::<ComponentA>()));
-        let component = component_view
+        let mut component = component_view
             .get_entity_component_reflect(entity, TypeId::of::<ComponentA>(), &type_registry)
             .unwrap();
         let mut resource = world.get_resource_mut::<A>().unwrap();
 
-        component.0.downcast_mut::<ComponentA>().unwrap().0.clear();
+        component.downcast_mut::<ComponentA>().unwrap().0.clear();
         resource.0.clear();
     }
 }
diff --git a/crates/bevy-inspector-egui/src/utils.rs b/crates/bevy-inspector-egui/src/utils.rs
index 2239cdec..02c230ba 100644
--- a/crates/bevy-inspector-egui/src/utils.rs
+++ b/crates/bevy-inspector-egui/src/utils.rs
@@ -1,16 +1,3 @@
-use bevy_ecs::change_detection::{DetectChangesMut, MutUntyped};
-use bevy_ecs::ptr::PtrMut;
-
-// workaround for https://github.com/bevyengine/bevy/pull/6430
-pub fn mut_untyped_split<'a>(mut mut_untyped: MutUntyped<'a>) -> (PtrMut<'a>, impl FnOnce() + 'a) {
-    // bypass_change_detection returns a `&mut PtrMut` which is basically useless, because all its methods take `self`
-    let ptr = mut_untyped.bypass_change_detection();
-    // SAFETY: this is exactly the same PtrMut, just not in a `&mut`. The old one is no longer accessible
-    let ptr = unsafe { PtrMut::new(std::ptr::NonNull::new_unchecked(ptr.as_ptr())) };
-
-    (ptr, move || mut_untyped.set_changed())
-}
-
 pub mod guess_entity_name {
     use bevy_core::Name;
     use bevy_ecs::{archetype::Archetype, prelude::*, world::unsafe_world_cell::UnsafeWorldCell};
@@ -20,7 +7,7 @@ pub mod guess_entity_name {
     /// Guesses an appropriate entity name like `Light (6)` or falls back to `Entity (8)`
     pub fn guess_entity_name(world: &World, entity: Entity) -> String {
         match world.get_entity(entity) {
-            Some(entity_ref) => {
+            Ok(entity_ref) => {
                 if let Some(name) = entity_ref.get::<Name>() {
                     return format!("{} ({})", name.as_str(), entity);
                 }
@@ -31,7 +18,7 @@ pub mod guess_entity_name {
                     entity_ref.archetype(),
                 )
             }
-            None => format!("Entity {} (inexistent)", entity.index()),
+            Err(entity) => format!("Entity {} (inexistent)", entity.index()),
         }
     }
 
@@ -70,6 +57,8 @@ pub mod guess_entity_name {
             ("bevy_asset::handle::Handle<bevy_pbr::pbr_material::StandardMaterial>", "Pbr Mesh"),
             ("bevy_window::window::Window", "Window"),
             ("bevy_ecs::observer::runner::ObserverState", "Observer"),
+            ("bevy_window::monitor::Monitor", "Monitor"),
+            ("bevy_picking::pointer::PointerId", "Pointer"),
         ];
 
         let type_names = archetype.components().filter_map(|id| {
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d9954236..af1b70cc 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.28.0
+- upgrade to `bevy_egui 0.31`
+- update `bevy` to 0.15
+- 
 ## Version 0.27.0
 - upgrade to `bevy_egui 0.30` / `egui 0.29`
 - update `image` to 0.25