From fb85d173a1a9cc58e09460824b0b1021622a88b9 Mon Sep 17 00:00:00 2001
From: IDEDARY <IDEDARY@gmail.com>
Date: Thu, 29 Aug 2024 16:58:59 +0200
Subject: [PATCH 1/2] Run cargo clippy on the crate

---
 crates/bevy_lunex/src/lib.rs             |   2 +
 crates/bevy_lunex/src/logic/actions.rs   |   2 +-
 crates/bevy_lunex/src/logic/states.rs    |  26 +-
 crates/bevy_lunex/src/logic/style.rs     |   2 +-
 crates/bevy_lunex/src/picking.rs         |   2 +-
 crates/bevy_lunex/src/structs.rs         |  30 +-
 crates/bevy_lunex/src/systems.rs         |  14 +-
 crates/lunex_engine/src/core/compute.rs  |   2 +-
 crates/lunex_engine/src/core/structs.rs  |  18 +-
 crates/lunex_engine/src/core/traits.rs   |  27 +-
 crates/lunex_engine/src/core/value.rs    | 124 ++++----
 crates/lunex_engine/src/layout/layout.rs |  37 +--
 crates/lunex_engine/src/layout/mod.rs    |   1 +
 crates/lunex_engine/src/layout/stack.rs  |  17 +-
 crates/lunex_engine/src/nodes/structs.rs |  26 +-
 docs/src/advanced/abstraction/routes.md  |   2 +-
 docs/src/quick_start.md                  |   4 +-
 examples/mesh2d/src/main.rs              |   2 +-
 examples/minimal/src/main.rs             |   2 +-
 examples/worldspace_text/src/main.rs     | 342 +++++++++++------------
 20 files changed, 341 insertions(+), 341 deletions(-)

diff --git a/crates/bevy_lunex/src/lib.rs b/crates/bevy_lunex/src/lib.rs
index 063c121..54d2b47 100644
--- a/crates/bevy_lunex/src/lib.rs
+++ b/crates/bevy_lunex/src/lib.rs
@@ -1,4 +1,6 @@
 #![doc = include_str!("../README.md")]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::too_many_arguments)]
 
 // #==============================#
 // #=== IMPORTS FOR THIS CRATE ===#
