diff --git a/Cargo.toml b/Cargo.toml
index 3769cbe93..cc5107323 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_trackball"
-version = "0.8.0"
+version = "0.9.0"
 rust-version = "1.80.0"
 authors = ["Rouven Spreckels <rs@qu1x.dev>"]
 edition = "2021"
@@ -42,15 +42,16 @@ serialize = ["bevy/serialize", "trackball/serde"]
 c11-orbit = ["trackball/cc"]
 
 [dependencies]
-bevy = { version = "0.14.2", default-features = false, features = ["bevy_render"] }
+bevy = { version = "0.15.0-rc.2", default-features = false, features = ["bevy_render", "custom_cursor", "wayland"] }
 bevy_egui = { version = "0.30.0", default-features = false, features = ["render"], optional = true }
-trackball = { version = "0.14.0", features = ["glam"] }
+trackball = { git = "https://github.com/qu1x/trackball", features = ["glam"] }
 
 [dev-dependencies.bevy]
-version = "0.14.2"
+version = "0.15.0-rc.2"
 default-features = false
 features = [
 	"bevy_winit",
+	"custom_cursor",
 	"bevy_core_pipeline",
 	"bevy_pbr",
 	"ktx2",
diff --git a/examples/constellation_clamp.rs b/examples/constellation_clamp.rs
index bd5a58d1d..717d9cc54 100644
--- a/examples/constellation_clamp.rs
+++ b/examples/constellation_clamp.rs
@@ -102,17 +102,14 @@ fn setup(
 
 	for (i, shape) in shapes.into_iter().enumerate() {
 		commands.spawn((
-			PbrBundle {
-				mesh: shape,
-				material: debug_material.clone(),
-				transform: Transform::from_xyz(
-					-SHAPES_X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * SHAPES_X_EXTENT,
-					2.0,
-					Z_EXTENT / 2.0,
-				)
-				.with_rotation(Quat::from_rotation_x(-PI / 4.)),
-				..default()
-			},
+			Mesh3d(shape),
+			MeshMaterial3d(debug_material.clone()),
+			Transform::from_xyz(
+				-SHAPES_X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * SHAPES_X_EXTENT,
+				2.0,
+				Z_EXTENT / 2.0,
+			)
+			.with_rotation(Quat::from_rotation_x(-PI / 4.)),
 			Shape,
 		));
 	}
@@ -121,41 +118,36 @@ fn setup(
 
 	for (i, shape) in extrusions.into_iter().enumerate() {
 		commands.spawn((
-			PbrBundle {
-				mesh: shape,
-				material: debug_material.clone(),
-				transform: Transform::from_xyz(
-					-EXTRUSION_X_EXTENT / 2.
-						+ i as f32 / (num_extrusions - 1) as f32 * EXTRUSION_X_EXTENT,
-					2.0,
-					-Z_EXTENT / 2.,
-				)
-				.with_rotation(Quat::from_rotation_x(-PI / 4.)),
-				..default()
-			},
+			Mesh3d(shape),
+			MeshMaterial3d(debug_material.clone()),
+			Transform::from_xyz(
+				-EXTRUSION_X_EXTENT / 2.
+					+ i as f32 / (num_extrusions - 1) as f32 * EXTRUSION_X_EXTENT,
+				2.0,
+				-Z_EXTENT / 2.,
+			)
+			.with_rotation(Quat::from_rotation_x(-PI / 4.)),
 			Shape,
 		));
 	}
 
 	// light
-	commands.spawn(PointLightBundle {
-		point_light: PointLight {
+	commands.spawn((
+		PointLight {
 			shadows_enabled: true,
 			intensity: 10_000_000.,
 			range: 100.0,
 			shadow_depth_bias: 0.2,
 			..default()
 		},
-		transform: Transform::from_xyz(8.0, 16.0, 8.0),
-		..default()
-	});
+		Transform::from_xyz(8.0, 16.0, 8.0),
+	));
 
 	// ground plane
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)),
-		material: materials.add(Color::from(SILVER)),
-		..default()
-	});
+	commands.spawn((
+		Mesh3d(meshes.add(Plane3d::default().mesh().size(50.0, 50.0))),
+		MeshMaterial3d(materials.add(Color::from(SILVER))),
+	));
 
 	// cameras and boundary conditions
 	let mut bound = Bound::default();
