diff --git a/code-validation/src/lib.rs b/code-validation/src/lib.rs
index 03d76c7742..bd2ad05ce6 100644
--- a/code-validation/src/lib.rs
+++ b/code-validation/src/lib.rs
@@ -19,8 +19,8 @@ mod learn {
             mod hot_reloading {}
             #[doc = include_str!("../../content/learn/book/assets/loading-assets/_index.md")]
             mod loading_assets {}
-            #[doc = include_str!("../../content/learn/book/assets/scenes/_index.md")]
-            mod scenes {}
+            #[doc = include_str!("../../content/learn/book/assets/scenes-reflection/_index.md")]
+            mod scenes_reflection {}
             #[doc = include_str!("../../content/learn/book/assets/working-with-handles/_index.md")]
             mod working_with_handles {}
         }
@@ -49,28 +49,24 @@ mod learn {
         mod ecs {
             #[doc = include_str!("../../content/learn/book/ecs/commands/_index.md")]
             mod commands {}
-            #[doc = include_str!("../../content/learn/book/ecs/detecting-changes/_index.md")]
-            mod detecting_changes {}
-            #[doc = include_str!("../../content/learn/book/ecs/ecs-magic/_index.md")]
-            mod ecs_magic {}
+            #[doc = include_str!("../../content/learn/book/ecs/change-detection/_index.md")]
+            mod change_detection {}
             #[doc = include_str!("../../content/learn/book/ecs/entities-components/_index.md")]
             mod entities_components {}
             #[doc = include_str!("../../content/learn/book/ecs/exclusive-world-access/_index.md")]
             mod exclusive_world_access {}
-            #[doc = include_str!("../../content/learn/book/ecs/queries/_index.md")]
-            mod queries {}
+            #[doc = include_str!("../../content/learn/book/ecs/systems-queries/_index.md")]
+            mod systems_queries {}
             #[doc = include_str!("../../content/learn/book/ecs/resources/_index.md")]
             mod resources {}
-            #[doc = include_str!("../../content/learn/book/ecs/systems/_index.md")]
-            mod systems {}
         }
 
         #[doc = include_str!("../../content/learn/book/game-logic/_index.md")]
         mod game_logic {
             #[doc = include_str!("../../content/learn/book/game-logic/async-tasks/_index.md")]
             mod async_tasks {}
-            #[doc = include_str!("../../content/learn/book/game-logic/custom-execution/_index.md")]
-            mod custom_execution {}
+            #[doc = include_str!("../../content/learn/book/game-logic/custom-runners-headless-operations/_index.md")]
+            mod custom_runners_headless_operation {}
             #[doc = include_str!("../../content/learn/book/game-logic/events/_index.md")]
             mod events {}
             #[doc = include_str!("../../content/learn/book/game-logic/run-criteria/_index.md")]
@@ -79,8 +75,8 @@ mod learn {
             mod states {}
             #[doc = include_str!("../../content/learn/book/game-logic/system-ordering/_index.md")]
             mod system_ordering {}
-            #[doc = include_str!("../../content/learn/book/game-logic/time/_index.md")]
-            mod time {}
+            #[doc = include_str!("../../content/learn/book/game-logic/time-timers/_index.md")]
+            mod time_timers {}
         }
 
         #[doc = include_str!("../../content/learn/book/graphics/_index.md")]
@@ -110,16 +106,16 @@ mod learn {
             }
             #[doc = include_str!("../../content/learn/book/graphics/transforms/_index.md")]
             mod transforms {}
-            #[doc = include_str!("../../content/learn/book/graphics/windowing/_index.md")]
-            mod windowing {}
+            #[doc = include_str!("../../content/learn/book/graphics/windows/_index.md")]
+            mod windows {}
         }
 
         #[doc = include_str!("../../content/learn/book/input/_index.md")]
         mod input {
             #[doc = include_str!("../../content/learn/book/input/gamepad/_index.md")]
             mod gamepad {}
-            #[doc = include_str!("../../content/learn/book/input/input-basics/_index.md")]
-            mod input_basics {}
+            #[doc = include_str!("../../content/learn/book/input/basics/_index.md")]
+            mod basics {}
             #[doc = include_str!("../../content/learn/book/input/keyboard/_index.md")]
             mod keyboard {}
             #[doc = include_str!("../../content/learn/book/input/mouse/_index.md")]
@@ -155,8 +151,8 @@ mod learn {
 
         #[doc = include_str!("../../content/learn/book/ui/_index.md")]
         mod ui {
-            #[doc = include_str!("../../content/learn/book/ui/ui-basics/_index.md")]
-            mod ui_basics {}
+            #[doc = include_str!("../../content/learn/book/ui/basics/_index.md")]
+            mod basics {}
         }
 
         #[doc = include_str!("../../content/learn/book/welcome/_index.md")]
diff --git a/content/learn/advanced-examples/_index.md b/content/learn/advanced-examples/_index.md
new file mode 100644
index 0000000000..a94c3d6aea
--- /dev/null
+++ b/content/learn/advanced-examples/_index.md
@@ -0,0 +1,6 @@
++++
+title = "Advanced Examples"
+template = "docs-section.html"
+[extra]
+public_draft = 877
++++
diff --git a/content/learn/advanced-examples/sudoku/_index.md b/content/learn/advanced-examples/sudoku/_index.md
new file mode 100644
index 0000000000..e19bc97e57
--- /dev/null
+++ b/content/learn/advanced-examples/sudoku/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Sudoku"
+weight = 2
+template = "docs-section.html"
++++
diff --git a/content/learn/advanced-examples/text-adventure/_index.md b/content/learn/advanced-examples/text-adventure/_index.md
new file mode 100644
index 0000000000..0a090525ba
--- /dev/null
+++ b/content/learn/advanced-examples/text-adventure/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Text Adventure"
+weight = 1
+template = "docs-section.html"
++++
diff --git a/content/learn/book/assets/_index.md b/content/learn/book/assets/_index.md
index 37625309ff..a908eff0d9 100644
--- a/content/learn/book/assets/_index.md
+++ b/content/learn/book/assets/_index.md
@@ -1,6 +1,6 @@
 +++
 title = "Assets"
-weight = 5
+weight = 6
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/assets/custom-assets/_index.md b/content/learn/book/assets/custom-assets/_index.md
index 043a283858..3adcb3623c 100644
--- a/content/learn/book/assets/custom-assets/_index.md
+++ b/content/learn/book/assets/custom-assets/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Custom assets"
+title = "Custom Assets"
 weight = 3
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/assets/hot-reloading/_index.md b/content/learn/book/assets/hot-reloading/_index.md
index d0e5caee4d..c8237fe1c4 100644
--- a/content/learn/book/assets/hot-reloading/_index.md
+++ b/content/learn/book/assets/hot-reloading/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Hot reloading"
+title = "Hot Reloading"
 weight = 4
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/assets/loading-assets/_index.md b/content/learn/book/assets/loading-assets/_index.md
index e49354c734..1f1fe9e551 100644
--- a/content/learn/book/assets/loading-assets/_index.md
+++ b/content/learn/book/assets/loading-assets/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Loading assets"
+title = "Loading Assets"
 weight = 1
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/assets/scenes/_index.md b/content/learn/book/assets/scenes-reflection/_index.md
similarity index 92%
rename from content/learn/book/assets/scenes/_index.md
rename to content/learn/book/assets/scenes-reflection/_index.md
index ebd533dac1..18d56e824f 100644
--- a/content/learn/book/assets/scenes/_index.md
+++ b/content/learn/book/assets/scenes-reflection/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Scenes and reflection"
+title = "Scenes and Reflection"
 weight = 5
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/assets/working-with-handles/_index.md b/content/learn/book/assets/working-with-handles/_index.md
index 0d7f1026da..1264444bbe 100644
--- a/content/learn/book/assets/working-with-handles/_index.md
+++ b/content/learn/book/assets/working-with-handles/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Working with handles"
+title = "Working With Handles"
 weight = 2
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/audio/_index.md b/content/learn/book/audio/_index.md
index 9c8e6d3afe..378002ebda 100644
--- a/content/learn/book/audio/_index.md
+++ b/content/learn/book/audio/_index.md
@@ -1,6 +1,6 @@
 +++
 title = "Audio"
-weight = 7
+weight = 8
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/development-practices/_index.md b/content/learn/book/development-practices/_index.md
index 759bd370f6..3e9d18295d 100644
--- a/content/learn/book/development-practices/_index.md
+++ b/content/learn/book/development-practices/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "Development practices"
-weight = 9
+title = "Development Practices"
+weight = 10
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/development-practices/boilerplate-reduction/_index.md b/content/learn/book/development-practices/boilerplate-reduction/_index.md
index 0f4afbdf15..a4c84843d9 100644
--- a/content/learn/book/development-practices/boilerplate-reduction/_index.md
+++ b/content/learn/book/development-practices/boilerplate-reduction/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Boilerplate reduction"
+title = "Boilerplate Reduction"
 weight = 5
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/development-practices/error-handling/_index.md b/content/learn/book/development-practices/error-handling/_index.md
index 00f6add69a..72afb15f66 100644
--- a/content/learn/book/development-practices/error-handling/_index.md
+++ b/content/learn/book/development-practices/error-handling/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Error handling"
+title = "Error Handling"
 weight = 4
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/development-practices/fast-compiles/_index.md b/content/learn/book/development-practices/fast-compiles/_index.md
index c834b986d2..ac4c273146 100644
--- a/content/learn/book/development-practices/fast-compiles/_index.md
+++ b/content/learn/book/development-practices/fast-compiles/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Fast compiles"
+title = "Fast Compiles"
 weight = 2
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/development-practices/organizing-your-code/_index.md b/content/learn/book/development-practices/organizing-your-code/_index.md
index 3b2b34f02b..87b7b31036 100644
--- a/content/learn/book/development-practices/organizing-your-code/_index.md
+++ b/content/learn/book/development-practices/organizing-your-code/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Organizing your code"
+title = "Organizing Your Code"
 weight = 1
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/ecs/_index.md b/content/learn/book/ecs/_index.md
index f6500c58a9..05c5cd80d1 100644
--- a/content/learn/book/ecs/_index.md
+++ b/content/learn/book/ecs/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Entities, components and systems"
+title = "Entities, Components and Systems"
 weight = 2
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/ecs/change-detection/_index.md b/content/learn/book/ecs/change-detection/_index.md
new file mode 100644
index 0000000000..a05be78999
--- /dev/null
+++ b/content/learn/book/ecs/change-detection/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Reliable Change Detection"
+weight = 6
+template = "docs-section.html"
++++
diff --git a/content/learn/book/ecs/commands/_index.md b/content/learn/book/ecs/commands/_index.md
index 035b6576a7..9dc6bf6614 100644
--- a/content/learn/book/ecs/commands/_index.md
+++ b/content/learn/book/ecs/commands/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "Commands queue up work"
-weight = 5
+title = "Manipulating Entities With Commands"
+weight = 4
 template = "docs-section.html"
 page_template = "docs-section.html"
 insert_anchor_links = "right"
diff --git a/content/learn/book/ecs/detecting-changes/_index.md b/content/learn/book/ecs/detecting-changes/_index.md
deleted file mode 100644
index c97d48ffdc..0000000000
--- a/content/learn/book/ecs/detecting-changes/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-+++
-title = "Detecting changes"
-weight = 6
-template = "docs-section.html"
-page_template = "docs-section.html"
-insert_anchor_links = "right"
-+++
diff --git a/content/learn/book/ecs/ecs-magic/_index.md b/content/learn/book/ecs/ecs-magic/_index.md
deleted file mode 100644
index 56a9008352..0000000000
--- a/content/learn/book/ecs/ecs-magic/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-+++
-title = "Understanding the magic"
-weight = 8
-template = "docs-section.html"
-page_template = "docs-section.html"
-insert_anchor_links = "right"
-+++
diff --git a/content/learn/book/ecs/entities-components/_index.md b/content/learn/book/ecs/entities-components/_index.md
index 3ca99bba1d..a82fb6a35f 100644
--- a/content/learn/book/ecs/entities-components/_index.md
+++ b/content/learn/book/ecs/entities-components/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Entities have components"
+title = "Entities Have Components"
 weight = 1
 template = "docs-section.html"
 page_template = "docs-section.html"
@@ -17,7 +17,7 @@ If you're an experienced programmer, you can reason about the [`World`] as somet
 [`HashMap`]: https://doc.rust-lang.org/std/collections/struct.HashMap.html
 [`World`]: https://docs.rs/bevy/latest/bevy/ecs/world/struct.World.html
 
-## Spawning and despawning entities
+## Spawning and Despawning Entities
 
 Before you can do much of anything in Bevy, you'll need to **spawn** your first entity, adding it to the app's [`World`].
 Once entities exist, they can likewise be despawned, deleting all of the data stored in their components and removing it from the world.
@@ -42,14 +42,14 @@ fn spawning_system(mut commands: Commands){
 
 [`Commands`]: https://docs.rs/bevy/latest/bevy/ecs/system/struct.Commands.html
 
-## Working with components
+## Working With Components
 
 Spawning an entity doesn't add any behavior or create a "physical object" in our game like it might in other engines.
 Instead, all it does is provide us an [`Entity`] identifer for a collection of component data.
 
 In order to make this useful, we need to be able to add, remove and modify component data for each entity.
 
-### Defining components
+### Defining Components
 
 To define a component type, we simply implement the [`Component`] [trait](https://doc.rust-lang.org/book/ch10-02-traits.html) for a Rust type of our choice.
 You will almost always want to use the `#[derive(Component)]` [macro](https://doc.rust-lang.org/reference/attributes/derive.html) to do this for you; which quickly and reliably generates the correct trait implementation.
@@ -85,7 +85,7 @@ enum Allegiance {
 
 [`Component`]: https://docs.rs/bevy/latest/bevy/ecs/component/trait.Component.html
 
-### Spawning entities with components
+### Spawning Entities With Components
 
 Now that we have some components defined, let's try adding them to our entities using [`Commands`].
 
@@ -144,7 +144,7 @@ fn spawn_combatants_system(mut commands: Commands) {
 }
 ```
 
-### Adding and removing components
+### Adding and Removing Components
 
 Once an entity is spawned, you can use [`Commands`] to add and remove components from them dynamically.
 
@@ -268,7 +268,7 @@ fn spawn_combatants_system(mut commands: Commands) {
 
 [`Bundle`]: https://docs.rs/bevy/latest/bevy/ecs/bundle/trait.Bundle.html
 
-### Nested bundles
+### Nested Bundles
 
 As your game grows further in complexity, you may find that you want to reuse various bundles across entities that share some but not all behavior.
 One of the tools you can use to do so is **nested bundles**; embedding one bundle of components within another.
@@ -330,7 +330,7 @@ impl Default for CombatantBundle {
 }
 ```
 
-## Component design
+## Component Design
 
 Over time, the Bevy community has converged on a few standard pieces of advice for how to structure and define component data:
 
diff --git a/content/learn/book/ecs/exclusive-world-access/_index.md b/content/learn/book/ecs/exclusive-world-access/_index.md
index e0fc967c0d..354ab35a6c 100644
--- a/content/learn/book/ecs/exclusive-world-access/_index.md
+++ b/content/learn/book/ecs/exclusive-world-access/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "Exclusive world access"
-weight = 7
+title = "Exclusive World Access"
+weight = 8
 template = "docs-section.html"
 page_template = "docs-section.html"
 insert_anchor_links = "right"
diff --git a/content/learn/book/ecs/filtering-queries/_index.md b/content/learn/book/ecs/filtering-queries/_index.md
new file mode 100644
index 0000000000..c744bb9c24
--- /dev/null
+++ b/content/learn/book/ecs/filtering-queries/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Filtering Queries"
+weight = 5
+template = "docs-section.html"
++++
diff --git a/content/learn/book/ecs/generic-systems/_index.md b/content/learn/book/ecs/generic-systems/_index.md
new file mode 100644
index 0000000000..67705729aa
--- /dev/null
+++ b/content/learn/book/ecs/generic-systems/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Generic Systems"
+weight = 7
+template = "docs-section.html"
++++
diff --git a/content/learn/book/ecs/resources/_index.md b/content/learn/book/ecs/resources/_index.md
index 3fe42a2f3b..bfd9ec5ced 100644
--- a/content/learn/book/ecs/resources/_index.md
+++ b/content/learn/book/ecs/resources/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Resources are global singletons"
+title = "Resources Are Global Singletons"
 weight = 3
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/ecs/queries/_index.md b/content/learn/book/ecs/systems-queries/_index.md
similarity index 71%
rename from content/learn/book/ecs/queries/_index.md
rename to content/learn/book/ecs/systems-queries/_index.md
index c5104dcaad..809cfd31ca 100644
--- a/content/learn/book/ecs/queries/_index.md
+++ b/content/learn/book/ecs/systems-queries/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Fetching data with queries"
+title = "Systems Access Data Through Queries"
 weight = 2
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/ecs/systems/_index.md b/content/learn/book/ecs/systems/_index.md
deleted file mode 100644
index b88c35026f..0000000000
--- a/content/learn/book/ecs/systems/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-+++
-title = "Systems do work"
-weight = 4
-template = "docs-section.html"
-page_template = "docs-section.html"
-insert_anchor_links = "right"
-+++
-
diff --git a/content/learn/book/game-logic/_index.md b/content/learn/book/game-logic/_index.md
index aa45e897e3..5dfe5a7c51 100644
--- a/content/learn/book/game-logic/_index.md
+++ b/content/learn/book/game-logic/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "Game logic"
-weight = 3
+title = "Game Logic"
+weight = 4
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/game-logic/async-tasks/_index.md b/content/learn/book/game-logic/async-tasks/_index.md
index c591988081..5e143b636a 100644
--- a/content/learn/book/game-logic/async-tasks/_index.md
+++ b/content/learn/book/game-logic/async-tasks/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Async tasks"
+title = "Async Tasks"
 weight = 6
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/game-logic/custom-execution/_index.md b/content/learn/book/game-logic/custom-runners-headless-operations/_index.md
similarity index 88%
rename from content/learn/book/game-logic/custom-execution/_index.md
rename to content/learn/book/game-logic/custom-runners-headless-operations/_index.md
index 8a2c1b446e..f1f36a26fe 100644
--- a/content/learn/book/game-logic/custom-execution/_index.md
+++ b/content/learn/book/game-logic/custom-runners-headless-operations/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Custom execution"
+title = "Custom Runners and Headless Operation"
 weight = 7
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/game-logic/run-criteria/_index.md b/content/learn/book/game-logic/run-criteria/_index.md
index e7e78540ca..1cb2005210 100644
--- a/content/learn/book/game-logic/run-criteria/_index.md
+++ b/content/learn/book/game-logic/run-criteria/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Run criteria"
+title = "Run Criteria and Fixed Timestep"
 weight = 5
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/game-logic/system-ordering/_index.md b/content/learn/book/game-logic/system-ordering/_index.md
index ea3df13268..39921ec6d8 100644
--- a/content/learn/book/game-logic/system-ordering/_index.md
+++ b/content/learn/book/game-logic/system-ordering/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "System ordering"
+title = "Stages and System Ordering"
 weight = 1
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/game-logic/time/_index.md b/content/learn/book/game-logic/time-timers/_index.md
similarity index 93%
rename from content/learn/book/game-logic/time/_index.md
rename to content/learn/book/game-logic/time-timers/_index.md
index 19977d6a4a..c041e9e92f 100644
--- a/content/learn/book/game-logic/time/_index.md
+++ b/content/learn/book/game-logic/time-timers/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Time and timers"
+title = "Time and Timers"
 weight = 4
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/getting-started/app-appbuilder-world/_index.md b/content/learn/book/getting-started/app-appbuilder-world/_index.md
new file mode 100644
index 0000000000..25f482add2
--- /dev/null
+++ b/content/learn/book/getting-started/app-appbuilder-world/_index.md
@@ -0,0 +1,5 @@
++++
+title = "App, Appbuilder, and World"
+weight = 3
+template = "docs-section.html"
++++
diff --git a/content/learn/book/getting-started/bevy-community/_index.md b/content/learn/book/getting-started/bevy-community/_index.md
new file mode 100644
index 0000000000..11a9feef1b
--- /dev/null
+++ b/content/learn/book/getting-started/bevy-community/_index.md
@@ -0,0 +1,5 @@
++++
+title = "The Bevy Community"
+weight = 5
+template = "docs-section.html"
++++
diff --git a/content/learn/book/getting-started/installation/_index.md b/content/learn/book/getting-started/installation/_index.md
new file mode 100644
index 0000000000..208ef1bd82
--- /dev/null
+++ b/content/learn/book/getting-started/installation/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Installing Rust and Bevy"
+weight = 2
+template = "docs-section.html"
++++
diff --git a/content/learn/book/getting-started/modular-plugins/_index.md b/content/learn/book/getting-started/modular-plugins/_index.md
new file mode 100644
index 0000000000..7e3a838f3f
--- /dev/null
+++ b/content/learn/book/getting-started/modular-plugins/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Plugins as Modular Building Blocks"
+weight = 4
+template = "docs-section.html"
++++
\ No newline at end of file
diff --git a/content/learn/book/getting-started/why-bevy/_index.md b/content/learn/book/getting-started/why-bevy/_index.md
new file mode 100644
index 0000000000..35f267c619
--- /dev/null
+++ b/content/learn/book/getting-started/why-bevy/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Why Bevy?"
+weight = 1
+template = "docs-section.html"
++++
diff --git a/content/learn/book/graphics/3d/_index.md b/content/learn/book/graphics/3d/_index.md
index ec54d2991f..41828e1ca4 100644
--- a/content/learn/book/graphics/3d/_index.md
+++ b/content/learn/book/graphics/3d/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "3d"
+title = "3D"
 weight = 6
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/graphics/3d/pbr/_index.md b/content/learn/book/graphics/3d/pbr/_index.md
index 9c6b90525d..c8e112c62e 100644
--- a/content/learn/book/graphics/3d/pbr/_index.md
+++ b/content/learn/book/graphics/3d/pbr/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Physically-based rendering"
+title = "Physically-Based Rendering"
 weight = 2
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/graphics/_index.md b/content/learn/book/graphics/_index.md
index ad53047c29..237fbf6452 100644
--- a/content/learn/book/graphics/_index.md
+++ b/content/learn/book/graphics/_index.md
@@ -1,6 +1,6 @@
 +++
 title = "Graphics"
-weight = 4
+weight = 5
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/graphics/parent-child-hierarchy/_index.md b/content/learn/book/graphics/parent-child-hierarchy/_index.md
index e765547cd0..914a673c0f 100644
--- a/content/learn/book/graphics/parent-child-hierarchy/_index.md
+++ b/content/learn/book/graphics/parent-child-hierarchy/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Parent-child hierarchy"
+title = "Parent-Child Hierarchy"
 weight = 3
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/graphics/rendering-internals/_index.md b/content/learn/book/graphics/rendering-internals/_index.md
index 74f7038ed4..38d63cc91b 100644
--- a/content/learn/book/graphics/rendering-internals/_index.md
+++ b/content/learn/book/graphics/rendering-internals/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Rendering internals"
+title = "Rendering Internals"
 weight = 7
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/graphics/transforms/_index.md b/content/learn/book/graphics/transforms/_index.md
index 41c3c1e815..637aa09419 100644
--- a/content/learn/book/graphics/transforms/_index.md
+++ b/content/learn/book/graphics/transforms/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Transforms"
+title = "The Transform Component Controls Position"
 weight = 1
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/graphics/windowing/_index.md b/content/learn/book/graphics/windows/_index.md
similarity index 90%
rename from content/learn/book/graphics/windowing/_index.md
rename to content/learn/book/graphics/windows/_index.md
index 8e47b3de57..3e809392c4 100644
--- a/content/learn/book/graphics/windowing/_index.md
+++ b/content/learn/book/graphics/windows/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Configuring your window(s)"
+title = "Configuring Your Window(s)"
 weight = 4
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/input/_index.md b/content/learn/book/input/_index.md
index eaca0d989e..ecbe2a116f 100644
--- a/content/learn/book/input/_index.md
+++ b/content/learn/book/input/_index.md
@@ -1,6 +1,6 @@
 +++
 title = "Input"
-weight = 6
+weight = 7
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/input/input-basics/_index.md b/content/learn/book/input/basics/_index.md
similarity index 94%
rename from content/learn/book/input/input-basics/_index.md
rename to content/learn/book/input/basics/_index.md
index 2f2c9fe9b5..44cc34cb83 100644
--- a/content/learn/book/input/input-basics/_index.md
+++ b/content/learn/book/input/basics/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Input basics"
+title = "Input Basics"
 weight = 1
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/input/gamepad/_index.md b/content/learn/book/input/gamepad/_index.md
index 536c9a1685..1231eea5a1 100644
--- a/content/learn/book/input/gamepad/_index.md
+++ b/content/learn/book/input/gamepad/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Gamepad"
+title = "Gamepad Input"
 weight = 5
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/input/keyboard/_index.md b/content/learn/book/input/keyboard/_index.md
index 6b5679042e..51bc67fa77 100644
--- a/content/learn/book/input/keyboard/_index.md
+++ b/content/learn/book/input/keyboard/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Keyboard"
+title = "Keyboard Input"
 weight = 2
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/input/mouse/_index.md b/content/learn/book/input/mouse/_index.md
index f84e4124ad..19b0728963 100644
--- a/content/learn/book/input/mouse/_index.md
+++ b/content/learn/book/input/mouse/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Mouse"
+title = "Mouse Input"
 weight = 3
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/input/touch/_index.md b/content/learn/book/input/touch/_index.md
index c45e8640dc..d21d6757e3 100644
--- a/content/learn/book/input/touch/_index.md
+++ b/content/learn/book/input/touch/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Touch"
+title = "Touch Input"
 weight = 4
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/book/performance-optimizations/_index.md b/content/learn/book/performance-optimizations/_index.md
index 736095fa75..8a52108e0e 100644
--- a/content/learn/book/performance-optimizations/_index.md
+++ b/content/learn/book/performance-optimizations/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "Performance optimizations"
-weight = 10
+title = "Performance Optimizations"
+weight = 11
 template = "docs-section.html"
 page_template = "docs-section.html"
 insert_anchor_links = "right"
diff --git a/content/learn/book/performance-optimizations/component-storage/_index.md b/content/learn/book/performance-optimizations/component-storage/_index.md
index da429526f4..a622eb82cb 100644
--- a/content/learn/book/performance-optimizations/component-storage/_index.md
+++ b/content/learn/book/performance-optimizations/component-storage/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Component storage"
+title = "Component Storage Types"
 weight = 4
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/performance-optimizations/diagnostics-benchmarking/_index.md b/content/learn/book/performance-optimizations/diagnostics-benchmarking/_index.md
index f5017cd7ca..6c7c91f49d 100644
--- a/content/learn/book/performance-optimizations/diagnostics-benchmarking/_index.md
+++ b/content/learn/book/performance-optimizations/diagnostics-benchmarking/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Diagnostics and benchmarking"
+title = "Diagnostics and Benchmarking"
 weight = 1
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/performance-optimizations/indexes/_index.md b/content/learn/book/performance-optimizations/indexes/_index.md
index 0b93386e38..d56b740f72 100644
--- a/content/learn/book/performance-optimizations/indexes/_index.md
+++ b/content/learn/book/performance-optimizations/indexes/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Indexes"
+title = "Custom \"Indexing\" Patterns"
 weight = 3
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/performance-optimizations/parallel-iteration/_index.md b/content/learn/book/performance-optimizations/parallel-iteration/_index.md
index 165dbf44e5..fdb2263082 100644
--- a/content/learn/book/performance-optimizations/parallel-iteration/_index.md
+++ b/content/learn/book/performance-optimizations/parallel-iteration/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Parallel iteration"
+title = "Parallel Iteration"
 weight = 2
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/platforms/_index.md b/content/learn/book/platforms/_index.md
index 5a06e7829b..9d218c01f7 100644
--- a/content/learn/book/platforms/_index.md
+++ b/content/learn/book/platforms/_index.md
@@ -1,6 +1,6 @@
 +++
 title = "Platforms"
-weight = 11
+weight = 12
 template = "docs-section.html"
 page_template = "docs-section.html"
 insert_anchor_links = "right"
diff --git a/content/learn/book/ui/_index.md b/content/learn/book/ui/_index.md
index c28e666030..5b2028069f 100644
--- a/content/learn/book/ui/_index.md
+++ b/content/learn/book/ui/_index.md
@@ -1,6 +1,6 @@
 +++
-title = "User interfaces"
-weight = 8
+title = "User Interfaces"
+weight = 9
 sort_by = "weight"
 template = "docs-section.html"
 page_template = "docs-section.html"
diff --git a/content/learn/book/ui/ui-basics/_index.md b/content/learn/book/ui/basics/_index.md
similarity index 95%
rename from content/learn/book/ui/ui-basics/_index.md
rename to content/learn/book/ui/basics/_index.md
index c6d5aeae0b..903060b7e4 100644
--- a/content/learn/book/ui/ui-basics/_index.md
+++ b/content/learn/book/ui/basics/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "UI basics"
+title = "User Interface Basics"
 weight = 1
 sort_by = "weight"
 template = "docs-section.html"
diff --git a/content/learn/quick-start/3d-puzzle-game/_index.md b/content/learn/quick-start/3d-puzzle-game/_index.md
new file mode 100644
index 0000000000..4c133940c0
--- /dev/null
+++ b/content/learn/quick-start/3d-puzzle-game/_index.md
@@ -0,0 +1,7 @@
++++
+title = "3D Puzzle Game"
+weight = 3
+template = "docs-section.html"
+[extra]
+public_draft = 877
++++
diff --git a/content/learn/quick-start/breakout/_index.md b/content/learn/quick-start/breakout/_index.md
new file mode 100644
index 0000000000..abb5798b2f
--- /dev/null
+++ b/content/learn/quick-start/breakout/_index.md
@@ -0,0 +1,7 @@
++++
+title = "Breakout"
+weight = 1
+template = "docs-section.html"
+[extra]
+public_draft = 877
++++
diff --git a/content/learn/quick-start/falling-sand/_index.md b/content/learn/quick-start/falling-sand/_index.md
new file mode 100644
index 0000000000..23dc688dc4
--- /dev/null
+++ b/content/learn/quick-start/falling-sand/_index.md
@@ -0,0 +1,7 @@
++++
+title = "Falling Sand"
+weight = 2
+template = "docs-section.html"
+[extra]
+public_draft = 877
++++