diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b707af..f18a6a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,72 +5,78 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - name: Setup | Checkout
-      uses: actions/checkout@v4
+      - name: Setup | Checkout
+        uses: actions/checkout@v4
 
-    - name: Setup | Ubuntu dependencies
-      run: sudo apt install libasound2-dev libudev-dev pkg-config
+      - name: Setup | Ubuntu dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
 
-    - name: Setup | Toolchain
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        components: clippy,rustfmt
+      - name: Setup | Toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy,rustfmt
 
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
 
-    - name: Build | Clippy
-      run: cargo clippy -- -D warnings
+      - name: Build | Clippy
+        run: cargo clippy -- -D warnings
 
-    - name: Build | Rustfmt
-      run: cargo fmt -- --check
+      - name: Build | Rustfmt
+        run: cargo fmt -- --check
 
   check:
     runs-on: ubuntu-latest
     steps:
-    - name: Setup | Checkout
-      uses: actions/checkout@v4
+      - name: Setup | Checkout
+        uses: actions/checkout@v4
 
-    - name: Setup | Ubuntu dependencies
-      run: sudo apt install libasound2-dev libudev-dev pkg-config
+      - name: Setup | Ubuntu dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
 
-    - name: Setup | Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        targets: wasm32-unknown-unknown
+      - name: Setup | Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
 
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
 
-    - name: Build | Check (native)
-      run: cargo check
+      - name: Build | Check (native)
+        run: cargo check
 
-    - name: Build | Check (wasm)
-      run: cargo check --target wasm32-unknown-unknown
+      - name: Build | Check (wasm)
+        run: cargo check --target wasm32-unknown-unknown
 
   test:
     needs: [check]
     runs-on: ubuntu-latest
     steps:
-    - name: Setup | Checkout
-      uses: actions/checkout@v4
+      - name: Setup | Checkout
+        uses: actions/checkout@v4
 
-    - name: Setup | Ubuntu dependencies
-      run: sudo apt install libasound2-dev libudev-dev pkg-config
+      - name: Setup | Ubuntu dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
 
-    - name: Setup | Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        targets: wasm32-unknown-unknown
+      - name: Setup | Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
 
-    - name: Setup | wasm-pack
-      uses: jetli/wasm-pack-action@v0.4.0
+      - name: Setup | wasm-pack
+        uses: jetli/wasm-pack-action@v0.4.0
 
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2.7.3
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.7.3
 
-    - name: Build | Test (native)
-      run: cargo test
+      - name: Build | Test (native)
+        run: cargo test
 
-    - name: Build | Test (wasm)
-      run: wasm-pack test --node
\ No newline at end of file
+      - name: Build | Test (wasm)
+        run: wasm-pack test --node
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d536a4..d7da5dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ You can find its changes [documented below](#061---2024-08-14).
 
 This release supports Bevy version 0.14 and has an [MSRV][] of 1.80.
 
+### Changed
+
+- bevy_vello now uses Bevy 0.15
+
 ## [0.6.1] - 2024-08-14
 
 This release supports Bevy version 0.14 and has an [MSRV][] of 1.80.
diff --git a/Cargo.toml b/Cargo.toml
index 94b695c..9f4134b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,9 +20,10 @@ license = "(MIT OR Apache-2.0) AND OFL-1.1"
 repository = "https://github.com/linebender/bevy_vello"
 
 [workspace.dependencies]
-bevy = { version = "0.14.0", default-features = false, features = [
+bevy = { version = "0.15.1", default-features = false, features = [
   "bevy_asset",
   "bevy_winit",
+  "bevy_window",
   "bevy_core_pipeline",
   "bevy_pbr",
   "bevy_render",
@@ -51,14 +52,16 @@ repository.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 bevy = { workspace = true }
-vello = "0.2.1"
-vello_svg = "0.3.0"
-velato = "0.3.0"
-thiserror = "1.0.61"
+vello = "0.4.0"
+vello_svg = "0.6.0"
+velato = "0.5.0"
+thiserror = "2.0.11"
 once_cell = "1.19.0"
+skrifa = "0.26.5"
+bytemuck = { version = "1.21.0", features = ["derive"] }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.42"
+wasm-bindgen-test = "0.3.50"
 
 [features]
 default = ["default_font"]
diff --git a/README.md b/README.md
index 6127d7f..adf2e11 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ cargo run -p demo
 
 |bevy|bevy_vello|
 |---|---|
-|0.14|0.5-0.6, main|
+|0.15|main|
+|0.14|0.5-0.6|
 |0.13|0.1-0.4|
 |< 0.13| unsupported |
 
diff --git a/examples/cube3d/src/main.rs b/examples/cube3d/src/main.rs
index 60ad858..191fcb0 100644
--- a/examples/cube3d/src/main.rs
+++ b/examples/cube3d/src/main.rs
@@ -97,24 +97,21 @@ fn setup(
     });
     // Main pass cube, with material containing the rendered first pass texture.
     commands.spawn((
-        PbrBundle {
-            mesh: meshes.add(Cuboid::new(4.0, 4.0, 4.0)),
-            material: material_handle,
-            transform: Transform::from_xyz(0.0, 0.0, 1.5)
-                .with_rotation(Quat::from_rotation_x(-std::f32::consts::PI / 5.0)),
-            ..default()
-        },
+        Mesh3d(meshes.add(Cuboid::new(4.0, 4.0, 4.0))),
+        MeshMaterial3d(material_handle),
+        Transform::from_xyz(0.0, 0.0, 1.5)
+            .with_rotation(Quat::from_rotation_x(-std::f32::consts::PI / 5.0)),
         MainPassCube,
     ));
     // The main pass camera.
-    commands.spawn(PointLightBundle {
-        transform: Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)),
-        ..default()
-    });
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(0.0, 0.0, 15.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands
+        .spawn(PointLight::default())
+        .insert(Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)));
+
+    commands
+        .spawn(Camera3d::default())
+        .insert(Transform::from_xyz(0.0, 0.0, 15.0).looking_at(Vec3::ZERO, Vec3::Y));
+
     commands.spawn(VelloTarget(image_handle));
 }
 