@@ -168,7 +160,7 @@ fn setup(
 		.spawn((
 			TrackballController::default(),
 			TrackballCamera::look_at(target, eye, up).with_clamp(bound.clone()),
-			Camera3dBundle::default(),
+			Camera3d::default(),
 		))
 		.id();
 	let window = windows.single();
@@ -180,22 +172,20 @@ fn setup(
 		TrackballCamera::look_at(target, down * (eye - target) + target, up)
 			.with_clamp(bound)
 			.add_controller(maximap, true),
-		Camera3dBundle {
-			camera: Camera {
-				order: 1,
-				clear_color: ClearColorConfig::None,
-				viewport: Some(Viewport {
-					physical_position: UVec2::new(
-						window.resolution.physical_width() - width,
-						window.resolution.physical_height() - height,
-					),
-					physical_size: UVec2::new(width, height),
-					..default()
-				}),
+		Camera {
+			order: 1,
+			clear_color: ClearColorConfig::None,
+			viewport: Some(Viewport {
+				physical_position: UVec2::new(
+					window.resolution.physical_width() - width,
+					window.resolution.physical_height() - height,
+				),
+				physical_size: UVec2::new(width, height),
 				..default()
-			},
+			}),
 			..default()
 		},
+		Camera3d::default(),
 		MinimapCamera,
 	));
 
@@ -203,27 +193,24 @@ fn setup(
 	#[cfg(not(target_arch = "wasm32"))]
 	commands.spawn((
 		TargetCamera(maximap),
-		TextBundle::from_section("Press space to toggle wireframes", TextStyle::default())
-			.with_style(Style {
-				position_type: PositionType::Absolute,
-				top: Val::Px(12.0),
-				left: Val::Px(12.0),
-				..default()
-			}),
+		Text::new("Press space to toggle wireframes"),
+		Node {
+			position_type: PositionType::Absolute,
+			top: Val::Px(12.0),
+			left: Val::Px(12.0),
+			..default()
+		},
 	));
 	commands.spawn((
 		Clamp,
 		TargetCamera(maximap),
-		TextBundle::from_section(
-			"Rigid Constellation Clamp (Toggle: Q)",
-			TextStyle::default(),
-		)
-		.with_style(Style {
+		Text::new("Rigid Constellation Clamp (Toggle: Q)"),
+		Node {
 			position_type: PositionType::Absolute,
 			bottom: Val::Px(10.0),
 			left: Val::Px(10.0),
 			..default()
-		}),
+		},
 	));
 }
 
@@ -262,8 +249,7 @@ fn toggle_rigid_loose(
 	keycode: Res<ButtonInput<KeyCode>>,
 ) {
 	if keycode.just_pressed(KeyCode::KeyQ) {
-		let mut text = text.single_mut();
-		let text = &mut text.sections[0].value;
+		let text = &mut text.single_mut().0;
 		let mut minimap = minimap.single_mut();
 		let rigid = minimap.group.values_mut().next().unwrap();
 		if *rigid {
@@ -277,7 +263,7 @@ fn toggle_rigid_loose(
 
 fn rotate(mut query: Query<&mut Transform, With<Shape>>, time: Res<Time>) {
 	for mut transform in &mut query {
-		transform.rotate_y(time.delta_seconds() / 2.);
+		transform.rotate_y(time.delta_secs() / 2.);
 	}
 }
 
diff --git a/examples/egui.rs b/examples/egui.rs
index 7ae3f73bc..299a4a920 100644
--- a/examples/egui.rs
+++ b/examples/egui.rs
@@ -105,12 +105,11 @@ fn setup(
 
 	// The cube that will be rendered to the texture.
 	commands
-		.spawn(PbrBundle {
-			mesh: cube_handle,
-			material: preview_material_handle,
-			transform: cube_transform,
-			..default()
-		})
+		.spawn((
+			Mesh3d(cube_handle),
+			MeshMaterial3d(preview_material_handle),
+			cube_transform,
+		))
 		.insert(PreviewPassCube)
 		.insert(preview_pass_layer.clone());
 
@@ -121,12 +120,11 @@ fn setup(
 	// Main pass cube.
 	let main_material_handle = materials.add(default_material);
 	commands
-		.spawn(PbrBundle {
-			mesh: cube_handle,
-			material: main_material_handle,
-			transform: cube_transform,
-			..default()
-		})
+		.spawn((
+			Mesh3d(cube_handle),
+			MeshMaterial3d(main_material_handle),
+			cube_transform,
+		))
 		.insert(MainPassCube);
 
 	// Defines initial transform of cameras and light.
@@ -137,15 +135,14 @@ fn setup(
 	// The same light is reused for both passes, you can specify different lights for preview and
 	// main pass by setting appropriate `RenderLayers`.
 	commands
-		.spawn(SpotLightBundle {
-			transform: Transform::from_translation(eye).looking_at(target, up),
-			spot_light: SpotLight {
+		.spawn((
+			Transform::from_translation(eye).looking_at(target, up),
+			SpotLight {
 				intensity: 10_000_000.0,
 				range: 100.0,
 				..default()
 			},
-			..default()
-		})
+		))
 		.insert(RenderLayers::default().with(1));
 
 	// The main pass camera with controller.
@@ -160,17 +157,15 @@ fn setup(
 	// UI camera sensitive to main pass camera's `controller`.
 	commands
 		.spawn((
-			Camera3dBundle {
-				camera: Camera {
-					// Render before the main pass camera.
-					order: -1,
-					target: RenderTarget::Image(image_handle),
-					clear_color: ClearColorConfig::Custom(Color::srgba(1.0, 1.0, 1.0, 0.0)),
-					..default()
-				},
+			TrackballCamera::look_at(target, eye, up).add_controller(controller, true),
+			Camera {
+				// Render before the main pass camera.
+				order: -1,
+				target: RenderTarget::Image(image_handle),
+				clear_color: ClearColorConfig::Custom(Color::srgba(1.0, 1.0, 1.0, 0.0)),
 				..default()
 			},
-			TrackballCamera::look_at(target, eye, up).add_controller(controller, true),
+			Camera3d::default(),
 		))
 		.insert(preview_pass_layer);
 }
diff --git a/examples/exponential_map.rs b/examples/exponential_map.rs
index 7118e285a..353c68c3c 100644
--- a/examples/exponential_map.rs
+++ b/examples/exponential_map.rs
@@ -37,32 +37,29 @@ fn setup(
 	mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
 	// circular base
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Circle::new(4.0)),
-		material: materials.add(Color::WHITE),
-		transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
-		..default()
-	});
+	commands.spawn((
+		Mesh3d(meshes.add(Circle::new(4.0))),
+		MeshMaterial3d(materials.add(Color::WHITE)),
+		Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
+	));
 	// cube
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-		material: materials.add(Color::srgb_u8(124, 144, 255)),
-		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_u8(124, 144, 255))),
+		Transform::from_xyz(0.0, 0.5, 0.0),
+	));
 	// light
-	commands.spawn(PointLightBundle {
-		point_light: PointLight {
+	commands.spawn((
+		PointLight {
 			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((
 		TrackballController::default(),
 		TrackballCamera::look_at(Vec3::Y * 0.5, Vec3::new(-2.5, 4.5, 9.0), Vec3::Y),
-		Camera3dBundle::default(),
+		Camera3d::default(),
 	));
 }
diff --git a/examples/gliding_clamp.rs b/examples/gliding_clamp.rs
index f655813c4..202dcc39f 100644
--- a/examples/gliding_clamp.rs
+++ b/examples/gliding_clamp.rs
@@ -90,17 +90,14 @@ fn setup(
 
 	for (i, shape) in shapes.into_iter().enumerate() {
 		commands.spawn((
-			PbrBundle {
-				mesh: shape,
-				material: debug_material.clone(),
-				transform: Transform::from_xyz(
-					-SHAPES_X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * SHAPES_X_EXTENT,
-					2.0,
-					Z_EXTENT / 2.0,
-				)
-				.with_rotation(Quat::from_rotation_x(-PI / 4.)),
-				..default()
-			},
+			Mesh3d(shape),
+			MeshMaterial3d(debug_material.clone()),
+			Transform::from_xyz(
+				-SHAPES_X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * SHAPES_X_EXTENT,
+				2.0,
+				Z_EXTENT / 2.0,
+			)
+			.with_rotation(Quat::from_rotation_x(-PI / 4.)),
 			Shape,
 		));
 	}
@@ -109,41 +106,36 @@ fn setup(
 
 	for (i, shape) in extrusions.into_iter().enumerate() {
 		commands.spawn((
-			PbrBundle {
-				mesh: shape,
-				material: debug_material.clone(),
-				transform: Transform::from_xyz(
-					-EXTRUSION_X_EXTENT / 2.
-						+ i as f32 / (num_extrusions - 1) as f32 * EXTRUSION_X_EXTENT,
-					2.0,
-					-Z_EXTENT / 2.,
-				)
-				.with_rotation(Quat::from_rotation_x(-PI / 4.)),
-				..default()
-			},
+			Mesh3d(shape),
+			MeshMaterial3d(debug_material.clone()),
+			Transform::from_xyz(
+				-EXTRUSION_X_EXTENT / 2.
+					+ i as f32 / (num_extrusions - 1) as f32 * EXTRUSION_X_EXTENT,
+				2.0,
+				-Z_EXTENT / 2.,
+			)
+			.with_rotation(Quat::from_rotation_x(-PI / 4.)),
 			Shape,
 		));
 	}
 
 	// light
-	commands.spawn(PointLightBundle {
-		point_light: PointLight {
+	commands.spawn((
+		PointLight {
 			shadows_enabled: true,
 			intensity: 10_000_000.,
 			range: 100.0,
 			shadow_depth_bias: 0.2,
 			..default()
 		},
-		transform: Transform::from_xyz(8.0, 16.0, 8.0),
-		..default()
-	});
+		Transform::from_xyz(8.0, 16.0, 8.0),
+	));
 
 	// ground plane
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)),
-		material: materials.add(Color::from(SILVER)),
-		..default()
-	});
+	commands.spawn((
+		Mesh3d(meshes.add(Plane3d::default().mesh().size(50.0, 50.0))),
+		MeshMaterial3d(materials.add(Color::from(SILVER))),
+	));
 
 	// camera
 	let [target, eye, up] = [Vec3::Y, Vec3::new(0.0, 7.0, 14.0), Vec3::Y];
@@ -157,24 +149,24 @@ fn setup(
 			bound.max_distance = 50.0;
 			bound
 		}),
-		Camera3dBundle::default(),
+		Camera3d::default(),
 	));
 
 	#[cfg(not(target_arch = "wasm32"))]
-	commands.spawn(
-		TextBundle::from_section("Press space to toggle wireframes", TextStyle::default())
-			.with_style(Style {
-				position_type: PositionType::Absolute,
-				top: Val::Px(12.0),
-				left: Val::Px(12.0),
-				..default()
-			}),
-	);
+	commands.spawn((
+		Text::new("Press space to toggle wireframes"),
+		Node {
+			position_type: PositionType::Absolute,
+			top: Val::Px(12.0),
+			left: Val::Px(12.0),
+			..default()
+		},
+	));
 }
 
 fn rotate(mut query: Query<&mut Transform, With<Shape>>, time: Res<Time>) {
 	for mut transform in &mut query {
-		transform.rotate_y(time.delta_seconds() / 2.);
+		transform.rotate_y(time.delta_secs() / 2.);
 	}
 }
 
diff --git a/examples/scaling_modes.rs b/examples/scaling_modes.rs
index 020e17ac3..a97d39c34 100644
--- a/examples/scaling_modes.rs
+++ b/examples/scaling_modes.rs
@@ -32,28 +32,25 @@ fn setup(
 	mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
 	// circular base
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Circle::new(4.0)),
-		material: materials.add(Color::WHITE),
-		transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
-		..default()
-	});
+	commands.spawn((
+		Mesh3d(meshes.add(Circle::new(4.0))),
+		MeshMaterial3d(materials.add(Color::WHITE)),
+		Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
+	));
 	// cube
-	commands.spawn(PbrBundle {
-		mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-		material: materials.add(Color::srgb_u8(124, 144, 255)),
-		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_u8(124, 144, 255))),
+		Transform::from_xyz(0.0, 0.5, 0.0),
+	));
 	// light
