diff --git a/Cargo.toml b/Cargo.toml
index d8d0bd1..99b64b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/nicopap/ui-navigation"
 homepage = "https://github.com/nicopap/ui-navigation"
 exclude = ["assets", ".github"]
 version = "0.32.0"
-rust-version = "1.70"
+rust-version = "1.73"
 edition = "2021"
 
 [features]
@@ -21,18 +21,24 @@ pointer_focus = ["bevy_mod_picking"]
 cuicui_chirp = ["cuicui_dsl", "dep:cuicui_chirp"]
 
 [dependencies]
-bevy = { version = "0.11", default-features = false, features = ["bevy_asset"] }
-bevy_mod_picking = { version = "0.15.0", optional = true, default-features = false }
-cuicui_chirp = { version = "0.10.0", optional = true, default-features = false, features = ["macros"] }
-cuicui_dsl = { version = "0.10.0", optional = true }
+bevy = { version = "0.12", default-features = false, features = ["bevy_asset"] }
+bevy_mod_picking = { version = "0.17.0", optional = true, default-features = false }
+cuicui_chirp = { version = "0.12.0", optional = true, default-features = false, features = ["macros"] }
+cuicui_dsl = { version = "0.12.0", optional = true }
 non-empty-vec = { version = "0.2.2", default-features = false }
 
 [dev-dependencies]
 fastrand = "1.7"
-cuicui_layout_bevy_ui = { version = "0.10.0", default-features = false }
-cuicui_layout = { version = "0.10.0", default-features = false }
-bevy = { version = "0.11", default-features = false, features = ["bevy_asset", "png", "x11", "default_font"] }
+cuicui_layout_bevy_ui = { version = "0.12.0", default-features = false }
+cuicui_layout = { version = "0.12.0", default-features = false }
+bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "png", "x11", "default_font", "bevy_gilrs"] }
+
+[package.metadata.release]
+pre-release-replacements = [
+  {search="\\| 0.12 \\| [0-9.]* \\|",replace="| 0.12 | {{version}} |",file="Readme.md"},
+  {search="bevy-ui-navigation = \"[0-9.]*\"",replace="bevy-ui-navigation = \"{{version}}\"",file="Readme.md"},
+]
 
 [[example]]
 name = "ultimate_menu_navigation"
-required-features = ["cuicui_chirp", "bevy/filesystem_watcher", "cuicui_layout_bevy_ui/chirp", "cuicui_layout/reflect"]
+required-features = ["cuicui_chirp", "cuicui_layout_bevy_ui/chirp"]
diff --git a/Makefile b/Makefile
index bbf6ec0..9d774d4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ check:
 	cargo clippy --examples
 
 run:
-	cargo run --example ultimate_menu_navigation --features cuicui_dsl
+	cargo run --example ultimate_menu_navigation --features="cuicui_chirp cuicui_layout_bevy_ui/chirp"
 
 pre-hook:
 	cargo fmt --all -- --check
@@ -10,4 +10,4 @@ pre-hook:
 	RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features
 	cargo clippy --all-features -- --deny clippy::all -D warnings
 	cargo test --all-features
