diff --git a/Cargo.toml b/Cargo.toml
index 776a923..d993d81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,14 +15,13 @@ readme = "README.md"
 bevy_egui = ["dep:bevy_egui"]
 
 [dependencies]
-bevy = { version = "0.12", default-features = false }
-bevy_easings = "0.12"
-bevy_egui = { version = "0.24", optional = true, default-features = false }
+bevy = { version = "0.13", default-features = false, features = ["bevy_render"] }
+bevy_egui = { version = "0.25", optional = true, default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.12" }
+bevy = { version = "0.13" }
 float-cmp = "0.9.0"
-bevy_egui = { version = "0.24", default-features = false, features = ["default_fonts"] }
+bevy_egui = { version = "0.25", default-features = false, features = ["render", "default_fonts"] }
 
 [[example]]
 name = "egui"
diff --git a/examples/advanced.rs b/examples/advanced.rs
index c27bbbb..ba55a3a 100644
--- a/examples/advanced.rs
+++ b/examples/advanced.rs
@@ -26,21 +26,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
@@ -88,10 +87,10 @@ fn setup(
 // This is how you can change config at runtime.
 // Press 'T' to toggle the camera controls.
 fn toggle_camera_controls_system(
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<ButtonInput<KeyCode>>,
     mut pan_orbit_query: Query<&mut PanOrbitCamera>,
 ) {
-    if key_input.just_pressed(KeyCode::T) {
+    if key_input.just_pressed(KeyCode::KeyT) {
         for mut pan_orbit in pan_orbit_query.iter_mut() {
             pan_orbit.enabled = !pan_orbit.enabled;
         }
diff --git a/examples/alternate_up_vector.rs b/examples/alternate_up_vector.rs
index e201a57..f37f5e6 100644
--- a/examples/alternate_up_vector.rs
+++ b/examples/alternate_up_vector.rs
@@ -18,21 +18,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/animate.rs b/examples/animate.rs
index f4dba34..983540d 100644
--- a/examples/animate.rs
+++ b/examples/animate.rs
@@ -20,21 +20,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/basic.rs b/examples/basic.rs
index 94b18c1..6ec0aaf 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -18,21 +18,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/egui.rs b/examples/egui.rs
index 931dd8e..6ee09b3 100644
--- a/examples/egui.rs
+++ b/examples/egui.rs
@@ -29,21 +29,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/egui_multiple_windows.rs b/examples/egui_multiple_windows.rs
index ef5156b..bf16e2d 100644
--- a/examples/egui_multiple_windows.rs
+++ b/examples/egui_multiple_windows.rs
@@ -32,21 +32,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/follow_target.rs b/examples/follow_target.rs
index 856c93b..2e83d73 100644
--- a/examples/follow_target.rs
+++ b/examples/follow_target.rs
@@ -23,15 +23,15 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands
         .spawn(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-            material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+            mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+            material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
             transform: Transform::from_xyz(0.0, 0.5, 0.0),
             ..default()
         })
@@ -39,7 +39,6 @@ fn setup(
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/keyboard_controls.rs b/examples/keyboard_controls.rs
index 922862b..bbb016d 100644
--- a/examples/keyboard_controls.rs
+++ b/examples/keyboard_controls.rs
@@ -25,21 +25,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
@@ -58,37 +57,37 @@ fn setup(
 
 fn keyboard_controls(
     time: Res<Time>,
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<ButtonInput<KeyCode>>,
     mut pan_orbit_query: Query<(&mut PanOrbitCamera, &mut Transform)>,
 ) {
     for (mut pan_orbit, mut transform) in pan_orbit_query.iter_mut() {
         if key_input.pressed(KeyCode::ControlLeft) {
             // Jump focus point 1m using Ctrl+Shift + Arrows
             if key_input.pressed(KeyCode::ShiftLeft) {
-                if key_input.just_pressed(KeyCode::Right) {
+                if key_input.just_pressed(KeyCode::ArrowRight) {
                     pan_orbit.target_focus += Vec3::X;
                 }
-                if key_input.just_pressed(KeyCode::Left) {
+                if key_input.just_pressed(KeyCode::ArrowLeft) {
                     pan_orbit.target_focus -= Vec3::X;
                 }
-                if key_input.just_pressed(KeyCode::Up) {
+                if key_input.just_pressed(KeyCode::ArrowUp) {
                     pan_orbit.target_focus += Vec3::Y;
                 }
-                if key_input.just_pressed(KeyCode::Down) {
+                if key_input.just_pressed(KeyCode::ArrowDown) {
                     pan_orbit.target_focus -= Vec3::Y;
                 }
             } else {
                 // Jump by 45 degrees using Left Ctrl + Arrows
-                if key_input.just_pressed(KeyCode::Right) {
+                if key_input.just_pressed(KeyCode::ArrowRight) {
                     pan_orbit.target_alpha += 45f32.to_radians();
                 }
-                if key_input.just_pressed(KeyCode::Left) {
+                if key_input.just_pressed(KeyCode::ArrowLeft) {
                     pan_orbit.target_alpha -= 45f32.to_radians();
                 }
-                if key_input.just_pressed(KeyCode::Up) {
+                if key_input.just_pressed(KeyCode::ArrowUp) {
                     pan_orbit.target_beta += 45f32.to_radians();
                 }
-                if key_input.just_pressed(KeyCode::Down) {
+                if key_input.just_pressed(KeyCode::ArrowDown) {
                     pan_orbit.target_beta -= 45f32.to_radians();
                 }
             }
@@ -96,16 +95,16 @@ fn keyboard_controls(
         // Pan using Left Shift + Arrows
         else if key_input.pressed(KeyCode::ShiftLeft) {
             let mut delta_translation = Vec3::ZERO;
-            if key_input.pressed(KeyCode::Right) {
+            if key_input.pressed(KeyCode::ArrowRight) {
                 delta_translation += transform.rotation * Vec3::X * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Left) {
+            if key_input.pressed(KeyCode::ArrowLeft) {
                 delta_translation += transform.rotation * Vec3::NEG_X * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Up) {
+            if key_input.pressed(KeyCode::ArrowUp) {
                 delta_translation += transform.rotation * Vec3::Y * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Down) {
+            if key_input.pressed(KeyCode::ArrowDown) {
                 delta_translation += transform.rotation * Vec3::NEG_Y * time.delta_seconds();
             }
             transform.translation += delta_translation;
@@ -113,24 +112,24 @@ fn keyboard_controls(
         }
         // Smooth rotation using arrow keys without modifier
         else {
-            if key_input.pressed(KeyCode::Right) {
+            if key_input.pressed(KeyCode::ArrowRight) {
                 pan_orbit.target_alpha += 50f32.to_radians() * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Left) {
+            if key_input.pressed(KeyCode::ArrowLeft) {
                 pan_orbit.target_alpha -= 50f32.to_radians() * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Up) {
+            if key_input.pressed(KeyCode::ArrowUp) {
                 pan_orbit.target_beta += 50f32.to_radians() * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::Down) {
+            if key_input.pressed(KeyCode::ArrowDown) {
                 pan_orbit.target_beta -= 50f32.to_radians() * time.delta_seconds();
             }
 
             // Zoom with Z and X
-            if key_input.pressed(KeyCode::Z) {
+            if key_input.pressed(KeyCode::KeyZ) {
                 pan_orbit.target_radius -= 5.0 * time.delta_seconds();
             }
-            if key_input.pressed(KeyCode::X) {
+            if key_input.pressed(KeyCode::KeyX) {
                 pan_orbit.target_radius += 5.0 * time.delta_seconds();
             }
         }
diff --git a/examples/multiple_viewports.rs b/examples/multiple_viewports.rs
index 928d1c0..0966f25 100644
--- a/examples/multiple_viewports.rs
+++ b/examples/multiple_viewports.rs
@@ -1,6 +1,5 @@
 //! Demonstrates usage with multiple viewports
 
-use bevy::core_pipeline::clear_color::ClearColorConfig;
 use bevy::prelude::*;
 use bevy::render::camera::Viewport;
 use bevy::window::WindowResized;
@@ -22,21 +21,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
@@ -58,9 +56,6 @@ fn setup(
             camera: Camera {
                 // Renders the minimap camera after the main camera, so it is rendered on top
                 order: 1,
-                ..default()
-            },
-            camera_3d: Camera3d {
                 // Don't clear on the second camera because the first camera already cleared the window
                 clear_color: ClearColorConfig::None,
                 ..default()
diff --git a/examples/multiple_windows.rs b/examples/multiple_windows.rs
index 06423d8..6e3ba69 100644
--- a/examples/multiple_windows.rs
+++ b/examples/multiple_windows.rs
@@ -20,21 +20,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/orthographic.rs b/examples/orthographic.rs
index 6085980..17da96c 100644
--- a/examples/orthographic.rs
+++ b/examples/orthographic.rs
@@ -19,21 +19,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
diff --git a/examples/render_to_texture.rs b/examples/render_to_texture.rs
index 46c3dd2..07f6df3 100644
--- a/examples/render_to_texture.rs
+++ b/examples/render_to_texture.rs
@@ -10,7 +10,6 @@ use std::f32::consts::PI;
 
 use bevy::window::PrimaryWindow;
 use bevy::{
-    core_pipeline::clear_color::ClearColorConfig,
     prelude::*,
     render::{
         camera::RenderTarget,
@@ -75,7 +74,7 @@ fn setup(
 
     let image_handle = images.add(image);
 
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 4.0 }));
+    let cube_handle = meshes.add(Cuboid::new(4.0, 4.0, 4.0));
     let cube_material_handle = materials.add(StandardMaterial {
         base_color: Color::rgb(0.8, 0.7, 0.6),
         reflectance: 0.02,
@@ -110,12 +109,9 @@ fn setup(
     let pan_orbit_id = commands
         .spawn((
             Camera3dBundle {
-                camera_3d: Camera3d {
-                    clear_color: ClearColorConfig::Custom(Color::WHITE),
-                    ..default()
-                },
                 camera: Camera {
                     // render before the "main pass" camera
+                    clear_color: ClearColorConfig::Custom(Color::WHITE),
                     order: -1,
                     target: RenderTarget::Image(image_handle.clone()),
                     ..default()
@@ -130,7 +126,7 @@ fn setup(
         .id();
 
     let cube_size = 4.0;
-    let cube_handle = meshes.add(Mesh::from(shape::Box::new(cube_size, cube_size, cube_size)));
+    let cube_handle = meshes.add(Cuboid::new(cube_size, cube_size, cube_size));
 
     // This material has the texture that has been rendered.
     let material_handle = materials.add(StandardMaterial {
diff --git a/examples/roll_axis.rs b/examples/roll_axis.rs
index 2a79327..4943d73 100644
--- a/examples/roll_axis.rs
+++ b/examples/roll_axis.rs
@@ -20,21 +20,20 @@ fn setup(
 ) {
     // Ground
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         ..default()
     });
     // Cube
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
@@ -60,21 +59,21 @@ fn setup(
 fn roll_controls(
     mut pan_orbit_q: Query<(&mut PanOrbitCamera, &Transform)>,
     time: Res<Time>,
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<ButtonInput<KeyCode>>,
 ) {
     if let Ok((mut pan_orbit, transform)) = pan_orbit_q.get_single_mut() {
         let mut roll_angle = 0.0;
         let roll_amount = TAU / 3.0 * time.delta_seconds();
-        if key_input.pressed(KeyCode::Left) {
+        if key_input.pressed(KeyCode::ArrowLeft) {
             roll_angle -= roll_amount;
         }
-        if key_input.pressed(KeyCode::Right) {
+        if key_input.pressed(KeyCode::ArrowRight) {
             roll_angle += roll_amount;
         }
         // Rotate the base transform by the roll amount around its current 'look' axis
         pan_orbit
             .base_transform
-            .rotate_axis(transform.local_z(), roll_angle);
+            .rotate_axis(transform.local_z().into(), roll_angle);
         // Whenever controlling the camera manually you must make it force update every frame
         pan_orbit.force_update = true;
     }
diff --git a/src/input.rs b/src/input.rs
index 8c23296..97aaf39 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -15,8 +15,8 @@ pub struct MouseKeyTracker {
 
 pub fn mouse_key_tracker(
     mut camera_movement: ResMut<MouseKeyTracker>,
-    mouse_input: Res<Input<MouseButton>>,
-    key_input: Res<Input<KeyCode>>,
+    mouse_input: Res<ButtonInput<MouseButton>>,
+    key_input: Res<ButtonInput<KeyCode>>,
     mut mouse_motion: EventReader<MouseMotion>,
     mut scroll_events: EventReader<MouseWheel>,
     active_cam: Res<ActiveCameraData>,
@@ -70,8 +70,8 @@ pub fn mouse_key_tracker(
 
 pub fn orbit_pressed(
     pan_orbit: &PanOrbitCamera,
-    mouse_input: &Res<Input<MouseButton>>,
-    key_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<ButtonInput<MouseButton>>,
+    key_input: &Res<ButtonInput<KeyCode>>,
 ) -> bool {
     let is_pressed = pan_orbit
         .modifier_orbit
@@ -86,8 +86,8 @@ pub fn orbit_pressed(
 
 pub fn orbit_just_pressed(
     pan_orbit: &PanOrbitCamera,
-    mouse_input: &Res<Input<MouseButton>>,
-    key_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<ButtonInput<MouseButton>>,
+    key_input: &Res<ButtonInput<KeyCode>>,
 ) -> bool {
     let just_pressed = pan_orbit
         .modifier_orbit
@@ -102,8 +102,8 @@ pub fn orbit_just_pressed(
 
 pub fn orbit_just_released(
     pan_orbit: &PanOrbitCamera,
-    mouse_input: &Res<Input<MouseButton>>,
-    key_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<ButtonInput<MouseButton>>,
+    key_input: &Res<ButtonInput<KeyCode>>,
 ) -> bool {
     let just_released = pan_orbit
         .modifier_orbit
@@ -118,8 +118,8 @@ pub fn orbit_just_released(
 
 pub fn pan_pressed(
     pan_orbit: &PanOrbitCamera,
-    mouse_input: &Res<Input<MouseButton>>,
-    key_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<ButtonInput<MouseButton>>,
+    key_input: &Res<ButtonInput<KeyCode>>,
 ) -> bool {
     let is_pressed = pan_orbit
         .modifier_pan
@@ -134,8 +134,8 @@ pub fn pan_pressed(
 
 pub fn pan_just_pressed(
     pan_orbit: &PanOrbitCamera,
-    mouse_input: &Res<Input<MouseButton>>,
-    key_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<ButtonInput<MouseButton>>,
+    key_input: &Res<ButtonInput<KeyCode>>,
 ) -> bool {
     let just_pressed = pan_orbit
         .modifier_pan
diff --git a/src/lib.rs b/src/lib.rs
index 65081f8..b3b8dc9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -46,10 +46,12 @@ impl Plugin for PanOrbitCameraPlugin {
             .add_systems(
                 Update,
                 (
-                    active_viewport_data
-                        .run_if(|active_cam: Res<ActiveCameraData>| !active_cam.manual),
-                    // The order of the input systems doesn't matter
-                    (mouse_key_tracker, touch_tracker),
+                    (
+                        active_viewport_data
+                            .run_if(|active_cam: Res<ActiveCameraData>| !active_cam.manual),
+                        mouse_key_tracker,
+                        touch_tracker,
+                    ),
                     pan_orbit_camera,
                 )
                     .chain()
@@ -344,8 +346,8 @@ pub struct ActiveCameraData {
 #[allow(clippy::too_many_arguments)]
 fn active_viewport_data(
     mut active_cam: ResMut<ActiveCameraData>,
-    mouse_input: Res<Input<MouseButton>>,
-    key_input: Res<Input<KeyCode>>,
+    mouse_input: Res<ButtonInput<MouseButton>>,
+    key_input: Res<ButtonInput<KeyCode>>,
     scroll_events: EventReader<MouseWheel>,
     touches: Res<Touches>,
     primary_windows: Query<&Window, With<PrimaryWindow>>,
@@ -376,6 +378,10 @@ fn active_viewport_data(
                         .expect("Must exist, since the camera is referencing it"),
                 };
 
+                // Is the cursor/touch in this window?
+                // Note: there's a bug in winit that causes `window.cursor_position()` to return
+                // a `Some` value even if the cursor is not in this window, in very specific cases.
+                // See: https://github.com/Plonq/bevy_panorbit_camera/issues/22
                 if let Some(input_position) = window.cursor_position().or(touches
                     .iter_just_pressed()
                     .collect::<Vec<_>>()
diff --git a/src/util.rs b/src/util.rs
index b5d1f58..b96560b 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use bevy_easings::Lerp;
 
 const EPSILON: f32 = 0.001;
 
@@ -39,7 +38,7 @@ pub fn approx_equal(a: f32, b: f32) -> bool {
 
 pub fn lerp_and_snap_f32(from: f32, to: f32, smoothness: f32) -> f32 {
     let t = 1.0 - smoothness;
-    let mut new_value = from.lerp(&to, &t);
+    let mut new_value = from.lerp(to, t);
     if smoothness < 1.0 && approx_equal(new_value, to) {
         new_value = to;
     }