-	commands.spawn(PointLightBundle {
-		point_light: PointLight {
+	commands.spawn((
+		PointLight {
 			shadows_enabled: true,
 			..default()
 		},
-		transform: Transform::from_xyz(4.0, 8.0, 4.0),
-		..default()
-	});
+		Transform::from_xyz(4.0, 8.0, 4.0),
+	));
 
 	// Windows
 	let mut window1 = windows.single_mut();
@@ -61,7 +58,7 @@ fn setup(
 	let res = &window1.resolution;
 	let max = Vec2::new(res.width() * 0.5, res.height()).into();
 	// Left and right camera orientation.
-	let [target, eye, up] = [Vec3::Y * 0.25, Vec3::new(-2.5, 4.5, 9.0), Vec3::Y];
+	let [target, eye, up] = [Vec3::Y * 0.5, Vec3::new(-2.5, 4.5, 9.0) * 1.2, Vec3::Y];
 	// Spawn a 2nd window.
 	let window2 = commands
 		.spawn(Window {
@@ -91,16 +88,14 @@ fn setup(
 		let left = commands
 			.spawn((
 				TrackballController::default(),
-				Camera3dBundle {
-					camera: Camera {
-						target: RenderTarget::Window(window),
-						// Renders the right camera after the left camera,
-						// which has a default priority of 0.
-						order,
-						..default()
-					},
+				Camera {
+					target: RenderTarget::Window(window),
+					// Renders the right camera after the left camera,
+					// which has a default priority of 0.
+					order,
 					..default()
 				},
+				Camera3d::default(),
 				LeftCamera,
 			))
 			.id();
@@ -109,19 +104,17 @@ fn setup(
 		let right = commands
 			.spawn((
 				TrackballController::default(),
-				Camera3dBundle {
-					camera: Camera {
-						target: RenderTarget::Window(window),
-						// Renders the right camera after the left camera,
-						// which has a default priority of 0.
-						order,
-						// Don't clear on the second camera
-						// because the first camera already cleared the window.
-						clear_color: ClearColorConfig::None,
-						..default()
-					},
+				Camera {
+					target: RenderTarget::Window(window),
+					// Renders the right camera after the left camera,
+					// which has a default priority of 0.
+					order,
+					// Don't clear on the second camera
+					// because the first camera already cleared the window.
+					clear_color: ClearColorConfig::None,
 					..default()
 				},
+				Camera3d::default(),
 				RightCamera,
 			))
 			.id();
@@ -161,17 +154,17 @@ fn set_camera_viewports(
 	// so then each camera always takes up half the screen. A `resize_event` is sent when the window
 	// is first created, allowing us to reuse this system for initial setup.
 	for resize_event in resize_events.read() {
-		let (resize_entity, resize_window) = windows.get(resize_event.window).unwrap();
+		let (resize_id, resize_window) = windows.get(resize_event.window).unwrap();
 		let resolution = &resize_window.resolution;
 		for mut left_camera in &mut left_cameras {
 			if let RenderTarget::Window(window_ref) = left_camera.target {
-				let Some((target_entity, _target_window)) = (match window_ref {
+				let Some((target_id, _target_window)) = (match window_ref {
 					WindowRef::Primary => primary_windows.get_single().ok(),
-					WindowRef::Entity(entity) => windows.get(entity).ok(),
+					WindowRef::Entity(id) => windows.get(id).ok(),
 				}) else {
 					continue;
 				};
-				if target_entity == resize_entity {
+				if target_id == resize_id {
 					left_camera.viewport = Some(Viewport {
 						physical_position: UVec2::new(0, 0),
 						physical_size: UVec2::new(
@@ -185,13 +178,13 @@ fn set_camera_viewports(
 		}
 		for mut right_camera in &mut right_cameras {
 			if let RenderTarget::Window(window_ref) = right_camera.target {
-				let Some((target_entity, _target_window)) = (match window_ref {
+				let Some((target_id, _target_window)) = (match window_ref {
 					WindowRef::Primary => primary_windows.get_single().ok(),
-					WindowRef::Entity(entity) => windows.get(entity).ok(),
+					WindowRef::Entity(id) => windows.get(id).ok(),
 				}) else {
 					continue;
 				};
-				if target_entity == resize_entity {
+				if target_id == resize_id {
 					right_camera.viewport = Some(Viewport {
 						physical_position: UVec2::new(resolution.physical_width() / 2, 0),
 						physical_size: UVec2::new(
diff --git a/src/camera.rs b/src/camera.rs
index 1b43faffd..314b356b5 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use bevy::{prelude::*, render::camera::ScalingMode};
+use bevy::prelude::*;
 use trackball::{approx::AbsDiffEq, nalgebra::Point2, Clamp, Delta, Fixed, Frame, Scope};
 
 /// Trackball camera component mainly defined by [`Frame`] and [`Scope`].
@@ -125,7 +125,7 @@ pub fn trackball_camera(
 				trackball.old_frame = trackball.frame;
 			}
 			let blend = (trackball.blend * 1e-3).clamp(0.0, 1.0);
-			let blend = 1.0 - 0.5f32.powf(time.delta_seconds() / blend);
+			let blend = 1.0 - 0.5f32.powf(time.delta_secs() / blend);
 			trackball.old_frame = trackball
 				.old_frame
 				.abs_diff_ne(&trackball.frame, f32::EPSILON.sqrt())
@@ -157,8 +157,8 @@ pub fn trackball_camera(
 				*projection = Projection::Orthographic(OrthographicProjection {
 					near,
 					far,
-					scaling_mode: ScalingMode::WindowSize(upp.recip()),
-					..default()
+					scale: upp,
+					..OrthographicProjection::default_3d()
 				});
 			}
 		} else if new_scope || (new_max && !matches!(fov, Fixed::Ver(_fov))) {
diff --git a/src/controller.rs b/src/controller.rs
index 24a5d666d..2402c368c 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -1,7 +1,8 @@
 use bevy::{
 	input::mouse::{MouseMotion, MouseWheel},
 	prelude::*,
-	window::{CursorGrabMode, PrimaryWindow},
+	window::{CursorGrabMode, PrimaryWindow, SystemCursorIcon},
+	winit::cursor::CursorIcon,
 };
 pub use input::{TrackballInput, TrackballVelocity, TrackballWheelUnit};
 use key::key;
@@ -53,6 +54,7 @@ impl TrackballController {
 #[allow(clippy::needless_pass_by_value)]
 #[allow(clippy::too_many_arguments)]
 pub fn trackball_controller(
+	mut commands: Commands,
 	mut viewport: ResMut<TrackballViewport>,
 	time: Res<Time>,
 	key_input: Res<ButtonInput<KeyCode>>,
@@ -62,7 +64,7 @@ pub fn trackball_controller(
 	mut delta_events: EventReader<MouseMotion>,
 	mut mouse_events: EventReader<CursorMoved>,
 	mut wheel_events: EventReader<MouseWheel>,
-	mut primary_windows: Query<&mut Window, With<PrimaryWindow>>,
+	mut primary_windows: Query<(Entity, &mut Window), With<PrimaryWindow>>,
 	mut secondary_windows: Query<&mut Window, Without<PrimaryWindow>>,
 	mut cameras: Query<(Entity, &Camera, &TrackballCamera, &mut TrackballController)>,
 	mut trackball_events: EventWriter<TrackballEvent>,
@@ -73,7 +75,7 @@ pub fn trackball_controller(
 		mouse_events.clear();
 		wheel_events.clear();
 	}
-	let Some((is_changed, mut window, group, camera, trackball, mut controller)) =
+	let Some((is_changed, window_id, mut window, group, camera, trackball, mut controller)) =
 		TrackballViewport::select(
 			&mut viewport,
 			&key_input,
@@ -100,15 +102,17 @@ pub fn trackball_controller(
 		controller.slide.discard();
 		controller.touch.discard(None);
 		controller.touch.discard(None);
-		window.cursor.icon = CursorIcon::Default;
-		window.cursor.grab_mode = CursorGrabMode::None;
-		window.cursor.visible = true;
+		commands
+			.entity(window_id)
+			.insert(CursorIcon::from(SystemCursorIcon::Default));
+		window.cursor_options.grab_mode = CursorGrabMode::None;
+		window.cursor_options.visible = true;
 	}
 	let zat = trackball.frame.distance();
 	let (_max, upp) = trackball.scope.fov().max_and_upp(zat, &max.into());
 	let v = controller.input.velocity.to_linear(zat).into_inner();
 	let w = controller.input.velocity.to_angular(zat).into_inner();
-	let t = time.delta_seconds();
+	let t = time.delta_secs();
 	key(
 		group,
 		&mut trackball_events,
@@ -123,10 +127,12 @@ pub fn trackball_controller(
 		t,
 	);
 	mouse(
+		&mut commands,
 		group,
 		&mut trackball_events,
 		trackball,
 		&mut controller,
+		window_id,
 		&mut window,
 		&mouse_input,
 		delta_events,
diff --git a/src/controller/key.rs b/src/controller/key.rs
index fa22e5ace..aae62dd3b 100644
--- a/src/controller/key.rs
+++ b/src/controller/key.rs
@@ -99,13 +99,13 @@ pub fn key(
 	}
 	if just_pressed(controller.input.first_key) {
 		controller.first.capture(trackball.frame.yaw_axis());
-		window.cursor.grab_mode = CursorGrabMode::Locked;
-		window.cursor.visible = false;
+		window.cursor_options.grab_mode = CursorGrabMode::Locked;
+		window.cursor_options.visible = false;
 	}
 	if just_released(controller.input.first_key) {
 		controller.first.discard();
-		window.cursor.grab_mode = CursorGrabMode::None;
-		window.cursor.visible = true;
+		window.cursor_options.grab_mode = CursorGrabMode::None;
+		window.cursor_options.visible = true;
 	}
 	controller.scale.set_denominator(zat);
 	if pressed(controller.input.scale_in_key) {
diff --git a/src/controller/mouse.rs b/src/controller/mouse.rs
index add474bed..c90bcb786 100644
--- a/src/controller/mouse.rs
+++ b/src/controller/mouse.rs
@@ -1,7 +1,8 @@
 use bevy::{
 	input::mouse::{MouseMotion, MouseScrollUnit, MouseWheel},
 	prelude::*,
-	window::CursorGrabMode,
+	window::{CursorGrabMode, SystemCursorIcon},
+	winit::cursor::CursorIcon,
 };
 use trackball::{
 	nalgebra::{Point2, Point3},
@@ -11,11 +12,14 @@ use trackball::{
 use super::{TrackballCamera, TrackballController, TrackballEvent};
 
 #[allow(clippy::too_many_arguments)]
+#[allow(clippy::too_many_lines)]
 pub fn mouse(
+	commands: &mut Commands,
 	group: Entity,
 	trackball_events: &mut EventWriter<TrackballEvent>,
 	trackball: &TrackballCamera,
 	controller: &mut TrackballController,
+	window_id: Entity,
 	window: &mut Window,
 	mouse_input: &Res<ButtonInput<MouseButton>>,
 	mut delta_events: EventReader<MouseMotion>,
@@ -37,13 +41,13 @@ pub fn mouse(
 	};
 	if just_pressed_button(controller.input.first_button) {
 		controller.first.capture(trackball.frame.yaw_axis());
-		window.cursor.grab_mode = CursorGrabMode::Locked;
-		window.cursor.visible = false;
+		window.cursor_options.grab_mode = CursorGrabMode::Locked;
+		window.cursor_options.visible = false;
 	}
 	if just_released_button(controller.input.first_button) {
 		controller.first.discard();
-		window.cursor.grab_mode = CursorGrabMode::None;
-		window.cursor.visible = true;
+		window.cursor_options.grab_mode = CursorGrabMode::None;
+		window.cursor_options.visible = true;
 	}
 	for delta_event in delta_events.read() {
 		if controller.first.enabled() {
@@ -57,7 +61,9 @@ pub fn mouse(
 	if just_pressed_button(controller.input.orbit_button) {
 		controller.touch.compute(None, pos, 0);
 		controller.orbit.compute(&pos, &max);
-		window.cursor.icon = CursorIcon::Pointer;
+		commands
+			.entity(window_id)
+			.insert(CursorIcon::from(SystemCursorIcon::Pointer));
 	}
 	if just_released_button(controller.input.orbit_button) {
 		if let Some((_num, pos)) = controller.touch.discard(None) {
@@ -68,15 +74,21 @@ pub fn mouse(
 			}
 		}
 		controller.orbit.discard();
-		window.cursor.icon = CursorIcon::Default;
+		commands
+			.entity(window_id)
+			.insert(CursorIcon::from(SystemCursorIcon::Default));
 	}
 	if just_pressed_button(controller.input.slide_button) {
 		controller.slide.compute(pos);
-		window.cursor.icon = CursorIcon::Move;
+		commands
+			.entity(window_id)
+			.insert(CursorIcon::from(SystemCursorIcon::Move));
 	}
 	if just_released_button(controller.input.slide_button) {
 		controller.slide.discard();
-		window.cursor.icon = CursorIcon::Default;
+		commands
+			.entity(window_id)
+			.insert(CursorIcon::from(SystemCursorIcon::Default));
 	}
 	for mouse_event in mouse_events.read() {
 		let pos = mouse_event.position - min;
diff --git a/src/controller/viewport.rs b/src/controller/viewport.rs
index 722ba037b..9a1e8fbd7 100644
--- a/src/controller/viewport.rs
+++ b/src/controller/viewport.rs
@@ -92,11 +92,12 @@ impl TrackballViewport {
 		mouse_input: &Res<ButtonInput<MouseButton>>,
 		touch_events: &mut EventReader<TouchInput>,
 		wheel_events: &EventReader<MouseWheel>,
-		primary_windows: &'a mut Query<&mut Window, With<PrimaryWindow>>,
+		primary_windows: &'a mut Query<(Entity, &mut Window), With<PrimaryWindow>>,
 		secondary_windows: &'a mut Query<&mut Window, Without<PrimaryWindow>>,
 		cameras: &'a mut Query<(Entity, &Camera, &TrackballCamera, &mut TrackballController)>,
 	) -> Option<(
 		bool,
+		Entity,
 		Mut<'a, Window>,
 		Entity,
 		&'a Camera,
@@ -112,13 +113,16 @@ impl TrackballViewport {
 			|| mouse_input.get_just_pressed().len() != 0;
 		let mut new_viewport = viewport.clone();
 		let mut max_order = 0;
-		for (entity, camera, _trackball, _controller) in cameras.iter() {
+		for (group, camera, _trackball, _controller) in cameras.iter() {
 			let RenderTarget::Window(window_ref) = camera.target else {
 				continue;
 			};
 			let window = match window_ref {
-				WindowRef::Primary => primary_windows.get_single().ok(),
-				WindowRef::Entity(entity) => secondary_windows.get(entity).ok(),
+				WindowRef::Primary => primary_windows
+					.get_single()
+					.ok()
+					.map(|(_id, window)| window),
+				WindowRef::Entity(id) => secondary_windows.get(id).ok(),
 			};
 			let Some(window) = window else {
 				continue;
@@ -134,7 +138,7 @@ impl TrackballViewport {
 			};
 			let contained = (min.x..max.x).contains(&pos.x) && (min.y..max.y).contains(&pos.y);
 			if contained && camera.order >= max_order {
-				new_viewport.entity = Some(entity);
+				new_viewport.entity = Some(group);
 				max_order = camera.order;
 			}
 		}
@@ -145,17 +149,22 @@ impl TrackballViewport {
 		let camera = viewport
 			.entity
 			.and_then(|entity| cameras.get_mut(entity).ok());
-		let Some((entity, camera, trackball, controller)) = camera else {
+		let Some((group, camera, trackball, controller)) = camera else {
 			viewport.entity = None;
 			return None;
 		};
 		let RenderTarget::Window(window_ref) = camera.target else {
 			return None;
 		};
-		let window = match window_ref {
+		let (window_id, window) = match window_ref {
 			WindowRef::Primary => primary_windows.get_single_mut().ok(),
-			WindowRef::Entity(entity) => secondary_windows.get_mut(entity).ok(),
+			WindowRef::Entity(id) => secondary_windows
+				.get_mut(id)
+				.ok()
+				.map(|window| (id, window)),
 		}?;
-		Some((is_changed, window, entity, camera, trackball, controller))
+		Some((
+			is_changed, window_id, window, group, camera, trackball, controller,
+		))
 	}
 }
diff --git a/src/lib.rs b/src/lib.rs
index 3d2e10640..24582720e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -139,7 +139,7 @@
 //! 	commands.spawn((
 //! 		TrackballController::default(),
 //! 		TrackballCamera::look_at(target, eye, up),
-//! 		Camera3dBundle::default(),
+//! 		Camera3d::default(),
 //! 	));
 //!
 //! 	// Set up your scene...