-	cargo clippy --all-features --features="cuicui_chirp bevy/filesystem_watcher cuicui_layout_bevy_ui/chirp cuicui_layout/reflect" --example ultimate_menu_navigation
+	cargo clippy --all-features --features="cuicui_chirp cuicui_layout_bevy_ui/chirp" --example ultimate_menu_navigation
diff --git a/Readme.md b/Readme.md
index a35a889..03d0dd7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -581,6 +581,9 @@ fn return_trigger_action(mut requests: EventWriter<NavRequest>, input: Res<Input
   * Upgrade to `cuicui_dsl v0.10.0`
   * Add `cuicui_chirp` support
   * Add `ParseDsl` impl for `NavigationDsl`
+* `0.33.0`: **BREAKING**:
+  * Upgrade to `cuicui v0.12.0`
+  * Upgrade to `bevy v0.12.0`
 
 [the RFC PR]: https://github.com/bevyengine/bevy/pull/5378
 [diff-18-19]: https://github.com/nicopap/ui-navigation/compare/v0.18.0...v0.19.0
@@ -629,6 +632,7 @@ fn return_trigger_action(mut requests: EventWriter<NavRequest>, input: Res<Input
 
 | bevy | latest supporting version      |
 |------|--------|
+| 0.12 | 0.32.0 |
 | 0.11 | 0.32.0 |
 | 0.10 | 0.24.1 |
 | 0.9  | 0.23.1 |
@@ -636,30 +640,9 @@ fn return_trigger_action(mut requests: EventWriter<NavRequest>, input: Res<Input
 | 0.7  | 0.18.0 |
 | 0.6  | 0.14.0 |
 
-### Notes on API Stability
-
-In the 4th week of January, there has been 5 breaking version changes. `0.13.0`
-marks the end of this wave of API changes. And things should go much slower in
-the future.
-
-The new `NavMenu` construction system helps adding orthogonal features to the
-library without breaking API changes. However, since bevy is still in `0.*`
-territory, it doesn't make sense for this library to leave the `0.*` range.
-
-Also, the way cargo handles versioning for `0.*` crates is in infraction of
-the semver specification. Meaning that additional features without breakages
-requires bumping the minor version rather than the patch version (as should
-pre-`1.` versions do).
-
-
 # License
 
 Copyright © 2022 Nicola Papale
 
 This software is licensed under either MIT or Apache 2.0 at your leisure. See
 licenses directory for details.
-
-### Font
-
-The font in `font.ttf` is derived from Adobe SourceSans, licensed
-under the SIL OFL. see file at `licenses/SIL Open Font License.txt`.
diff --git a/assets/font.ttf b/assets/font.ttf
deleted file mode 100644
index 2e94dbe..0000000
Binary files a/assets/font.ttf and /dev/null differ
diff --git a/examples/infinite_upgrades.rs b/examples/infinite_upgrades.rs
index 0bf8129..e0caeb0 100644
--- a/examples/infinite_upgrades.rs
+++ b/examples/infinite_upgrades.rs
@@ -50,7 +50,6 @@ fn main() {
         .add_systems(PostUpdate, mark_buttons)
         .add_systems(Startup, setup)
         // Our systems.
-        .init_resource::<MenuFont>()
         .init_resource::<MenuMap>()
         .run();
 }
@@ -134,15 +133,6 @@ impl MenuMap {
     }
 }
 
-#[derive(Resource)]
-struct MenuFont(Handle<Font>);
-impl FromWorld for MenuFont {
-    fn from_world(world: &mut World) -> Self {
-        let assets = world.get_resource::<AssetServer>().unwrap();
-        MenuFont(assets.load("font.ttf"))
-    }
-}
-
 /// Animate anything. Used to move the camera smoothly.
 ///
 /// See the `animate_system` for how this is used.
@@ -380,7 +370,7 @@ const QUALIFICATIVES: &[&str] = &[
 //
 // === === ===
 
-fn setup(mut commands: Commands, font: Res<MenuFont>, mut menus: ResMut<MenuMap>) {
+fn setup(mut commands: Commands, mut menus: ResMut<MenuMap>) {
     let name = NAMES[fastrand::usize(0..NAMES.len())];
     let upgrade = if fastrand::bool() {
         Upgrade::Roman(1)
@@ -390,7 +380,7 @@ fn setup(mut commands: Commands, font: Res<MenuFont>, mut menus: ResMut<MenuMap>
     let weapon = Weapon::new(name, upgrade);
     commands.spawn((Camera2dBundle::default(), Animate::default()));
     let at = IVec2::ZERO;
-    let menu = spawn_weapon_upgrade_menu(&mut commands, at, &weapon, &font, None);
+    let menu = spawn_weapon_upgrade_menu(&mut commands, at, &weapon, None);
     menus.grid.insert(at, menu);
 }
 
@@ -452,7 +442,7 @@ fn handle_menu_change(
     menu_position: Query<&GlobalTransform, With<Menu>>,
     menu_query: Query<&ParentMenu>,
 ) {
-    for event in nav_events.iter() {
+    for event in nav_events.read() {
         if let NavEvent::FocusChanged { to, from } = event {
             let menu_query = (menu_query.get(*from.first()), menu_query.get(*to.first()));
             if let (Ok(from), Ok(to)) = menu_query {
@@ -481,7 +471,7 @@ fn upgrade_weapon(
     mut commands: Commands,
     mut events: EventReader<NavEvent>,
     mut requests: EventWriter<NavRequest>,
-    (mut menus, time, font): (ResMut<MenuMap>, Res<Time>, Res<MenuFont>),
+    (mut menus, time): (ResMut<MenuMap>, Res<Time>),
     mut cam: Query<&mut Animate, With<Camera2d>>,
     query: Query<(&ParentMenu, &WeaponUpgrade, &SpawnDirection, Entity)>,
     menu_data: Query<&Menu>,
@@ -502,7 +492,7 @@ fn upgrade_weapon(
             // `Menu.weapon`, but instead reads the `WeaponUpgrade` component of all
             // focusable in the `from` field of `NavEvent::NoChanges` to generate
             // the current weapon upgrade.
-            let menu = spawn_weapon_upgrade_menu(&mut commands, at, &weapon, &font, Some(entity));
+            let menu = spawn_weapon_upgrade_menu(&mut commands, at, &weapon, Some(entity));
             menus.grid.insert(at, menu);
             requests.send(NavRequest::Action);
         } else {
@@ -558,7 +548,6 @@ fn spawn_weapon_upgrade_menu(
     commands: &mut Commands,
     position: IVec2,
     weapon: &Weapon,
-    font: &MenuFont,
     parent: Option<Entity>,
 ) -> Entity {
     let quals = QUALIFICATIVES.len();
@@ -568,9 +557,9 @@ fn spawn_weapon_upgrade_menu(
     let menu_grid_offset = Vec2::new(MENU_WIDTH, MENU_HEIGHT) + MENU_GAP;
     let at = position.as_vec2() * menu_grid_offset;
     let text_style = || TextStyle {
-        font: font.0.clone_weak(),
         color: Color::WHITE,
         font_size: FONT_SIZE,
+        ..default()
     };
     let item_position = |at: Vec2| Transform::from_translation(at.extend(0.1));
     // Rectangle
diff --git a/examples/locking.rs b/examples/locking.rs
index d2e04c3..3aaf95f 100644
--- a/examples/locking.rs
+++ b/examples/locking.rs
@@ -30,7 +30,7 @@ fn main() {
 }
 
 fn print_nav_events(mut events: EventReader<NavEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         println!("{:?}", event);
     }
 }
diff --git a/examples/menu_navigation.rs b/examples/menu_navigation.rs
index a3bd96a..61809f7 100644
--- a/examples/menu_navigation.rs
+++ b/examples/menu_navigation.rs
@@ -94,7 +94,7 @@ fn handle_nav_events(
     game: Res<Gameui>,
 ) {
     use NavRequest::Action;
-    for event in events.iter() {
+    for event in events.read() {
         if let NavEvent::FocusChanged { from, to } = &event {
             println!("----------\nfrom: {:?}\n  to: {:?}", from, to);
         }
diff --git a/examples/simple.rs b/examples/simple.rs
index a12bcf4..36f5ddd 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -38,7 +38,7 @@ fn button_system(
     }
 }
 fn print_nav_events(mut events: EventReader<NavEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         println!("{:?}", event);
     }
 }
diff --git a/examples/ultimate_menu_navigation.rs b/examples/ultimate_menu_navigation.rs
index b1bc17b..a576fb1 100644
--- a/examples/ultimate_menu_navigation.rs
+++ b/examples/ultimate_menu_navigation.rs
@@ -17,8 +17,8 @@ struct UltimateMenuDsl {
 #[parse_dsl_impl(delegate = inner)]
 impl UltimateMenuDsl {}
 impl DslBundle for UltimateMenuDsl {
-    fn insert(&mut self, cmds: &mut EntityCommands) -> Entity {
-        self.inner.insert(cmds)
+    fn insert(&mut self, cmds: &mut EntityCommands) {
+        self.inner.insert(cmds);
     }
 }
 
@@ -37,14 +37,15 @@ impl DslBundle for UltimateMenuDsl {
 ///
 /// Navigation also works with controller
 fn main() {
+    let primary_window = Some(Window {
+        resolution: (1280., 720.).into(),
+        ..default()
+    });
     App::new()
         .add_plugins((
-            DefaultPlugins.set({
-                let delay = std::time::Duration::from_millis(200);
-                AssetPlugin {
-                    watch_for_changes: bevy::asset::ChangeWatcher::with_delay(delay),
-                    ..default()
-                }
+            DefaultPlugins.set(WindowPlugin {
+                primary_window,
+                ..default()
             }),
             DefaultNavigationPlugins,
             cuicui_chirp::loader::Plugin::new::<UltimateMenuDsl>(),
diff --git a/licenses/SIL Open Font License.txt b/licenses/SIL Open Font License.txt
deleted file mode 100644
index 295975a..0000000
--- a/licenses/SIL Open Font License.txt	
+++ /dev/null
@@ -1,43 +0,0 @@
-Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/src/dsl.rs b/src/dsl.rs
index c5d2cf3..1699a35 100644
--- a/src/dsl.rs
+++ b/src/dsl.rs
@@ -89,7 +89,7 @@ impl<C> NavigationDsl<C> {
     }
 }
 impl<C: DslBundle> DslBundle for NavigationDsl<C> {
-    fn insert(&mut self, cmds: &mut EntityCommands) -> Entity {
+    fn insert(&mut self, cmds: &mut EntityCommands) {
         self.inner.insert(cmds);
         if let Some(menu) = self.menu.take() {
             let builder = match menu.reachable_from {
@@ -110,6 +110,5 @@ impl<C: DslBundle> DslBundle for NavigationDsl<C> {
             };
             cmds.insert(focusable);
         }
-        cmds.id()
     }
 }
diff --git a/src/events.rs b/src/events.rs
index 9d23e15..3eed307 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -231,7 +231,7 @@ impl<'w, 's, 'a> NavEventReader<'w, 's, 'a> {
     /// triggered by `request` type requests.
     pub fn with_request(&mut self, request: NavRequest) -> impl Iterator<Item = Entity> + '_ {
         self.event_reader
-            .iter()
+            .read()
             .filter_map(move |nav_event| match nav_event {
                 NavEvent::NoChanges {
                     from,
@@ -254,7 +254,7 @@ impl<'w, 's, 'a> NavEventReader<'w, 's, 'a> {
     /// with the "relevant" entity of the event.
     pub fn types(&mut self) -> impl Iterator<Item = (&NavEvent, Entity)> + '_ {
         use NavEvent::{FocusChanged, InitiallyFocused, Locked, NoChanges, Unlocked};
-        self.event_reader.iter().filter_map(|event| {
+        self.event_reader.read().filter_map(|event| {
             let entity = match event {
                 NoChanges { from, .. } => Some(*from.first()),
                 InitiallyFocused(initial) => Some(*initial),
diff --git a/src/lib.rs b/src/lib.rs
index 50034c1..76f8989 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -148,10 +148,10 @@ impl<T: 'static + Sync + Send + Component + Clone> Plugin for NavMarkerPropagati
 /// # fn button_system() {}
 /// fn main() {
 ///     App::new()
-///         .add_plugin(GenericNavigationPlugin::<MoveCursor3d>::new())
+///         .add_plugins(GenericNavigationPlugin::<MoveCursor3d>::new())
 ///         // ...
 ///         // Add the button color update system after the focus update system
-///         .add_system(button_system.after(NavRequestSystem))
+///         .add_systems(Update, button_system.after(NavRequestSystem))
 ///         // ...
 ///         .run();
 /// }
@@ -165,7 +165,7 @@ pub struct NavRequestSystem;
 
 /// The navigation plugin.
 ///
-/// Add it to your app with `.add_plugin(NavigationPlugin::new())` and send
+/// Add it to your app with `.add_plugins(NavigationPlugin::new())` and send
 /// [`NavRequest`]s to move focus within declared [`Focusable`] entities.
 ///
 /// You should prefer `bevy_ui` provided defaults
@@ -250,7 +250,7 @@ impl PluginGroup for DefaultNavigationPlugins {
 mod test {
     use crate::prelude::*;
     use bevy::{
-        ecs::{event::Event, world::EntityMut},
+        ecs::{event::Event, world::EntityWorldMut},
         prelude::*,
     };
 
@@ -297,7 +297,7 @@ mod test {
     }
 
     impl SpawnFocusable {
-        fn spawn(self, mut entity: EntityMut) {
+        fn spawn(self, mut entity: EntityWorldMut) {
             let SpawnFocusable {
                 name,
                 prioritized,
@@ -324,7 +324,7 @@ mod test {
         children: Vec<SpawnFocusable>,
     }
     impl SpawnMenu {
-        fn spawn(self, entity: &mut EntityMut) {
+        fn spawn(self, entity: &mut EntityWorldMut) {
             let SpawnMenu { name, children } = self;
             let parent_focusable = name.strip_suffix(" Menu");
             let menu_builder = match parent_focusable {
diff --git a/src/resolve.rs b/src/resolve.rs
index c4db13b..f28c591 100644
--- a/src/resolve.rs
+++ b/src/resolve.rs
@@ -907,7 +907,7 @@ pub(crate) fn listen_nav_requests<STGY: SystemParam>(
 
     // Cache focus result from previous iteration to avoid re-running costly `pick_first_focused`
     let mut computed_focused = None;
-    for request in requests.iter() {
+    for request in requests.read() {
         if lock.is_locked() && *request != NavRequest::Unlock {
             continue;
         }