diff --git a/Cargo.toml b/Cargo.toml
index 8566896..c4bbdac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_meshem"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 authors = ["Adamkob12"]
 description = "A crate that offers a flexible and efficient way to generate meshes from a grid of Voxels"
@@ -11,5 +11,5 @@ documentation = "https://docs.rs/bevy_meshem"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.16.0"
+bevy = "0.18.0"
 rand = "0.8.5"
diff --git a/examples/simple_example.rs b/examples/simple_example.rs
index 061de7e..584fa03 100644
--- a/examples/simple_example.rs
+++ b/examples/simple_example.rs
@@ -23,14 +23,10 @@ fn main() {
             Some(0.8),
             1.0,
         ),
-    })
-    .insert_resource(AmbientLight {
-        brightness: 1500.0,
-        color: Color::WHITE,
-        ..default()
     });
 
-    app.add_systems(Startup, setup).add_systems(
+    app.add_systems(Startup, setup)
+        .add_systems(
         Update,
         (
             input_handler,
@@ -40,8 +36,8 @@ fn main() {
         ),
     );
 
-    app.add_event::<ToggleWireframe>()
-        .add_event::<RegenerateMesh>();
+    app.add_message::<ToggleWireframe>()
+        .add_message::<RegenerateMesh>();
 
     app.run();
 }
@@ -55,10 +51,10 @@ struct Meshy {
 #[derive(Component)]
 struct MeshInfo;
 
-#[derive(Event, Default)]
+#[derive(Message, Default)]
 struct ToggleWireframe;
 
-#[derive(Event, Default)]
+#[derive(Message, Default)]
 struct RegenerateMesh;
 
 /// Setting up everything to showcase the mesh.
@@ -114,7 +110,12 @@ fn setup(
     // Camera in 3D space.
     commands.spawn((
         Camera3d::default(),
-        camera_and_light_transform
+        camera_and_light_transform,
+        AmbientLight {
+                brightness: 1500.0,
+                color: Color::WHITE,
+                ..default()
+        }
     ));
 
     // Light up the scene.
@@ -190,7 +191,7 @@ impl VoxelRegistry for BlockRegistry {
     /// The attributes we want to take from out voxels, note that using a lot of different
     /// attributes will likely lead to performance problems and unpredictable behaviour.
     /// We chose these 3 because they are very common, the algorithm does preserve UV data.
-    fn all_attributes(&self) -> Vec<bevy::render::mesh::MeshVertexAttribute> {
+    fn all_attributes(&self) -> Vec<bevy::mesh::MeshVertexAttribute> {
         return vec![
             Mesh::ATTRIBUTE_POSITION,
             Mesh::ATTRIBUTE_UV_0,
@@ -204,8 +205,8 @@ fn input_handler(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<&mut Transform, With<Meshy>>,
     time: Res<Time>,
-    mut event_writer: EventWriter<ToggleWireframe>,
-    mut e: EventWriter<RegenerateMesh>,
+    mut message_writer: MessageWriter<ToggleWireframe>,
+    mut e: MessageWriter<RegenerateMesh>,
 ) {
     if keyboard_input.pressed(KeyCode::KeyX) {
         for mut transform in &mut query {
@@ -228,7 +229,7 @@ fn input_handler(
         }
     }
     if keyboard_input.just_pressed(KeyCode::KeyT) {
-        event_writer.write_default();
+        message_writer.write_default();
     }
     if keyboard_input.just_pressed(KeyCode::KeyC) {
         e.write_default();
@@ -241,9 +242,9 @@ fn toggle_wireframe(
     mut materials: ResMut<Assets<StandardMaterial>>,
     with: Query<Entity, With<Wireframe>>,
     without: Query<Entity, (Without<Wireframe>, With<Meshy>)>,
-    mut events: EventReader<ToggleWireframe>,
+    mut messages: MessageReader<ToggleWireframe>,
 ) {
-    for _ in events.read() {
+    for _ in messages.read() {
         if let Ok(ent) = with.single() {
             commands.entity(ent).remove::<Wireframe>();
             for (_, material) in materials.iter_mut() {
@@ -301,10 +302,10 @@ fn regenerate_mesh(
     breg: Res<BlockRegistry>,
     mut meshes: ResMut<Assets<Mesh>>,
     mesh_query: Query<&Mesh3d>,
-    mut event_reader: EventReader<RegenerateMesh>,
+    mut message_reader: MessageReader<RegenerateMesh>,
     mut text_query: Query<&mut Text, With<MeshInfo>>,
 ) {
-    for _ in event_reader.read() {
+    for _ in message_reader.read() {
         let mesh = meshes
             .get_mut(mesh_query.single().unwrap())
             .expect("Couldn't get a mut ref to the mesh");
diff --git a/examples/update_mesh_example.rs b/examples/update_mesh_example.rs
index 6e1d4db..8260c88 100644
--- a/examples/update_mesh_example.rs
+++ b/examples/update_mesh_example.rs
@@ -49,11 +49,6 @@ fn main() {
     app.insert_resource(BlockRegistry {
         grass: mesh,
         dirt: mesh2,
-    })
-    .insert_resource(AmbientLight {
-        brightness: 400.0,
-        color: Color::WHITE,
-        ..default()
     });
 
     app.add_systems(Startup, setup).add_systems(
@@ -66,8 +61,8 @@ fn main() {
         ),
     );
 
-    app.add_event::<ToggleWireframe>()
-        .add_event::<RegenerateMesh>();
+    app.add_message::<ToggleWireframe>()
+        .add_message::<RegenerateMesh>();
 
     app.run();
 }
@@ -81,10 +76,10 @@ struct Meshy {
 #[derive(Component)]
 struct MeshInfo;
 
-#[derive(Event, Default)]
+#[derive(Message, Default)]
 struct ToggleWireframe;
 
-#[derive(Event, Default)]
+#[derive(Message, Default)]
 struct RegenerateMesh;
 
 /// Setting up everything to showcase the mesh.
@@ -153,7 +148,12 @@ fn setup(
     // Camera in 3D space.
     commands.spawn((
         Camera3d::default(),
-        camera_and_light_transform
+        camera_and_light_transform,
+        AmbientLight {
+            brightness: 400.0,
+            color: Color::WHITE,
+            ..default()
+        }
     ));
 
     // Light up the scene.
@@ -240,7 +240,7 @@ impl VoxelRegistry for BlockRegistry {
     /// The attributes we want to take from out voxels, note that using a lot of different
     /// attributes will likely lead to performance problems and unpredictable behaviour.
     /// We chose these 3 because they are very common, the algorithm does preserve UV data.
-    fn all_attributes(&self) -> Vec<bevy::render::mesh::MeshVertexAttribute> {
+    fn all_attributes(&self) -> Vec<bevy::mesh::MeshVertexAttribute> {
         return vec![
             Mesh::ATTRIBUTE_POSITION,
             Mesh::ATTRIBUTE_UV_0,
@@ -254,8 +254,8 @@ fn input_handler(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<&mut Transform, With<Meshy>>,
     time: Res<Time>,
-    mut event_writer: EventWriter<ToggleWireframe>,
-    mut e: EventWriter<RegenerateMesh>,
+    mut message_writer: MessageWriter<ToggleWireframe>,
+    mut e: MessageWriter<RegenerateMesh>,
 ) {
     if keyboard_input.pressed(KeyCode::KeyX) {
         for mut transform in &mut query {
@@ -278,7 +278,7 @@ fn input_handler(
         }
     }
     if keyboard_input.just_pressed(KeyCode::KeyT) {
-        event_writer.write_default();
+        message_writer.write_default();
     }
     if keyboard_input.pressed(KeyCode::KeyC) {
         e.write_default();
@@ -291,9 +291,9 @@ fn toggle_wireframe(
     mut materials: ResMut<Assets<StandardMaterial>>,
     with: Query<Entity, With<Wireframe>>,
     without: Query<Entity, (Without<Wireframe>, With<Meshy>)>,
-    mut events: EventReader<ToggleWireframe>,
+    mut messages: MessageReader<ToggleWireframe>,
 ) {
-    for _ in events.read() {
+    for _ in messages.read() {
         if let Ok(ent) = with.single() {
             commands.entity(ent).remove::<Wireframe>();
             for (_, material) in materials.iter_mut() {
@@ -351,9 +351,9 @@ fn mesh_update(
     breg: Res<BlockRegistry>,
     mut meshes: ResMut<Assets<Mesh>>,
     mesh_query: Query<&Mesh3d>,
-    mut event_reader: EventReader<RegenerateMesh>,
+    mut message_reader: MessageReader<RegenerateMesh>,
 ) {
-    for _ in event_reader.read() {
+    for _ in message_reader.read() {
         let mesh = meshes
             .get_mut(mesh_query.single().unwrap())
             .expect("Couldn't get a mut ref to the mesh");
diff --git a/src/lib.rs b/src/lib.rs
index cfd9542..ed8d862 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,8 +8,8 @@ pub mod util;
 pub(crate) mod voxel_mesh;
 
 use bevy::log::warn;
+use bevy::mesh::MeshVertexAttribute;
 use bevy::prelude::*;
-use bevy::render::mesh::MeshVertexAttribute;
 
 pub mod prelude {
     pub use crate::adj::*;
diff --git a/src/meshem.rs b/src/meshem.rs
index ea332b9..62378a7 100644
--- a/src/meshem.rs
+++ b/src/meshem.rs
@@ -1,9 +1,9 @@
 //! This module contains the main functions themself, and some added utilities and defs.
 use crate::pbs::*;
 use crate::prelude::*;
+use bevy::asset::RenderAssetUsages;
 use bevy::prelude::*;
-use bevy::render::mesh::{Indices, MeshVertexAttribute, VertexAttributeValues};
-use bevy::render::render_asset::RenderAssetUsages;
+use bevy::mesh::{Indices, MeshVertexAttribute, VertexAttributeValues};
 use bevy::render::render_resource::PrimitiveTopology;
 
 /// All the variants for the Meshing algorithm.
diff --git a/src/pbs.rs b/src/pbs.rs
index ecd0d72..4e7699c 100644
--- a/src/pbs.rs
+++ b/src/pbs.rs
@@ -2,8 +2,7 @@
 /// voxel based games that resembles Ambient Occlusion, but it is static- which means the
 /// shadows are computed only once, when the mesh is generated (or updated).
 use crate::prelude::*;
-use bevy::math::Vec3;
-use bevy::render::mesh::{Mesh, VertexAttributeValues};
+use bevy::{math::Vec3, mesh::VertexAttributeValues};
 use std::sync::{Arc, RwLock};
 
 #[derive(Copy, Clone)]
diff --git a/src/update.rs b/src/update.rs
index 1bd46ca..074085c 100644
--- a/src/update.rs
+++ b/src/update.rs
@@ -1,6 +1,6 @@
 // use crate::pbs::*;
 use crate::prelude::*;
-use bevy::render::mesh::{Indices, VertexAttributeValues};
+use bevy::mesh::{Indices, VertexAttributeValues};
 
 /// The function updates the mesh according to the change log in the mesh meta data.
 pub fn update_mesh<T: std::fmt::Debug>(
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 553a3d7..3fe2a4f 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -154,7 +154,7 @@ pub const fn one_d_cords_safe(threed: [usize; 3], dims: (usize, usize, usize)) -
 }
 
 // Extract the vertex data for the physics engine.
-use bevy::render::mesh::{Mesh, VertexAttributeValues};
+use bevy::mesh::{Mesh, VertexAttributeValues};
 pub fn extract_position_vertex_data(mesh: &Mesh) -> Vec<Vec3> {
     let VertexAttributeValues::Float32x3(pos_vertices) =
         mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap()
@@ -168,7 +168,7 @@ pub fn extract_position_vertex_data(mesh: &Mesh) -> Vec<Vec3> {
 }
 
 // Extract the indices for the physics engine.
-use bevy::render::mesh::Indices;
+use bevy::mesh::Indices;
 pub fn extract_indices_data(mesh: &Mesh) -> Vec<[u32; 3]> {
     let Indices::U32(indices) = mesh.indices().unwrap() else {
         panic!("Indices data shoud be in `Indices::U32` format")
diff --git a/src/util/vav.rs b/src/util/vav.rs
index cf48015..64f894b 100644
--- a/src/util/vav.rs
+++ b/src/util/vav.rs
@@ -2,7 +2,9 @@
 //! that makes working with them more comfortable. It is very spaghetti but it helps with the
 //! readability of main API.
 #![allow(unused_variables)]
-use bevy::render::{mesh::VertexAttributeValues, render_resource::VertexFormat};
+use bevy::render::render_resource::VertexFormat;
+use bevy::mesh::VertexAttributeValues;
+
 pub trait VAVutils {
     fn extend(&mut self, t: &Self);
     fn filter_bool_array(&self, index_filter: Vec<bool>) -> Self;
diff --git a/src/voxel_mesh.rs b/src/voxel_mesh.rs
index b8ed4b9..e232445 100644
--- a/src/voxel_mesh.rs
+++ b/src/voxel_mesh.rs
@@ -1,9 +1,9 @@
 //! A module containing the "default block", it is used in the examples,
 //! it is simple and easy to work with.
 use crate::prelude::*;
+use bevy::asset::RenderAssetUsages;
+use bevy::mesh::Indices;
 use bevy::prelude::*;
-use bevy::render::mesh::Indices;
-use bevy::render::render_asset::RenderAssetUsages;
 use bevy::render::render_resource::PrimitiveTopology;
 
 /// Function that generates the mesh of a voxel.