diff --git a/crates/bevy_lunex/src/logic/actions.rs b/crates/bevy_lunex/src/logic/actions.rs
index 5f472fd..7817b0a 100644
--- a/crates/bevy_lunex/src/logic/actions.rs
+++ b/crates/bevy_lunex/src/logic/actions.rs
@@ -187,7 +187,7 @@ pub struct SetUiLayout {
 fn apply_event_set_ui_layout(mut events: EventReader<SetUiLayout>, mut query: Query<&mut UiLayout>) {
     for event in events.read() {
         if let Ok(mut layout) = query.get_mut(event.target) {
-            if layout.clone() != event.layout{
+            if *layout != event.layout{
                 *layout = event.layout;
             }
         }
diff --git a/crates/bevy_lunex/src/logic/states.rs b/crates/bevy_lunex/src/logic/states.rs
index 34a7f09..a1a4413 100644
--- a/crates/bevy_lunex/src/logic/states.rs
+++ b/crates/bevy_lunex/src/logic/states.rs
@@ -51,14 +51,7 @@ pub struct UiAnimator<S: UiState> {
 impl <S: UiState> UiAnimator<S> {
     /// Creates new struct
     pub fn new() -> Self {
-        UiAnimator {
-            marker: PhantomData,
-            animation_direction: -1.0,
-            animation_transition: 0.0,
-            receiver: false,
-            animation_speed_backward: 8.0,
-            animation_speed_forward: 8.0,
-        }
+        Self::default()
     }
     /// Marks this hover as receiver
     pub fn receiver(mut self, receiver: bool) -> Self {
@@ -80,6 +73,18 @@ impl <S: UiState> UiAnimator<S> {
         self.animation_direction == 1.0
     }
 }
+impl <S: UiState> Default for UiAnimator<S> {
+    fn default() -> Self {
+        Self {
+            marker: PhantomData,
+            animation_direction: -1.0,
+            animation_transition: 0.0,
+            receiver: false,
+            animation_speed_backward: 8.0,
+            animation_speed_forward: 8.0,
+        }
+    }
+}
 fn ui_animation<S: UiState>(time: Res<Time>, mut query: Query<&mut UiAnimator<S>>) {
     for mut control in &mut query {
         if control.receiver { continue }
@@ -229,6 +234,11 @@ impl <T:Component, N:Default + Component, S: UiState> Plugin for StatePlugin<T,N
             .add_systems(Update, send_layout_to_node::<T, N, S>.in_set(UiSystems::Send).before(send_content_size_to_node::<T, N>));
     }
 }
+impl <T:Component, N:Default + Component, S: UiState> Default for StatePlugin<T,N,S> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
 
 pub struct DefaultStatesPlugin;
 impl Plugin for DefaultStatesPlugin {
diff --git a/crates/bevy_lunex/src/logic/style.rs b/crates/bevy_lunex/src/logic/style.rs
index c816e21..d121adc 100644
--- a/crates/bevy_lunex/src/logic/style.rs
+++ b/crates/bevy_lunex/src/logic/style.rs
@@ -7,7 +7,7 @@ pub trait LerpColor {
 }
 impl LerpColor for Color {
     fn lerp(&self, color: Color, value: f32) -> Color {
-        let c1: Hsla = self.clone().into();
+        let c1: Hsla = (*self).into();
         let c2: Hsla = color.into();
         Color::hsla(c1.hue.lerp(c2.hue, value), c1.saturation.lerp(c2.saturation, value), c1.lightness.lerp(c2.lightness, value), c1.alpha.lerp(c2.alpha, value))
     }
diff --git a/crates/bevy_lunex/src/picking.rs b/crates/bevy_lunex/src/picking.rs
index d99e7d4..621611c 100644
--- a/crates/bevy_lunex/src/picking.rs
+++ b/crates/bevy_lunex/src/picking.rs
@@ -70,7 +70,7 @@ pub fn lunex_picking(
                         return None;
                     }
 
-                    let pos = if !element.is_some() { dimension.size.invert_y() / 2.0 } else { Vec2::ZERO };
+                    let pos = if element.is_none() { dimension.size.invert_y() / 2.0 } else { Vec2::ZERO };
 
                     let rect = Rect::from_center_size(pos, dimension.size);
 
diff --git a/crates/bevy_lunex/src/structs.rs b/crates/bevy_lunex/src/structs.rs
index fa096d3..0611074 100644
--- a/crates/bevy_lunex/src/structs.rs
+++ b/crates/bevy_lunex/src/structs.rs
@@ -59,7 +59,7 @@ impl UiState for Outro {
 
 /// This struct marks [`UiTree`] entity to receive piped [`Camera`] size and position to its [`Dimension`] and [`Transform`] component.
 #[derive(Component, Debug, Default, Clone, Copy, PartialEq)]
-pub struct MovableByCamera;
+pub struct SourceFromCamera;
 
 /// This struct is used to mark linked UI entities as elements for easier rendering.
 /// They are picked up by different systems, that ensure their piped [`Transform`] is centered,
@@ -205,9 +205,9 @@ pub trait PackageLayout {
 }
 
 // Implement packaging 
-impl <S> Into<UiLayout<S>> for ui::Boundary {
-    fn into(self) -> UiLayout<S> {
-        self.pack::<S>()
+impl <S> From<ui::Boundary> for UiLayout<S> {
+    fn from(val: ui::Boundary) -> Self {
+        val.pack::<S>()
     }
 }
 impl PackageLayout for ui::Boundary {
@@ -215,9 +215,9 @@ impl PackageLayout for ui::Boundary {
         UiLayout::<S>::from(self)
     }
 }
-impl <S> Into<UiLayout<S>> for ui::Window {
-    fn into(self) -> UiLayout<S> {
-        self.pack::<S>()
+impl <S> From<ui::Window> for UiLayout<S> {
+    fn from(val: ui::Window) -> Self {
+        val.pack::<S>()
     }
 }
 impl PackageLayout for ui::Window {
@@ -225,9 +225,9 @@ impl PackageLayout for ui::Window {
         UiLayout::<S>::from(self)
     }
 }
-impl <S> Into<UiLayout<S>> for ui::Solid {
-    fn into(self) -> UiLayout<S> {
-        self.pack::<S>()
+impl <S> From<ui::Solid> for UiLayout<S> {
+    fn from(val: ui::Solid) -> Self {
+        val.pack::<S>()
     }
 }
 impl PackageLayout for ui::Solid {
@@ -235,9 +235,9 @@ impl PackageLayout for ui::Solid {
         UiLayout::<S>::from(self)
     }
 }
-impl <S> Into<UiLayout<S>> for ui::Div {
-    fn into(self) -> UiLayout<S> {
-        self.pack::<S>()
+impl <S> From<ui::Div> for UiLayout<S> {
+    fn from(val: ui::Div) -> Self {
+        val.pack::<S>()
     }
 }
 impl PackageLayout for ui::Div {
@@ -289,7 +289,7 @@ impl <T> UiLink<T> {
     }
     pub fn new() -> Self {
         UiLink {
-            path: format!("/"),
+            path: "/".to_string(),
             marker: PhantomData,
         }
     }
@@ -297,7 +297,7 @@ impl <T> UiLink<T> {
 impl <T> Default for UiLink<T> {
     fn default() -> Self {
         UiLink {
-            path: String::new(),
+            path: "/".to_string(),
             marker: PhantomData,
         }
     }
diff --git a/crates/bevy_lunex/src/systems.rs b/crates/bevy_lunex/src/systems.rs
index 8c29e41..9478130 100644
--- a/crates/bevy_lunex/src/systems.rs
+++ b/crates/bevy_lunex/src/systems.rs
@@ -12,7 +12,7 @@ use lunex_engine::*;
 /// * Generic `(N)` - Node data schema struct defining what can be stored in [`UiNode`]
 /// * Generic `(T)` - Marker component grouping entities into one widget type
 pub fn compute_ui<T:Component, N:Default + Component>(
-    mut query: Query<(&Dimension, &mut UiTree<T, N>, Option<&MovableByCamera>), (With<UiLink<T>>, Or<(Changed<UiTree<T, N>>, Changed<Dimension>)>)>,
+    mut query: Query<(&Dimension, &mut UiTree<T, N>, Option<&SourceFromCamera>), (With<UiLink<T>>, Or<(Changed<UiTree<T, N>>, Changed<Dimension>)>)>,
     window: Query<&bevy::window::Window, With<PrimaryWindow>>,
 ) {
     let scale = if let Ok(window) = window.get_single() { window.resolution.scale_factor() } else { 1.0 };
@@ -89,7 +89,7 @@ pub fn debug_print_tree<T:Component, N:Default + Component>(
 ///   is marked with `(T)` component at the same time.
 pub fn fetch_dimension_from_camera<T:Component, N:Default + Component>(
     source: Query<(&Camera, Option<&OrthographicProjection>), (With<T>, Changed<Camera>)>,
-    mut destination: Query<&mut Dimension, (With<UiTree<T, N>>, With<MovableByCamera>)>
+    mut destination: Query<&mut Dimension, (With<UiTree<T, N>>, With<SourceFromCamera>)>
 ) {
     // Undesired behaviour if source.len() > 1
     for (cam, o_projection) in &source {
@@ -104,7 +104,7 @@ pub fn fetch_dimension_from_camera<T:Component, N:Default + Component>(
     }
 }
 
-/// This system takes [`Camera`] data and overwrites querried [`Transform`] + [`MovableByCamera`].
+/// This system takes [`Camera`] data and overwrites querried [`Transform`] + [`SourceFromCamera`].
 /// It is mainly used to pipe [`Camera`] data into [`UiTree`] for positioning.
 /// ## 📦 Types
 /// * Generic `(N)` - Node data schema struct defining what can be stored in [`UiNode`]
@@ -115,7 +115,7 @@ pub fn fetch_dimension_from_camera<T:Component, N:Default + Component>(
 ///   is marked with `(T)` component at the same time.
 pub fn fetch_transform_from_camera<T:Component, N:Default + Component>(
     source: Query<(&Camera, Option<&OrthographicProjection>), (With<T>, Changed<Camera>)>,
-    mut destination: Query<&mut Transform, (With<UiTree<T, N>>, With<MovableByCamera>)>,
+    mut destination: Query<&mut Transform, (With<UiTree<T, N>>, With<SourceFromCamera>)>,
     window: Query<&bevy::window::Window, With<PrimaryWindow>>,
 ) {
     // Undesired behaviour if source.len() > 1
@@ -144,7 +144,7 @@ pub fn fetch_transform_from_camera<T:Component, N:Default + Component>(
 ///   Otherwise, it will lead to value overwriting. Just make sure only one camera
 ///   is marked with `(T)` component at the same time.
 pub fn touch_camera_if_uitree_added<T:Component, N:Default + Component>(
-    query: Query<Entity, (Added<UiTree<T, N>>, With<MovableByCamera>)>,
+    query: Query<Entity, (Added<UiTree<T, N>>, With<SourceFromCamera>)>,
     mut camera: Query<&mut Camera, With<T>>,
 ){
     if !query.is_empty() {
@@ -227,7 +227,7 @@ pub fn send_stack_to_node<T:Component, N:Default + Component>(
                     if let Some(container) = node.obtain_data_mut() {
                         #[cfg(feature = "verbose")]
                         info!("{} {} - Received Stack data", "->".blue(), link.path.yellow().bold());
-                        container.stack = *stack;
+                        container.stack = stack.clone();
                     }
                 }
             }
@@ -386,7 +386,7 @@ pub fn element_sprite_size_from_dimension<T: Component>(
 /// ## 📦 Types
 /// * Generic `(T)` - Marker component grouping entities into one widget type
 pub fn element_image_size_from_dimension<T: Component>(
-    query: Query<(&Handle<Image>, &Dimension), (With<UiLink<T>>, With<Element>, With<MovableByCamera>, Changed<Dimension>)>,
+    query: Query<(&Handle<Image>, &Dimension), (With<UiLink<T>>, With<Element>, With<SourceFromCamera>, Changed<Dimension>)>,
     mut images: ResMut<Assets<Image>>,
 ) {
     for (handle, dimension) in &query {
diff --git a/crates/lunex_engine/src/core/compute.rs b/crates/lunex_engine/src/core/compute.rs
index ffdac17..72f61e8 100644
--- a/crates/lunex_engine/src/core/compute.rs
+++ b/crates/lunex_engine/src/core/compute.rs
@@ -115,7 +115,7 @@ impl <N:Default + Component> UiNodeComputeTrait for UiNode<N> {
 
         } else { return; };
 
-        if skip == false {
+        if !skip {
             if is_parametric {
                 //compute divs with inherited scale
                 //self.compute_content(parent.size, Vec4::ZERO, absolute_scale, font_size);
diff --git a/crates/lunex_engine/src/core/structs.rs b/crates/lunex_engine/src/core/structs.rs
index dbc37df..264504d 100644
--- a/crates/lunex_engine/src/core/structs.rs
+++ b/crates/lunex_engine/src/core/structs.rs
@@ -81,11 +81,11 @@ impl Rectangle2D {
         self
     }    
 }
-impl Into<Rectangle3D> for Rectangle2D {
-    fn into(self) -> Rectangle3D {
+impl From<Rectangle2D> for Rectangle3D {
+    fn from(val: Rectangle2D) -> Self {
         Rectangle3D {
-            pos: self.pos.extend(0.0),
-            size: self.size,
+            pos: val.pos.extend(0.0),
+            size: val.size,
             ..Default::default()
         }
     }
@@ -112,17 +112,17 @@ impl Rectangle3D {
         }
     }
 }
-impl Into<Rectangle2D> for Rectangle3D {
-    fn into(self) -> Rectangle2D {
+impl From<Rectangle3D> for Rectangle2D {
+    fn from(val: Rectangle3D) -> Self {
         Rectangle2D {
-            pos: self.pos.truncate(),
-            size: self.size,
+            pos: val.pos.truncate(),
+            size: val.size,
         }
     }
 }
 impl NiceDisplay for Rectangle3D {
     fn to_nicestr(&self) -> String {
-        let text = format!("[pos: {} size: {}]", self.pos.to_string(), self.size.to_string());
+        let text = format!("[pos: {} size: {}]", self.pos, self.size);
         format!("{} {}", "Computed".bright_magenta(), text.black())
     }
 }
diff --git a/crates/lunex_engine/src/core/traits.rs b/crates/lunex_engine/src/core/traits.rs
index d5a897a..a399887 100644
--- a/crates/lunex_engine/src/core/traits.rs
+++ b/crates/lunex_engine/src/core/traits.rs
@@ -145,7 +145,7 @@ pub trait UiNodeDataTrait<N> {
     /// * Use [`UiNodeDataTrait::insert_ui_data`] for hierarchy insert `(supports path recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn add_ui_data(&mut self, data: N) -> Option<N>;
     /// ## 🚸 Recursive
     /// Inserts new data to this node or any other subnode and returns the previous data.
@@ -153,14 +153,14 @@ pub trait UiNodeDataTrait<N> {
     /// * Use [`UiNodeDataTrait::add_ui_data`] for direct insert on this node `(no recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn insert_ui_data(&mut self, path: impl Borrow<str>, data: N) -> Result<Option<N>, NodeError>;
     /// Removes data from this node and returns them.
     /// ## 📌 Note
     /// * Use [`UiNodeDataTrait::remove_ui_data`] for hierarchy retrieval `(supports path recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn take_ui_data(&mut self) -> Option<N>;
     /// ## 🚸 Recursive
     /// Removes data from this node or any other subnode and returns them.
@@ -168,21 +168,21 @@ pub trait UiNodeDataTrait<N> {
     /// * Use [`UiNodeDataTrait::take_ui_data`] for direct retrieval on this node `(no recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn remove_ui_data(&mut self, path: impl Borrow<str>) -> Result<Option<N>, NodeError>;
     /// Borrows data from this node.
     /// ## 📌 Note
     /// * Use [`UiNodeDataTrait::borrow_ui_data`] for hierarchy retrieval `(supports path recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn obtain_ui_data(&self) -> Option<&N>;
     /// Borrows data from this node as mut.
     /// ## 📌 Note
     /// * Use [`UiNodeDataTrait::borrow_ui_data_mut`] for hierarchy retrieval `(supports path recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn obtain_ui_data_mut(&mut self) -> Option<&mut N>;
     /// ## 🚸 Recursive
     /// Borrows data from this node or any other subnode.
@@ -190,7 +190,7 @@ pub trait UiNodeDataTrait<N> {
     /// * Use [`UiNodeDataTrait::obtain_ui_data`] for direct retrieval on this node `(no recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn borrow_ui_data(&self, path: impl Borrow<str>) -> Result<Option<&N>, NodeError>;
     /// ## 🚸 Recursive
     /// Borrows data from this node or any other subnode as mut.
@@ -198,7 +198,7 @@ pub trait UiNodeDataTrait<N> {
     /// * Use [`UiNodeDataTrait::obtain_ui_data_mut`] for direct retrieval on this node `(no recursion)`
     /// ## ⚠️ Panics
     /// * Panics if [`UiNode`] is missing [`NodeData`] struct that holds layout data + user data.
-    /// Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
+    ///   Wont happen unless somebody messed with internals using elevated access methods _(not in prelude)_.
     fn borrow_ui_data_mut(&mut self, path: impl Borrow<str>) -> Result<Option<&mut N>, NodeError>;
 }
 impl <T, N: Default + Component> UiNodeDataTrait<N> for UiTree<T, N> {
@@ -238,11 +238,11 @@ impl <N: Default + Component> UiNodeDataTrait<N> for UiNode<N> {
     }
     fn take_ui_data(&mut self) -> Option<N> {
         let Some(container) = self.obtain_data_mut() else { panic!("This UiNode is missing Ui data!") };
-        core::mem::replace(&mut container.data, None)
+        container.data.take()
     }
     fn remove_ui_data(&mut self, path: impl Borrow<str>) -> Result<Option<N>, NodeError> {
         let Some(container) = self.borrow_data_mut(path)? else { panic!("This UiNode is missing Ui data!") };
-        Ok(core::mem::replace(&mut container.data, None))
+        Ok(container.data.take())
     }
     fn obtain_ui_data(&self) -> Option<&N> {
         let Some(container) = self.obtain_data() else { panic!("This UiNode is missing Ui data!") };
@@ -279,9 +279,10 @@ impl <T, N: Default + Component> UiNodeTreeInitTrait for UiTree<T, N> {
     }
     fn new3d(name: impl Borrow<str>) -> Self {
         let mut tree: UiTree<T, N> = NodeTreeInitTrait::new(name);
-        let mut md = MasterData::default();
-        md.abs_scale = 0.001;
-        tree.add_topdata(md);
+        tree.add_topdata(MasterData {
+            abs_scale : 0.001,
+            ..Default::default()
+        });
         tree.add_data(NodeData::default());
         tree
     }
diff --git a/crates/lunex_engine/src/core/value.rs b/crates/lunex_engine/src/core/value.rs
index 9181c7f..4ef3179 100644
--- a/crates/lunex_engine/src/core/value.rs
+++ b/crates/lunex_engine/src/core/value.rs
@@ -119,10 +119,10 @@ macro_rules! uivalue_implement {
     ($( ($unit:ident, $ufield:ident) ),* ) => {
 
         $(
-            impl <T> Into<UiValue<T>> for $unit<T> {
-                fn into(self) -> UiValue<T> {
+            impl <T> From<$unit<T>> for UiValue<T> {
+                fn from(val: $unit<T>) -> UiValue<T> {
                     let mut ret = UiValue::new();
-                    ret.$ufield = Some(self.0);
+                    ret.$ufield = Some(val.0);
                     ret
                 }
             }
@@ -486,41 +486,41 @@ macro_rules! unit_implement {
                 }
             }
         
-            impl Into<UiValue<Vec2>> for $unit<(f32, f32)> {
-                fn into(self) -> UiValue<Vec2> {
-                    $unit(Vec2::new(self.0.0, self.0.1)).into()
+            impl From<$unit<(f32, f32)>> for UiValue<Vec2> {
+                fn from(val: $unit<(f32, f32)>) -> UiValue<Vec2> {
+                    $unit(Vec2::new(val.0.0, val.0.1)).into()
                 }
             }
-            impl Into<UiValue<Vec3>> for $unit<(f32, f32, f32)> {
-                fn into(self) -> UiValue<Vec3> {
-                    $unit(Vec3::new(self.0.0, self.0.1, self.0.2)).into()
+            impl From<$unit<(f32, f32, f32)>> for UiValue<Vec3> {
+                fn from(val: $unit<(f32, f32, f32)>) -> UiValue<Vec3> {
+                    $unit(Vec3::new(val.0.0, val.0.1, val.0.2)).into()
                 }
             }
-            impl Into<UiValue<Vec4>> for $unit<(f32, f32, f32, f32)> {
-                fn into(self) -> UiValue<Vec4> {
-                    $unit(Vec4::new(self.0.0, self.0.1, self.0.2, self.0.3)).into()
+            impl From<$unit<(f32, f32, f32, f32)>> for UiValue<Vec4> {
+                fn from(val: $unit<(f32, f32, f32, f32)>) -> UiValue<Vec4> {
+                    $unit(Vec4::new(val.0.0, val.0.1, val.0.2, val.0.3)).into()
                 }
             }
-            impl Into<UiValue<Vec2>> for $unit<f32> {
-                fn into(self) -> UiValue<Vec2> {
-                    $unit(Vec2::new(self.0, self.0)).into()
+
+            impl From<$unit<f32>> for UiValue<Vec2> {
+                fn from(val: $unit<f32>) -> UiValue<Vec2> {
+                    $unit(Vec2::new(val.0, val.0)).into()
                 }
             }
-            impl Into<UiValue<Vec3>> for $unit<f32> {
-                fn into(self) -> UiValue<Vec3> {
-                    $unit(Vec3::new(self.0, self.0, self.0)).into()
+            impl From<$unit<f32>> for UiValue<Vec3> {
+                fn from(val: $unit<f32>) -> UiValue<Vec3> {
+                    $unit(Vec3::new(val.0, val.0, val.0)).into()
                 }
             }
-            impl Into<UiValue<Vec4>> for $unit<f32> {
-                fn into(self) -> UiValue<Vec4> {
-                    $unit(Vec4::new(self.0, self.0, self.0, self.0)).into()
+            impl From<$unit<f32>> for UiValue<Vec4> {
+                fn from(val: $unit<f32>) -> UiValue<Vec4> {
+                    $unit(Vec4::new(val.0, val.0, val.0, val.0)).into()
                 }
             }
-        
 
-            impl Into<UiValueType<f32>> for $unit<f32> {
-                fn into(self) -> UiValueType<f32> {
-                    UiValueType::$unit(self)
+            impl From<$unit<f32>> for UiValueType<f32> {
+                fn from(val: $unit<f32>) -> UiValueType<f32> {
+                    UiValueType::$unit(val)
                 }
             }
         )*
@@ -758,90 +758,90 @@ unit_cross_operations!((Vh, vh), (Vw, vw));
 // #=== CUSTOM IMPLEMENTATIONS ===#
 
 // # Impl (A, B) => UiValue(Vec2)
-impl <A, B> Into<UiValue<Vec2>> for (A, B) where 
+impl <A, B> From<(A, B)> for UiValue<Vec2> where 
     A: Into<UiValue<f32>>, 
     B: Into<UiValue<f32>>
 {
-    fn into(self) -> UiValue<Vec2> {
-        UiValue::<Vec2>::new().with_x(self.0).with_y(self.1)
+    fn from(val: (A, B)) -> Self {
+        UiValue::<Vec2>::new().with_x(val.0).with_y(val.1)
     }
 }
 
 // # Impl (A, B, C) => UiValue(Vec3)
-impl <A, B, C> Into<UiValue<Vec3>> for (A, B, C) where 
+impl <A, B, C> From<(A, B, C)> for UiValue<Vec3> where 
     A: Into<UiValue<f32>>, 
     B: Into<UiValue<f32>>,
     C: Into<UiValue<f32>>
 {
-    fn into(self) -> UiValue<Vec3> {
-        UiValue::<Vec3>::new().with_x(self.0).with_y(self.1).with_z(self.2)
+    fn from(val: (A, B, C)) -> Self {
+        UiValue::<Vec3>::new().with_x(val.0).with_y(val.1).with_z(val.2)
     }
 }
 
-// # Impl (A, B, C) => UiValue(Vec4)
-impl <A, B, C, D> Into<UiValue<Vec4>> for (A, B, C, D) where 
+// # Impl (A, B, C, D) => UiValue(Vec4)
+impl <A, B, C, D> From<(A, B, C, D)> for UiValue<Vec4> where 
     A: Into<UiValue<f32>>, 
     B: Into<UiValue<f32>>,
     C: Into<UiValue<f32>>,
     D: Into<UiValue<f32>>
 {
-    fn into(self) -> UiValue<Vec4> {
-        UiValue::<Vec4>::new().with_x(self.0).with_y(self.1).with_z(self.2).with_w(self.3)
+    fn from(val: (A, B, C, D)) -> Self {
+        UiValue::<Vec4>::new().with_x(val.0).with_y(val.1).with_z(val.2).with_w(val.3)
     }
 }
 
 // # Impl f32 => UiValue(f32)
-impl Into<UiValue<f32>> for f32 {
-    fn into(self) -> UiValue<f32> {
-        Ab(self).into()
+impl From<f32> for UiValue<f32> {
+    fn from(val: f32) -> Self {
+        Ab(val).into()
     }
 }
 // # Impl f32 => UiValue(Vec2)
-impl Into<UiValue<Vec2>> for f32 {
-    fn into(self) -> UiValue<Vec2> {
-        Ab(Vec2::new(self, self)).into()
+impl From<f32> for UiValue<Vec2> {
+    fn from(val: f32) -> Self {
+        Ab(Vec2::new(val, val)).into()
     }
 }
 // # Impl f32 => UiValue(Vec3)
-impl Into<UiValue<Vec3>> for f32 {
-    fn into(self) -> UiValue<Vec3> {
-        Ab(Vec3::new(self, self, self)).into()
+impl From<f32> for UiValue<Vec3> {
+    fn from(val: f32) -> Self {
+        Ab(Vec3::new(val, val, val)).into()
     }
 }
 // # Impl f32 => UiValue(Vec4)
-impl Into<UiValue<Vec4>> for f32 {
-    fn into(self) -> UiValue<Vec4> {
-        Ab(Vec4::new(self, self, self, self)).into()
+impl From<f32> for UiValue<Vec4> {
+    fn from(val: f32) -> Self {
+        Ab(Vec4::new(val, val, val, val)).into()
     }
 }
 
 // # Impl UiValue(f32) => UiValue(Vec2)
-impl Into<UiValue<Vec2>> for UiValue<f32> {
-    fn into(self) -> UiValue<Vec2> {
+impl From<UiValue<f32>> for UiValue<Vec2> {
+    fn from(val: UiValue<f32>) -> Self {
         let mut out = UiValue::<Vec2>::new();
-        out.set_x(self);
-        out.set_y(self);
+        out.set_x(val);
+        out.set_y(val);
         out
     }
 }
 // # Impl UiValue(f32) => UiValue(Vec3)
-impl Into<UiValue<Vec3>> for UiValue<f32> {
-    fn into(self) -> UiValue<Vec3> {
+impl From<UiValue<f32>> for UiValue<Vec3> {
+    fn from(val: UiValue<f32>) -> Self {
         let mut out = UiValue::<Vec3>::new();
-        out.set_x(self);
-        out.set_y(self);
-        out.set_z(self);
+        out.set_x(val);
+        out.set_y(val);
+        out.set_z(val);
         out
     }
 }
 // # Impl UiValue(f32) => UiValue(Vec4)
-impl Into<UiValue<Vec4>> for UiValue<f32> {
-    fn into(self) -> UiValue<Vec4> {
+impl From<UiValue<f32>> for UiValue<Vec4> {
+    fn from(val: UiValue<f32>) -> Self {
         let mut out = UiValue::<Vec4>::new();
-        out.set_x(self);
-        out.set_y(self);
-        out.set_z(self);
-        out.set_w(self);
+        out.set_x(val);
+        out.set_y(val);
+        out.set_z(val);
+        out.set_w(val);
         out
     }
 }
diff --git a/crates/lunex_engine/src/layout/layout.rs b/crates/lunex_engine/src/layout/layout.rs
index ce57b0e..6b4de33 100644
--- a/crates/lunex_engine/src/layout/layout.rs
+++ b/crates/lunex_engine/src/layout/layout.rs
@@ -18,6 +18,7 @@ use crate::{NiceDisplay, Rectangle2D, UiValue, UiValueEvaluate, Ab, Rl};
 /// ```
 /// The expected range is `-1.0` to `1.0`, but you can extrapolate.
 #[cfg_attr(feature = "bevy", derive(Component))]
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Layout {
     Boundary(Boundary),
@@ -210,9 +211,9 @@ impl Anchor {
     }
 }
 #[cfg(feature = "bevy")]
-impl Into<Anchor> for bevy::sprite::Anchor {
-    fn into(self) -> Anchor {
-        match self {
+impl From<bevy::sprite::Anchor> for Anchor {
+    fn from(val: bevy::sprite::Anchor) -> Self {
+        match val {
             bevy::sprite::Anchor::Center => Anchor::Center,
             bevy::sprite::Anchor::BottomLeft => Anchor::BottomLeft,
             bevy::sprite::Anchor::BottomCenter => Anchor::BottomCenter,
@@ -247,9 +248,9 @@ impl Align {
     pub const END: Align = Align(1.0);
     pub const RIGHT: Align = Align(1.0);
 }
-impl Into<Align> for f32 {
-    fn into(self) -> Align {
-        Align(self)
+impl From<f32> for Align {
+    fn from(val: f32) -> Self {
+        Align(val)
     }
 }
 impl NiceDisplay for Align {
@@ -413,9 +414,9 @@ impl Boundary {
         self.into()
     }
 }
-impl Into<Layout> for Boundary {
-    fn into(self) -> Layout {
-        Layout::Boundary(self)
+impl From<Boundary> for Layout {
+    fn from(val: Boundary) -> Self {
+        Layout::Boundary(val)
     }
 }
 impl NiceDisplay for Boundary {
@@ -537,9 +538,9 @@ impl Window {
         self.into()
     }
 }
-impl Into<Layout> for Window {
-    fn into(self) -> Layout {
-        Layout::Window(self)
+impl From<Window> for Layout {
+    fn from(val: Window) -> Self {
+        Layout::Window(val)
     }
 }
 impl NiceDisplay for Window {
@@ -665,9 +666,9 @@ impl Solid {
         self.into()
     }
 }
-impl Into<Layout> for Solid {
-    fn into(self) -> Layout {
-        Layout::Solid(self)
+impl From<Solid> for Layout {
+    fn from(val: Solid) -> Self {
+        Layout::Solid(val)
     }
 }
 impl NiceDisplay for Solid {
@@ -1059,9 +1060,9 @@ impl Div {
         self.into()
     }
 }
-impl Into<Layout> for Div {
-    fn into(self) -> Layout {
-        Layout::Div(self)
+impl From<Div> for Layout {
+    fn from(val: Div) -> Self {
+        Layout::Div(val)
     }
 }
 impl NiceDisplay for Div {
diff --git a/crates/lunex_engine/src/layout/mod.rs b/crates/lunex_engine/src/layout/mod.rs
index 63933ce..4f8a871 100644
--- a/crates/lunex_engine/src/layout/mod.rs
+++ b/crates/lunex_engine/src/layout/mod.rs
@@ -1,3 +1,4 @@
+#[allow(clippy::module_inception)]
 mod layout;
 pub use layout::*;
 
diff --git a/crates/lunex_engine/src/layout/stack.rs b/crates/lunex_engine/src/layout/stack.rs
index 49ac0ec..8c65561 100644
--- a/crates/lunex_engine/src/layout/stack.rs
+++ b/crates/lunex_engine/src/layout/stack.rs
@@ -28,7 +28,7 @@ pub enum StackDirection {
 /// let margin = StackMargin::Evenly; // -> All subnodes will inherit 1sp on both sides except 1st
 /// let margin = StackMargin::Around; // -> All subnodes will inherit 1sp on both sides
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq)]
 pub enum StackMargin {
     /// Default, does nothing.
     #[default]
@@ -44,7 +44,7 @@ pub enum StackMargin {
     /// All subnodes will inherit 1sp on both sides.
     Around,
     /// Manually set margin for all subnodes.
-    Manual (UiValue<Vec4>),
+    Manual(Box<UiValue<Vec4>>),
 }
 
 
@@ -58,7 +58,7 @@ pub enum StackMargin {
 /// let stack: UiStack = UiStack::new().flipped(true);
 /// ```
 #[cfg_attr(feature = "bevy", derive(Component))]
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq)]
 pub struct UiStack {
     /// Populating direction
     pub direction: StackDirection,
@@ -71,17 +71,6 @@ pub struct UiStack {
     /// The margin that subnodes should inherit.
     pub margin: StackMargin,
 }
-impl Default for UiStack {
-    fn default() -> Self {
-        UiStack {
-            direction: Default::default(),
-            flipped: false,
-            inverted: false,
-            gap: Default::default(),
-            margin: Default::default(),
-        }
-    }
-}
 impl UiStack {
     /// Creates new empty Stack.
     pub fn new() -> Self {
diff --git a/crates/lunex_engine/src/nodes/structs.rs b/crates/lunex_engine/src/nodes/structs.rs
index 467b85c..4a8c190 100644
--- a/crates/lunex_engine/src/nodes/structs.rs
+++ b/crates/lunex_engine/src/nodes/structs.rs
@@ -81,7 +81,7 @@ impl <D, T> NodeTopDataTrait<D> for NodeTree<D, T> {
     }
 
     fn take_topdata(&mut self) -> Option<D> {
-        core::mem::replace(&mut self.data, None)
+        self.data.take()
     }
 
     fn obtain_topdata(&self) -> Option<&D> {
@@ -152,11 +152,11 @@ impl <D, T> NodeGeneralTrait<T> for NodeTree<D, T> {
     }
 
     fn get_name(&self) -> &String {
-        &self.node.get_name()
+        self.node.get_name()
     }
 
     fn get_path(&self) -> &String {
-        &self.node.get_path()
+        self.node.get_path()
     }
 
     fn get_depth(&self) -> f32 {
@@ -226,9 +226,9 @@ impl <D, T: NiceDisplay> NodeDisplayTrait<T> for NodeTree<D, T> {
         self.node.tree(params)
     }
 }
-impl <D, T> Into<Node<T>> for NodeTree<D, T>{
-    fn into(self) -> Node<T> {
-        self.node
+impl <D, T> From<NodeTree<D, T>> for Node<T>{
+    fn from(val: NodeTree<D, T>) -> Self {
+        val.node
     }
 }
 
@@ -308,9 +308,9 @@ impl <T> NodeGeneralTrait<T> for Node<T> {
         let mut node = node.into();
         if !name.borrow().is_empty() {
             if name.borrow() == "." { return Err(NodeError::NameInUse("The special symbol '.' is used to refer to 'self' and is not available for use".to_owned())) }
-            if self.nodes.contains_key(name.borrow()) == false {
+            if !self.nodes.contains_key(name.borrow()) {
                 node.name = name.borrow().to_owned();
-                node.path = if self.path.is_empty() { name.borrow().to_owned() } else { self.path.to_owned() + "/" + name.borrow() };
+                node.path = if self.path.is_empty() { name.borrow().to_string() } else { self.path.to_string() + "/" + name.borrow() };
                 node.depth = self.depth + 1.0;
                 self.nodes.insert(name.borrow().to_owned(), node);
                 Ok(name.borrow().to_owned())
@@ -320,7 +320,7 @@ impl <T> NodeGeneralTrait<T> for Node<T> {
         } else {
             let mut generated_name = format!(".||#:{}", self.nodes.len());
             let mut i = 0;
-            while self.nodes.contains_key(&generated_name) == true {
+            while self.nodes.contains_key(&generated_name) {
                 generated_name = format!(".||#:{}", self.nodes.len()+i);
                 i += 1;
                 if i > 100 { return Err(NodeError::InvalidPath("Failed to generate name, max threshold reached!".to_owned())); }
@@ -440,10 +440,10 @@ impl <T> NodeCreationTrait<T> for Node<T> {
     fn make_node(&mut self, name: impl Borrow<str>) -> Result<String, NodeError> {
         if !name.borrow().is_empty() {
             if name.borrow() == "." { return Err(NodeError::NameInUse("The special symbol '.' is used to refer to 'self' and is not available for use".to_owned())) }
-            if self.nodes.contains_key(name.borrow()) == false {
+            if !self.nodes.contains_key(name.borrow()) {
                 let mut node = Node::new();
                 node.name = name.borrow().to_owned();
-                node.path = if self.path.is_empty() { name.borrow().to_owned() } else { self.path.to_owned() + "/" + name.borrow() };
+                node.path = if self.path.is_empty() { name.borrow().to_string() } else { self.path.to_string() + "/" + name.borrow() };
                 node.depth = self.depth + 1.0;
                 self.nodes.insert(name.borrow().to_owned(), node);
                 Ok(name.borrow().to_owned())
@@ -453,7 +453,7 @@ impl <T> NodeCreationTrait<T> for Node<T> {
         } else {
             let mut generated_name = format!(".||#:{}", self.nodes.len());
             let mut i = 0;
-            while self.nodes.contains_key(&generated_name) == true {
+            while self.nodes.contains_key(&generated_name) {
                 generated_name = format!(".||#:{}", self.nodes.len()+i);
                 i += 1;
                 if i > 100 { return Err(NodeError::InvalidPath("Failed to generate name, max threshold reached!".to_owned())); }
@@ -505,7 +505,7 @@ impl <T> NodeDataTrait<T> for Node<T> {
     }
 
     fn take_data(&mut self) -> Option<T> {
-        core::mem::replace(&mut self.data, None)
+        self.data.take()
     }
 
     fn remove_data(&mut self, path: impl Borrow<str>) -> Result<Option<T>, NodeError> {
diff --git a/docs/src/advanced/abstraction/routes.md b/docs/src/advanced/abstraction/routes.md
index 07c1c2a..7e00ef3 100644
--- a/docs/src/advanced/abstraction/routes.md
+++ b/docs/src/advanced/abstraction/routes.md
@@ -33,7 +33,7 @@ fn build_route(mut commands: Commands, assets: Res<AssetServer>, query: Query<En
             // Here you can spawn the UI
             route.spawn((
                 UiTreeBundle::<MainUi>::from(UiTree::new2d("MyRoute")),
-                MovableByCamera,
+                SourceFromCamera,
             )).with_children(|ui| {
 
                 // Spawn some UI nodes
diff --git a/docs/src/quick_start.md b/docs/src/quick_start.md
index 2255dd1..e1b8deb 100644
--- a/docs/src/quick_start.md
+++ b/docs/src/quick_start.md
@@ -46,12 +46,12 @@ commands.spawn((
 
 ### UiTree
 
-Now we need create our `UiTree` entity. Use the bundle below and attach `MovableByCamera` component so our `UiTree` will receive updates from our camera. The last step is adding the default `MainUi` marker as a generic.
+Now we need create our `UiTree` entity. Use the bundle below and attach `SourceFromCamera` component so our `UiTree` will receive updates from our camera. The last step is adding the default `MainUi` marker as a generic.
 
 ```rust
 commands.spawn((
     // This makes the UI entity able to receive camera data
-    MovableByCamera,
+    SourceFromCamera,
 
     // This is our UI system
     UiTreeBundle::<MainUi>::from(UiTree::new2d("Hello UI!")),
diff --git a/examples/mesh2d/src/main.rs b/examples/mesh2d/src/main.rs
index dc2d66a..7870ade 100644
--- a/examples/mesh2d/src/main.rs
+++ b/examples/mesh2d/src/main.rs
@@ -27,7 +27,7 @@ fn setup(mut cmd: Commands, mut materials: ResMut<Assets<ColorMaterial>>) {
             tree: UiTree::new2d("MyUiSystem"),
             ..default()
         },
-        MovableByCamera,
+        SourceFromCamera,
     )).with_children(|ui| {
 
         // Spawn boundary node
diff --git a/examples/minimal/src/main.rs b/examples/minimal/src/main.rs
index aeed0d5..77a2102 100644
--- a/examples/minimal/src/main.rs
+++ b/examples/minimal/src/main.rs
@@ -27,7 +27,7 @@ fn setup(mut cmd: Commands, assets: Res<AssetServer>) {
             tree: UiTree::new2d("MyUiSystem"),
             ..default()
         },
-        MovableByCamera,
+        SourceFromCamera,
     )).with_children(|ui| {
 
         // Spawn boundary node
diff --git a/examples/worldspace_text/src/main.rs b/examples/worldspace_text/src/main.rs
index 8bda258..b620dd3 100644
--- a/examples/worldspace_text/src/main.rs
+++ b/examples/worldspace_text/src/main.rs
@@ -10,7 +10,7 @@ use boilerplate::*;
 // # ABOUT THIS EXAMPLE
 // This is a WIP progress, prototype example, that utilises bevy_mod_billboard for 3D text.
 // Everything here is a subject of change, and this implementation will be changed in the
-// future. I wish to integrate the crate upstream, but due to me being quite busy, my 
+// future. I wish to integrate the crate upstream, but due to me being quite busy, my
 // progress is quite slow. In the meantime, this is an example on how to do it yourself.
 
 fn main() {
@@ -39,182 +39,178 @@ fn setup(
         }
     ));
 
-    // Spawn it 3 times
-    for x in [0] {
+    // Spawn the floating Ui panel
+    commands.spawn((
+        UiTreeBundle::<MainUi> {
+            transform: Transform::from_xyz(-0.4, 0.0, 0.0),
+            tree: UiTree::new3d("HeaderWidget"),
+            ..default()
+        },
+    )).with_children(|ui| {
+        ui.spawn((
+            // Link this widget
+            UiLink::<MainUi>::path("Root"),
+
+            // The layout that is used when in base state
+            UiLayout::window_full().size((818.0, 170.0)).pack::<Base>(),
+
+            // Give the mesh an image
+            UiMaterial3dBundle::from_image(&mut material, asset_server.load("header.png")),
+
+            // Make the panel pickable
+            PickableBundle::default(),
+
+            // This is required to control our hover animation
+            UiAnimator::<Hover>::new().forward_speed(6.0).backward_speed(5.0),
+
+            // This is required for Layout animation
+            UiLayoutController::default(),
+
+            // The layout that is used when in hover state
+            UiLayout::window_full().x(100.0).size((818.0, 170.0)).pack::<Hover>(),
+
+            // This will change cursor icon on mouse hover
+            OnHoverSetCursor::new(CursorIcon::Pointer),
+        ));
+
+        ui.spawn((
+            // Link this widget
+            UiLink::<MainUi>::path("Root/Name"),
+
+            // The layout that is used when in base state
+            UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((20.0, 40.0))).pack::<Base>(),
+
+            // Pop the text further out
+            UiDepthBias(20.0),
+
+            // Add the 3D text
+            BillboardTextBundle {
+                transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
+                text: Text::from_sections([
+                    TextSection {
+                        value: "SQ. JANE KELLY".to_string(),
+                        style: TextStyle {
+                            font_size: 60.0,
+                            font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
+                            color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
+                        },
+                    },
+                ])
+                .with_justify(JustifyText::Left),
+                text_anchor: Anchor::CenterLeft,
+                ..default()
+            },
 
-        // Spawn the floating Ui panel
-        commands.spawn((
-            UiTreeBundle::<MainUi> {
-                transform: Transform::from_xyz(-0.4, 0.0, 0.0 + (0.3 * x as f32)),
-                tree: UiTree::new3d("HeaderWidget"),
+            // Lock the billboard automatic rotation
+            BillboardLockAxis {
+                rotation: true,
                 ..default()
             },
-        )).with_children(|ui| {
-            ui.spawn((
-                // Link this widget
-                UiLink::<MainUi>::path("Root"),
-
-                // The layout that is used when in base state
-                UiLayout::window_full().size((818.0, 170.0)).pack::<Base>(),
-
-                // Give the mesh an image
-                UiMaterial3dBundle::from_image(&mut material, asset_server.load("header.png")),
-
-                // Make the panel pickable
-                PickableBundle::default(),
-
-                // This is required to control our hover animation
-                UiAnimator::<Hover>::new().forward_speed(6.0).backward_speed(5.0),
-
-                // This is required for Layout animation
-                UiLayoutController::default(),
-
-                // The layout that is used when in hover state
-                UiLayout::window_full().x(100.0).size((818.0, 170.0)).pack::<Hover>(),
-
-                // This will change cursor icon on mouse hover
-                OnHoverSetCursor::new(CursorIcon::Pointer),
-            ));
-
-            ui.spawn((
-                // Link this widget
-                UiLink::<MainUi>::path("Root/Name"),
-
-                // The layout that is used when in base state
-                UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((20.0, 40.0))).pack::<Base>(),
-
-                // Pop the text further out
-                UiDepthBias(20.0),
-
-                // Add the 3D text
-                BillboardTextBundle {
-                    transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
-                    text: Text::from_sections([
-                        TextSection {
-                            value: "SQ. JANE KELLY".to_string(),
-                            style: TextStyle {
-                                font_size: 60.0,
-                                font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
-                                color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
-                            },
-                        },
-                    ])
-                    .with_justify(JustifyText::Left),
-                    text_anchor: Anchor::CenterLeft,
-                    ..default()
-                },
-
-                // Lock the billboard automatic rotation
-                BillboardLockAxis {
-                    rotation: true,
-                    ..default()
-                },
-            ));
-
-            ui.spawn((
-                // Link this widget
-                UiLink::<MainUi>::path("Root/Missions"),
-
-                // The layout that is used when in base state
-                UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((35.0, 77.0))).pack::<Base>(),
-
-                // Pop the text further out
-                UiDepthBias(20.0),
-
-                // Add the 3D text
-                BillboardTextBundle {
-                    transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
-                    text: Text::from_sections([
-                        TextSection {
-                            value: "6".to_string(),
-                            style: TextStyle {
-                                font_size: 60.0,
-                                font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
-                                color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
-                            },
+        ));
+
+        ui.spawn((
+            // Link this widget
+            UiLink::<MainUi>::path("Root/Missions"),
+
+            // The layout that is used when in base state
+            UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((35.0, 77.0))).pack::<Base>(),
+
+            // Pop the text further out
+            UiDepthBias(20.0),
+
+            // Add the 3D text
+            BillboardTextBundle {
+                transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
+                text: Text::from_sections([
+                    TextSection {
+                        value: "6".to_string(),
+                        style: TextStyle {
+                            font_size: 60.0,
+                            font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
+                            color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
                         },
-                    ])
-                    .with_justify(JustifyText::Left),
-                    text_anchor: Anchor::CenterLeft,
-                    ..default()
-                },
-
-                // Lock the billboard automatic rotation
-                BillboardLockAxis {
-                    rotation: true,
-                    ..default()
-                },
-            ));
-
-            ui.spawn((
-                // Link this widget
-                UiLink::<MainUi>::path("Root/Kills"),
-
-                // The layout that is used when in base state
-                UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((55.0, 77.0))).pack::<Base>(),
-
-                // Pop the text further out
-                UiDepthBias(20.0),
-
-                // Add the 3D text
-                BillboardTextBundle {
-                    transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
-                    text: Text::from_sections([
-                        TextSection {
-                            value: "17".to_string(),
-                            style: TextStyle {
-                                font_size: 60.0,
-                                font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
-                                color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
-                            },
+                    },
+                ])
+                .with_justify(JustifyText::Left),
+                text_anchor: Anchor::CenterLeft,
+                ..default()
+            },
+
+            // Lock the billboard automatic rotation
+            BillboardLockAxis {
+                rotation: true,
+                ..default()
+            },
+        ));
+
+        ui.spawn((
+            // Link this widget
+            UiLink::<MainUi>::path("Root/Kills"),
+
+            // The layout that is used when in base state
+            UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((55.0, 77.0))).pack::<Base>(),
+
+            // Pop the text further out
+            UiDepthBias(20.0),
+
+            // Add the 3D text
+            BillboardTextBundle {
+                transform: Transform::from_scale(Vec3::splat(0.00085)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
+                text: Text::from_sections([
+                    TextSection {
+                        value: "17".to_string(),
+                        style: TextStyle {
+                            font_size: 60.0,
+                            font: asset_server.load("rajdhani/Rajdhani-SemiBold.ttf"),
+                            color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
                         },
-                    ])
-                    .with_justify(JustifyText::Left),
-                    text_anchor: Anchor::CenterLeft,
-                    ..default()
-                },
-
-                // Lock the billboard automatic rotation
-                BillboardLockAxis {
-                    rotation: true,
-                    ..default()
-                },
-            ));
-
-            ui.spawn((
-                // Link this widget
-                UiLink::<MainUi>::path("Root/Status"),
-
-                // The layout that is used when in base state
-                UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((74.0, 77.0))).pack::<Base>(),
-
-                // Pop the text further out
-                UiDepthBias(20.0),
-
-                // Add the 3D text
-                BillboardTextBundle {
-                    transform: Transform::from_scale(Vec3::splat(0.0007)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
-                    text: Text::from_sections([
-                        TextSection {
-                            value: "ON MISSION".to_string(),
-                            style: TextStyle {
-                                font_size: 60.0,
-                                font: asset_server.load("rajdhani/Rajdhani-Regular.ttf"),
-                                color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
-                            },
+                    },
+                ])
+                .with_justify(JustifyText::Left),
+                text_anchor: Anchor::CenterLeft,
+                ..default()
+            },
+
+            // Lock the billboard automatic rotation
+            BillboardLockAxis {
+                rotation: true,
+                ..default()
+            },
+        ));
+
+        ui.spawn((
+            // Link this widget
+            UiLink::<MainUi>::path("Root/Status"),
+
+            // The layout that is used when in base state
+            UiLayout::window().anchor(Anchor::CenterLeft).pos(Rl((74.0, 77.0))).pack::<Base>(),
+
+            // Pop the text further out
+            UiDepthBias(20.0),
+
+            // Add the 3D text
+            BillboardTextBundle {
+                transform: Transform::from_scale(Vec3::splat(0.0007)).looking_at(Vec3::new(0.0, 0.0, 1.0), Vec3::Y),
+                text: Text::from_sections([
+                    TextSection {
+                        value: "ON MISSION".to_string(),
+                        style: TextStyle {
+                            font_size: 60.0,
+                            font: asset_server.load("rajdhani/Rajdhani-Regular.ttf"),
+                            color: Color::Srgba(Srgba::rgb_u8(129, 192, 205)),
                         },
-                    ])
-                    .with_justify(JustifyText::Left),
-                    text_anchor: Anchor::CenterLeft,
-                    ..default()
-                },
-
-                // Lock the billboard automatic rotation
-                BillboardLockAxis {
-                    rotation: true,
-                    ..default()
-                },
-            ));
-        }); 
-    }
+                    },
+                ])
+                .with_justify(JustifyText::Left),
+                text_anchor: Anchor::CenterLeft,
+                ..default()
+            },
+
+            // Lock the billboard automatic rotation
+            BillboardLockAxis {
+                rotation: true,
+                ..default()
+            },
+        ));
+    });
 }

From a5249929a9e950eca8c57ccc997a3fa073983a83 Mon Sep 17 00:00:00 2001
From: IDEDARY <IDEDARY@gmail.com>
Date: Thu, 29 Aug 2024 18:49:28 +0200
Subject: [PATCH 2/2] Add reflection to types

---
 crates/bevy_lunex/Cargo.toml             |  2 +-
 crates/bevy_lunex/src/structs.rs         | 12 ++++++------
 crates/lunex_engine/Cargo.toml           |  1 -
 crates/lunex_engine/src/core/value.rs    | 22 +++++++++++-----------
 crates/lunex_engine/src/layout/layout.rs | 23 +++++++++--------------
 crates/lunex_engine/src/layout/stack.rs  |  6 +-----
 crates/lunex_engine/src/lib.rs           |  2 ++
 7 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/crates/bevy_lunex/Cargo.toml b/crates/bevy_lunex/Cargo.toml
index eb3b1a9..09363f1 100644
--- a/crates/bevy_lunex/Cargo.toml
+++ b/crates/bevy_lunex/Cargo.toml
@@ -12,7 +12,7 @@
 [dependencies]
   bevy             = { workspace = true }
   colored          = { workspace = true }
-  lunex_engine     = { workspace = true, features = ["bevy"] }
+  lunex_engine     = { workspace = true }
   bevy_kira_audio  = { workspace = true, optional = true }
   bevy_mod_picking = { workspace = true }
 
diff --git a/crates/bevy_lunex/src/structs.rs b/crates/bevy_lunex/src/structs.rs
index 0611074..51ad034 100644
--- a/crates/bevy_lunex/src/structs.rs
+++ b/crates/bevy_lunex/src/structs.rs
@@ -73,7 +73,7 @@ pub struct Element;
 
 /// This struct holds rectangular data. If the component covers some kind of 2D area, it should be stored in this component.
 /// Lunex uses this component to mirror node size in & out from parent [`UiTree`].
-#[derive(Component, Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Component, Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Dimension {
     pub size: Vec2,
 }
@@ -86,7 +86,7 @@ impl Dimension {
 }
 
 /// # WIP - used for Div layout
-#[derive(Component, Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Component, Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct UiContent {
     pub size: Vec2,
 }
@@ -98,7 +98,7 @@ impl UiContent {
 
 
 /// This struct is used to specify size of the font in UI.
-#[derive(Component, Debug, Clone, Copy, PartialEq)]
+#[derive(Component, Debug, Clone, Copy, PartialEq, Reflect)]
 pub struct UiTextSize {
     /// The unit type and scale value of the text height
     pub size: UiValueType<f32>,
@@ -123,7 +123,7 @@ impl UiTextSize {
 // #=======================#
 // #=== MAIN COMPONENTS ===#
 
-#[derive(Component, Debug, Copy, Clone, PartialEq)]
+#[derive(Component, Debug, Copy, Clone, PartialEq, Reflect)]
 pub struct UiLayout<S = Base> {
     pub layout: Layout,
     state: PhantomData<S>,
@@ -269,7 +269,7 @@ impl Default for UiLayoutController {
 
 /// This struct is a string reference to a specific node in a parent [`UiTree`].
 /// Lunex uses this component to locate what data this entity should be working with.
-#[derive(Component, Debug, Clone, PartialEq)]
+#[derive(Component, Debug, Clone, PartialEq, Reflect)]
 pub struct UiLink<T = MainUi> {
     pub path: String,
     marker: PhantomData<T>,
@@ -307,7 +307,7 @@ impl <T> Default for UiLink<T> {
 /// This struct holds depth bias that will be relatively added to `depth` in the layout calculation.
 /// Nodes with higher depth bias will be placed on top of nodes with lower depth bias.
 /// It is recursive.
-#[derive(Component, Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Component, Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct UiDepthBias (pub f32);
 
 
diff --git a/crates/lunex_engine/Cargo.toml b/crates/lunex_engine/Cargo.toml
index 0c205b7..e4d7a01 100644
--- a/crates/lunex_engine/Cargo.toml
+++ b/crates/lunex_engine/Cargo.toml
@@ -16,4 +16,3 @@
   thiserror.workspace = true
 
 [features]
-  bevy  = []
diff --git a/crates/lunex_engine/src/core/value.rs b/crates/lunex_engine/src/core/value.rs
index 4ef3179..cf2b26a 100644
--- a/crates/lunex_engine/src/core/value.rs
+++ b/crates/lunex_engine/src/core/value.rs
@@ -32,7 +32,7 @@ macro_rules! uivalue_declare {
         /// let c: UiValue<f32> = Sp(5.0).into();     // -> 5 space
         /// let d: UiValue<Vec2> = (Ab(20.0), Em(2.0)).into() // -> [20px, 2em]
         /// ```
-        #[derive(Debug, Default, Clone, Copy, PartialEq)]
+        #[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
         pub struct UiValue<T> {
             $(
                 $ufield: Option<T>,
@@ -562,7 +562,7 @@ macro_rules! unit_cross_operations {
 /// let a: Ab<f32> = Ab(4.0) + Ab(6.0); // -> 10px
 /// let b: Ab<f32> = Ab(4.0) * 2.0;     // -> 8px
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Ab<T>(pub T);
 
 /// **Relative** - Represents scalable unit `0% to 100%`. `120%` is allowed.
@@ -572,7 +572,7 @@ pub struct Ab<T>(pub T);
 /// let a: Rl<f32> = Rl(25.0) + Rl(40.0); // -> 65%
 /// let b: Rl<f32> = Rl(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Rl<T>(pub T);
 
 /// **Relative width** - Represents scalable unit `0% to 100%`. `120%` is allowed.
@@ -583,7 +583,7 @@ pub struct Rl<T>(pub T);
 /// let a: Rw<f32> = Rw(25.0) + Rw(40.0); // -> 65%
 /// let b: Rw<f32> = Rw(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Rw<T>(pub T);
 
 /// **Relative height** - Represents scalable unit `0% to 100%`. `120%` is allowed.
@@ -594,7 +594,7 @@ pub struct Rw<T>(pub T);
 /// let a: Rh<f32> = Rh(25.0) + Rh(40.0); // -> 65%
 /// let b: Rh<f32> = Rh(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Rh<T>(pub T);
 
 /// **Size of M** - Represents unit that is the size of the symbol `M`. Which is `16px` with `font size 16px` and so on.
@@ -603,7 +603,7 @@ pub struct Rh<T>(pub T);
 /// # use lunex_engine::Em;
 /// let a: Em<f32> = Em(1.0) + Em(2.0); // -> 3em == 48px with font size 16px
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Em<T>(pub T);
 
 /// **Space** - Represents proportional empty space left in the parent container. Requires to know space unit of surrounding
@@ -616,7 +616,7 @@ pub struct Em<T>(pub T);
 /// let b: Sp<f32> = Sp(2.0) * 3.0;     // -> 6 space
 /// ```
 /// If container `a` and `b` were next to each other, they would split remaining space in **3:6** ratio.
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Sp<T>(pub T);
 
 /// **Viewport** - Represents scalable unit `0% to 100%` of the root container. `120%` is allowed.
@@ -626,7 +626,7 @@ pub struct Sp<T>(pub T);
 /// let a: Vp<f32> = Vp(25.0) + Vp(40.0); // -> 65%
 /// let b: Vp<f32> = Vp(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Vp<T>(pub T);
 
 /// **Viewport width** - Represents scalable unit `0% to 100%` of the root container. `120%` is allowed.
@@ -637,7 +637,7 @@ pub struct Vp<T>(pub T);
 /// let a: Vw<f32> = Vw(25.0) + Vw(40.0); // -> 65%
 /// let b: Vw<f32> = Vw(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Vw<T>(pub T);
 
 /// **Viewport Height** - Represents scalable unit `0% to 100%` of the root container. `120%` is allowed.
@@ -648,11 +648,11 @@ pub struct Vw<T>(pub T);
 /// let a: Vh<f32> = Vh(25.0) + Vh(40.0); // -> 65%
 /// let b: Vh<f32> = Vh(25.0) * 3.0;      // -> 75%
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Deref, DerefMut, Reflect)]
 pub struct Vh<T>(pub T);
 
 /// **Unit type** - Enum with all possible ui unit types.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Reflect)]
 pub enum UiValueType<T> {
     Ab(Ab<T>),
     Rl(Rl<T>),
diff --git a/crates/lunex_engine/src/layout/layout.rs b/crates/lunex_engine/src/layout/layout.rs
index 6b4de33..d7438c7 100644
--- a/crates/lunex_engine/src/layout/layout.rs
+++ b/crates/lunex_engine/src/layout/layout.rs
@@ -1,6 +1,3 @@
-#[cfg(feature = "bevy")]
-use bevy::prelude::Component;
-
 use crate::{import::*, YInvert};
 use crate::{NiceDisplay, Rectangle2D, UiValue, UiValueEvaluate, Ab, Rl};
 
@@ -17,9 +14,8 @@ use crate::{NiceDisplay, Rectangle2D, UiValue, UiValueEvaluate, Ab, Rl};
 /// let layout: UiLayout = UiLayout::solid().size(Rl(50.0)).pack();
 /// ```
 /// The expected range is `-1.0` to `1.0`, but you can extrapolate.
-#[cfg_attr(feature = "bevy", derive(Component))]
 #[allow(clippy::large_enum_variant)]
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Reflect)]
 pub enum Layout {
     Boundary(Boundary),
     Window(Window),
@@ -163,7 +159,7 @@ impl NiceDisplay for Layout {
 // #=== LAYOUT PROPERTIES ===#
 
 /// **Anchor** - A type used to define where should Window node layout be anchored at.
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub enum Anchor {
     Center,
     BottomLeft,
@@ -210,7 +206,6 @@ impl Anchor {
         }
     }
 }
-#[cfg(feature = "bevy")]
 impl From<bevy::sprite::Anchor> for Anchor {
     fn from(val: bevy::sprite::Anchor) -> Self {
         match val {
@@ -238,7 +233,7 @@ impl From<bevy::sprite::Anchor> for Anchor {
 /// let align: Align = -1.0.into();  // -> -1.0
 /// ```
 /// The expected range is `-1.0` to `1.0`, but you can extrapolate.
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Align (pub f32);
 impl Align {
     pub const START: Align = Align(-1.0);
@@ -269,7 +264,7 @@ impl NiceDisplay for Align {
 /// let scaling: Scaling = Scaling::Fit;  // -> always fit inside
 /// let scaling: Scaling = Scaling::Fill; // -> always cover all
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub enum Scaling {
     /// Node layout should always cover the horizontal axis of the parent node.
     HorFill,
@@ -300,7 +295,7 @@ impl NiceDisplay for Scaling {
 /// let scaling: Sizing = Sizing::Basic; // -> Default value, as big as its content
 /// let scaling: Sizing = Sizing::Max;   // -> Tries to reach maximum size limit
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub enum Sizing {
     /// Div node layout should be as small as possible.
     Min,
@@ -330,7 +325,7 @@ impl NiceDisplay for Sizing {
 /// # use lunex_engine::{Boundary, Rl};
 /// let layout: UiLayout = Boundary::new().pos1(Rl(20.0)).pos2(Rl(80.0)).pack();
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Boundary {
     /// Position of the top-left corner.
     pub pos1: UiValue<Vec2>,
@@ -434,7 +429,7 @@ impl NiceDisplay for Boundary {
 /// # use lunex_engine::{Window, Ab, Rl};
 /// let layout: UiLayout = Window::new().pos(Ab(100.0)).size(Rl(50.0)).pack();
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Window {
     /// Position of the node.
     pub pos : UiValue<Vec2>,
@@ -559,7 +554,7 @@ impl NiceDisplay for Window {
 /// # use lunex_engine::Solid;
 /// let layout: UiLayout = Solid::new().size((4.0, 3.0)).align_x(-0.8).pack();
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Solid {
     /// Aspect ratio of the width and height. `1:1 == 10:10 == 100:100`.
     pub size: UiValue<Vec2>,
@@ -687,7 +682,7 @@ impl NiceDisplay for Solid {
 /// # use lunex_engine::{Div, Sp};
 /// let layout: UiLayout = Div::new().pad_x(2.0).margin_y(Sp(1.0)).br().pack();
 /// ```
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
 pub struct Div {
     /// Describes how width should size itself.
     pub width: Sizing,
diff --git a/crates/lunex_engine/src/layout/stack.rs b/crates/lunex_engine/src/layout/stack.rs
index 8c65561..df63517 100644
--- a/crates/lunex_engine/src/layout/stack.rs
+++ b/crates/lunex_engine/src/layout/stack.rs
@@ -1,6 +1,3 @@
-#[cfg(feature = "bevy")]
-use bevy::prelude::Component;
-
 use crate::import::*;
 use crate::UiValue;
 
@@ -57,8 +54,7 @@ pub enum StackMargin {
 /// # use lunex_engine::UiStack;
 /// let stack: UiStack = UiStack::new().flipped(true);
 /// ```
-#[cfg_attr(feature = "bevy", derive(Component))]
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Component)]
 pub struct UiStack {
     /// Populating direction
     pub direction: StackDirection,
diff --git a/crates/lunex_engine/src/lib.rs b/crates/lunex_engine/src/lib.rs
index cfdd39a..cb65093 100644
--- a/crates/lunex_engine/src/lib.rs
+++ b/crates/lunex_engine/src/lib.rs
@@ -23,6 +23,8 @@ pub mod prelude {
 
 pub(crate) mod import {
     pub(crate) use std::borrow::Borrow;
+    pub(crate) use bevy::reflect::Reflect;
+    pub(crate) use bevy::prelude::{Component, Deref, DerefMut};
 
     pub(crate) use indexmap::IndexMap;
     pub(crate) use bevy::utils::HashMap;