@@ -131,7 +128,7 @@ fn render_texture(
 
     let mut scene = VelloScene::default();
     // Animate the scene
-    let sin_time = time.elapsed_seconds().sin().mul_add(0.5, 0.5);
+    let sin_time = time.elapsed_secs().sin().mul_add(0.5, 0.5);
     let c = Vec3::lerp(
         Vec3::new(-1.0, 0.0, 1.0),
         Vec3::new(1.0, 0.0, 1.0),
@@ -140,7 +137,7 @@ fn render_texture(
     scene.fill(
         peniko::Fill::NonZero,
         kurbo::Affine::translate((128.0, 128.0)),
-        peniko::Color::rgb(c.x as f64, c.y as f64, c.z as f64),
+        peniko::Color::new([c.x, c.y, c.z, 1.]),
         None,
         &kurbo::RoundedRect::new(0.0, 0.0, 256.0, 256.0, (sin_time as f64) * 128.0),
     );
@@ -168,7 +165,7 @@ fn render_texture(
 /// Rotates the outer cube (main pass)
 fn cube_rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<MainPassCube>>) {
     for mut transform in &mut query {
-        transform.rotate_x(1.0 * time.delta_seconds());
-        transform.rotate_y(0.7 * time.delta_seconds());
+        transform.rotate_x(1.0 * time.delta_secs());
+        transform.rotate_y(0.7 * time.delta_secs());
     }
 }
diff --git a/examples/demo/Cargo.toml b/examples/demo/Cargo.toml
index 2526f19..1c0dd28 100644
--- a/examples/demo/Cargo.toml
+++ b/examples/demo/Cargo.toml
@@ -10,5 +10,5 @@ publish = false
 [dependencies]
 bevy_vello = { path = "../../", features = ["experimental-dotLottie"] }
 bevy = { workspace = true }
-bevy_pancam = { version = "0.12.0", features = ["bevy_egui"] }
-bevy_egui = "0.28.0"
+bevy_pancam = { version = "0.16.0", features = ["bevy_egui"] }
+bevy_egui = "0.31.0"
diff --git a/examples/demo/src/main.rs b/examples/demo/src/main.rs
index 4eedd25..9c10183 100644
--- a/examples/demo/src/main.rs
+++ b/examples/demo/src/main.rs
@@ -25,10 +25,12 @@ fn main() {
 }
 
 fn setup_vector_graphics(mut commands: Commands, asset_server: ResMut<AssetServer>) {
-    commands.spawn((Camera2dBundle::default(), bevy_pancam::PanCam::default()));
+    commands.spawn((Camera2d, bevy_pancam::PanCam::default()));
     commands
         .spawn(VelloAssetBundle {
-            asset: asset_server.load::<VelloAsset>("embedded://demo/assets/calendar.json"),
+            asset: VelloAssetHandle(
+                asset_server.load::<VelloAsset>("embedded://demo/assets/calendar.json"),
+            ),
             transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0))
                 .with_scale(Vec3::splat(20.0)),
             debug_visualizations: DebugVisualizations::Visible,
diff --git a/examples/demo/src/ui.rs b/examples/demo/src/ui.rs
index 33a53a6..fa2fb34 100644
--- a/examples/demo/src/ui.rs
+++ b/examples/demo/src/ui.rs
@@ -13,7 +13,7 @@ pub fn controls_ui(
         &mut Playhead,
         &mut PlaybackOptions,
         &mut Theme,
-        &Handle<VelloAsset>,
+        &VelloAssetHandle,
     )>,
     assets: Res<Assets<VelloAsset>>,
 ) {
diff --git a/examples/drag_n_drop/src/main.rs b/examples/drag_n_drop/src/main.rs
index 0bca583..ee1a61d 100644
--- a/examples/drag_n_drop/src/main.rs
+++ b/examples/drag_n_drop/src/main.rs
@@ -18,9 +18,11 @@ fn main() {
 }
 
 fn setup_vector_graphics(mut commands: Commands, asset_server: ResMut<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands.spawn(VelloAssetBundle {
-        asset: asset_server.load::<VelloAsset>("embedded://drag_n_drop/assets/fountain.svg"),
+        asset: VelloAssetHandle(
+            asset_server.load::<VelloAsset>("embedded://drag_n_drop/assets/fountain.svg"),
+        ),
         debug_visualizations: DebugVisualizations::Visible,
         transform: Transform::from_scale(Vec3::splat(5.0)),
         ..default()
@@ -30,7 +32,7 @@ fn setup_vector_graphics(mut commands: Commands, asset_server: ResMut<AssetServe
 /// Drag and drop any SVG or Lottie JSON asset into the window and change the
 /// displayed asset
 fn drag_and_drop(
-    mut query: Query<&mut Handle<VelloAsset>>,
+    mut query: Query<&mut VelloAssetHandle>,
     asset_server: ResMut<AssetServer>,
     mut dnd_evr: EventReader<FileDragAndDrop>,
 ) {
@@ -41,7 +43,7 @@ fn drag_and_drop(
         let FileDragAndDrop::DroppedFile { path_buf, .. } = ev else {
             continue;
         };
-        let new_handle = asset_server.load(path_buf.clone());
+        let new_handle = VelloAssetHandle(asset_server.load(path_buf.clone()));
         *asset = new_handle;
     }
 }
diff --git a/examples/lottie/src/main.rs b/examples/lottie/src/main.rs
index f3e3306..f97cbda 100644
--- a/examples/lottie/src/main.rs
+++ b/examples/lottie/src/main.rs
@@ -17,11 +17,11 @@ fn main() {
 }
 
 fn load_lottie(mut commands: Commands, asset_server: ResMut<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     // Yes, it's this simple.
     commands.spawn(VelloAssetBundle {
-        asset: asset_server.load("embedded://lottie/assets/Tiger.json"),
+        asset: VelloAssetHandle(asset_server.load("embedded://lottie/assets/Tiger.json")),
         debug_visualizations: DebugVisualizations::Visible,
         transform: Transform::from_scale(Vec3::splat(0.5)),
         ..default()
diff --git a/examples/render_layers/src/main.rs b/examples/render_layers/src/main.rs
index 94f095d..feb7d8b 100644
--- a/examples/render_layers/src/main.rs
+++ b/examples/render_layers/src/main.rs
@@ -26,12 +26,10 @@ struct BackgroundScene;
 fn setup_gizmos(mut commands: Commands, mut config_store: ResMut<GizmoConfigStore>) {
     // This camera can only see Gizmos.
     commands.spawn((
-        Camera2dBundle {
-            camera: Camera {
-                // This camera will render LAST.
-                order: 1,
-                ..default()
-            },
+        Camera2d,
+        Camera {
+            // This camera will render LAST.
+            order: 1,
             ..default()
         },
         RenderLayers::layer(3),
@@ -42,12 +40,10 @@ fn setup_gizmos(mut commands: Commands, mut config_store: ResMut<GizmoConfigStor
 
 fn setup_scene(mut commands: Commands) {
     commands.spawn((
-        Camera2dBundle {
-            camera: Camera {
-                // This camera will render first.
-                order: -1,
-                ..default()
-            },
+        Camera2d,
+        Camera {
+            // This camera will render first.
+            order: -1,
             ..default()
         },
         RenderLayers::layer(1).with(2),
@@ -69,7 +65,7 @@ fn animation(
     mut query_scene: Query<(&mut Transform, &mut VelloScene), With<AnimationScene>>,
     time: Res<Time>,
 ) {
-    let sin_time = time.elapsed_seconds().sin().mul_add(0.5, 0.5);
+    let sin_time = time.elapsed_secs().sin().mul_add(0.5, 0.5);
     let (mut transform, mut scene) = query_scene.single_mut();
     // Reset scene every frame
     *scene = VelloScene::default();
@@ -85,7 +81,7 @@ fn animation(
     scene.fill(
         peniko::Fill::NonZero,
         kurbo::Affine::default(),
-        peniko::Color::rgb(c.x as f64, c.y as f64, c.z as f64),
+        peniko::Color::new([c.x, c.y, c.z, 1.]),
         None,
         &kurbo::RoundedRect::new(-50.0, -50.0, 50.0, 50.0, (sin_time as f64) * 50.0),
     );
@@ -101,7 +97,7 @@ fn background(mut query_scene: Query<&mut VelloScene, With<BackgroundScene>>) {
     scene.fill(
         peniko::Fill::NonZero,
         kurbo::Affine::default(),
-        peniko::Color::rgb(0.0, 0.0, 1.0),
+        peniko::Color::new([0.0, 0.0, 1.0, 1.0]),
         None,
         &kurbo::RoundedRect::new(-200.0, -200.0, 200.0, 200.0, 0.0),
     );
diff --git a/examples/run_wasm/src/main.rs b/examples/run_wasm/src/main.rs
index a303415..71cfcc1 100644
--- a/examples/run_wasm/src/main.rs
+++ b/examples/run_wasm/src/main.rs
@@ -1,13 +1,13 @@
-/// Use [cargo-run-wasm](https://github.com/rukai/cargo-run-wasm) to build an example for web
-///
-/// Usage:
-/// ```
-/// cargo run_wasm --package [example_name]
-/// ```
-/// Generally:
-/// ```
-/// cargo run_wasm -p with_winit
-/// ```
+//! Use [cargo-run-wasm](https://github.com/rukai/cargo-run-wasm) to build an example for web
+//!
+//! Usage:
+//! ```
+//! cargo run_wasm --package [example_name]
+//! ```
+//! Generally:
+//! ```
+//! cargo run_wasm -p with_winit
+//! ```
 
 fn main() {
     cargo_run_wasm::run_wasm_cli_with_css("body { margin: 0px; }");
diff --git a/examples/scene/src/main.rs b/examples/scene/src/main.rs
index e08f216..61f42c7 100644
--- a/examples/scene/src/main.rs
+++ b/examples/scene/src/main.rs
@@ -11,12 +11,12 @@ fn main() {
 }
 
 fn setup_vector_graphics(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands.spawn(VelloSceneBundle::default());
 }
 
 fn simple_animation(mut query_scene: Query<(&mut Transform, &mut VelloScene)>, time: Res<Time>) {
-    let sin_time = time.elapsed_seconds().sin().mul_add(0.5, 0.5);
+    let sin_time = time.elapsed_secs().sin().mul_add(0.5, 0.5);
     let (mut transform, mut scene) = query_scene.single_mut();
     // Reset scene every frame
     *scene = VelloScene::default();
@@ -32,7 +32,7 @@ fn simple_animation(mut query_scene: Query<(&mut Transform, &mut VelloScene)>, t
     scene.fill(
         peniko::Fill::NonZero,
         kurbo::Affine::default(),
-        peniko::Color::rgb(c.x as f64, c.y as f64, c.z as f64),
+        peniko::Color::new([c.x, c.y, c.z, 1.]),
         None,
         &kurbo::RoundedRect::new(-50.0, -50.0, 50.0, 50.0, (sin_time as f64) * 50.0),
     );
diff --git a/examples/scene_ui/src/main.rs b/examples/scene_ui/src/main.rs
index 6735c68..8808ebb 100644
--- a/examples/scene_ui/src/main.rs
+++ b/examples/scene_ui/src/main.rs
@@ -12,30 +12,27 @@ fn main() {
 }
 
 fn setup_ui(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let one_third = Val::Percent(100.0 / 3.0);
     commands.spawn((
-        NodeBundle {
-            style: Style {
-                position_type: PositionType::Absolute,
-                left: one_third,
-                top: one_third,
-                width: one_third,
-                height: one_third,
-                border: UiRect::all(Val::Px(2.0)),
-                ..default()
-            },
-            border_color: css::FUCHSIA.with_alpha(0.5).into(),
+        Node {
+            position_type: PositionType::Absolute,
+            left: one_third,
+            top: one_third,
+            width: one_third,
+            height: one_third,
+            border: UiRect::all(Val::Px(2.0)),
             ..default()
         },
+        BorderColor(css::FUCHSIA.with_alpha(0.5).into()),
         Interaction::default(),
         VelloScene::default(),
         CoordinateSpace::ScreenSpace,
     ));
 }
 
-fn update_ui(mut query: Query<(&Node, &Interaction, &mut VelloScene)>) {
+fn update_ui(mut query: Query<(&ComputedNode, &Interaction, &mut VelloScene)>) {
     let Ok((node, interaction, mut scene)) = query.get_single_mut() else {
         return;
     };
@@ -52,8 +49,8 @@ fn update_ui(mut query: Query<(&Node, &Interaction, &mut VelloScene)>) {
     match *interaction {
         Interaction::Hovered | Interaction::Pressed => {
             let color = match *interaction {
-                Interaction::Hovered => peniko::Color::GREEN,
-                Interaction::Pressed => peniko::Color::rgba8(0, 110, 0, 255),
+                Interaction::Hovered => peniko::Color::from_rgba8(0, 255, 0, 255),
+                Interaction::Pressed => peniko::Color::from_rgba8(0, 110, 0, 255),
                 _ => unreachable!(),
             };
 
@@ -88,7 +85,7 @@ fn update_ui(mut query: Query<(&Node, &Interaction, &mut VelloScene)>) {
             scene.fill(
                 peniko::Fill::NonZero,
                 kurbo::Affine::default(),
-                peniko::Color::RED,
+                peniko::Color::from_rgba8(255, 0, 0, 255),
                 None,
                 &kurbo::Circle::new(center, radius),
             );
diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs
index 8db803e..07536e5 100644
--- a/examples/svg/src/main.rs
+++ b/examples/svg/src/main.rs
@@ -17,11 +17,11 @@ fn main() {
 }
 
 fn load_svg(mut commands: Commands, asset_server: ResMut<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     // Yes, it's this simple.
     commands.spawn(VelloAssetBundle {
-        asset: asset_server.load("embedded://svg/assets/fountain.svg"),
+        asset: VelloAssetHandle(asset_server.load("embedded://svg/assets/fountain.svg")),
         debug_visualizations: DebugVisualizations::Visible,
         transform: Transform::from_scale(Vec3::splat(5.0)),
         ..default()
diff --git a/examples/text/src/main.rs b/examples/text/src/main.rs
index f152d0d..2fa70c8 100644
--- a/examples/text/src/main.rs
+++ b/examples/text/src/main.rs
@@ -20,7 +20,7 @@ fn main() {
 }
 
 fn setup_camera(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 }
 
 fn setup_worldspace_text(mut commands: Commands, asset_server: ResMut<AssetServer>) {
@@ -58,7 +58,7 @@ fn setup_screenspace_text(mut commands: Commands) {
             value: "Screen-space text rendered by Vello!".to_string(),
             style: VelloTextStyle {
                 font_size: 24.0,
-                brush: peniko::Brush::Solid(peniko::Color::RED),
+                brush: peniko::Brush::Solid(peniko::Color::from_rgba8(255, 0, 0, 155)),
                 ..default()
             },
         },
@@ -70,20 +70,17 @@ fn setup_screenspace_text(mut commands: Commands) {
     });
 
     // Bevy text
-    commands.spawn(
-        TextBundle::from_section(
-            "Screen-space text rendered by Bevy!",
-            TextStyle {
-                font_size: 24.0,
-                ..default()
-            },
-        )
-        .with_style(Style {
+    commands
+        .spawn(Node {
             position_type: PositionType::Absolute,
             top: Val::Px(100.0),
             left: Val::Px(100.0),
             ..default()
         })
-        .with_text_justify(JustifyText::Left),
-    );
+        .insert(Text::new("Screen-space text rendered by Bevy!"))
+        .insert(TextFont {
+            font_size: 24.,
+            ..default()
+        })
+        .insert(TextLayout::new_with_justify(JustifyText::Left));
 }
diff --git a/src/debug.rs b/src/debug.rs
index d7f8bf2..4655d24 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -1,7 +1,7 @@
 //! Logic for rendering debug visualizations
 use crate::{
-    text::VelloTextAnchor, CoordinateSpace, VelloAsset, VelloAssetAnchor, VelloFont,
-    VelloTextSection,
+    text::VelloTextAnchor, CoordinateSpace, VelloAsset, VelloAssetAnchor, VelloAssetHandle,
+    VelloFont, VelloTextSection,
 };
 use bevy::{color::palettes::css, math::Vec3Swizzles, prelude::*};
 
@@ -27,7 +27,7 @@ pub enum DebugVisualizations {
 fn render_asset_debug(
     query_vectors: Query<
         (
-            &Handle<VelloAsset>,
+            &VelloAssetHandle,
             &VelloAssetAnchor,
             &GlobalTransform,
             &CoordinateSpace,
@@ -48,7 +48,7 @@ fn render_asset_debug(
         .iter()
         .filter(|(_, _, _, _, d)| **d == DebugVisualizations::Visible)
     {
-        if let Some(asset) = assets.get(asset) {
+        if let Some(asset) = assets.get(asset.id()) {
             match space {
                 CoordinateSpace::WorldSpace => {
                     // Origin
@@ -63,14 +63,14 @@ fn render_asset_debug(
                 CoordinateSpace::ScreenSpace => {
                     // Origin
                     let origin = gtransform.translation().xy();
-                    let Some(origin) = camera.viewport_to_world_2d(view, origin) else {
+                    let Ok(origin) = camera.viewport_to_world_2d(view, origin) else {
                         continue;
                     };
                     draw_origin(&mut gizmos, projection, origin);
                     // Bounding box
                     let gtransform = &asset_anchor.compute(asset, gtransform);
                     let rect_center = gtransform.translation().xy();
-                    let Some(rect_center) = camera.viewport_to_world_2d(view, rect_center) else {
+                    let Ok(rect_center) = camera.viewport_to_world_2d(view, rect_center) else {
                         continue;
                     };
                     let Some(rect) = asset.bb_in_screen_space(gtransform, camera, view) else {
@@ -148,13 +148,17 @@ fn render_text_debug(
                         }
                     };
                     let rect_center = origin + rect.size() / 2.0;
-                    gizmos.rect_2d(rect_center, 0.0, rect.size(), css::WHITE);
+                    gizmos.rect_2d(
+                        Isometry2d::new(rect_center, Rot2::degrees(0.0)),
+                        rect.size(),
+                        css::WHITE,
+                    );
                 }
                 CoordinateSpace::ScreenSpace => {
                     let Some(rect) = text.bb_in_screen_space(font, gtransform, camera, view) else {
                         continue;
                     };
-                    let Some(mut origin) =
+                    let Ok(mut origin) =
                         camera.viewport_to_world_2d(view, gtransform.translation().xy())
                     else {
                         continue;
@@ -195,8 +199,7 @@ fn render_text_debug(
                     };
                     let rect_center = origin + Vec2::new(rect.width() / 2.0, -rect.height() / 2.0);
                     gizmos.rect_2d(
-                        rect_center,
-                        0.0,
+                        Isometry2d::new(rect_center, Rot2::degrees(0.0)),
                         rect.size() * Vec2::new(1.0, 1.0),
                         css::WHITE,
                     );
@@ -221,5 +224,9 @@ fn draw_origin(gizmos: &mut Gizmos, projection: &OrthographicProjection, origin:
 
 /// A helper method to draw the bounding box
 fn draw_bounding_box(gizmos: &mut Gizmos, position: Vec2, size: Vec2) {
-    gizmos.rect_2d(position, 0.0, size, css::WHITE);
+    gizmos.rect_2d(
+        Isometry2d::new(position, Rot2::degrees(0.0)),
+        size,
+        css::WHITE,
+    );
 }
diff --git a/src/integrations/asset.rs b/src/integrations/asset.rs
index 4884e64..e607670 100644
--- a/src/integrations/asset.rs
+++ b/src/integrations/asset.rs
@@ -1,6 +1,9 @@
 use crate::VectorFile;
 use bevy::{prelude::*, reflect::TypePath};
 
+#[derive(Component, Default, Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+pub struct VelloAssetHandle(pub Handle<VelloAsset>);
+
 #[derive(Asset, TypePath, Clone)]
 pub struct VelloAsset {
     pub file: VectorFile,
@@ -36,7 +39,8 @@ impl VelloAsset {
         let Rect { min, max } = self.bb_in_world_space(gtransform);
         camera
             .viewport_to_world_2d(camera_transform, min)
-            .zip(camera.viewport_to_world_2d(camera_transform, max))
+            .ok()
+            .zip(camera.viewport_to_world_2d(camera_transform, max).ok())
             .map(|(min, max)| Rect { min, max })
     }
 }
diff --git a/src/integrations/dot_lottie/player_state.rs b/src/integrations/dot_lottie/player_state.rs
index 88f91de..81849df 100644
--- a/src/integrations/dot_lottie/player_state.rs
+++ b/src/integrations/dot_lottie/player_state.rs
@@ -1,11 +1,10 @@
 use super::PlayerTransition;
-use crate::{PlaybackOptions, Theme, VelloAsset};
-use bevy::prelude::*;
+use crate::{PlaybackOptions, Theme, VelloAssetHandle};
 
 #[derive(Debug, Clone)]
 pub struct PlayerState {
     pub id: &'static str,
-    pub asset: Option<Handle<VelloAsset>>,
+    pub asset: Option<VelloAssetHandle>,
     pub theme: Option<Theme>,
     pub options: Option<PlaybackOptions>,
     pub transitions: Vec<PlayerTransition>,
@@ -28,7 +27,7 @@ impl PlayerState {
         }
     }
 
-    pub fn asset(mut self, asset: Handle<VelloAsset>) -> Self {
+    pub fn asset(mut self, asset: VelloAssetHandle) -> Self {
         self.asset.replace(asset);
         self
     }
@@ -58,7 +57,7 @@ impl PlayerState {
         self
     }
 
-    pub fn set_asset(mut self, asset: Option<Handle<VelloAsset>>) -> Self {
+    pub fn set_asset(mut self, asset: Option<VelloAssetHandle>) -> Self {
         self.asset = asset;
         self
     }
@@ -88,7 +87,7 @@ impl PlayerState {
         self
     }
 
-    pub fn get_asset(&self) -> Option<&Handle<VelloAsset>> {
+    pub fn get_asset(&self) -> Option<&VelloAssetHandle> {
         self.asset.as_ref()
     }
 
diff --git a/src/integrations/dot_lottie/systems.rs b/src/integrations/dot_lottie/systems.rs
index 87564db..f6672d8 100644
--- a/src/integrations/dot_lottie/systems.rs
+++ b/src/integrations/dot_lottie/systems.rs
@@ -1,7 +1,7 @@
 use super::DotLottiePlayer;
 use crate::{
     integrations::lottie::PlaybackPlayMode, PlaybackDirection, PlaybackLoopBehavior,
-    PlaybackOptions, PlayerTransition, Playhead, VectorFile, VelloAsset,
+    PlaybackOptions, PlayerTransition, Playhead, VectorFile, VelloAsset, VelloAssetHandle,
 };
 use bevy::{prelude::*, utils::Instant};
 use std::time::Duration;
@@ -10,7 +10,7 @@ use vello_svg::usvg::strict_num::Ulps;
 /// Advance all the dotLottie playheads in the scene
 pub fn advance_dot_lottie_playheads(
     mut query: Query<(
-        &Handle<VelloAsset>,
+        &VelloAssetHandle,
         &mut Playhead,
         &mut DotLottiePlayer,
         &PlaybackOptions,
@@ -70,7 +70,7 @@ pub fn advance_dot_lottie_playheads(
 
         // Advance playhead
         let length = end_frame - start_frame;
-        playhead.frame += (time.delta_seconds_f64()
+        playhead.frame += (time.delta_secs_f64()
             * options.speed
             * composition.frame_rate
             * (options.direction as i32 as f64)
@@ -139,7 +139,7 @@ pub fn run_transitions(
         &Playhead,
         &PlaybackOptions,
         &GlobalTransform,
-        &mut Handle<VelloAsset>,
+        &mut VelloAssetHandle,
     )>,
     mut assets: ResMut<Assets<VelloAsset>>,
     windows: Query<&Window>,
@@ -156,7 +156,7 @@ pub fn run_transitions(
 
     let pointer_pos = window
         .cursor_position()
-        .and_then(|cursor| camera.viewport_to_world(view, cursor))
+        .and_then(|cursor| camera.viewport_to_world(view, cursor).ok())
         .map(|ray| ray.origin.truncate());
 
     for (mut player, playhead, options, gtransform, current_asset_handle) in query_player.iter_mut()
@@ -312,7 +312,7 @@ pub fn transition_state(
                 let Some(VelloAsset {
                     file: VectorFile::Lottie(composition),
                     ..
-                }) = assets.get(target_asset)
+                }) = assets.get(target_asset.id())
                 else {
                     warn!("not ready for state transition, re-queueing {next_state}...");
                     player.next_state = Some(next_state);
diff --git a/src/integrations/lottie/asset_loader.rs b/src/integrations/lottie/asset_loader.rs
index 3ec8c6b..6ba8eaa 100644
--- a/src/integrations/lottie/asset_loader.rs
+++ b/src/integrations/lottie/asset_loader.rs
@@ -3,7 +3,7 @@ use crate::{
     VelloAsset,
 };
 use bevy::{
-    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
+    asset::{io::Reader, AssetLoader, LoadContext},
     prelude::*,
     utils::ConditionalSendFuture,
 };
@@ -18,11 +18,11 @@ impl AssetLoader for VelloLottieLoader {
 
     type Error = VectorLoaderError;
 
-    fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader,
-        _settings: &'a Self::Settings,
-        load_context: &'a mut LoadContext,
+    fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &Self::Settings,
+        load_context: &mut LoadContext,
     ) -> impl ConditionalSendFuture<Output = Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
diff --git a/src/integrations/lottie/systems.rs b/src/integrations/lottie/systems.rs
index ed8ea73..ef68b95 100644
--- a/src/integrations/lottie/systems.rs
+++ b/src/integrations/lottie/systems.rs
@@ -1,6 +1,6 @@
 use crate::{
     integrations::lottie::PlaybackPlayMode, PlaybackDirection, PlaybackLoopBehavior,
-    PlaybackOptions, Playhead, VectorFile, VelloAsset,
+    PlaybackOptions, Playhead, VectorFile, VelloAsset, VelloAssetHandle,
 };
 use bevy::{prelude::*, utils::Instant};
 use std::time::Duration;
@@ -9,7 +9,7 @@ use vello_svg::usvg::strict_num::Ulps;
 /// Spawn playheads for Lotties. Every Lottie gets exactly 1 playhead.
 pub fn spawn_playheads(
     mut commands: Commands,
-    query: Query<(Entity, &Handle<VelloAsset>, Option<&PlaybackOptions>), Without<Playhead>>,
+    query: Query<(Entity, &VelloAssetHandle, Option<&PlaybackOptions>), Without<Playhead>>,
     assets: Res<Assets<VelloAsset>>,
 ) {
     for (entity, handle, options) in query.iter() {
@@ -18,7 +18,7 @@ pub fn spawn_playheads(
                 file: _file @ VectorFile::Lottie(composition),
                 ..
             },
-        ) = assets.get(handle)
+        ) = assets.get(handle.id())
         {
             let frame = match options {
                 Some(options) => match options.direction {
@@ -39,11 +39,11 @@ pub fn spawn_playheads(
 /// Advance all lottie playheads without playback options in the scene
 pub fn advance_playheads_without_options(
     #[cfg(feature = "experimental-dotLottie")] mut query: Query<
-        (&Handle<VelloAsset>, &mut Playhead),
+        (&VelloAssetHandle, &mut Playhead),
         (Without<PlaybackOptions>, Without<crate::DotLottiePlayer>),
     >,
     #[cfg(not(feature = "experimental-dotLottie"))] mut query: Query<
-        (&Handle<VelloAsset>, &mut Playhead),
+        (&VelloAssetHandle, &mut Playhead),
         Without<PlaybackOptions>,
     >,
     mut assets: ResMut<Assets<VelloAsset>>,
@@ -69,7 +69,7 @@ pub fn advance_playheads_without_options(
 
         // Advance playhead
         let length = end_frame - start_frame;
-        playhead.frame += (time.delta_seconds_f64() * composition.frame_rate) % length;
+        playhead.frame += (time.delta_secs_f64() * composition.frame_rate) % length;
 
         if playhead.frame > end_frame {
             // Wrap around to the beginning of the segment
@@ -81,11 +81,11 @@ pub fn advance_playheads_without_options(
 /// Advance all lottie playheads with playback options in the scene
 pub fn advance_playheads_with_options(
     #[cfg(feature = "experimental-dotLottie")] mut query: Query<
-        (&Handle<VelloAsset>, &mut Playhead, &PlaybackOptions),
+        (&VelloAssetHandle, &mut Playhead, &PlaybackOptions),
         Without<crate::DotLottiePlayer>,
     >,
     #[cfg(not(feature = "experimental-dotLottie"))] mut query: Query<(
-        &Handle<VelloAsset>,
+        &VelloAssetHandle,
         &mut Playhead,
         &PlaybackOptions,
     )>,
@@ -134,7 +134,7 @@ pub fn advance_playheads_with_options(
 
         // Advance playhead
         let length = end_frame - start_frame;
-        playhead.frame += (time.delta_seconds_f64()
+        playhead.frame += (time.delta_secs_f64()
             * options.speed
             * composition.frame_rate
             * (options.direction as i32 as f64)
diff --git a/src/integrations/lottie/theme.rs b/src/integrations/lottie/theme.rs
index a1af1a8..553c54a 100644
--- a/src/integrations/lottie/theme.rs
+++ b/src/integrations/lottie/theme.rs
@@ -8,6 +8,7 @@ use velato::{
     model::{Brush, Shape},
     Composition,
 };
+use vello::peniko::color::DynamicColor;
 
 #[derive(PartialEq, Component, Default, Clone, Debug, Reflect)]
 #[reflect(Component)]
@@ -64,15 +65,14 @@ impl Theme {
                     continue 'layers;
                 }
             };
-            // TODO: Vello hasn't fully implemented color spaces yet, so I'm very unsure of
-            // which color space to use here.
-            let target_color = target_color.to_linear();
-            let target_color = vello::peniko::Color::rgba(
+            // Convert Bevy color to peniko::Color
+            let target_color = target_color.to_srgba();
+            let target_color = vello::peniko::Color::new([
                 target_color.red as _,
                 target_color.green as _,
                 target_color.blue as _,
                 target_color.alpha as _,
-            );
+            ]);
             for shape in shapes.iter_mut() {
                 recolor_shape(shape, target_color);
             }
@@ -104,8 +104,8 @@ fn recolor_brush(brush: &mut Brush, target_color: vello::peniko::Color) {
                 *solid = target_color;
             }
             vello::peniko::Brush::Gradient(gradient) => {
-                for stop in gradient.stops.iter_mut() {
-                    stop.color = target_color;
+                for stop in gradient.stops.0.as_mut() {
+                    stop.color = DynamicColor::from_alpha_color(target_color);
                 }
             }
             vello::peniko::Brush::Image(_) => {}
@@ -123,22 +123,25 @@ fn recolor_brush(brush: &mut Brush, target_color: vello::peniko::Color) {
             },
             velato::model::animated::Brush::Gradient(gr) => match &mut gr.stops {
                 velato::model::ColorStops::Fixed(stops) => {
-                    for stop in stops.iter_mut() {
-                        stop.color = target_color;
+                    for stop in stops.0.as_mut() {
+                        stop.color = DynamicColor::from_alpha_color(target_color);
                     }
                 }
                 velato::model::ColorStops::Animated(stops) => {
                     for _ in 0..stops.count {
                         for stop in stops.values.iter_mut() {
                             let _offset = stop[0];
+
+                            let [cr, cg, cb, ca] = target_color.components;
+
                             let r = &mut stop[1];
-                            *r = target_color.r as f64;
+                            *r = cr as f64;
                             let g = &mut stop[2];
-                            *g = target_color.g as f64;
+                            *g = cg as f64;
                             let b = &mut stop[3];
-                            *b = target_color.b as f64;
+                            *b = cb as f64;
                             let a = &mut stop[4];
-                            *a = target_color.a as f64;
+                            *a = ca as f64;
                         }
                     }
                 }
diff --git a/src/integrations/mod.rs b/src/integrations/mod.rs
index 632c66a..ad4ddf7 100644
--- a/src/integrations/mod.rs
+++ b/src/integrations/mod.rs
@@ -18,7 +18,7 @@ mod error;
 pub use error::VectorLoaderError;
 
 mod asset;
-pub use asset::{VelloAsset, VelloAssetAnchor};
+pub use asset::{VelloAsset, VelloAssetAnchor, VelloAssetHandle};
 
 #[derive(Clone)]
 pub enum VectorFile {
diff --git a/src/integrations/svg/asset_loader.rs b/src/integrations/svg/asset_loader.rs
index 644cab7..71217e1 100644
--- a/src/integrations/svg/asset_loader.rs
+++ b/src/integrations/svg/asset_loader.rs
@@ -3,7 +3,7 @@ use crate::{
     VelloAsset,
 };
 use bevy::{
-    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
+    asset::{io::Reader, AssetLoader, LoadContext},
     prelude::*,
     utils::ConditionalSendFuture,
 };
@@ -18,11 +18,11 @@ impl AssetLoader for VelloSvgLoader {
 
     type Error = VectorLoaderError;
 
-    fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader,
-        _settings: &'a Self::Settings,
-        load_context: &'a mut LoadContext,
+    fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &Self::Settings,
+        load_context: &mut LoadContext,
     ) -> impl ConditionalSendFuture<Output = Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
diff --git a/src/integrations/svg/extract.rs b/src/integrations/svg/extract.rs
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib.rs b/src/lib.rs
index 60a37dc..97254ee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,11 +19,12 @@ pub use vello;
 pub use vello_svg;
 
 pub mod prelude {
-    pub use vello::{self, kurbo, peniko, skrifa};
+    pub use skrifa;
+    pub use vello::{self, kurbo, peniko};
 
     pub use crate::{
         debug::DebugVisualizations,
-        integrations::{VectorFile, VelloAsset, VelloAssetAnchor},
+        integrations::{VectorFile, VelloAsset, VelloAssetAnchor, VelloAssetHandle},
         render::{SkipEncoding, VelloRenderSettings},
         text::{VelloFont, VelloTextAnchor, VelloTextSection, VelloTextStyle},
         CoordinateSpace, VelloAssetBundle, VelloScene, VelloSceneBundle, VelloTextBundle,
@@ -50,24 +51,17 @@ pub enum CoordinateSpace {
 #[derive(Bundle, Default)]
 pub struct VelloAssetBundle {
     /// Asset data to render
-    pub asset: Handle<VelloAsset>,
+    pub asset: VelloAssetHandle,
     /// How the asset is positioned relative to its [`Transform`].
     pub asset_anchor: VelloAssetAnchor,
     /// The coordinate space in which this vector should be rendered.
     pub coordinate_space: CoordinateSpace,
     /// A transform to apply to this vector
     pub transform: Transform,
-    /// The global transform managed by Bevy
-    pub global_transform: GlobalTransform,
     /// Whether to render debug visualizations
     pub debug_visualizations: DebugVisualizations,
     /// User indication of whether an entity is visible. Propagates down the entity hierarchy.
     pub visibility: Visibility,
-    /// Whether or not an entity is visible in the hierarchy.
-    pub inherited_visibility: InheritedVisibility,
-    /// Algorithmically-computed indication of whether an entity is visible. Should be extracted
-    /// for rendering.
-    pub view_visibility: ViewVisibility,
 }
 
 #[derive(Bundle, Default)]
@@ -78,15 +72,8 @@ pub struct VelloSceneBundle {
     pub coordinate_space: CoordinateSpace,
     /// A transform to apply to this scene
     pub transform: Transform,
-    /// The global transform managed by Bevy
-    pub global_transform: GlobalTransform,
     /// User indication of whether an entity is visible. Propagates down the entity hierarchy.
     pub visibility: Visibility,
-    /// Whether or not an entity is visible in the hierarchy.
-    pub inherited_visibility: InheritedVisibility,
-    /// Algorithmically-computed indication of whether an entity is visible. Should be extracted
-    /// for rendering.
-    pub view_visibility: ViewVisibility,
 }
 
 #[derive(Bundle, Default)]
@@ -99,17 +86,10 @@ pub struct VelloTextBundle {
     pub coordinate_space: CoordinateSpace,
     /// A transform to apply to this text
     pub transform: Transform,
-    /// The global transform managed by Bevy
-    pub global_transform: GlobalTransform,
     /// Whether to render debug visualizations
     pub debug_visualizations: DebugVisualizations,
     /// User indication of whether an entity is visible. Propagates down the entity hierarchy.
     pub visibility: Visibility,
-    /// Whether or not an entity is visible in the hierarchy.
-    pub inherited_visibility: InheritedVisibility,
-    /// Algorithmically-computed indication of whether an entity is visible. Should be extracted
-    /// for rendering.
-    pub view_visibility: ViewVisibility,
 }
 
 /// A simple newtype component wrapper for [`vello::Scene`] for rendering.
diff --git a/src/render/extract.rs b/src/render/extract.rs
index 68fd37d..2368183 100644
--- a/src/render/extract.rs
+++ b/src/render/extract.rs
@@ -1,7 +1,10 @@
 use crate::prelude::*;
 use bevy::{
     prelude::*,
-    render::{extract_component::ExtractComponent, view::RenderLayers, Extract},
+    render::{
+        extract_component::ExtractComponent, sync_world::TemporaryRenderEntity, view::RenderLayers,
+        Extract,
+    },
     window::PrimaryWindow,
 };
 
@@ -11,7 +14,7 @@ pub struct ExtractedRenderAsset {
     pub asset_anchor: VelloAssetAnchor,
     pub transform: GlobalTransform,
     pub render_mode: CoordinateSpace,
-    pub ui_node: Option<Node>,
+    pub ui_node: Option<ComputedNode>,
     pub render_layers: Option<RenderLayers>,
     pub alpha: f32,
     #[cfg(feature = "lottie")]
@@ -26,11 +29,11 @@ pub fn extract_svg_assets(
     query_vectors: Extract<
         Query<
             (
-                &Handle<VelloAsset>,
+                &VelloAssetHandle,
                 &VelloAssetAnchor,
                 &CoordinateSpace,
                 &GlobalTransform,
-                Option<&Node>,
+                Option<&ComputedNode>,
                 Option<&RenderLayers>,
                 &ViewVisibility,
                 &InheritedVisibility,
@@ -57,22 +60,24 @@ pub fn extract_svg_assets(
                 alpha,
                 ..
             },
-        ) = assets.get(asset)
+        ) = assets.get(asset.id())
         {
             if view_visibility.get() && inherited_visibility.get() {
-                commands.spawn(ExtractedRenderAsset {
-                    asset: asset.to_owned(),
-                    transform: *transform,
-                    asset_anchor: *asset_anchor,
-                    render_mode: *coord_space,
-                    ui_node: ui_node.cloned(),
-                    render_layers: render_layers.cloned(),
-                    alpha: *alpha,
-                    #[cfg(feature = "lottie")]
-                    theme: None,
-                    #[cfg(feature = "lottie")]
-                    playhead: 0.0,
-                });
+                commands
+                    .spawn(ExtractedRenderAsset {
+                        asset: asset.to_owned(),
+                        transform: *transform,
+                        asset_anchor: *asset_anchor,
+                        render_mode: *coord_space,
+                        ui_node: ui_node.cloned(),
+                        render_layers: render_layers.cloned(),
+                        alpha: *alpha,
+                        #[cfg(feature = "lottie")]
+                        theme: None,
+                        #[cfg(feature = "lottie")]
+                        playhead: 0.0,
+                    })
+                    .insert(TemporaryRenderEntity);
             }
         }
     }
@@ -84,13 +89,13 @@ pub fn extract_lottie_assets(
     query_vectors: Extract<
         Query<
             (
-                &Handle<VelloAsset>,
+                &VelloAssetHandle,
                 &VelloAssetAnchor,
                 &CoordinateSpace,
                 &GlobalTransform,
                 &crate::Playhead,
                 Option<&crate::Theme>,
-                Option<&Node>,
+                Option<&ComputedNode>,
                 Option<&RenderLayers>,
                 &ViewVisibility,
                 &InheritedVisibility,
@@ -119,21 +124,23 @@ pub fn extract_lottie_assets(
                 alpha,
                 ..
             },
-        ) = assets.get(asset)
+        ) = assets.get(asset.id())
         {
             if view_visibility.get() && inherited_visibility.get() {
                 let playhead = playhead.frame();
-                commands.spawn(ExtractedRenderAsset {
-                    asset: asset.to_owned(),
-                    transform: *transform,
-                    asset_anchor: *asset_anchor,
-                    theme: theme.cloned(),
-                    render_mode: *coord_space,
-                    playhead,
-                    alpha: *alpha,
-                    ui_node: ui_node.cloned(),
-                    render_layers: render_layers.cloned(),
-                });
+                commands
+                    .spawn(ExtractedRenderAsset {
+                        asset: asset.to_owned(),
+                        transform: *transform,
+                        asset_anchor: *asset_anchor,
+                        theme: theme.cloned(),
+                        render_mode: *coord_space,
+                        playhead,
+                        alpha: *alpha,
+                        ui_node: ui_node.cloned(),
+                        render_layers: render_layers.cloned(),
+                    })
+                    .insert(TemporaryRenderEntity);
             }
         }
     }
@@ -144,7 +151,7 @@ pub struct ExtractedRenderScene {
     pub scene: VelloScene,
     pub transform: GlobalTransform,
     pub render_mode: CoordinateSpace,
-    pub ui_node: Option<Node>,
+    pub ui_node: Option<ComputedNode>,
     pub render_layers: Option<RenderLayers>,
 }
 
@@ -158,7 +165,7 @@ pub fn extract_scenes(
                 &GlobalTransform,
                 &ViewVisibility,
                 &InheritedVisibility,
-                Option<&Node>,
+                Option<&ComputedNode>,
                 Option<&RenderLayers>,
             ),
             Without<SkipEncoding>,
@@ -176,13 +183,15 @@ pub fn extract_scenes(
     ) in query_scenes.iter()
     {
         if view_visibility.get() && inherited_visibility.get() {
-            commands.spawn(ExtractedRenderScene {
-                transform: *transform,
-                render_mode: *coord_space,
-                scene: scene.clone(),
-                ui_node: ui_node.cloned(),
-                render_layers: render_layers.cloned(),
-            });
+            commands
+                .spawn(ExtractedRenderScene {
+                    transform: *transform,
+                    render_mode: *coord_space,
+                    scene: scene.clone(),
+                    ui_node: ui_node.cloned(),
+                    render_layers: render_layers.cloned(),
+                })
+                .insert(TemporaryRenderEntity);
         }
     }
 }
@@ -224,13 +233,15 @@ pub fn extract_text(
     ) in query_scenes.iter()
     {
         if view_visibility.get() && inherited_visibility.get() {
-            commands.spawn(ExtractedRenderText {
-                text: text.clone(),
-                text_anchor: *text_anchor,
-                transform: *transform,
-                render_space: *render_space,
-                render_layers: render_layers.cloned(),
-            });
+            commands
+                .spawn(ExtractedRenderText {
+                    text: text.clone(),
+                    text_anchor: *text_anchor,
+                    transform: *transform,
+                    render_space: *render_space,
+                    render_layers: render_layers.cloned(),
+                })
+                .insert(TemporaryRenderEntity);
         }
     }
 }
diff --git a/src/render/mod.rs b/src/render/mod.rs
index 8ed57cb..9c8b84a 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -48,6 +48,15 @@ impl Material2d for VelloCanvasMaterial {
         _layout: &MeshVertexBufferLayoutRef,
         _key: Material2dKey<Self>,
     ) -> Result<(), SpecializedMeshPipelineError> {
+        // FIXME: Vello isn't obeying transparency on render_to_surface call.
+        // See https://github.com/linebender/vello/issues/549
+        if let Some(target) = descriptor.fragment.as_mut() {
+            let mut_targets = &mut target.targets;
+            if let Some(Some(target)) = mut_targets.get_mut(0) {
+                target.blend = Some(vello::wgpu::BlendState::ALPHA_BLENDING);
+            }
+        }
+
         let formats = vec![
             // Position
             VertexFormat::Float32x3,
diff --git a/src/render/plugin.rs b/src/render/plugin.rs
index 0fb258c..d79b755 100644
--- a/src/render/plugin.rs
+++ b/src/render/plugin.rs
@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{
     render::{VelloCanvasMaterial, VelloRenderer, SSRT_SHADER_HANDLE},
-    VelloAsset, VelloFont, VelloScene, VelloTextSection,
+    VelloAssetHandle, VelloFont, VelloScene, VelloTextSection,
 };
 use bevy::{
     asset::load_internal_asset,
@@ -40,7 +40,6 @@ impl Plugin for VelloRenderPlugin {
         let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
             return;
         };
-
         #[cfg(feature = "svg")]
         render_app.add_systems(ExtractSchedule, extract::extract_svg_assets);
         #[cfg(feature = "lottie")]
@@ -95,7 +94,7 @@ impl Plugin for VelloRenderPlugin {
                 check_visibility::<
                     Or<(
                         With<VelloScene>,
-                        With<Handle<VelloAsset>>,
+                        With<VelloAssetHandle>,
                         With<VelloTextSection>,
                     )>,
                 >
diff --git a/src/render/prepare.rs b/src/render/prepare.rs
index 140b691..c387c85 100644
--- a/src/render/prepare.rs
+++ b/src/render/prepare.rs
@@ -25,7 +25,6 @@ pub trait PrepareRenderInstance {
         &self,
         view: &ExtractedView,
         world_transform: GlobalTransform,
-        pixel_scale: f32,
         viewport_size: UVec2,
     ) -> PreparedAffine;
 }
@@ -39,14 +38,13 @@ impl PrepareRenderInstance for ExtractedRenderAsset {
         &self,
         view: &ExtractedView,
         world_transform: GlobalTransform,
-        pixel_scale: f32,
         viewport_size: UVec2,
     ) -> PreparedAffine {
         let local_center_matrix = self.asset.local_transform_center.compute_matrix().inverse();
 
         let raw_transform = match self.render_mode {
             CoordinateSpace::ScreenSpace => {
-                let mut model_matrix = world_transform.compute_matrix().mul_scalar(pixel_scale);
+                let mut model_matrix = world_transform.compute_matrix();
 
                 let asset_size = Vec2::new(self.asset.width, self.asset.height);
 
@@ -112,7 +110,6 @@ pub fn prepare_asset_affines(
     mut commands: Commands,
     views: Query<(&ExtractedCamera, &ExtractedView, Option<&RenderLayers>), With<Camera2d>>,
     mut render_entities: Query<(Entity, &ExtractedRenderAsset)>,
-    pixel_scale: Res<ExtractedPixelScale>,
 ) {
     for (camera, view, maybe_camera_layers) in views.iter() {
         let camera_render_layers = maybe_camera_layers.unwrap_or_default();
@@ -126,8 +123,7 @@ pub fn prepare_asset_affines(
 
             // Prepare render data needed for the subsequent render system
             let final_transform = render_entity.final_transform();
-            let affine =
-                render_entity.scene_affine(view, *final_transform, pixel_scale.0, viewport_size);
+            let affine = render_entity.scene_affine(view, *final_transform, viewport_size);
 
             commands.entity(entity).insert((affine, final_transform));
         }
@@ -138,7 +134,6 @@ pub fn prepare_scene_affines(
     mut commands: Commands,
     views: Query<(&ExtractedCamera, &ExtractedView, Option<&RenderLayers>), With<Camera2d>>,
     render_entities: Query<(Entity, &ExtractedRenderScene)>,
-    pixel_scale: Res<ExtractedPixelScale>,
 ) {
     for (camera, view, maybe_camera_layers) in views.iter() {
         let camera_render_layers = maybe_camera_layers.unwrap_or_default();
@@ -165,8 +160,7 @@ pub fn prepare_scene_affines(
 
             let raw_transform = match render_entity.render_mode {
                 CoordinateSpace::ScreenSpace => {
-                    let mut model_matrix =
-                        world_transform.compute_matrix().mul_scalar(pixel_scale.0);
+                    let mut model_matrix = world_transform.compute_matrix();
 
                     if let Some(node) = &render_entity.ui_node {
                         // The Bevy Transform for a UI node seems to always have the origin
@@ -174,9 +168,9 @@ pub fn prepare_scene_affines(
                         // move the origin back to the top left, so that, e.g., drawing a
                         // shape with center=(20,20) inside of a 40x40 UI node results in
                         // the shape being centered within the node.
-                        let Vec2 { x, y } = node.size() * pixel_scale.0;
-                        model_matrix.w_axis.x -= x / 2.0;
-                        model_matrix.w_axis.y -= y / 2.0;
+                        let Vec2 { x, y } = node.size();
+                        model_matrix.w_axis.x -= x * 0.5;
+                        model_matrix.w_axis.y -= y * 0.5;
 
                         // Note that there's no need to flip the Y axis in this case, as
                         // Bevy handles it for us.
diff --git a/src/render/systems.rs b/src/render/systems.rs
index 4afab4e..86148fe 100644
--- a/src/render/systems.rs
+++ b/src/render/systems.rs
@@ -4,8 +4,8 @@ use super::{
     VelloCanvasMaterial, VelloCanvasSettings, VelloRenderSettings, VelloRenderer,
 };
 use crate::{
-    render::extract::ExtractedRenderScene, CoordinateSpace, VelloAsset, VelloFont, VelloScene,
-    VelloTextSection,
+    render::extract::ExtractedRenderScene, CoordinateSpace, VelloAssetHandle, VelloFont,
+    VelloScene, VelloTextSection,
 };
 use bevy::{
     prelude::*,
@@ -21,7 +21,7 @@ use bevy::{
         texture::GpuImage,
         view::{NoFrustumCulling, RenderLayers},
     },
-    sprite::{MaterialMesh2dBundle, Mesh2dHandle},
+    sprite::MeshMaterial2d,
     window::{WindowResized, WindowResolution},
 };
 use vello::{kurbo::Affine, RenderParams, Scene};
@@ -244,7 +244,7 @@ pub fn render_frame(
 
 pub fn resize_rendertargets(
     mut window_resize_events: EventReader<WindowResized>,
-    mut query: Query<(&mut SSRenderTarget, &Handle<VelloCanvasMaterial>)>,
+    mut query: Query<(&mut SSRenderTarget, &MeshMaterial2d<VelloCanvasMaterial>)>,
     mut images: ResMut<Assets<Image>>,
     mut target_materials: ResMut<Assets<VelloCanvasMaterial>>,
     windows: Query<&Window>,
@@ -263,7 +263,7 @@ pub fn resize_rendertargets(
         }
         for (mut target, target_mat_handle) in query.iter_mut() {
             let image = setup_image(&mut images, &window.resolution);
-            if let Some(mat) = target_materials.get_mut(target_mat_handle) {
+            if let Some(mat) = target_materials.get_mut(target_mat_handle.id()) {
                 target.0 = image.clone();
                 mat.texture = image;
             }
@@ -314,20 +314,16 @@ pub fn setup_ss_rendertarget(
         meshes.add(rendertarget_quad)
     });
     let texture_image = setup_image(&mut images, &window.resolution);
-    let render_target = SSRenderTarget(texture_image.clone());
-    let mesh = Mesh2dHandle(mesh_handle.clone());
-    let material = custom_materials.add(VelloCanvasMaterial {
-        texture: texture_image,
-    });
 
     commands
-        .spawn(MaterialMesh2dBundle {
-            mesh,
-            material,
-            ..default()
-        })
+        .spawn((
+            SSRenderTarget(texture_image.clone()),
+            Mesh2d(mesh_handle.clone()),
+            MeshMaterial2d(custom_materials.add(VelloCanvasMaterial {
+                texture: texture_image,
+            })),
+        ))
         .insert(NoFrustumCulling)
-        .insert(render_target)
         .insert(settings.render_layers.clone());
 }
 
@@ -351,7 +347,7 @@ pub fn hide_when_empty(
         (),
         Or<(
             With<VelloScene>,
-            With<Handle<VelloAsset>>,
+            With<VelloAssetHandle>,
             With<VelloTextSection>,
         )>,
     >,
diff --git a/src/text/font.rs b/src/text/font.rs
index c83f688..07e7f67 100644
--- a/src/text/font.rs
+++ b/src/text/font.rs
@@ -1,14 +1,11 @@
 use super::{vello_text::VelloTextSection, VelloTextAnchor};
 use bevy::{prelude::*, reflect::TypePath, render::render_asset::RenderAsset};
+use skrifa::{FontRef, MetadataProvider};
 use std::sync::Arc;
 use vello::{
-    glyph::{
-        skrifa::{FontRef, MetadataProvider},
-        Glyph,
-    },
     kurbo::Affine,
     peniko::{self, Blob, Font},
-    Scene,
+    Glyph, Scene,
 };
 
 const VARIATIONS: &[(&str, f32)] = &[];
@@ -40,7 +37,7 @@ impl VelloFont {
 
     pub fn sizeof(&self, text: &VelloTextSection) -> Vec2 {
         let font = FontRef::new(self.font.data.data()).expect("Vello font creation error");
-        let font_size = vello::skrifa::instance::Size::new(text.style.font_size);
+        let font_size = skrifa::instance::Size::new(text.style.font_size);
         let charmap = font.charmap();
         let axes = font.axes();
         // TODO: What do Variations here do? Any font nerds know? I'm definitely not doing this
@@ -79,7 +76,7 @@ impl VelloFont {
     ) {
         let font = FontRef::new(self.font.data.data()).expect("Vello font creation error");
 
-        let font_size = vello::skrifa::instance::Size::new(text.style.font_size);
+        let font_size = skrifa::instance::Size::new(text.style.font_size);
         let charmap = font.charmap();
         let axes = font.axes();
         let var_loc = axes.location(VARIATIONS);
@@ -105,7 +102,7 @@ impl VelloFont {
                 pen_x += advance;
                 width = width.max(pen_x);
                 Some(Glyph {
-                    id: gid.to_u16() as u32,
+                    id: gid.to_u32(),
                     x,
                     y: pen_y,
                 })
@@ -151,7 +148,7 @@ impl VelloFont {
             .draw_glyphs(&self.font)
             .font_size(text.style.font_size)
             .transform(transform)
-            .normalized_coords(var_loc.coords())
+            .normalized_coords(bytemuck::cast_slice(var_loc.coords()))
             .brush(&text.style.brush.clone())
             .draw(vello::peniko::Fill::EvenOdd, glyphs.into_iter());
     }
diff --git a/src/text/font_loader.rs b/src/text/font_loader.rs
index 05bbcda..0951502 100644
--- a/src/text/font_loader.rs
+++ b/src/text/font_loader.rs
@@ -1,7 +1,7 @@
 use super::font::VelloFont;
 use crate::integrations::VectorLoaderError;
 use bevy::{
-    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
+    asset::{io::Reader, AssetLoader, LoadContext},
     utils::ConditionalSendFuture,
 };
 
@@ -15,11 +15,11 @@ impl AssetLoader for VelloFontLoader {
 
     type Error = VectorLoaderError;
 
-    fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader,
-        _settings: &'a Self::Settings,
-        _load_context: &'a mut LoadContext,
+    fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &Self::Settings,
+        _load_context: &mut LoadContext,
     ) -> impl ConditionalSendFuture<Output = Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
diff --git a/src/text/vello_text.rs b/src/text/vello_text.rs
index 192b009..54ee812 100644
--- a/src/text/vello_text.rs
+++ b/src/text/vello_text.rs
@@ -80,7 +80,8 @@ impl VelloTextSection {
         let Rect { min, max } = self.bb_in_world_space(font, gtransform);
         camera
             .viewport_to_world_2d(camera_transform, min)
-            .zip(camera.viewport_to_world_2d(camera_transform, max))
+            .ok()
+            .zip(camera.viewport_to_world_2d(camera_transform, max).ok())
             .map(|(min, max)| Rect { min, max })
     }
 }