diff --git a/Cargo.toml b/Cargo.toml
index 0fb27974..751643ee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,25 +16,26 @@ render = []
 serde = ["dep:serde"]
 
 [dependencies]
-bevy = { version = "0.14.0", default-features = false, features = [
+bevy = { version = "0.15", default-features = false, features = [
     "bevy_core_pipeline",
     "bevy_render",
     "bevy_asset",
     "bevy_sprite",
 ] }
+# See Bevy#16563
+bevy_internal = { version = "0.15", features = ["bevy_image"] }
 log = "0.4"
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
 ldtk_rust = { version = "0.6" }
 rand = "0.8"
-env_logger = "0.10"
 serde_json = { version = "1.0" }
 tiled = { version = "0.11.0", default-features = false }
 thiserror = { version = "1.0" }
 
 [dev-dependencies.bevy]
-version = "0.14.0"
+version = "0.15"
 default-features = false
 features = [
     "bevy_core_pipeline",
@@ -43,6 +44,7 @@ features = [
     "png",
     "ktx2",
     "bevy_winit",
+    "bevy_window",
     "bevy_text",
     "bevy_sprite",
     #"file_watcher",
@@ -51,7 +53,7 @@ features = [
 ]
 
 [target.'cfg(unix)'.dev-dependencies.bevy]
-version = "0.14.0"
+version = "0.15"
 default-features = false
 features = [
     "bevy_core_pipeline",
@@ -60,6 +62,7 @@ features = [
     "png",
     "ktx2",
     "bevy_winit",
+    "bevy_window",
     "wayland",
     "x11",
     "bevy_text",
diff --git a/examples/3d_iso.rs b/examples/3d_iso.rs
index b8219cd3..cdf0301d 100644
--- a/examples/3d_iso.rs
+++ b/examples/3d_iso.rs
@@ -4,9 +4,9 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    let map_handle: Handle<helpers::tiled::TiledMap> = asset_server.load("iso_map.tmx");
+    let map_handle = helpers::tiled::TiledMapHandle(asset_server.load("iso_map.tmx"));
 
     commands.spawn(helpers::tiled::TiledMapBundle {
         tiled_map: map_handle,
diff --git a/examples/accessing_tiles.rs b/examples/accessing_tiles.rs
index 16929c40..a44acf5e 100644
--- a/examples/accessing_tiles.rs
+++ b/examples/accessing_tiles.rs
@@ -11,7 +11,7 @@ struct CurrentColor(u16);
 struct LastUpdate(f64);
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -109,7 +109,7 @@ fn update_map(
     )>,
     mut tile_query: Query<&mut TileTextureIndex>,
 ) {
-    let current_time = time.elapsed_seconds_f64();
+    let current_time = time.elapsed_secs_f64();
     for (mut current_color, mut last_update, tile_storage, map_size) in tilemap_query.iter_mut() {
         if current_time - last_update.0 > 0.1 {
             current_color.0 += 1;
diff --git a/examples/animation.rs b/examples/animation.rs
index 59ff5c20..59765714 100644
--- a/examples/animation.rs
+++ b/examples/animation.rs
@@ -123,7 +123,7 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
 }
 
 fn startup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 }
 
 fn main() {
diff --git a/examples/basic.rs b/examples/basic.rs
index b9a2868e..575c839f 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -10,7 +10,7 @@ fn startup(
         ArrayTextureLoader,
     >,
 ) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
diff --git a/examples/bench.rs b/examples/bench.rs
index 3b3f9ffe..e056d565 100644
--- a/examples/bench.rs
+++ b/examples/bench.rs
@@ -1,13 +1,14 @@
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
+    window::PresentMode,
 };
 use bevy_ecs_tilemap::prelude::*;
 
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -50,6 +51,7 @@ fn main() {
                 .set(WindowPlugin {
                     primary_window: Some(Window {
                         title: String::from("Benchmark Example"),
+                        present_mode: PresentMode::AutoNoVsync,
                         ..Default::default()
                     }),
                     ..default()
diff --git a/examples/chunking.rs b/examples/chunking.rs
index c289ffc6..3818cfaf 100644
--- a/examples/chunking.rs
+++ b/examples/chunking.rs
@@ -2,7 +2,7 @@ use bevy::{math::Vec3Swizzles, prelude::*, utils::HashSet};
 use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
-/// Press WASD to move the camera around, and watch as chunks spawn/despawn in response.
+// Press WASD to move the camera around, and watch as chunks spawn/despawn in response.
 
 const TILE_SIZE: TilemapTileSize = TilemapTileSize { x: 16.0, y: 16.0 };
 // For this example, don't choose too large a chunk size.
@@ -54,7 +54,7 @@ fn spawn_chunk(commands: &mut Commands, asset_server: &AssetServer, chunk_pos: I
 }
 
 fn startup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 }
 
 fn camera_pos_to_chunk_pos(camera_pos: &Vec2) -> IVec2 {
diff --git a/examples/colors.rs b/examples/colors.rs
index 6b33e878..14a94dfe 100644
--- a/examples/colors.rs
+++ b/examples/colors.rs
@@ -7,7 +7,7 @@ mod helpers;
 const QUADRANT_SIDE_LENGTH: u32 = 64;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
diff --git a/examples/custom_shader.rs b/examples/custom_shader.rs
index 3c37a7d6..1e5ff477 100644
--- a/examples/custom_shader.rs
+++ b/examples/custom_shader.rs
@@ -22,12 +22,12 @@ fn startup(
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<MyMaterial>>,
 ) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    let my_material_handle = materials.add(MyMaterial {
+    let my_material_handle = MaterialTilemapHandle::from(materials.add(MyMaterial {
         brightness: 0.5,
         ..default()
-    });
+    }));
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
diff --git a/examples/frustum_cull_test.rs b/examples/frustum_cull_test.rs
index ee15f082..83354ed5 100644
--- a/examples/frustum_cull_test.rs
+++ b/examples/frustum_cull_test.rs
@@ -75,7 +75,7 @@ impl FromWorld for FontHandle {
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquare>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let map_size = TilemapSize {
         // Render chunks are of size 64, so let's create two render chunks
@@ -122,13 +122,6 @@ fn spawn_map_type_label(
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
-
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
             // Place the map type label somewhere in the top left side of the screen
@@ -138,12 +131,15 @@ fn spawn_map_type_label(
                 ..Default::default()
             };
             commands.spawn((
-                Text2dBundle {
-                    text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_justify(text_justify),
-                    transform,
+                Text2d::new(format!("{map_type:?}")),
+                TextFont {
+                    font: font_handle.clone(),
+                    font_size: 20.0,
                     ..default()
                 },
+                TextColor(Color::BLACK),
+                TextLayout::new_with_justify(JustifyText::Center),
+                transform,
                 MapTypeLabel,
             ));
         }
@@ -160,7 +156,7 @@ fn swap_map_type(
         &mut TilemapTileSize,
     )>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
+    mut map_type_label_q: Query<&mut Text2d, With<MapTypeLabel>>,
     tile_handle_square: Res<TileHandleSquare>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
     tile_handle_hex_col: Res<TileHandleHexCol>,
@@ -216,7 +212,7 @@ fn swap_map_type(
             }
 
             for mut label_text in map_type_label_q.iter_mut() {
-                label_text.sections[0].value = format!("{:?}", map_type.as_ref());
+                label_text.0 = format!("{:?}", map_type.as_ref());
             }
         }
     }
diff --git a/examples/game_of_life.rs b/examples/game_of_life.rs
index 6b11cacc..65415b1a 100644
--- a/examples/game_of_life.rs
+++ b/examples/game_of_life.rs
@@ -5,7 +5,7 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -58,7 +58,7 @@ fn update(
     mut tile_storage_query: Query<(&TileStorage, &TilemapSize, &mut LastUpdate)>,
     tile_query: Query<(Entity, &TilePos, &TileVisible)>,
 ) {
-    let current_time = time.elapsed_seconds_f64();
+    let current_time = time.elapsed_secs_f64();
     let (tile_storage, map_size, mut last_update) = tile_storage_query.single_mut();
     if current_time - last_update.0 > 0.1 {
         for (entity, position, visibility) in tile_query.iter() {
diff --git a/examples/helpers/camera.rs b/examples/helpers/camera.rs
index e6155f5c..0511a56b 100644
--- a/examples/helpers/camera.rs
+++ b/examples/helpers/camera.rs
@@ -39,7 +39,7 @@ pub fn movement(
         }
 
         let z = transform.translation.z;
-        transform.translation += time.delta_seconds() * direction * 500.;
+        transform.translation += time.delta_secs() * direction * 500.;
         // Important! We need to restore the Z values when moving the camera around.
         // Bevy has a specific camera setup and this can mess with how our layers are shown.
         transform.translation.z = z;
diff --git a/examples/helpers/ldtk.rs b/examples/helpers/ldtk.rs
index e515ed01..f6e26b5e 100644
--- a/examples/helpers/ldtk.rs
+++ b/examples/helpers/ldtk.rs
@@ -7,10 +7,7 @@ use bevy_ecs_tilemap::{
 use std::{collections::HashMap, io::ErrorKind};
 use thiserror::Error;
 
-use bevy::{
-    asset::{io::Reader, AsyncReadExt},
-    reflect::TypePath,
-};
+use bevy::{asset::io::Reader, reflect::TypePath};
 use bevy::{
     asset::{AssetLoader, AssetPath, LoadContext},
     prelude::*,
@@ -39,9 +36,12 @@ pub struct LdtkMapConfig {
     pub selected_level: usize,
 }
 
+#[derive(Default, Component)]
+pub struct LdtkMapHandle(pub Handle<LdtkMap>);
+
 #[derive(Default, Bundle)]
 pub struct LdtkMapBundle {
-    pub ldtk_map: Handle<LdtkMap>,
+    pub ldtk_map: LdtkMapHandle,
     pub ldtk_map_config: LdtkMapConfig,
     pub transform: Transform,
     pub global_transform: GlobalTransform,
@@ -61,11 +61,11 @@ impl AssetLoader for LdtkLoader {
     type Settings = ();
     type Error = LdtkAssetLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a Self::Settings,
-        load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &Self::Settings,
+        load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut bytes = Vec::new();
         reader.read_to_end(&mut bytes).await?;
@@ -110,8 +110,8 @@ pub fn process_loaded_tile_maps(
     mut commands: Commands,
     mut map_events: EventReader<AssetEvent<LdtkMap>>,
     maps: Res<Assets<LdtkMap>>,
-    mut query: Query<(Entity, &Handle<LdtkMap>, &LdtkMapConfig)>,
-    new_maps: Query<&Handle<LdtkMap>, Added<Handle<LdtkMap>>>,
+    mut query: Query<(Entity, &LdtkMapHandle, &LdtkMapConfig)>,
+    new_maps: Query<&LdtkMapHandle, Added<LdtkMapHandle>>,
 ) {
     let mut changed_maps = Vec::<AssetId<LdtkMap>>::default();
     for event in map_events.read() {
@@ -136,16 +136,16 @@ pub fn process_loaded_tile_maps(
 
     // If we have new map entities, add them to the changed_maps list
     for new_map_handle in new_maps.iter() {
-        changed_maps.push(new_map_handle.id());
+        changed_maps.push(new_map_handle.0.id());
     }
 
     for changed_map in changed_maps.iter() {
         for (entity, map_handle, map_config) in query.iter_mut() {
             // only deal with currently changed map
-            if map_handle.id() != *changed_map {
+            if map_handle.0.id() != *changed_map {
                 continue;
             }
-            if let Some(ldtk_map) = maps.get(map_handle) {
+            if let Some(ldtk_map) = maps.get(&map_handle.0) {
                 // Despawn all existing tilemaps for this LdtkMap
                 commands.entity(entity).despawn_descendants();
 
diff --git a/examples/helpers/tiled.rs b/examples/helpers/tiled.rs
index 4e5172ff..810f8ee0 100644
--- a/examples/helpers/tiled.rs
+++ b/examples/helpers/tiled.rs
@@ -17,7 +17,7 @@ use std::path::Path;
 use std::sync::Arc;
 
 use bevy::{
-    asset::{io::Reader, AssetLoader, AssetPath, AsyncReadExt},
+    asset::{io::Reader, AssetLoader, AssetPath},
     log,
     prelude::{
         Added, Asset, AssetApp, AssetEvent, AssetId, Assets, Bundle, Commands, Component,
@@ -59,9 +59,12 @@ pub struct TiledLayersStorage {
     pub storage: HashMap<u32, Entity>,
 }
 
+#[derive(Component, Default)]
+pub struct TiledMapHandle(pub Handle<TiledMap>);
+
 #[derive(Default, Bundle)]
 pub struct TiledMapBundle {
-    pub tiled_map: Handle<TiledMap>,
+    pub tiled_map: TiledMapHandle,
     pub storage: TiledLayersStorage,
     pub transform: Transform,
     pub global_transform: GlobalTransform,
@@ -104,11 +107,11 @@ impl AssetLoader for TiledLoader {
     type Settings = ();
     type Error = TiledAssetLoaderError;
 
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a Self::Settings,
-        load_context: &'a mut bevy::asset::LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &Self::Settings,
+        load_context: &mut bevy::asset::LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut bytes = Vec::new();
         reader.read_to_end(&mut bytes).await?;
@@ -199,11 +202,11 @@ pub fn process_loaded_maps(
     maps: Res<Assets<TiledMap>>,
     tile_storage_query: Query<(Entity, &TileStorage)>,
     mut map_query: Query<(
-        &Handle<TiledMap>,
+        &TiledMapHandle,
         &mut TiledLayersStorage,
         &TilemapRenderSettings,
     )>,
-    new_maps: Query<&Handle<TiledMap>, Added<Handle<TiledMap>>>,
+    new_maps: Query<&TiledMapHandle, Added<TiledMapHandle>>,
 ) {
     let mut changed_maps = Vec::<AssetId<TiledMap>>::default();
     for event in map_events.read() {
@@ -228,16 +231,16 @@ pub fn process_loaded_maps(
 
     // If we have new map entities add them to the changed_maps list.
     for new_map_handle in new_maps.iter() {
-        changed_maps.push(new_map_handle.id());
+        changed_maps.push(new_map_handle.0.id());
     }
 
     for changed_map in changed_maps.iter() {
         for (map_handle, mut layer_storage, render_settings) in map_query.iter_mut() {
             // only deal with currently changed map
-            if map_handle.id() != *changed_map {
+            if map_handle.0.id() != *changed_map {
                 continue;
             }
-            if let Some(tiled_map) = maps.get(map_handle) {
+            if let Some(tiled_map) = maps.get(&map_handle.0) {
                 // TODO: Create a RemoveMap component..
                 for layer_entity in layer_storage.storage.values() {
                     if let Ok((_, layer_tile_storage)) = tile_storage_query.get(*layer_entity) {
diff --git a/examples/hex_neighbors.rs b/examples/hex_neighbors.rs
index 9aa2f1bd..e56c0471 100644
--- a/examples/hex_neighbors.rs
+++ b/examples/hex_neighbors.rs
@@ -48,7 +48,7 @@ impl FromWorld for FontHandle {
 
 // Generates the initial tilemap, which is a hex grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexRow>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let map_size = TilemapSize {
         x: MAP_SIDE_LENGTH_X,
@@ -93,12 +93,6 @@ fn spawn_tile_labels(
     tile_q: Query<&mut TilePos>,
     font_handle: Res<FontHandle>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -106,15 +100,17 @@ fn spawn_tile_labels(
             let transform = *map_transform * Transform::from_translation(tile_center);
 
             let label_entity = commands
-                .spawn(Text2dBundle {
-                    text: Text::from_section(
-                        format!("{}, {}", tile_pos.x, tile_pos.y),
-                        text_style.clone(),
-                    )
-                    .with_justify(text_justify),
+                .spawn((
+                    Text2d::new(format!("{}, {}", tile_pos.x, tile_pos.y)),
+                    TextFont {
+                        font: font_handle.clone(),
+                        font_size: 20.0,
+                        ..default()
+                    },
+                    TextColor(Color::BLACK),
+                    TextLayout::new_with_justify(JustifyText::Center),
                     transform,
-                    ..default()
-                })
+                ))
                 .id();
             commands
                 .entity(*tile_entity)
@@ -133,13 +129,6 @@ fn spawn_map_type_label(
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
-
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
             // Place the map type label somewhere in the top left side of the screen
@@ -149,12 +138,15 @@ fn spawn_map_type_label(
                 ..Default::default()
             };
             commands.spawn((
-                Text2dBundle {
-                    text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_justify(text_justify),
-                    transform,
+                Text2d::new(format!("{map_type:?}")),
+                TextFont {
+                    font: font_handle.clone(),
+                    font_size: 20.0,
                     ..default()
                 },
+                TextColor(Color::BLACK),
+                TextLayout::new_with_justify(JustifyText::Center),
+                transform,
                 MapTypeLabel,
             ));
         }
@@ -177,7 +169,7 @@ fn swap_map_type(
         (&TileLabel, &TilePos),
         (With<TileLabel>, Without<MapTypeLabel>, Without<TilemapType>),
     >,
-    mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
+    mut map_type_label_q: Query<&mut Text2d, With<MapTypeLabel>>,
     mut transform_q: Query<&mut Transform, Without<TilemapType>>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
     tile_handle_hex_col: Res<TileHandleHexCol>,
@@ -231,7 +223,7 @@ fn swap_map_type(
             }
 
             for mut label_text in map_type_label_q.iter_mut() {
-                label_text.sections[0].value = format!("{:?}", map_type.as_ref());
+                label_text.0 = format!("{:?}", map_type.as_ref());
             }
         }
     }
@@ -261,7 +253,7 @@ pub fn update_cursor_pos(
         // any transforms on the camera. This is done by projecting the cursor position into
         // camera space (world space).
         for (cam_t, cam) in camera_q.iter() {
-            if let Some(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
+            if let Ok(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
                 *cursor_pos = CursorPos(pos);
             }
         }
@@ -281,15 +273,13 @@ fn hover_highlight_tile_label(
     )>,
     highlighted_tiles_q: Query<Entity, With<Hovered>>,
     tile_label_q: Query<&TileLabel>,
-    mut text_q: Query<&mut Text>,
+    mut text_q: Query<&mut TextColor>,
 ) {
     // Un-highlight any previously highlighted tile labels.
     for highlighted_tile_entity in highlighted_tiles_q.iter() {
         if let Ok(label) = tile_label_q.get(highlighted_tile_entity) {
-            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                for section in tile_text.sections.iter_mut() {
-                    section.style.color = Color::BLACK;
-                }
+            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                text_color.0 = Color::BLACK;
                 commands.entity(highlighted_tile_entity).remove::<Hovered>();
             }
         }
@@ -313,10 +303,8 @@ fn hover_highlight_tile_label(
             // Highlight the relevant tile's label
             if let Some(tile_entity) = tile_storage.get(&tile_pos) {
                 if let Ok(label) = tile_label_q.get(tile_entity) {
-                    if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                        for section in tile_text.sections.iter_mut() {
-                            section.style.color = palettes::tailwind::RED_600.into();
-                        }
+                    if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                        text_color.0 = palettes::tailwind::RED_600.into();
                         commands.entity(tile_entity).insert(Hovered);
                     }
                 }
@@ -337,15 +325,13 @@ fn highlight_neighbor_label(
     highlighted_tiles_q: Query<Entity, With<NeighborHighlight>>,
     hovered_tiles_q: Query<&TilePos, With<Hovered>>,
     tile_label_q: Query<&TileLabel>,
-    mut text_q: Query<&mut Text>,
+    mut text_q: Query<&mut TextColor>,
 ) {
     // Un-highlight any previously highlighted tile labels.
     for highlighted_tile_entity in highlighted_tiles_q.iter() {
         if let Ok(label) = tile_label_q.get(highlighted_tile_entity) {
-            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                for section in tile_text.sections.iter_mut() {
-                    section.style.color = Color::BLACK;
-                }
+            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                text_color.0 = Color::BLACK;
                 commands
                     .entity(highlighted_tile_entity)
                     .remove::<NeighborHighlight>();
@@ -369,10 +355,8 @@ fn highlight_neighbor_label(
                 // `checked_get`.
                 if let Some(tile_entity) = tile_storage.checked_get(neighbor_pos) {
                     if let Ok(label) = tile_label_q.get(tile_entity) {
-                        if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                            for section in tile_text.sections.iter_mut() {
-                                section.style.color = palettes::tailwind::BLUE_600.into();
-                            }
+                        if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                            text_color.0 = palettes::tailwind::BLUE_600.into();
                             commands.entity(tile_entity).insert(NeighborHighlight);
                         }
                     }
@@ -410,10 +394,8 @@ fn highlight_neighbor_label(
                 // `checked_get`.
                 if let Some(tile_entity) = tile_storage.checked_get(&tile_pos) {
                     if let Ok(label) = tile_label_q.get(tile_entity) {
-                        if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                            for section in tile_text.sections.iter_mut() {
-                                section.style.color = palettes::tailwind::GREEN_600.into();
-                            }
+                        if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                            text_color.0 = palettes::tailwind::GREEN_600.into();
                             commands.entity(tile_entity).insert(NeighborHighlight);
                         }
                     }
diff --git a/examples/hex_neighbors_radius_chunks.rs b/examples/hex_neighbors_radius_chunks.rs
index 9f3f9593..2f64f3a2 100644
--- a/examples/hex_neighbors_radius_chunks.rs
+++ b/examples/hex_neighbors_radius_chunks.rs
@@ -188,7 +188,7 @@ fn hex_neighbors_radius_from_tile_pos(
 }
 
 fn spawn_chunks(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexRow>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let map_size = TilemapSize {
         x: CHUNK_MAP_SIDE_LENGTH_X,
@@ -252,7 +252,7 @@ fn swap_map_type(
     )>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
     tile_label_q: Query<(Entity, &TileLabel, &TilePos), Without<TilemapType>>,
-    mut transform_q: Query<(&mut Transform, &mut Text), Without<TilemapType>>,
+    mut transform_q: Query<(&mut Transform, &mut Text2d), Without<TilemapType>>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
     tile_handle_hex_col: Res<TileHandleHexCol>,
 ) {
@@ -308,8 +308,7 @@ fn swap_map_type(
                                 &map_type,
                                 &map_transform,
                             );
-                            tile_label_text.sections.get_mut(0).unwrap().value =
-                                format!("{}, {}", hex_pos.x, hex_pos.y);
+                            tile_label_text.0 = format!("{}, {}", hex_pos.x, hex_pos.y);
                         }
                     }
                 }
@@ -327,12 +326,6 @@ fn spawn_tile_labels(
     tile_q: Query<&TilePos>,
     font_handle: Res<FontHandle>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -342,15 +335,17 @@ fn spawn_tile_labels(
             let hex_pos = hex_pos_from_tile_pos(tile_pos, grid_size, map_type, map_transform);
 
             let label_entity = commands
-                .spawn(Text2dBundle {
-                    text: Text::from_section(
-                        format!("{}, {}", hex_pos.x, hex_pos.y),
-                        text_style.clone(),
-                    )
-                    .with_justify(text_justify),
+                .spawn((
+                    Text2d(format!("{}, {}", hex_pos.x, hex_pos.y)),
+                    TextFont {
+                        font: font_handle.clone(),
+                        font_size: 20.0,
+                        ..default()
+                    },
+                    TextColor(Color::BLACK),
+                    TextLayout::new_with_justify(JustifyText::Center),
                     transform,
-                    ..default()
-                })
+                ))
                 .id();
             commands
                 .entity(*tile_entity)
@@ -382,7 +377,7 @@ pub fn update_cursor_pos(
         // any transforms on the camera. This is done by projecting the cursor position into
         // camera space (world space).
         for (cam_t, cam) in camera_q.iter() {
-            if let Some(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
+            if let Ok(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
                 *cursor_pos = CursorPos(pos);
             }
         }
@@ -402,15 +397,13 @@ fn hover_highlight_tile_label(
     )>,
     highlighted_tiles_q: Query<Entity, With<Hovered>>,
     tile_label_q: Query<&TileLabel>,
-    mut text_q: Query<&mut Text>,
+    mut text_q: Query<&mut TextColor>,
 ) {
     // Un-highlight any previously highlighted tile labels.
     for highlighted_tile_entity in highlighted_tiles_q.iter() {
         if let Ok(label) = tile_label_q.get(highlighted_tile_entity) {
-            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                for section in tile_text.sections.iter_mut() {
-                    section.style.color = Color::BLACK;
-                }
+            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                text_color.0 = Color::BLACK;
                 commands.entity(highlighted_tile_entity).remove::<Hovered>();
             }
         }
@@ -428,10 +421,8 @@ fn hover_highlight_tile_label(
         {
             if let Some(tile_entity) = tile_storage.get(&tile_pos) {
                 if let Ok(label) = tile_label_q.get(tile_entity) {
-                    if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                        for section in tile_text.sections.iter_mut() {
-                            section.style.color = palettes::tailwind::RED_600.into();
-                        }
+                    if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                        text_color.0 = palettes::tailwind::RED_600.into();
                         commands.entity(tile_entity).insert(Hovered);
                     }
                 }
@@ -468,15 +459,13 @@ fn highlight_neighbor_labels(
     hovered_tiles_q: Query<(Entity, &TilePos), With<Hovered>>,
     tiles_q: Query<&TilePos, Without<Hovered>>,
     tile_label_q: Query<&TileLabel>,
-    mut text_q: Query<&mut Text>,
+    mut text_q: Query<&mut TextColor>,
     radius: Res<HighlightRadius>,
 ) {
     for highlighted_tile_entity in highlighted_tiles_q.iter() {
         if let Ok(label) = tile_label_q.get(highlighted_tile_entity) {
-            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                for section in tile_text.sections.iter_mut() {
-                    section.style.color = Color::BLACK;
-                }
+            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                text_color.0 = Color::BLACK;
                 commands
                     .entity(highlighted_tile_entity)
                     .remove::<NeighborHighlight>();
@@ -509,10 +498,8 @@ fn highlight_neighbor_labels(
                     let tile_hex_pos = hex_pos_from_tile_pos(tile_pos, grid_size, map_type, map_t);
                     if neighbors.contains(&tile_hex_pos) {
                         if let Ok(label) = tile_label_q.get(*tile_entity) {
-                            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                                for section in tile_text.sections.iter_mut() {
-                                    section.style.color = palettes::tailwind::BLUE_600.into();
-                                }
+                            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                                text_color.0 = palettes::tailwind::BLUE_600.into();
                                 commands.entity(*tile_entity).insert(NeighborHighlight);
                             }
                         }
diff --git a/examples/hexagon_column.rs b/examples/hexagon_column.rs
index 597f83e2..2740e0f3 100644
--- a/examples/hexagon_column.rs
+++ b/examples/hexagon_column.rs
@@ -7,7 +7,7 @@ mod helpers;
 const QUADRANT_SIDE_LENGTH: u32 = 80;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("flat_hex_tiles.png");
 
diff --git a/examples/hexagon_generation.rs b/examples/hexagon_generation.rs
index 57b9f895..15d20b1e 100644
--- a/examples/hexagon_generation.rs
+++ b/examples/hexagon_generation.rs
@@ -46,7 +46,7 @@ impl FromWorld for FontHandle {
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexRow>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let map_size = TilemapSize {
         x: MAP_SIDE_LENGTH,
@@ -98,13 +98,6 @@ fn spawn_map_type_label(
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
-
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
             // Place the map type label somewhere in the top left side of the screen
@@ -114,12 +107,15 @@ fn spawn_map_type_label(
                 ..Default::default()
             };
             commands.spawn((
-                Text2dBundle {
-                    text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_justify(text_justify),
-                    transform,
+                Text2d::new(format!("{map_type:?}")),
+                TextFont {
+                    font: font_handle.clone(),
+                    font_size: 20.0,
                     ..default()
                 },
+                TextColor(Color::BLACK),
+                TextLayout::new_with_justify(JustifyText::Center),
+                transform,
                 MapTypeLabel,
             ));
         }
@@ -141,7 +137,7 @@ fn swap_map_type(
         &mut TileStorage,
     )>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
+    mut map_type_label_q: Query<&mut Text2d, With<MapTypeLabel>>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
     tile_handle_hex_col: Res<TileHandleHexCol>,
 ) {
@@ -201,7 +197,7 @@ fn swap_map_type(
             );
 
             for mut label_text in map_type_label_q.iter_mut() {
-                label_text.sections[0].value = format!("{:?}", map_type.as_ref());
+                label_text.0 = format!("{:?}", map_type.as_ref());
             }
         }
     }
diff --git a/examples/hexagon_row.rs b/examples/hexagon_row.rs
index e99cd66e..2e34121d 100644
--- a/examples/hexagon_row.rs
+++ b/examples/hexagon_row.rs
@@ -6,7 +6,7 @@ mod helpers;
 const QUADRANT_SIDE_LENGTH: u32 = 80;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("pointy_hex_tiles.png");
 
diff --git a/examples/iso_diamond.rs b/examples/iso_diamond.rs
index 89ebc966..81fc9be9 100644
--- a/examples/iso_diamond.rs
+++ b/examples/iso_diamond.rs
@@ -8,7 +8,7 @@ mod helpers;
 const QUADRANT_SIDE_LENGTH: u32 = 80;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("iso_color.png");
 
diff --git a/examples/iso_staggered.rs b/examples/iso_staggered.rs
index 3070d852..6d0baedf 100644
--- a/examples/iso_staggered.rs
+++ b/examples/iso_staggered.rs
@@ -10,7 +10,7 @@ mod helpers;
 const QUADRANT_SIDE_LENGTH: u32 = 80;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("iso_color.png");
 
diff --git a/examples/layers.rs b/examples/layers.rs
index 85e488b7..fca24438 100644
--- a/examples/layers.rs
+++ b/examples/layers.rs
@@ -3,7 +3,7 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
diff --git a/examples/ldtk.rs b/examples/ldtk.rs
index 8e68a22c..2b0e56ff 100644
--- a/examples/ldtk.rs
+++ b/examples/ldtk.rs
@@ -14,9 +14,9 @@ use bevy_ecs_tilemap::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    let handle: Handle<helpers::ldtk::LdtkMap> = asset_server.load("map.ldtk");
+    let handle = helpers::ldtk::LdtkMapHandle(asset_server.load("map.ldtk"));
 
     commands.spawn(helpers::ldtk::LdtkMapBundle {
         ldtk_map: handle,
diff --git a/examples/mouse_to_tile.rs b/examples/mouse_to_tile.rs
index 9ea13ec2..f79f88ac 100644
--- a/examples/mouse_to_tile.rs
+++ b/examples/mouse_to_tile.rs
@@ -72,7 +72,7 @@ impl FromWorld for FontHandle {
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquare>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let map_size = TilemapSize {
         x: MAP_SIDE_LENGTH_X,
@@ -117,12 +117,6 @@ fn spawn_tile_labels(
     tile_q: Query<&mut TilePos>,
     font_handle: Res<FontHandle>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_justify = JustifyText::Center;
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
             let tile_pos = tile_q.get(*tile_entity).unwrap();
@@ -130,15 +124,17 @@ fn spawn_tile_labels(
             let transform = *map_transform * Transform::from_translation(tile_center);
 
             let label_entity = commands
-                .spawn(Text2dBundle {
-                    text: Text::from_section(
-                        format!("{}, {}", tile_pos.x, tile_pos.y),
-                        text_style.clone(),
-                    )
-                    .with_justify(text_justify),
+                .spawn((
+                    Text2d::new(format!("{}, {}", tile_pos.x, tile_pos.y)),
+                    TextFont {
+                        font: font_handle.clone(),
+                        font_size: 20.0,
+                        ..default()
+                    },
+                    TextColor(Color::BLACK),
+                    TextLayout::new_with_justify(JustifyText::Center),
                     transform,
-                    ..default()
-                })
+                ))
                 .id();
             commands
                 .entity(*tile_entity)
@@ -157,13 +153,6 @@ fn spawn_map_type_label(
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
-    let text_style = TextStyle {
-        font: font_handle.clone(),
-        font_size: 20.0,
-        color: Color::BLACK,
-    };
-    let text_alignment = JustifyText::Center;
-
     for window in windows.iter() {
         for map_type in map_type_q.iter() {
             // Place the map type label somewhere in the top left side of the screen
@@ -173,12 +162,15 @@ fn spawn_map_type_label(
                 ..Default::default()
             };
             commands.spawn((
-                Text2dBundle {
-                    text: Text::from_section(format!("{map_type:?}"), text_style.clone())
-                        .with_justify(text_alignment),
-                    transform,
+                Text2d::new(format!("{map_type:?}")),
+                TextFont {
+                    font: font_handle.clone(),
+                    font_size: 20.0,
                     ..default()
                 },
+                TextColor(Color::BLACK),
+                TextLayout::new_with_justify(JustifyText::Center),
+                transform,
                 MapTypeLabel,
             ));
         }
@@ -201,7 +193,7 @@ fn swap_map_type(
         (&TileLabel, &TilePos),
         (With<TileLabel>, Without<MapTypeLabel>, Without<TilemapType>),
     >,
-    mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
+    mut map_type_label_q: Query<&mut Text2d, With<MapTypeLabel>>,
     mut transform_q: Query<&mut Transform, Without<TilemapType>>,
     tile_handle_square: Res<TileHandleSquare>,
     tile_handle_hex_row: Res<TileHandleHexRow>,
@@ -274,7 +266,7 @@ fn swap_map_type(
             }
 
             for mut label_text in map_type_label_q.iter_mut() {
-                label_text.sections[0].value = format!("{:?}", map_type.as_ref());
+                label_text.0 = format!("{:?}", map_type.as_ref());
             }
         }
     }
@@ -304,7 +296,7 @@ pub fn update_cursor_pos(
         // any transforms on the camera. This is done by projecting the cursor position into
         // camera space (world space).
         for (cam_t, cam) in camera_q.iter() {
-            if let Some(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
+            if let Ok(pos) = cam.viewport_to_world_2d(cam_t, cursor_moved.position) {
                 *cursor_pos = CursorPos(pos);
             }
         }
@@ -324,15 +316,13 @@ fn highlight_tile_labels(
     )>,
     highlighted_tiles_q: Query<Entity, With<HighlightedLabel>>,
     tile_label_q: Query<&TileLabel>,
-    mut text_q: Query<&mut Text>,
+    mut text_q: Query<&mut TextColor>,
 ) {
     // Un-highlight any previously highlighted tile labels.
     for highlighted_tile_entity in highlighted_tiles_q.iter() {
         if let Ok(label) = tile_label_q.get(highlighted_tile_entity) {
-            if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                for section in tile_text.sections.iter_mut() {
-                    section.style.color = Color::BLACK;
-                }
+            if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                text_color.0 = Color::BLACK;
                 commands
                     .entity(highlighted_tile_entity)
                     .remove::<HighlightedLabel>();
@@ -358,10 +348,8 @@ fn highlight_tile_labels(
             // Highlight the relevant tile's label
             if let Some(tile_entity) = tile_storage.get(&tile_pos) {
                 if let Ok(label) = tile_label_q.get(tile_entity) {
-                    if let Ok(mut tile_text) = text_q.get_mut(label.0) {
-                        for section in tile_text.sections.iter_mut() {
-                            section.style.color = palettes::tailwind::RED_600.into();
-                        }
+                    if let Ok(mut text_color) = text_q.get_mut(label.0) {
+                        text_color.0 = palettes::tailwind::RED_600.into();
                         commands.entity(tile_entity).insert(HighlightedLabel);
                     }
                 }
diff --git a/examples/move_tile.rs b/examples/move_tile.rs
index d88e2933..436d6988 100644
--- a/examples/move_tile.rs
+++ b/examples/move_tile.rs
@@ -3,7 +3,7 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
diff --git a/examples/random_map.rs b/examples/random_map.rs
index fe32b727..592311ef 100644
--- a/examples/random_map.rs
+++ b/examples/random_map.rs
@@ -8,7 +8,7 @@ use rand::{thread_rng, Rng};
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -57,7 +57,7 @@ struct LastUpdate {
 // In this example it's better not to use the default `MapQuery` SystemParam as
 // it's faster to do it this way:
 fn random(time: ResMut<Time>, mut query: Query<(&mut TileTextureIndex, &mut LastUpdate)>) {
-    let current_time = time.elapsed_seconds_f64();
+    let current_time = time.elapsed_secs_f64();
     let mut random = thread_rng();
     for (mut tile, mut last_update) in query.iter_mut() {
         if (current_time - last_update.value) > 0.2 {
diff --git a/examples/remove_tiles.rs b/examples/remove_tiles.rs
index 51a1d4f9..bfa7e752 100644
--- a/examples/remove_tiles.rs
+++ b/examples/remove_tiles.rs
@@ -5,7 +5,7 @@ use rand::{thread_rng, Rng};
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -56,7 +56,7 @@ fn remove_tiles(
     time: Res<Time>,
     mut last_update_query: Query<(&mut LastUpdate, &mut TileStorage)>,
 ) {
-    let current_time = time.elapsed_seconds_f64();
+    let current_time = time.elapsed_secs_f64();
     for (mut last_update, mut tile_storage) in last_update_query.iter_mut() {
         // Remove a tile every half second.
         if (current_time - last_update.value) > 0.1 {
diff --git a/examples/spacing.rs b/examples/spacing.rs
index 05929a5d..80f3dc47 100644
--- a/examples/spacing.rs
+++ b/examples/spacing.rs
@@ -3,7 +3,7 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles-spaced.png");
 
diff --git a/examples/texture_container.rs b/examples/texture_container.rs
index f716c132..d6c0f54a 100644
--- a/examples/texture_container.rs
+++ b/examples/texture_container.rs
@@ -20,7 +20,7 @@ mod no_atlas {
 
     #[cfg(not(feature = "atlas"))]
     fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-        commands.spawn(Camera2dBundle::default());
+        commands.spawn(Camera2d);
 
         // Most of the work is happening bevy side. In this case, using the `ktx2` feature. If this
         // feature is not turned on, that the image won't properly be interpreted as a texture
diff --git a/examples/texture_vec.rs b/examples/texture_vec.rs
index 84202f97..60d5ed82 100644
--- a/examples/texture_vec.rs
+++ b/examples/texture_vec.rs
@@ -19,7 +19,7 @@ mod no_atlas {
     const COORD_SYS: HexCoordSystem = HexCoordSystem::Row;
 
     fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-        commands.spawn(Camera2dBundle::default());
+        commands.spawn(Camera2d);
 
         let image_handles = vec![
             asset_server.load("hex-tile-0.png"),
diff --git a/examples/tiled.rs b/examples/tiled.rs
index 79e59292..7574ea4c 100644
--- a/examples/tiled.rs
+++ b/examples/tiled.rs
@@ -4,9 +4,9 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    let map_handle: Handle<helpers::tiled::TiledMap> = asset_server.load("map.tmx");
+    let map_handle = helpers::tiled::TiledMapHandle(asset_server.load("map.tmx"));
 
     commands.spawn(helpers::tiled::TiledMapBundle {
         tiled_map: map_handle,
diff --git a/examples/tiled_rotated.rs b/examples/tiled_rotated.rs
index bca68123..a1616cbe 100644
--- a/examples/tiled_rotated.rs
+++ b/examples/tiled_rotated.rs
@@ -4,9 +4,9 @@ use bevy_ecs_tilemap::prelude::*;
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    let map_handle: Handle<helpers::tiled::TiledMap> = asset_server.load("rotate.tmx");
+    let map_handle = helpers::tiled::TiledMapHandle(asset_server.load("rotate.tmx"));
 
     commands.spawn(helpers::tiled::TiledMapBundle {
         tiled_map: map_handle,
diff --git a/examples/visibility.rs b/examples/visibility.rs
index 967ccab4..c10a1cad 100644
--- a/examples/visibility.rs
+++ b/examples/visibility.rs
@@ -5,7 +5,7 @@ use rand::{thread_rng, Rng};
 mod helpers;
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     let texture_handle: Handle<Image> = asset_server.load("tiles.png");
 
@@ -56,7 +56,7 @@ fn remove_tiles(
     mut last_update_query: Query<(&mut LastUpdate, &TileStorage)>,
     mut tile_query: Query<&mut TileVisible>,
 ) {
-    let current_time = time.elapsed_seconds_f64();
+    let current_time = time.elapsed_secs_f64();
     for (mut last_update, tile_storage) in last_update_query.iter_mut() {
         // Remove a tile every half second.
         if (current_time - last_update.value) > 0.1 {
diff --git a/src/array_texture_preload.rs b/src/array_texture_preload.rs
index 9a894237..28746eff 100644
--- a/src/array_texture_preload.rs
+++ b/src/array_texture_preload.rs
@@ -3,11 +3,9 @@ use crate::{
     prelude::{TilemapSpacing, TilemapTileSize},
     TilemapTexture,
 };
-use bevy::render::{
-    render_resource::{FilterMode, TextureFormat},
-    texture::BevyDefault,
-};
+use bevy::render::render_resource::{FilterMode, TextureFormat};
 use bevy::{
+    image::BevyDefault,
     prelude::{Assets, Image, Res, ResMut, Resource},
     render::Extract,
 };
diff --git a/src/helpers/filling.rs b/src/helpers/filling.rs
index 77cad55b..60dfd894 100644
--- a/src/helpers/filling.rs
+++ b/src/helpers/filling.rs
@@ -5,7 +5,7 @@ use crate::prelude::HexCoordSystem;
 use crate::tiles::{TileBundle, TileColor, TilePos, TileTextureIndex};
 use crate::{TileStorage, TilemapSize};
 use bevy::hierarchy::BuildChildren;
-use bevy::prelude::{Color, Commands};
+use bevy::prelude::{ChildBuild, Color, Commands};
 
 /// Fills an entire tile storage with the given tile.
 pub fn fill_tilemap(
diff --git a/src/lib.rs b/src/lib.rs
index 4783bd08..4db09e98 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,11 +20,12 @@ use bevy::{
         IntoSystemConfigs, IntoSystemSetConfigs, Plugin, Query, Reflect, ReflectComponent,
         SystemSet, Transform, ViewVisibility, Visibility,
     },
+    render::sync_world::SyncToRenderWorld,
     time::TimeSystem,
 };
 
 #[cfg(feature = "render")]
-use bevy::prelude::Handle;
+use render::material::MaterialTilemapHandle;
 
 use map::{
     TilemapGridSize, TilemapSize, TilemapSpacing, TilemapTexture, TilemapTextureSize,
@@ -131,7 +132,8 @@ pub struct MaterialTilemapBundle<M: MaterialTilemap> {
     pub view_visibility: ViewVisibility,
     /// User indication of whether tilemap should be frustum culled.
     pub frustum_culling: FrustumCulling,
-    pub material: Handle<M>,
+    pub material: MaterialTilemapHandle<M>,
+    pub sync: SyncToRenderWorld,
 }
 
 #[cfg(not(feature = "render"))]
@@ -156,6 +158,7 @@ pub struct StandardTilemapBundle {
     pub view_visibility: ViewVisibility,
     /// User indication of whether tilemap should be frustum culled.
     pub frustum_culling: FrustumCulling,
+    pub sync: SyncToRenderWorld,
 }
 
 /// A module which exports commonly used dependencies.
@@ -170,6 +173,8 @@ pub mod prelude {
     #[cfg(feature = "render")]
     pub use crate::render::material::MaterialTilemap;
     #[cfg(feature = "render")]
+    pub use crate::render::material::MaterialTilemapHandle;
+    #[cfg(feature = "render")]
     pub use crate::render::material::MaterialTilemapKey;
     #[cfg(feature = "render")]
     pub use crate::render::material::MaterialTilemapPlugin;
diff --git a/src/render/chunk.rs b/src/render/chunk.rs
index 93319f58..da9da83e 100644
--- a/src/render/chunk.rs
+++ b/src/render/chunk.rs
@@ -1,13 +1,14 @@
 use std::hash::{Hash, Hasher};
 
 use bevy::render::render_asset::RenderAssetUsages;
+use bevy::render::render_resource::Buffer;
 use bevy::render::{mesh::BaseMeshPipelineKey, primitives::Aabb};
 use bevy::{math::Mat4, render::mesh::PrimitiveTopology};
 use bevy::{
     math::{UVec2, UVec3, UVec4, Vec2, Vec3Swizzles, Vec4, Vec4Swizzles},
     prelude::{Component, Entity, GlobalTransform, Mesh, Vec3},
     render::{
-        mesh::{GpuBufferInfo, GpuMesh, Indices, VertexAttributeValues},
+        mesh::{Indices, RenderMesh, RenderMeshBufferInfo, VertexAttributeValues},
         render_resource::{BufferInitDescriptor, BufferUsages, ShaderType},
         renderer::RenderDevice,
     },
@@ -214,7 +215,9 @@ pub struct RenderChunk2d {
     pub texture: TilemapTexture,
     pub texture_size: Vec2,
     pub mesh: Mesh,
-    pub gpu_mesh: Option<GpuMesh>,
+    pub render_mesh: Option<RenderMesh>,
+    pub vertex_buffer: Option<Buffer>,
+    pub index_buffer: Option<Buffer>,
     pub dirty_mesh: bool,
     pub visible: bool,
     pub frustum_culling: bool,
@@ -250,7 +253,7 @@ impl RenderChunk2d {
         let aabb = chunk_aabb(size_in_tiles, &grid_size, &tile_size, &map_type);
         Self {
             dirty_mesh: true,
-            gpu_mesh: None,
+            render_mesh: None,
             id,
             index: *index,
             position,
@@ -268,6 +271,8 @@ impl RenderChunk2d {
                 bevy::render::render_resource::PrimitiveTopology::TriangleList,
                 RenderAssetUsages::default(),
             ),
+            vertex_buffer: None,
+            index_buffer: None,
             spacing,
             texture_size,
             texture,
@@ -429,33 +434,28 @@ impl RenderChunk2d {
             );
             self.mesh.insert_indices(Indices::U32(indices));
 
-            let vertex_buffer_data = self.mesh.get_vertex_buffer_data();
+            let vertex_buffer_data = self.mesh.create_packed_vertex_buffer_data();
             let vertex_buffer = device.create_buffer_with_data(&BufferInitDescriptor {
                 usage: BufferUsages::VERTEX,
                 label: Some("Mesh Vertex Buffer"),
                 contents: &vertex_buffer_data,
             });
 
-            let buffer_info =
-                self.mesh
-                    .get_index_buffer_bytes()
-                    .map_or(GpuBufferInfo::NonIndexed {}, |data| {
-                        GpuBufferInfo::Indexed {
-                            buffer: device.create_buffer_with_data(&BufferInitDescriptor {
-                                usage: BufferUsages::INDEX,
-                                contents: data,
-                                label: Some("Mesh Index Buffer"),
-                            }),
-                            count: self.mesh.indices().unwrap().len() as u32,
-                            index_format: self.mesh.indices().unwrap().into(),
-                        }
-                    });
+            let index_buffer = device.create_buffer_with_data(&BufferInitDescriptor {
+                usage: BufferUsages::INDEX,
+                contents: self.mesh.get_index_buffer_bytes().unwrap(),
+                label: Some("Mesh Index Buffer"),
+            });
+
+            let buffer_info = RenderMeshBufferInfo::Indexed {
+                count: self.mesh.indices().unwrap().len() as u32,
+                index_format: self.mesh.indices().unwrap().into(),
+            };
 
             let mesh_vertex_buffer_layout = self
                 .mesh
                 .get_mesh_vertex_buffer_layout(mesh_vertex_buffer_layouts);
-            self.gpu_mesh = Some(GpuMesh {
-                vertex_buffer,
+            self.render_mesh = Some(RenderMesh {
                 vertex_count: self.mesh.count_vertices() as u32,
                 buffer_info,
                 morph_targets: None,
@@ -464,6 +464,8 @@ impl RenderChunk2d {
                     PrimitiveTopology::TriangleList,
                 ),
             });
+            self.vertex_buffer = Some(vertex_buffer);
+            self.index_buffer = Some(index_buffer);
             self.dirty_mesh = false;
         }
     }
diff --git a/src/render/draw.rs b/src/render/draw.rs
index 26c8f7ec..27d47379 100644
--- a/src/render/draw.rs
+++ b/src/render/draw.rs
@@ -7,9 +7,8 @@ use bevy::{
         SystemParamItem,
     },
     math::UVec4,
-    prelude::Handle,
     render::{
-        mesh::GpuBufferInfo,
+        mesh::RenderMeshBufferInfo,
         render_phase::{RenderCommand, RenderCommandResult, TrackedRenderPass},
         render_resource::PipelineCache,
         view::ViewUniformOffset,
@@ -21,7 +20,7 @@ use crate::TilemapTexture;
 
 use super::{
     chunk::{ChunkId, RenderChunk2dStorage, TilemapUniformData},
-    material::{MaterialTilemap, RenderMaterialsTilemap},
+    material::{MaterialTilemap, MaterialTilemapHandle, RenderMaterialsTilemap},
     prepare::MeshUniform,
     queue::{ImageBindGroups, TilemapViewBindGroup, TransformBindGroup},
     DynamicUniformIndex,
@@ -66,7 +65,7 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetTransformBindGroup<I> {
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
         let Some((transform_index, tilemap_index)) = uniform_indices else {
-            return RenderCommandResult::Failure;
+            return RenderCommandResult::Skip;
         };
 
         pass.set_bind_group(
@@ -93,7 +92,7 @@ impl<const I: usize> RenderCommand<Transparent2d> for SetTextureBindGroup<I> {
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
         let Some(texture) = texture else {
-            return RenderCommandResult::Failure;
+            return RenderCommandResult::Skip;
         };
 
         let bind_group = image_bind_groups.into_inner().values.get(texture).unwrap();
@@ -123,7 +122,7 @@ impl RenderCommand<Transparent2d> for SetItemPipeline {
             pass.set_render_pipeline(pipeline);
             RenderCommandResult::Success
         } else {
-            RenderCommandResult::Failure
+            RenderCommandResult::Skip
         }
     }
 }
@@ -149,7 +148,10 @@ pub struct SetMaterialBindGroup<M: MaterialTilemap, const I: usize>(PhantomData<
 impl<M: MaterialTilemap, const I: usize> RenderCommand<Transparent2d>
     for SetMaterialBindGroup<M, I>
 {
-    type Param = (SRes<RenderMaterialsTilemap<M>>, SQuery<&'static Handle<M>>);
+    type Param = (
+        SRes<RenderMaterialsTilemap<M>>,
+        SQuery<&'static MaterialTilemapHandle<M>>,
+    );
     type ViewQuery = ();
     type ItemQuery = Read<TilemapId>;
     #[inline]
@@ -161,7 +163,7 @@ impl<M: MaterialTilemap, const I: usize> RenderCommand<Transparent2d>
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
         let Some(id) = id else {
-            return RenderCommandResult::Failure;
+            return RenderCommandResult::Skip;
         };
 
         if let Ok(material_handle) = material_handles.get(id.0) {
@@ -190,7 +192,7 @@ impl RenderCommand<Transparent2d> for DrawMesh {
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
         let Some((chunk_id, tilemap_id)) = ids else {
-            return RenderCommandResult::Failure;
+            return RenderCommandResult::Skip;
         };
 
         if let Some(chunk) = chunk_storage.into_inner().get(&UVec4::new(
@@ -199,19 +201,26 @@ impl RenderCommand<Transparent2d> for DrawMesh {
             chunk_id.0.z,
             tilemap_id.0.index(),
         )) {
-            if let Some(gpu_mesh) = &chunk.gpu_mesh {
-                pass.set_vertex_buffer(0, gpu_mesh.vertex_buffer.slice(..));
-                match &gpu_mesh.buffer_info {
-                    GpuBufferInfo::Indexed {
-                        buffer,
+            if let (Some(render_mesh), Some(vertex_buffer), Some(index_buffer)) = (
+                &chunk.render_mesh,
+                &chunk.vertex_buffer,
+                &chunk.index_buffer,
+            ) {
+                if render_mesh.vertex_count == 0 {
+                    return RenderCommandResult::Skip;
+                }
+
+                pass.set_vertex_buffer(0, vertex_buffer.slice(..));
+                match &render_mesh.buffer_info {
+                    RenderMeshBufferInfo::Indexed {
                         index_format,
                         count,
                     } => {
-                        pass.set_index_buffer(buffer.slice(..), 0, *index_format);
+                        pass.set_index_buffer(index_buffer.slice(..), 0, *index_format);
                         pass.draw_indexed(0..*count, 0, 0..1);
                     }
-                    GpuBufferInfo::NonIndexed {} => {
-                        pass.draw(0..gpu_mesh.vertex_count, 0..1);
+                    RenderMeshBufferInfo::NonIndexed {} => {
+                        pass.draw(0..render_mesh.vertex_count, 0..1);
                     }
                 }
             }
diff --git a/src/render/extract.rs b/src/render/extract.rs
index 06fd69a6..d63671e4 100644
--- a/src/render/extract.rs
+++ b/src/render/extract.rs
@@ -2,6 +2,7 @@ use bevy::math::Affine3A;
 use bevy::render::primitives::{Aabb, Frustum};
 use bevy::render::render_resource::FilterMode;
 use bevy::render::render_resource::TextureFormat;
+use bevy::render::sync_world::RenderEntity;
 use bevy::{prelude::*, render::Extract, utils::HashMap};
 
 use crate::prelude::TilemapGridSize;
@@ -18,8 +19,10 @@ use crate::{
     FrustumCulling,
 };
 
-use super::RemovedMapEntity;
-use super::{chunk::PackedTileData, RemovedTileEntity};
+use super::chunk::PackedTileData;
+
+#[derive(Component)]
+pub struct ChangedInMainWorld;
 
 #[derive(Component)]
 pub struct ExtractedTile {
@@ -33,26 +36,7 @@ pub struct ExtractedTile {
 #[derive(Bundle)]
 pub struct ExtractedTileBundle {
     tile: ExtractedTile,
-}
-
-#[derive(Component)]
-pub struct ExtractedRemovedTile {
-    pub entity: Entity,
-}
-
-#[derive(Bundle)]
-pub struct ExtractedRemovedTileBundle {
-    tile: ExtractedRemovedTile,
-}
-
-#[derive(Component)]
-pub struct ExtractedRemovedMap {
-    pub entity: Entity,
-}
-
-#[derive(Bundle)]
-pub struct ExtractedRemovedMapBundle {
-    map: ExtractedRemovedMap,
+    changed: ChangedInMainWorld,
 }
 
 #[derive(Bundle)]
@@ -68,6 +52,7 @@ pub struct ExtractedTilemapBundle {
     visibility: InheritedVisibility,
     frustum_culling: FrustumCulling,
     render_settings: TilemapRenderSettings,
+    changed: ChangedInMainWorld,
 }
 
 #[derive(Component)]
@@ -167,6 +152,7 @@ impl ExtractedTilemapTexture {
 #[derive(Bundle)]
 pub(crate) struct ExtractedTilemapTextureBundle {
     data: ExtractedTilemapTexture,
+    changed: ChangedInMainWorld,
 }
 
 #[derive(Component, Debug)]
@@ -188,7 +174,7 @@ pub fn extract(
     changed_tiles_query: Extract<
         Query<
             (
-                Entity,
+                &RenderEntity,
                 &TilePos,
                 &TilePosOld,
                 &TilemapId,
@@ -210,7 +196,7 @@ pub fn extract(
     >,
     tilemap_query: Extract<
         Query<(
-            Entity,
+            &RenderEntity,
             &GlobalTransform,
             &TilemapTileSize,
             &TilemapSpacing,
@@ -241,7 +227,7 @@ pub fn extract(
             )>,
         >,
     >,
-    camera_query: Extract<Query<(Entity, &Frustum), With<Camera>>>,
+    camera_query: Extract<Query<(&RenderEntity, &Frustum), With<Camera>>>,
     images: Extract<Res<Assets<Image>>>,
     time: Extract<Res<Time>>,
 ) {
@@ -250,7 +236,7 @@ pub fn extract(
     let mut extracted_tilemap_textures = Vec::new();
     // Process all tiles
     for (
-        entity,
+        render_entity,
         tile_pos,
         tile_pos_old,
         tilemap_id,
@@ -288,9 +274,9 @@ pub fn extract(
         let data = tilemap_query.get(tilemap_id.0).unwrap();
 
         extracted_tilemaps.insert(
-            data.0,
+            data.0.id(),
             (
-                data.0,
+                data.0.id(),
                 ExtractedTilemapBundle {
                     transform: *data.1,
                     tile_size: *data.2,
@@ -303,20 +289,22 @@ pub fn extract(
                     visibility: *data.8,
                     frustum_culling: *data.9,
                     render_settings: *data.10,
+                    changed: ChangedInMainWorld,
                 },
             ),
         );
 
         extracted_tiles.push((
-            entity,
+            render_entity.id(),
             ExtractedTileBundle {
                 tile: ExtractedTile {
-                    entity,
+                    entity: render_entity.id(),
                     position: *tile_pos,
                     old_position: *tile_pos_old,
                     tile,
-                    tilemap_id: *tilemap_id,
+                    tilemap_id: TilemapId(data.0.id()),
                 },
+                changed: ChangedInMainWorld,
             },
         ));
     }
@@ -324,9 +312,9 @@ pub fn extract(
     for tilemap_entity in changed_tilemap_query.iter() {
         if let Ok(data) = tilemap_query.get(tilemap_entity) {
             extracted_tilemaps.insert(
-                data.0,
+                data.0.id(),
                 (
-                    data.0,
+                    data.0.id(),
                     ExtractedTilemapBundle {
                         transform: *data.1,
                         tile_size: *data.2,
@@ -339,72 +327,51 @@ pub fn extract(
                         visibility: *data.8,
                         frustum_culling: *data.9,
                         render_settings: *data.10,
+                        changed: ChangedInMainWorld,
                     },
                 ),
             );
         }
     }
 
-    let extracted_tilemaps: Vec<(Entity, ExtractedTilemapBundle)> =
-        extracted_tilemaps.drain().map(|kv| kv.1).collect();
+    let extracted_tilemaps: Vec<_> = extracted_tilemaps.drain().map(|(_, val)| val).collect();
 
     // Extracts tilemap textures.
-    for (entity, _, tile_size, tile_spacing, _, _, texture, _, _, _, _) in tilemap_query.iter() {
+    for (render_entity, _, tile_size, tile_spacing, _, _, texture, _, _, _, _) in
+        tilemap_query.iter()
+    {
         if texture.verify_ready(&images) {
             extracted_tilemap_textures.push((
-                entity,
+                render_entity.id(),
                 ExtractedTilemapTextureBundle {
                     data: ExtractedTilemapTexture::new(
-                        entity,
+                        render_entity.id(),
                         texture.clone_weak(),
                         *tile_size,
                         *tile_spacing,
                         default_image_settings.0.min_filter.into(),
                         &images,
                     ),
+                    changed: ChangedInMainWorld,
                 },
             ))
         }
     }
 
-    for (entity, frustum) in camera_query.iter() {
+    for (render_entity, frustum) in camera_query.iter() {
         commands
-            .get_or_spawn(entity)
+            .entity(render_entity.id())
             .insert(ExtractedFrustum { frustum: *frustum });
     }
 
-    commands.insert_or_spawn_batch(extracted_tiles);
-    commands.insert_or_spawn_batch(extracted_tilemaps);
-    commands.insert_or_spawn_batch(extracted_tilemap_textures);
-    commands.insert_resource(SecondsSinceStartup(time.elapsed_seconds_f64() as f32));
+    commands.insert_batch(extracted_tiles);
+    commands.insert_batch(extracted_tilemaps);
+    commands.insert_batch(extracted_tilemap_textures);
+    commands.insert_resource(SecondsSinceStartup(time.elapsed_secs_f64() as f32));
 }
 
-pub fn extract_removal(
-    mut commands: Commands,
-    removed_tiles_query: Extract<Query<(Entity, &RemovedTileEntity)>>,
-    removed_maps_query: Extract<Query<(Entity, &RemovedMapEntity)>>,
-) {
-    let mut removed_tiles: Vec<(Entity, ExtractedRemovedTileBundle)> = Vec::new();
-    for (entity, removed) in removed_tiles_query.iter() {
-        removed_tiles.push((
-            entity,
-            ExtractedRemovedTileBundle {
-                tile: ExtractedRemovedTile { entity: removed.0 },
-            },
-        ));
-    }
-
-    commands.insert_or_spawn_batch(removed_tiles);
-
-    let mut removed_maps: Vec<(Entity, ExtractedRemovedMapBundle)> = Vec::new();
-    for (entity, removed) in removed_maps_query.iter() {
-        removed_maps.push((
-            entity,
-            ExtractedRemovedMapBundle {
-                map: ExtractedRemovedMap { entity: removed.0 },
-            },
-        ));
+pub fn remove_changed(mut commands: Commands, query: Query<Entity, With<ChangedInMainWorld>>) {
+    for entity in &query {
+        commands.entity(entity).remove::<ChangedInMainWorld>();
     }
-
-    commands.insert_or_spawn_batch(removed_maps);
 }
diff --git a/src/render/material.rs b/src/render/material.rs
index d7382412..4a089c1c 100644
--- a/src/render/material.rs
+++ b/src/render/material.rs
@@ -1,10 +1,15 @@
+use crate::prelude::{TilemapId, TilemapRenderSettings};
+#[cfg(not(feature = "atlas"))]
+use bevy::render::renderer::RenderQueue;
 use bevy::{
     core_pipeline::core_2d::Transparent2d,
+    ecs::system::{StaticSystemParam, SystemParamItem},
+    log::error,
     math::FloatOrd,
     prelude::*,
     reflect::TypePath,
     render::{
-        extract_component::ExtractComponentPlugin,
+        extract_component::{ExtractComponent, ExtractComponentPlugin},
         globals::GlobalsBuffer,
         render_asset::RenderAssets,
         render_phase::{
@@ -16,19 +21,14 @@ use bevy::{
             ShaderRef, SpecializedRenderPipeline, SpecializedRenderPipelines,
         },
         renderer::RenderDevice,
-        texture::{FallbackImage, GpuImage},
-        view::{ExtractedView, ViewUniforms, VisibleEntities},
+        texture::GpuImage,
+        view::{ExtractedView, RenderVisibleEntities, ViewUniforms},
         Extract, Render, RenderApp, RenderSet,
     },
     utils::{HashMap, HashSet},
 };
 use std::{hash::Hash, marker::PhantomData};
 
-#[cfg(not(feature = "atlas"))]
-use bevy::render::renderer::RenderQueue;
-
-use crate::prelude::{TilemapId, TilemapRenderSettings};
-
 use super::{
     chunk::{ChunkId, RenderChunk2dStorage},
     draw::DrawTilemapMaterial,
@@ -99,6 +99,34 @@ where
     }
 }
 
+#[derive(Component, Clone, Debug, Deref, DerefMut, Reflect, PartialEq, Eq, ExtractComponent)]
+#[reflect(Component, Default)]
+pub struct MaterialTilemapHandle<M: MaterialTilemap>(pub Handle<M>);
+
+impl<M: MaterialTilemap> Default for MaterialTilemapHandle<M> {
+    fn default() -> Self {
+        Self(Handle::default())
+    }
+}
+
+impl<M: MaterialTilemap> From<Handle<M>> for MaterialTilemapHandle<M> {
+    fn from(handle: Handle<M>) -> Self {
+        Self(handle)
+    }
+}
+
+impl<M: MaterialTilemap> From<MaterialTilemapHandle<M>> for AssetId<M> {
+    fn from(tilemap: MaterialTilemapHandle<M>) -> Self {
+        tilemap.id()
+    }
+}
+
+impl<M: MaterialTilemap> From<&MaterialTilemapHandle<M>> for AssetId<M> {
+    fn from(tilemap: &MaterialTilemapHandle<M>) -> Self {
+        tilemap.id()
+    }
+}
+
 pub struct MaterialTilemapPlugin<M: MaterialTilemap>(PhantomData<M>);
 
 impl<M: MaterialTilemap> Default for MaterialTilemapPlugin<M> {
@@ -113,7 +141,7 @@ where
 {
     fn build(&self, app: &mut App) {
         app.init_asset::<M>()
-            .add_plugins(ExtractComponentPlugin::<Handle<M>>::extract_visible());
+            .add_plugins(ExtractComponentPlugin::<MaterialTilemapHandle<M>>::extract_visible());
     }
 
     fn finish(&self, app: &mut App) {
@@ -307,25 +335,21 @@ fn prepare_materials_tilemap<M: MaterialTilemap>(
     mut extracted_assets: ResMut<ExtractedMaterialsTilemap<M>>,
     mut render_materials: ResMut<RenderMaterialsTilemap<M>>,
     render_device: Res<RenderDevice>,
-    images: Res<RenderAssets<GpuImage>>,
-    fallback_image: Res<FallbackImage>,
     pipeline: Res<MaterialTilemapPipeline<M>>,
+    mut param: StaticSystemParam<M::Param>,
 ) {
     let queued_assets = std::mem::take(&mut prepare_next_frame.assets);
     for (handle, material) in queued_assets {
-        match prepare_material_tilemap(
-            &material,
-            &render_device,
-            &images,
-            &fallback_image,
-            &pipeline,
-        ) {
+        match prepare_material_tilemap(&material, &render_device, &pipeline, &mut param) {
             Ok(prepared_asset) => {
                 render_materials.insert(handle, prepared_asset);
             }
             Err(AsBindGroupError::RetryNextUpdate) => {
                 prepare_next_frame.assets.push((handle, material));
             }
+            Err(AsBindGroupError::InvalidSamplerType(_, _, _)) => {
+                error!("Encountered AsBindGroupError::InvalidSamplerType while preparing material");
+            }
         }
     }
 
@@ -334,19 +358,16 @@ fn prepare_materials_tilemap<M: MaterialTilemap>(
     }
 
     for (handle, material) in std::mem::take(&mut extracted_assets.extracted) {
-        match prepare_material_tilemap(
-            &material,
-            &render_device,
-            &images,
-            &fallback_image,
-            &pipeline,
-        ) {
+        match prepare_material_tilemap(&material, &render_device, &pipeline, &mut param) {
             Ok(prepared_asset) => {
                 render_materials.insert(handle, prepared_asset);
             }
             Err(AsBindGroupError::RetryNextUpdate) => {
                 prepare_next_frame.assets.push((handle, material));
             }
+            Err(AsBindGroupError::InvalidSamplerType(_, _, _)) => {
+                error!("Encountered AsBindGroupError::InvalidSamplerType while preparing material");
+            }
         }
     }
 }
@@ -354,16 +375,11 @@ fn prepare_materials_tilemap<M: MaterialTilemap>(
 fn prepare_material_tilemap<M: MaterialTilemap>(
     material: &M,
     render_device: &RenderDevice,
-    images: &RenderAssets<GpuImage>,
-    fallback_image: &FallbackImage,
     pipeline: &MaterialTilemapPipeline<M>,
+    param: &mut SystemParamItem<M::Param>,
 ) -> Result<PreparedMaterialTilemap<M>, AsBindGroupError> {
-    let prepared = material.as_bind_group(
-        &pipeline.material_tilemap_layout,
-        render_device,
-        images,
-        fallback_image,
-    )?;
+    let prepared =
+        material.as_bind_group(&pipeline.material_tilemap_layout, render_device, param)?;
     Ok(PreparedMaterialTilemap {
         bindings: prepared.bindings,
         bind_group: prepared.bind_group,
@@ -375,7 +391,7 @@ fn prepare_material_tilemap<M: MaterialTilemap>(
 pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
     chunk_storage: Res<RenderChunk2dStorage>,
     transparent_2d_draw_functions: Res<DrawFunctions<Transparent2d>>,
-    render_device: Res<RenderDevice>,
+    _render_device: Res<RenderDevice>,
     (material_tilemap_pipeline, mut material_pipelines): (
         Res<MaterialTilemapPipeline<M>>,
         ResMut<SpecializedRenderPipelines<MaterialTilemapPipeline<M>>>,
@@ -383,13 +399,12 @@ pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
     pipeline_cache: Res<PipelineCache>,
     view_uniforms: Res<ViewUniforms>,
     gpu_images: Res<RenderAssets<GpuImage>>,
-    msaa: Res<Msaa>,
     globals_buffer: Res<GlobalsBuffer>,
     (standard_tilemap_meshes, materials): (
         Query<(Entity, &ChunkId, &Transform, &TilemapId)>,
-        Query<&Handle<M>>,
+        Query<&MaterialTilemapHandle<M>>,
     ),
-    mut views: Query<(Entity, &ExtractedView, &VisibleEntities)>,
+    mut views: Query<(Entity, &ExtractedView, &Msaa, &RenderVisibleEntities)>,
     render_materials: Res<RenderMaterialsTilemap<M>>,
     #[cfg(not(feature = "atlas"))] (mut texture_array_cache, render_queue): (
         ResMut<TextureArrayCache>,
@@ -400,7 +415,7 @@ pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
     M::Data: PartialEq + Eq + Hash + Clone,
 {
     #[cfg(not(feature = "atlas"))]
-    texture_array_cache.queue(&render_device, &render_queue, &gpu_images);
+    texture_array_cache.queue(&_render_device, &render_queue, &gpu_images);
 
     if standard_tilemap_meshes.is_empty() {
         return;
@@ -410,7 +425,7 @@ pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
         return;
     }
 
-    for (view_entity, view, visible_entities) in views.iter_mut() {
+    for (view_entity, view, msaa, visible_entities) in views.iter_mut() {
         let Some(transparent_phase) = transparent_render_phases.get_mut(&view_entity) else {
             continue;
         };
@@ -423,7 +438,7 @@ pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
         for (entity, chunk_id, transform, tilemap_id) in standard_tilemap_meshes.iter() {
             if !visible_entities
                 .iter::<With<TilemapRenderSettings>>()
-                .any(|&entity| entity.index() == tilemap_id.0.index())
+                .any(|(entity, _main_entity)| entity.index() == tilemap_id.0.index())
             {
                 continue;
             }
@@ -474,7 +489,7 @@ pub fn queue_material_tilemap_meshes<M: MaterialTilemap>(
                     transform.translation.z
                 };
                 transparent_phase.add(Transparent2d {
-                    entity,
+                    entity: (entity, tilemap_id.0.into()),
                     draw_function: draw_tilemap,
                     pipeline: pipeline_id,
                     sort_key: FloatOrd(z),
@@ -496,8 +511,11 @@ pub fn bind_material_tilemap_meshes<M: MaterialTilemap>(
     gpu_images: Res<RenderAssets<GpuImage>>,
     globals_buffer: Res<GlobalsBuffer>,
     mut image_bind_groups: ResMut<ImageBindGroups>,
-    (standard_tilemap_meshes, materials): (Query<(&ChunkId, &TilemapId)>, Query<&Handle<M>>),
-    mut views: Query<(Entity, &VisibleEntities)>,
+    (standard_tilemap_meshes, materials): (
+        Query<(&ChunkId, &TilemapId)>,
+        Query<&MaterialTilemapHandle<M>>,
+    ),
+    mut views: Query<(Entity, &RenderVisibleEntities)>,
     render_materials: Res<RenderMaterialsTilemap<M>>,
     modified_image_ids: Res<ModifiedImageIds>,
     #[cfg(not(feature = "atlas"))] (mut texture_array_cache, render_queue): (
@@ -541,7 +559,7 @@ pub fn bind_material_tilemap_meshes<M: MaterialTilemap>(
             for (chunk_id, tilemap_id) in standard_tilemap_meshes.iter() {
                 if !visible_entities
                     .iter::<With<TilemapRenderSettings>>()
-                    .any(|&entity| entity.index() == tilemap_id.0.index())
+                    .any(|(entity, _main_entity)| entity.index() == tilemap_id.0.index())
                 {
                     continue;
                 }
diff --git a/src/render/mod.rs b/src/render/mod.rs
index 2f0c7a56..07d01d5a 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -3,13 +3,15 @@ use std::marker::PhantomData;
 use bevy::{
     asset::load_internal_asset,
     core_pipeline::core_2d::Transparent2d,
+    image::ImageSamplerDescriptor,
     prelude::*,
     render::{
+        extract_component::{ExtractComponent, ExtractComponentPlugin},
         extract_resource::{extract_resource, ExtractResource},
         mesh::MeshVertexAttribute,
         render_phase::AddRenderCommand,
         render_resource::{FilterMode, SpecializedRenderPipelines, VertexFormat},
-        texture::ImageSamplerDescriptor,
+        sync_world::RenderEntity,
         view::{check_visibility, VisibilitySystems},
         Render, RenderApp, RenderSet,
     },
@@ -20,6 +22,7 @@ use bevy::{
 use bevy::render::renderer::RenderDevice;
 #[cfg(not(feature = "atlas"))]
 use bevy::render::texture::GpuImage;
+use extract::remove_changed;
 
 use crate::{
     prelude::TilemapRenderSettings,
@@ -114,7 +117,12 @@ impl Plugin for TilemapRenderingPlugin {
         app.add_systems(Update, set_texture_to_copy_src);
 
         app.add_systems(First, clear_removed.in_set(TilemapFirstSet));
-        app.add_systems(PostUpdate, (removal_helper, removal_helper_tilemap));
+
+        app.add_observer(on_remove_tile);
+        app.add_observer(on_remove_tilemap);
+
+        app.add_plugins(ExtractComponentPlugin::<RemovedTileEntity>::default());
+        app.add_plugins(ExtractComponentPlugin::<RemovedMapEntity>::default());
 
         app.add_plugins(MaterialTilemapPlugin::<StandardTilemapMaterial>::default());
 
@@ -246,11 +254,7 @@ impl Plugin for TilemapRenderingPlugin {
             .insert_resource(SecondsSinceStartup(0.0))
             .add_systems(
                 ExtractSchedule,
-                (
-                    extract::extract,
-                    extract::extract_removal,
-                    extract_resource::<ModifiedImageIds>,
-                ),
+                (extract::extract, extract_resource::<ModifiedImageIds>),
             )
             .add_systems(
                 Render,
@@ -262,6 +266,7 @@ impl Plugin for TilemapRenderingPlugin {
                 Render,
                 queue::queue_transform_bind_group.in_set(RenderSet::PrepareBindGroups),
             )
+            .add_systems(Render, remove_changed.in_set(RenderSet::Cleanup))
             .init_resource::<ImageBindGroups>()
             .init_resource::<SpecializedRenderPipelines<TilemapPipeline>>()
             .init_resource::<MeshUniformResource>()
@@ -303,24 +308,30 @@ pub const ATTRIBUTE_TEXTURE: MeshVertexAttribute =
 pub const ATTRIBUTE_COLOR: MeshVertexAttribute =
     MeshVertexAttribute::new("Color", 231497124, VertexFormat::Float32x4);
 
-#[derive(Component)]
-pub struct RemovedTileEntity(pub Entity);
+#[derive(Component, ExtractComponent, Clone)]
 
-#[derive(Component)]
-pub struct RemovedMapEntity(pub Entity);
+pub struct RemovedTileEntity(pub RenderEntity);
 
-fn removal_helper(mut commands: Commands, mut removed_query: RemovedComponents<TilePos>) {
-    for entity in removed_query.read() {
-        commands.spawn(RemovedTileEntity(entity));
+#[derive(Component, ExtractComponent, Clone)]
+pub struct RemovedMapEntity(pub RenderEntity);
+
+fn on_remove_tile(
+    trigger: Trigger<OnRemove, TilePos>,
+    mut commands: Commands,
+    query: Query<&RenderEntity>,
+) {
+    if let Ok(render_entity) = query.get(trigger.entity()) {
+        commands.spawn(RemovedTileEntity(*render_entity));
     }
 }
 
-fn removal_helper_tilemap(
+fn on_remove_tilemap(
+    trigger: Trigger<OnRemove, TileStorage>,
     mut commands: Commands,
-    mut removed_query: RemovedComponents<TileStorage>,
+    query: Query<&RenderEntity>,
 ) {
-    for entity in removed_query.read() {
-        commands.spawn(RemovedMapEntity(entity));
+    if let Ok(render_entity) = query.get(trigger.entity()) {
+        commands.spawn(RemovedMapEntity(*render_entity));
     }
 }
 
diff --git a/src/render/pipeline.rs b/src/render/pipeline.rs
index 09ec40bb..3a926455 100644
--- a/src/render/pipeline.rs
+++ b/src/render/pipeline.rs
@@ -1,17 +1,20 @@
 use bevy::{
+    core_pipeline::core_2d::CORE_2D_DEPTH_FORMAT,
+    image::BevyDefault,
     prelude::{Component, FromWorld, Handle, Resource, Shader, World},
     render::{
         globals::GlobalsUniform,
         render_resource::{
             BindGroupLayout, BindGroupLayoutEntry, BindingType, BlendComponent, BlendFactor,
-            BlendOperation, BlendState, BufferBindingType, ColorTargetState, ColorWrites, Face,
-            FragmentState, FrontFace, MultisampleState, PolygonMode, PrimitiveState,
-            PrimitiveTopology, RenderPipelineDescriptor, SamplerBindingType, ShaderStages,
-            ShaderType, SpecializedRenderPipeline, TextureFormat, TextureSampleType,
-            TextureViewDimension, VertexBufferLayout, VertexFormat, VertexState, VertexStepMode,
+            BlendOperation, BlendState, BufferBindingType, ColorTargetState, ColorWrites,
+            CompareFunction, DepthBiasState, DepthStencilState, Face, FragmentState, FrontFace,
+            MultisampleState, PolygonMode, PrimitiveState, PrimitiveTopology,
+            RenderPipelineDescriptor, SamplerBindingType, ShaderStages, ShaderType,
+            SpecializedRenderPipeline, StencilFaceState, StencilState, TextureFormat,
+            TextureSampleType, TextureViewDimension, VertexBufferLayout, VertexFormat, VertexState,
+            VertexStepMode,
         },
         renderer::RenderDevice,
-        texture::BevyDefault,
         view::{ViewTarget, ViewUniform},
     },
 };
@@ -233,7 +236,22 @@ impl SpecializedRenderPipeline for TilemapPipeline {
                 topology: PrimitiveTopology::TriangleList,
                 unclipped_depth: false,
             },
-            depth_stencil: None,
+            depth_stencil: Some(DepthStencilState {
+                format: CORE_2D_DEPTH_FORMAT,
+                depth_write_enabled: false,
+                depth_compare: CompareFunction::GreaterEqual,
+                stencil: StencilState {
+                    front: StencilFaceState::IGNORE,
+                    back: StencilFaceState::IGNORE,
+                    read_mask: 0,
+                    write_mask: 0,
+                },
+                bias: DepthBiasState {
+                    constant: 0,
+                    slope_scale: 0.0,
+                    clamp: 0.0,
+                },
+            }),
             multisample: MultisampleState {
                 count: key.msaa,
                 mask: !0,
@@ -241,6 +259,7 @@ impl SpecializedRenderPipeline for TilemapPipeline {
             },
             label: Some("tilemap_pipeline".into()),
             push_constant_ranges: vec![],
+            zero_initialize_workgroup_memory: false,
         }
     }
 }
diff --git a/src/render/prepare.rs b/src/render/prepare.rs
index afdb602f..f2fc5bb2 100644
--- a/src/render/prepare.rs
+++ b/src/render/prepare.rs
@@ -9,8 +9,10 @@ use crate::render::extract::ExtractedFrustum;
 use crate::{
     prelude::TilemapGridSize, render::RenderChunkSize, render::SecondsSinceStartup, FrustumCulling,
 };
-use bevy::prelude::{InheritedVisibility, Resource};
-use bevy::{log::trace, render::mesh::MeshVertexBufferLayouts};
+use bevy::log::trace;
+use bevy::prelude::{InheritedVisibility, Resource, With};
+use bevy::render::mesh::MeshVertexBufferLayouts;
+use bevy::render::sync_world::TemporaryRenderEntity;
 use bevy::{
     math::{Mat4, UVec4},
     prelude::{Commands, Component, Entity, GlobalTransform, Query, Res, ResMut, Vec2},
@@ -20,11 +22,13 @@ use bevy::{
     },
 };
 
+use super::extract::ChangedInMainWorld;
 use super::{
     chunk::{ChunkId, PackedTileData, RenderChunk2dStorage, TilemapUniformData},
-    extract::{ExtractedRemovedMap, ExtractedRemovedTile, ExtractedTile, ExtractedTilemapTexture},
+    extract::{ExtractedTile, ExtractedTilemapTexture},
     DynamicUniformIndex,
 };
+use super::{RemovedMapEntity, RemovedTileEntity};
 
 #[derive(Resource, Default)]
 pub struct MeshUniformResource(pub DynamicUniformBuffer<MeshUniform>);
@@ -43,22 +47,25 @@ pub(crate) fn prepare(
     mut chunk_storage: ResMut<RenderChunk2dStorage>,
     mut mesh_uniforms: ResMut<MeshUniformResource>,
     mut tilemap_uniforms: ResMut<TilemapUniformResource>,
-    extracted_tiles: Query<&ExtractedTile>,
-    extracted_tilemaps: Query<(
-        Entity,
-        &GlobalTransform,
-        &TilemapTileSize,
-        &TilemapTextureSize,
-        &TilemapSpacing,
-        &TilemapGridSize,
-        &TilemapType,
-        &TilemapTexture,
-        &TilemapSize,
-        &InheritedVisibility,
-        &FrustumCulling,
-        &TilemapRenderSettings,
-    )>,
-    extracted_tilemap_textures: Query<&ExtractedTilemapTexture>,
+    extracted_tiles: Query<&ExtractedTile, With<ChangedInMainWorld>>,
+    extracted_tilemaps: Query<
+        (
+            Entity,
+            &GlobalTransform,
+            &TilemapTileSize,
+            &TilemapTextureSize,
+            &TilemapSpacing,
+            &TilemapGridSize,
+            &TilemapType,
+            &TilemapTexture,
+            &TilemapSize,
+            &InheritedVisibility,
+            &FrustumCulling,
+            &TilemapRenderSettings,
+        ),
+        With<ChangedInMainWorld>,
+    >,
+    extracted_tilemap_textures: Query<&ExtractedTilemapTexture, With<ChangedInMainWorld>>,
     extracted_frustum_query: Query<&ExtractedFrustum>,
     render_device: Res<RenderDevice>,
     render_queue: Res<RenderQueue>,
@@ -187,7 +194,6 @@ pub(crate) fn prepare(
             trace!("Frustum culled chunk: {:?}", chunk.get_index());
             continue;
         }
-        trace!("Preparing chunk: {:?}", chunk.get_index());
 
         chunk.prepare(&render_device, &mut mesh_vertex_buffer_layouts);
 
@@ -210,6 +216,7 @@ pub(crate) fn prepare(
                 index: tilemap_uniforms.0.push(&chunk_uniform),
                 marker: PhantomData,
             },
+            TemporaryRenderEntity,
         ));
     }
 
@@ -221,14 +228,14 @@ pub(crate) fn prepare(
 
 pub fn prepare_removal(
     mut chunk_storage: ResMut<RenderChunk2dStorage>,
-    removed_tiles: Query<&ExtractedRemovedTile>,
-    removed_maps: Query<&ExtractedRemovedMap>,
+    removed_tiles: Query<&RemovedTileEntity>,
+    removed_maps: Query<&RemovedMapEntity>,
 ) {
     for removed_tile in removed_tiles.iter() {
-        chunk_storage.remove_tile_with_entity(removed_tile.entity)
+        chunk_storage.remove_tile_with_entity(removed_tile.0.id())
     }
 
     for removed_map in removed_maps.iter() {
-        chunk_storage.remove_map(removed_map.entity);
+        chunk_storage.remove_map(removed_map.0.id());
     }
 }
diff --git a/src/tiles/mod.rs b/src/tiles/mod.rs
index 8721044e..ccb1bc06 100644
--- a/src/tiles/mod.rs
+++ b/src/tiles/mod.rs
@@ -3,6 +3,7 @@ mod storage;
 use bevy::{
     math::{UVec2, Vec2},
     prelude::{Bundle, Color, Component, Reflect, ReflectComponent},
+    render::sync_world::SyncToRenderWorld,
 };
 pub use storage::*;
 
@@ -118,6 +119,8 @@ pub struct TileBundle {
     pub flip: TileFlip,
     pub color: TileColor,
     pub old_position: TilePosOld,
+    #[cfg_attr(feature = "serde", serde(skip))]
+    pub sync: SyncToRenderWorld,
 }
 
 #[derive(Component, Reflect, Default, Clone, Copy, Debug)]