diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
index be0506d45d..0a0924a4bc 100644
--- a/crates/bevy_render/src/lib.rs
+++ b/crates/bevy_render/src/lib.rs
@@ -15,7 +15,12 @@ pub use once_cell;
 
 pub mod prelude {
     pub use crate::{
-        color::Color, draw::Draw, entity::*, mesh::Mesh, pipeline::RenderPipelines, shader::Shader,
+        color::Color,
+        draw::Draw,
+        entity::*,
+        mesh::{shape, Mesh},
+        pipeline::RenderPipelines,
+        shader::Shader,
         texture::Texture,
     };
 }
diff --git a/crates/bevy_scene/src/lib.rs b/crates/bevy_scene/src/lib.rs
index 332c7c9f3f..b59f506dde 100644
--- a/crates/bevy_scene/src/lib.rs
+++ b/crates/bevy_scene/src/lib.rs
@@ -7,6 +7,10 @@ pub use loaded_scenes::*;
 pub use scene::*;
 pub use scene_spawner::*;
 
+pub mod prelude {
+    pub use crate::{Scene, SceneSpawner};
+}
+
 use bevy_app::prelude::*;
 use bevy_asset::AddAsset;
 use bevy_ecs::IntoThreadLocalSystem;
diff --git a/crates/bevy_sprite/src/lib.rs b/crates/bevy_sprite/src/lib.rs
index 027fb57d9e..ea6e315fc5 100644
--- a/crates/bevy_sprite/src/lib.rs
+++ b/crates/bevy_sprite/src/lib.rs
@@ -1,7 +1,8 @@
 pub mod collide_aabb;
+pub mod entity;
+
 mod color_material;
 mod dynamic_texture_atlas_builder;
-pub mod entity;
 mod rect;
 mod render;
 mod sprite;
@@ -16,6 +17,13 @@ pub use sprite::*;
 pub use texture_atlas::*;
 pub use texture_atlas_builder::*;
 
+pub mod prelude {
+    pub use crate::{
+        entity::{SpriteComponents, SpriteSheetComponents},
+        ColorMaterial, Sprite, TextureAtlas, TextureAtlasSprite,
+    };
+}
+
 use bevy_app::prelude::*;
 use bevy_asset::{AddAsset, Assets, Handle};
 use bevy_ecs::IntoQuerySystem;
diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs
index 73ff9c9e05..7cf2b118cc 100644
--- a/crates/bevy_text/src/lib.rs
+++ b/crates/bevy_text/src/lib.rs
@@ -10,6 +10,10 @@ pub use font_atlas::*;
 pub use font_atlas_set::*;
 pub use font_loader::*;
 
+pub mod prelude {
+    pub use crate::{Font, TextStyle};
+}
+
 use bevy_app::prelude::*;
 use bevy_asset::AddAsset;
 
diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
index 536a5ca71d..3ef1b0649a 100644
--- a/crates/bevy_ui/src/lib.rs
+++ b/crates/bevy_ui/src/lib.rs
@@ -12,6 +12,10 @@ pub use node::*;
 pub use render::*;
 pub use ui_update_system::*;
 
+pub mod prelude {
+    pub use crate::{entity::*, widget::Label, Anchors, Margins, Node};
+}
+
 use bevy_app::prelude::*;
 use bevy_ecs::IntoQuerySystem;
 use bevy_render::render_graph::RenderGraph;
diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs
index 090e271cb1..858c0c223b 100644
--- a/examples/3d/3d_scene.rs
+++ b/examples/3d/3d_scene.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, render::mesh::shape};
+use bevy::prelude::*;
 
 fn main() {
     App::build()
diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs
index 616ad51625..66ab125946 100644
--- a/examples/3d/spawner.rs
+++ b/examples/3d/spawner.rs
@@ -1,7 +1,6 @@
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, PrintDiagnosticsPlugin},
     prelude::*,
-    render::mesh::shape,
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
 
diff --git a/examples/3d/texture.rs b/examples/3d/texture.rs
index c954f84640..20c5fd6374 100644
--- a/examples/3d/texture.rs
+++ b/examples/3d/texture.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, render::mesh::shape};
+use bevy::prelude::*;
 
 fn main() {
     App::build()
diff --git a/examples/app/dynamic_plugin_loading/example_plugin/src/lib.rs b/examples/app/dynamic_plugin_loading/example_plugin/src/lib.rs
index 158944965e..2f0458b959 100644
--- a/examples/app/dynamic_plugin_loading/example_plugin/src/lib.rs
+++ b/examples/app/dynamic_plugin_loading/example_plugin/src/lib.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, render::mesh::shape};
+use bevy::prelude::*;
 
 #[derive(DynamicAppPlugin)]
 pub struct ExamplePlugin;
diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs
index 7522eebed7..d45185fafb 100644
--- a/examples/window/multiple_windows.rs
+++ b/examples/window/multiple_windows.rs
@@ -6,7 +6,7 @@ use bevy::{
         render_graph::{CameraNode, PassNode, RenderGraph, WindowSwapChainNode, WindowTextureNode},
         texture::{TextureDescriptor, TextureFormat, TextureUsage},
     },
-    window::{CreateWindow, WindowId, WindowReference},
+    window::{CreateWindow, WindowDescriptor, WindowId, WindowReference},
 };
 
 fn main() {
diff --git a/src/prelude.rs b/src/prelude.rs
index 0f5104dace..f622f08061 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -9,15 +9,11 @@ pub use crate::{
     pbr::prelude::*,
     property::prelude::*,
     render::prelude::*,
-    scene::{Scene, SceneSpawner},
-    sprite::{
-        entity::{SpriteComponents, SpriteSheetComponents},
-        ColorMaterial, Sprite, TextureAtlas, TextureAtlasSprite,
-    },
-    text::{Font, TextStyle},
+    scene::prelude::*,
+    sprite::prelude::*,
+    text::prelude::*,
     transform::prelude::*,
     type_registry::RegisterType,
-    ui::{entity::*, widget::Label, Anchors, Margins, Node},
-    window::{Window, WindowDescriptor, WindowPlugin, Windows},
+    ui::prelude::*,
     AddDefaultPlugins,
 };