diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a53e9e..5079c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Dialog Update - [v0.4.0](https://github.com/Fabinistere/fabien-et-la-trahison-de-olf/releases/tag/v0.4.0) - 2023-09-04
 
+### Changed
+
+- globalize `PlayerLocation` to `Location`
+  - The component `Location` is given to
+    - Each npc
+    - Each landmark
+  - `Location` is still a `State` to keep the quick and easy access to the player's location
+
+### Dialog
+
+- YML Dialog and reorganize ui components
+
+### NPCs' Behavior
+
+#### Refactored
+
+- Follow Behavior
+  - add and use a `FollowRangeSensor` to detect the follow_target's hitbox
+
+#### Added
+
+- Detection Behavior
+  - `TargetSeeker`
+  - `DetectionRangeSensor` used to analyze all entering characters' hitbox and compare with their `TargetType`
+    - if it correpond: Deactivate this sensor and start the Chase Behavior with the component `Chaser`.
+- Chase Behavior
+  - `Chaser`
+  - `PursuitRangeSensor` used to analyze all exiting characters' hitbox and compare with their `Chaser`'s `target`
+    - if it correpond: Deactivate this sensor and remove the Chase Behavior.
+  - The `CharacterCloseSensor` used to detect all entering `Chaser`s hitbox and start a Combat if the `Chaser`'s `target` is the parent of the `CharacterCloseSensor`.
+
 ## Map, Title Screen and Animation Update - [v0.3.9](https://github.com/Fabinistere/fabien-et-la-trahison-de-olf/releases/tag/v0.3.9) - 2023-08-31
 
 [![v0.3.9](https://img.shields.io/badge/v0.3.9-gray?style=flat&logo=github&logoColor=181717&link=https://github.com/Fabinistere/fabien-et-la-trahison-de-olf/releases/tag/v0.3.9)](https://github.com/Fabinistere/fabien-et-la-trahison-de-olf/releases/tag/v0.3.9)
diff --git a/src/animations/mod.rs b/src/animations/mod.rs
old mode 100644
new mode 100755
index 6bea73a..5944442
--- a/src/animations/mod.rs
+++ b/src/animations/mod.rs
@@ -7,7 +7,15 @@ use bevy::prelude::*;
 pub use fade::{Fade, FadeType};
 pub use slide::{Slide, UiSlide, UiSlideType};
 
-use crate::in_menu;
+use crate::{
+    constants::character::{
+        COLUMN_FRAME_IDLE_END, COLUMN_FRAME_IDLE_START, COLUMN_FRAME_RUN_END,
+        SPRITESHEET_COLUMN_NUMBER, SPRITESHEET_LINE_NUMBER,
+    },
+    in_menu,
+};
+
+use self::sprite_sheet_animation::CharacterState;
 
 // DOC: create systemsLabel for `sprite_sheet_animation::tempo_animation_timer`
 
@@ -16,6 +24,7 @@ pub struct AnimationPlugin;
 impl Plugin for AnimationPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<CharacterSpriteSheet>()
+            .init_resource::<GlobalAnimationIndices>()
             .add_systems(
                 PostUpdate,
                 (
@@ -68,3 +77,31 @@ impl FromWorld for CharacterSpriteSheet {
         }
     }
 }
+
+#[derive(Deref, Clone, Resource)]
+pub struct GlobalAnimationIndices(Vec<Vec<(usize, usize, CharacterState)>>);
+
+impl FromWorld for GlobalAnimationIndices {
+    fn from_world(_world: &mut World) -> Self {
+        let mut global_animations_indices: Vec<Vec<(usize, usize, CharacterState)>> = Vec::new();
+        for line in 0..SPRITESHEET_LINE_NUMBER {
+            global_animations_indices.push(vec![
+                // Run Indexes for each line
+                (
+                    line * SPRITESHEET_COLUMN_NUMBER,
+                    line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_RUN_END,
+                    CharacterState::Idle,
+                    // CharacterState::Run, ?
+                ),
+                // Idle Indexes for each line
+                (
+                    line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_START,
+                    line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_END,
+                    CharacterState::Idle,
+                ),
+            ]);
+        }
+
+        GlobalAnimationIndices(global_animations_indices)
+    }
+}
diff --git a/src/characters/npcs/idle.rs b/src/characters/npcs/idle.rs
index 8624357..6d9d860 100755
--- a/src/characters/npcs/idle.rs
+++ b/src/characters/npcs/idle.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use bevy_rapier2d::prelude::Velocity;
 
 use super::{movement::NPCBehavior, NPC};
 
@@ -11,12 +12,19 @@ pub struct RestTime {
 pub fn flexing_timer(
     mut commands: Commands,
     time: Res<Time>,
-    mut npc_query: Query<(Entity, &mut RestTime, &Name), (With<NPC>, With<NPCBehavior>)>,
+    mut npc_query: Query<
+        (Entity, &mut RestTime, &mut Velocity, &Name),
+        (With<NPC>, With<NPCBehavior>),
+    >,
 ) {
-    for (npc, mut rest_timer, name) in npc_query.iter_mut() {
+    for (npc, mut rest_timer, mut rb_vel, _name) in npc_query.iter_mut() {
         rest_timer.timer.tick(time.delta());
+
+        rb_vel.linvel.x = 0.;
+        rb_vel.linvel.y = 0.;
+        // info!("{:#?}", rest_timer.timer);
         if rest_timer.timer.finished() {
-            info!(target: "Stop Rest", "{:?}, {}", npc, name);
+            // info!(target: "Stop Rest", "{:?}, {}", npc, _name);
 
             // restart previous behavior
             commands.entity(npc).remove::<RestTime>();
diff --git a/src/characters/npcs/mod.rs b/src/characters/npcs/mod.rs
index d962a26..e73423f 100755
--- a/src/characters/npcs/mod.rs
+++ b/src/characters/npcs/mod.rs
@@ -12,15 +12,19 @@ use yml_dialog::DialogNode;
 use crate::{
     animations::{
         sprite_sheet_animation::{AnimationIndices, CharacterState},
-        CharacterSpriteSheet,
+        CharacterSpriteSheet, GlobalAnimationIndices,
     },
     characters::{movement::MovementBundle, npcs::movement::NPCBehavior, CharacterHitbox},
     combat::Reputation,
-    constants::character::{npcs::*, player::PLAYER_SPAWN, *},
-    interactions::{Interactible, InteractionSensor},
+    constants::{
+        character::{npcs::*, player::PLAYER_SPAWN, *},
+        interactions::INTERACT_BUTTON_SCALE,
+    },
+    hud_opened,
+    interactions::{InteractIcon, Interactible, InteractionResources, InteractionSensor},
     locations::{
-        landmarks::{reserved_random_free_landmark, Landmark, LandmarkStatus},
-        temple::OverlappingEntity,
+        landmarks::{reserved_random_free_landmark, Landmark},
+        temple::{Location, OverlappingEntity},
     },
     ui::dialog_systems::{CurrentInterlocutor, DialogMap},
     GameState, HUDState,
@@ -31,7 +35,7 @@ use self::{
     movement::{FollowRangeSensor, TargetSeeker, TargetType},
 };
 
-use super::movement::CharacterCloseSensor;
+use super::player::Player;
 
 #[derive(Default)]
 pub struct NPCPlugin;
@@ -72,7 +76,7 @@ impl Plugin for NPCPlugin {
             .add_event::<aggression::EngagePursuitEvent>()
             .add_systems(
                 OnEnter(GameState::Playing),
-                (spawn_characters, spawn_vilains),
+                (spawn_characters, spawn_vilains, spawn_cat),
             )
             .add_systems(
                 Update,
@@ -86,6 +90,7 @@ impl Plugin for NPCPlugin {
                     idle::flexing_timer
                         .in_set(NPCSystems::Idle)
                         .after(NPCSystems::Movement),
+                    freeze_player_in_dialog.run_if(hud_opened),
                 )
                     .run_if(in_state(GameState::Playing)),
             )
@@ -105,6 +110,10 @@ impl Plugin for NPCPlugin {
 #[derive(Component)]
 pub struct NPC;
 
+// /// Global Direction TODO: or StareAt Entity
+// #[derive(Deref, Component)]
+// pub struct StareAt(pub Entity);
+
 #[derive(Component)]
 pub struct OlfCat;
 
@@ -140,158 +149,124 @@ pub fn character_interaction_event(
     }
 }
 
+/// FIXME: Freeze ALL character in Dialog
+fn freeze_player_in_dialog(
+    // talker_query: Query<&mut Velocity, With<InDialog>>,
+    mut player_query: Query<(&mut Velocity, &mut CharacterState), With<Player>>,
+) {
+    let (mut rb_vel, mut character_state) = player_query.single_mut();
+    rb_vel.linvel.x = 0.;
+    rb_vel.linvel.y = 0.;
+    *character_state = CharacterState::Idle;
+}
+
 /// Cats and all friendly npc
 fn spawn_characters(
     mut commands: Commands,
     characters_spritesheet: Res<CharacterSpriteSheet>,
     mut dialogs: ResMut<DialogMap>,
+    global_animations_indices: Res<GlobalAnimationIndices>,
+    interaction_resources: Res<InteractionResources>,
     mut landmark_sensor_query: Query<(Entity, &mut Landmark), With<Sensor>>,
 ) {
-    let mut global_animations_indices: Vec<Vec<(usize, usize, CharacterState)>> = Vec::new();
-    for line in 0..16 {
-        global_animations_indices.push(vec![
-            // Run Indexes for each line
-            (
-                line * SPRITESHEET_COLUMN_NUMBER,
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_RUN_END,
-                CharacterState::Idle,
-                // CharacterState::Run, ?
-            ),
-            // Idle Indexes for each line
-            (
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_START,
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_END,
-                CharacterState::Idle,
-            ),
-        ]);
-    }
-
-    /* -------------------------------------------------------------------------- */
-    /*                                   Olf Cat                                  */
-    /* -------------------------------------------------------------------------- */
-    // TODO: Polish #visual - Cat like movement
-    let mut cat_animation_indices = AnimationIndices(HashMap::new());
-    cat_animation_indices.insert(
-        CharacterState::Run,
-        (
-            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER,
-            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_RUN_END,
-            CharacterState::Idle,
-        ),
-    );
-    cat_animation_indices.insert(
-        CharacterState::Idle,
-        (
-            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_START,
-            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_END,
-            CharacterState::Idle,
-        ),
-    );
-
-    // TEMP: Static Olf cat
-    commands
-        .spawn((
-            SpriteSheetBundle {
-                texture_atlas: characters_spritesheet.texture_atlas.clone(),
-                transform: Transform {
-                    translation: OLF_CAT_POSITION.into(),
-                    scale: Vec3::splat(OLF_CAT_SCALE),
-                    ..Transform::default()
-                },
-                ..default()
-            },
-            Name::new("Olf Cat"),
-            OlfCat,
-            MovementBundle {
-                animation_indices: cat_animation_indices,
-                overlapping_entity: OverlappingEntity::new(CAT_SWITCH_Z_OFFSET),
-                ..default()
-            },
-            // -- Hitbox --
-            RigidBody::Fixed,
-        ))
-        .with_children(|parent| {
-            parent.spawn((
-                Collider::cuboid(2.5, 1.),
-                Transform::from_translation(OLF_CAT_HITBOX_OFFSET.into()),
-            ));
-        });
-
     /* -------------------------------------------------------------------------- */
     /*                                    NPCs                                    */
     /* -------------------------------------------------------------------------- */
 
-    // let fabien_dialog_path = "data/fabien_dialog.yml";
+    let fabien_dialog_path = "data/fabien_dialog.yml";
     let supreme_god_dialog_path = "data/supreme_god_dialog.yml";
     let hugo_dialog_path = "data/hugo_dialog.yml";
     // let olf_dialog_path = "data/olf_dialog.yml";
 
-    let npcs_infos = vec![
+    let mut npcs_infos = vec![
         (
-            "Supreme God",
+            "Supreme God".to_string(),
             SUPREME_GOD_LINE,
             SUPREME_GOD_SPAWN_POSITION,
             Reputation::new(100, 0),
             NPCBehavior::Camping,
+            Location::Temple,
             supreme_god_dialog_path,
         ),
         (
-            "Hugo",
+            "Hugo".to_string(),
             HEALER_V2_LINE,
             PLAYER_SPAWN,
             Reputation::new(100, 0),
             NPCBehavior::Camping,
+            Location::SecretRoom,
             hugo_dialog_path,
         ),
-        // (
-        //     "Vampire",
-        //     VAMPIRE_LINE,
-        //     PLAYER_SPAWN,
-        //     Reputation::new(100, 0),
-        //     NPCBehavior::LandmarkSeeking(reserved_random_free_landmark(&mut landmark_sensor_query).unwrap()),
-        //     fabien_dialog_path,
-        // ),
-        // (
-        //     "Olf",
-        //     OLF_LINE,
-        //     OLF_SPAWN_POSITION,
-        //     Reputation::new(0, 100),
-        //     olf_dialog_path,
-        // ),
+        (
+            "Vampire".to_string(),
+            VAMPIRE_LINE,
+            VAMPIRE_SPAWN_POSITION,
+            Reputation::new(100, 0),
+            NPCBehavior::LandmarkSeeking(
+                // match if there is none
+                reserved_random_free_landmark(&mut landmark_sensor_query, Location::Temple)
+                    .unwrap(),
+                Location::Temple,
+            ),
+            Location::Temple,
+            fabien_dialog_path,
+        ),
     ];
+    for i in 0..5 {
+        npcs_infos.push((
+            format!("Fabien {}", i),
+            FABIEN_LOYAL_LINE,
+            FABIEN_SPAWN_POSITION,
+            Reputation::new(0, 0),
+            NPCBehavior::LandmarkSeeking(
+                // match if there is none
+                reserved_random_free_landmark(&mut landmark_sensor_query, Location::Temple)
+                    .unwrap(),
+                Location::Temple,
+            ),
+            Location::Temple,
+            fabien_dialog_path,
+        ));
+    }
 
-    for info in npcs_infos {
+    for (name, spritesheet_line, spawn_position, reputation, behavior, location, dialog_path) in
+        npcs_infos
+    {
         let mut npc_animation_indices = AnimationIndices(HashMap::new());
-        npc_animation_indices.insert(CharacterState::Run, global_animations_indices[info.1][0]);
-        npc_animation_indices.insert(CharacterState::Idle, global_animations_indices[info.1][1]);
+        npc_animation_indices.insert(
+            CharacterState::Run,
+            global_animations_indices[spritesheet_line][0],
+        );
+        npc_animation_indices.insert(
+            CharacterState::Idle,
+            global_animations_indices[spritesheet_line][1],
+        );
 
-        // match if there is none
-        // only check the landmark in their zone
-        // let free_random_landmark =
-        //     reserved_random_free_landmark(&mut landmark_sensor_query).unwrap();
+        let interactible = Interactible::new_npc();
 
         let npc = commands
             .spawn((
                 SpriteSheetBundle {
                     texture_atlas: characters_spritesheet.texture_atlas.clone(),
                     transform: Transform {
-                        translation: info.2.into(),
+                        translation: spawn_position.into(),
                         scale: Vec3::splat(NPC_SCALE),
                         ..default()
                     },
                     ..default()
                 },
-                Name::new(format!("NPC {}", info.0)),
+                Name::new(format!("NPC {}", name)),
                 NPC,
                 // -- Movement --
-                info.4,
+                behavior,
                 MovementBundle {
                     animation_indices: npc_animation_indices,
                     ..default()
                 },
+                location,
                 // -- Social --
-                Interactible::new_npc(),
-                info.3,
+                interactible,
+                reputation,
                 // -- Hitbox --
                 RigidBody::Dynamic,
                 LockedAxes::ROTATION_LOCKED,
@@ -302,23 +277,39 @@ fn spawn_characters(
                     Transform::IDENTITY,
                     Sensor,
                     InteractionSensor,
-                    Name::new(format!("{} Interaction Sensor", info.0)),
+                    Name::new(format!("{} Interaction Sensor", name)),
+                ));
+
+                parent.spawn((
+                    SpriteBundle {
+                        texture: interaction_resources.interact_button.clone(),
+                        transform: Transform {
+                            translation: interactible.icon_translation,
+                            scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                            ..default()
+                        },
+                        visibility: Visibility::Hidden,
+                        ..default()
+                    },
+                    InteractIcon,
                 ));
 
                 parent.spawn((
                     Collider::cuboid(CHAR_HITBOX_WIDTH, CHAR_HITBOX_HEIGHT),
                     Transform::from_xyz(0., CHAR_HITBOX_Y_OFFSET, 0.),
                     CharacterHitbox,
-                    Name::new(format!("{} Hitbox", info.0)),
+                    Name::new(format!("{} Hitbox", name)),
                 ));
 
+                // REFACTOR: Spawn all sensor (but with a component "InactiveSensor" or query With<ActiveEvents>)
+
                 // parent.spawn((
                 //     Collider::ball(10.),
                 //     Sensor,
                 //     ActiveEvents::COLLISION_EVENTS,
                 //     ActiveCollisionTypes::STATIC_STATIC,
                 //     CharacterCloseSensor,
-                //     Name::new(format!("{} Close Sensor", info.0)),
+                //     Name::new(format!("{} Close Sensor", name)),
                 // ));
 
                 // parent.spawn((
@@ -326,7 +317,7 @@ fn spawn_characters(
                 //     // ActiveEvents::COLLISION_EVENTS,
                 //     Sensor,
                 //     PursuitRangeSensor,
-                //     Name::new(format!("{} Pursuit Range", info.0)),
+                //     Name::new(format!("{} Pursuit Range", name)),
                 // ));
 
                 // parent.spawn((
@@ -334,7 +325,7 @@ fn spawn_characters(
                 //     // ActiveEvents::COLLISION_EVENTS,
                 //     Sensor,
                 //     DetectionRangeSensor,
-                //     Name::new(format!("{} Detection Range", info.0)),
+                //     Name::new(format!("{} Detection Range", name)),
                 // ));
 
                 parent.spawn((
@@ -342,12 +333,12 @@ fn spawn_characters(
                     // ActiveEvents::COLLISION_EVENTS,
                     Sensor,
                     FollowRangeSensor,
-                    Name::new(format!("{} Follow Range", info.0)),
+                    Name::new(format!("{} Follow Range", name)),
                 ));
             })
             .id();
 
-        let dialog_file = std::fs::File::open(info.5).unwrap();
+        let dialog_file = std::fs::File::open(dialog_path).unwrap();
         let npc_deserialized_map: BTreeMap<usize, DialogNode> =
             serde_yaml::from_reader(dialog_file).unwrap();
         dialogs.insert(
@@ -361,31 +352,16 @@ fn spawn_characters(
 }
 
 /// All vilain npc
+///
+/// Merge all spawn npcs function
 fn spawn_vilains(
     mut commands: Commands,
     characters_spritesheet: Res<CharacterSpriteSheet>,
     mut dialogs: ResMut<DialogMap>,
-    // mut landmark_sensor_query: Query<(Entity, &mut Landmark), With<Sensor>>,
+    global_animations_indices: Res<GlobalAnimationIndices>,
+    interaction_resources: Res<InteractionResources>,
+    mut landmark_sensor_query: Query<(Entity, &mut Landmark), With<Sensor>>,
 ) {
-    let mut global_animations_indices: Vec<Vec<(usize, usize, CharacterState)>> = Vec::new();
-    for line in 0..16 {
-        global_animations_indices.push(vec![
-            // Run Indexes for each line
-            (
-                line * SPRITESHEET_COLUMN_NUMBER,
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_RUN_END,
-                CharacterState::Idle,
-                // CharacterState::Run, ?
-            ),
-            // Idle Indexes for each line
-            (
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_START,
-                line * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_END,
-                CharacterState::Idle,
-            ),
-        ]);
-    }
-
     /* -------------------------------------------------------------------------- */
     /*                                   Vilains                                  */
     /* -------------------------------------------------------------------------- */
@@ -397,42 +373,51 @@ fn spawn_vilains(
         OLF_LINE,
         OLF_SPAWN_POSITION,
         Reputation::new(0, 100),
-        NPCBehavior::Camping,
+        NPCBehavior::LandmarkSeeking(
+            // match if there is none
+            reserved_random_free_landmark(&mut landmark_sensor_query, Location::SecretRoom)
+                .unwrap(),
+            Location::SecretRoom,
+        ),
         olf_dialog_path,
     )];
 
-    for info in npcs_infos {
+    for (name, spritesheet_line, spawn_position, reputation, behavior, dialog_path) in npcs_infos {
         let mut npc_animation_indices = AnimationIndices(HashMap::new());
-        npc_animation_indices.insert(CharacterState::Run, global_animations_indices[info.1][0]);
-        npc_animation_indices.insert(CharacterState::Idle, global_animations_indices[info.1][1]);
+        npc_animation_indices.insert(
+            CharacterState::Run,
+            global_animations_indices[spritesheet_line][0],
+        );
+        npc_animation_indices.insert(
+            CharacterState::Idle,
+            global_animations_indices[spritesheet_line][1],
+        );
 
-        // match if there is none
-        // only check the landmark in their zone
-        // let free_random_landmark =
-        //     reserved_random_free_landmark(&mut landmark_sensor_query).unwrap();
+        let interactible = Interactible::new_npc();
 
         let npc = commands
             .spawn((
                 SpriteSheetBundle {
                     texture_atlas: characters_spritesheet.texture_atlas.clone(),
                     transform: Transform {
-                        translation: info.2.into(),
+                        translation: spawn_position.into(),
                         scale: Vec3::splat(NPC_SCALE),
                         ..default()
                     },
                     ..default()
                 },
-                Name::new(format!("NPC {}", info.0)),
+                Name::new(format!("NPC {}", name)),
                 NPC,
                 // -- Movement --
-                info.4,
+                behavior,
                 MovementBundle {
                     animation_indices: npc_animation_indices,
                     ..default()
                 },
+                Location::SecretRoom,
                 // -- Social --
-                Interactible::new_npc(),
-                info.3,
+                interactible,
+                reputation,
                 TargetSeeker(TargetType::Player),
                 // -- Hitbox --
                 RigidBody::Dynamic,
@@ -444,14 +429,28 @@ fn spawn_vilains(
                     Transform::IDENTITY,
                     Sensor,
                     InteractionSensor,
-                    Name::new(format!("{} Interaction Sensor", info.0)),
+                    Name::new(format!("{} Interaction Sensor", name)),
+                ));
+
+                parent.spawn((
+                    SpriteBundle {
+                        texture: interaction_resources.interact_button.clone(),
+                        transform: Transform {
+                            translation: interactible.icon_translation,
+                            scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                            ..default()
+                        },
+                        visibility: Visibility::Hidden,
+                        ..default()
+                    },
+                    InteractIcon,
                 ));
 
                 parent.spawn((
                     Collider::cuboid(CHAR_HITBOX_WIDTH, CHAR_HITBOX_HEIGHT),
                     Transform::from_xyz(0., CHAR_HITBOX_Y_OFFSET, 0.),
                     CharacterHitbox,
-                    Name::new(format!("{} Hitbox", info.0)),
+                    Name::new(format!("{} Hitbox", name)),
                 ));
 
                 // parent.spawn((
@@ -460,7 +459,7 @@ fn spawn_vilains(
                 //     ActiveEvents::COLLISION_EVENTS,
                 //     ActiveCollisionTypes::STATIC_STATIC,
                 //     CharacterCloseSensor,
-                //     Name::new(format!("{} Close Sensor", info.0)),
+                //     Name::new(format!("{} Close Sensor", name)),
                 // ));
 
                 parent.spawn((
@@ -468,7 +467,7 @@ fn spawn_vilains(
                     // ActiveEvents::COLLISION_EVENTS,
                     Sensor,
                     PursuitRangeSensor,
-                    Name::new(format!("{} Pursuit Range", info.0)),
+                    Name::new(format!("{} Pursuit Range", name)),
                 ));
 
                 parent.spawn((
@@ -476,7 +475,7 @@ fn spawn_vilains(
                     ActiveEvents::COLLISION_EVENTS,
                     Sensor,
                     DetectionRangeSensor,
-                    Name::new(format!("{} Detection Range", info.0)),
+                    Name::new(format!("{} Detection Range", name)),
                 ));
 
                 // parent.spawn((
@@ -484,12 +483,12 @@ fn spawn_vilains(
                 //     // ActiveEvents::COLLISION_EVENTS,
                 //     Sensor,
                 //     FollowRangeSensor,
-                //     Name::new(format!("{} Follow Range", info.0)),
+                //     Name::new(format!("{} Follow Range", name)),
                 // ));
             })
             .id();
 
-        let dialog_file = std::fs::File::open(info.5).unwrap();
+        let dialog_file = std::fs::File::open(dialog_path).unwrap();
         let npc_deserialized_map: BTreeMap<usize, DialogNode> =
             serde_yaml::from_reader(dialog_file).unwrap();
         dialogs.insert(
@@ -501,3 +500,56 @@ fn spawn_vilains(
         );
     }
 }
+
+fn spawn_cat(mut commands: Commands, characters_spritesheet: Res<CharacterSpriteSheet>) {
+    /* -------------------------------------------------------------------------- */
+    /*                                   Olf Cat                                  */
+    /* -------------------------------------------------------------------------- */
+    // TODO: Polish #visual - Cat like movement
+    let mut cat_animation_indices = AnimationIndices(HashMap::new());
+    cat_animation_indices.insert(
+        CharacterState::Run,
+        (
+            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER,
+            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_RUN_END,
+            CharacterState::Idle,
+        ),
+    );
+    cat_animation_indices.insert(
+        CharacterState::Idle,
+        (
+            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_START,
+            BLACK_CAT_LINE * SPRITESHEET_COLUMN_NUMBER + COLUMN_FRAME_IDLE_END,
+            CharacterState::Idle,
+        ),
+    );
+
+    // TEMP: Static Olf cat
+    commands
+        .spawn((
+            SpriteSheetBundle {
+                texture_atlas: characters_spritesheet.texture_atlas.clone(),
+                transform: Transform {
+                    translation: OLF_CAT_POSITION.into(),
+                    scale: Vec3::splat(OLF_CAT_SCALE),
+                    ..Transform::default()
+                },
+                ..default()
+            },
+            Name::new("Olf Cat"),
+            OlfCat,
+            MovementBundle {
+                animation_indices: cat_animation_indices,
+                overlapping_entity: OverlappingEntity::new(CAT_SWITCH_Z_OFFSET),
+                ..default()
+            },
+            // -- Hitbox --
+            RigidBody::Fixed,
+        ))
+        .with_children(|parent| {
+            parent.spawn((
+                Collider::cuboid(2.5, 1.),
+                Transform::from_translation(OLF_CAT_HITBOX_OFFSET.into()),
+            ));
+        });
+}
diff --git a/src/characters/npcs/movement.rs b/src/characters/npcs/movement.rs
index 3c617de..8666c78 100755
--- a/src/characters/npcs/movement.rs
+++ b/src/characters/npcs/movement.rs
@@ -5,7 +5,6 @@ use bevy_ecs::query::QueryEntityError;
 use bevy_rapier2d::prelude::{
     ActiveEvents, Collider, CollisionEvent, RapierContext, Sensor, Velocity,
 };
-use rand::Rng;
 
 use crate::{
     animations::sprite_sheet_animation::CharacterState,
@@ -24,8 +23,11 @@ use crate::{
     },
     collisions::CollisionEventExt,
     combat::{CombatEvent, FairPlayTimer, Reputation},
-    constants::TILE_SIZE,
-    locations::landmarks::{reserved_random_free_landmark, Landmark, LandmarkStatus},
+    constants::character::CHAR_HITBOX_Y_OFFSET,
+    locations::{
+        landmarks::{reserved_random_free_landmark, Direction, Landmark, LandmarkStatus},
+        temple::Location,
+    },
 };
 
 // pub const PROXIMITY_RADIUS: f32 = 64.;
@@ -38,7 +40,7 @@ use crate::{
 pub enum NPCBehavior {
     /// The entity runs to a specify location and occupy this zone.
     /// Tourist butterfly.
-    LandmarkSeeking(Entity),
+    LandmarkSeeking(Entity, Location),
     Camping,
     Follow {
         target: Entity,
@@ -175,9 +177,19 @@ pub fn follow_event(
 }
 
 pub fn animation(
-    mut npc_query: Query<(&Velocity, &mut CharacterState, &mut TextureAtlasSprite), With<NPC>>,
+    mut npc_query: Query<
+        (
+            &Velocity,
+            &mut CharacterState,
+            &mut TextureAtlasSprite,
+            Option<&Direction>,
+        ),
+        (Or<(Changed<Velocity>, Changed<Direction>)>, With<NPC>),
+    >,
 ) {
-    for (rb_vel, mut npc_state, mut texture_atlas_sprite) in &mut npc_query {
+    for (rb_vel, mut npc_state, mut texture_atlas_sprite, potential_forced_direction) in
+        &mut npc_query
+    {
         /* -------------------------------------------------------------------------- */
         /*                                  Animation                                 */
         /* -------------------------------------------------------------------------- */
@@ -198,10 +210,15 @@ pub fn animation(
         /*                                  Direction                                 */
         /* -------------------------------------------------------------------------- */
 
-        if rb_vel.linvel.x > 0. {
-            texture_atlas_sprite.flip_x = false;
-        } else if rb_vel.linvel.x < 0. {
-            texture_atlas_sprite.flip_x = true;
+        match potential_forced_direction {
+            None => {
+                if rb_vel.linvel.x > 0. {
+                    texture_atlas_sprite.flip_x = false;
+                } else if rb_vel.linvel.x < 0. {
+                    texture_atlas_sprite.flip_x = true;
+                }
+            }
+            Some(direction) => texture_atlas_sprite.flip_x = (*direction).into(),
         }
     }
 }
@@ -211,34 +228,44 @@ pub fn animation(
 pub fn npc_movement(
     mut npc_query: Query<
         (
+            Entity,
             &mut NPCBehavior,
             Option<&Chaser>,
             &Transform,
             &Speed,
             &mut Velocity,
+            &Name,
         ),
         Without<RestTime>,
     >,
     mut landmark_sensor_query: Query<(Entity, &mut Landmark), With<Sensor>>,
     pos_query: Query<&GlobalTransform>,
+
+    player_query: Query<Entity, With<Player>>,
+    location_query: Query<&Location>,
+    player_location: Res<State<Location>>,
+    mut ev_stop_chase: EventWriter<StopChaseEvent>,
 ) {
-    for (mut behavior, potential_chaser, transform, speed, mut rb_vel) in &mut npc_query {
+    for (npc, mut behavior, potential_chaser, transform, speed, mut rb_vel, npc_name) in
+        &mut npc_query
+    {
         let (vel_x, vel_y) = match potential_chaser {
             None => match *behavior {
                 NPCBehavior::Camping => (0., 0.),
-                NPCBehavior::LandmarkSeeking(destination) => {
+                NPCBehavior::LandmarkSeeking(destination, location) => {
                     let (_, landmark) = landmark_sensor_query.get(destination).unwrap();
                     let landmark_transform = pos_query.get(destination).unwrap();
                     match landmark.status {
-                        LandmarkStatus::Occupied => {
+                        LandmarkStatus::OccupiedBy(_) => {
                             // FIXME: Match the LandmarkReservationError
                             let next_destination =
-                                reserved_random_free_landmark(&mut landmark_sensor_query).unwrap();
-                            *behavior = NPCBehavior::LandmarkSeeking(next_destination);
+                                reserved_random_free_landmark(&mut landmark_sensor_query, location)
+                                    .unwrap();
+                            *behavior = NPCBehavior::LandmarkSeeking(next_destination, location);
                             let next_transform = pos_query.get(next_destination).unwrap();
-                            move_to(next_transform, transform, speed)
+                            move_to(next_transform, false, transform, speed)
                         }
-                        _ => move_to(landmark_transform, transform, speed),
+                        _ => move_to(landmark_transform, false, transform, speed),
                     }
                 }
                 NPCBehavior::Follow { target, close } => {
@@ -246,7 +273,7 @@ pub fn npc_movement(
                         (0., 0.)
                     } else {
                         let target_transform = pos_query.get(target).unwrap();
-                        move_to(target_transform, transform, speed)
+                        move_to(target_transform, true, transform, speed)
                     }
                 }
             },
@@ -254,8 +281,21 @@ pub fn npc_movement(
                 if *close {
                     (0., 0.)
                 } else {
-                    let target_transform = pos_query.get(*target).unwrap();
-                    move_to(target_transform, transform, speed)
+                    let player = player_query.single();
+                    let [npc_location, target_location] = if *target == player {
+                        [location_query.get(npc).unwrap(), player_location.get()]
+                    } else {
+                        location_query.get_many([*target, npc]).unwrap()
+                    };
+
+                    if target_location != npc_location {
+                        ev_stop_chase.send(StopChaseEvent { npc_entity: npc });
+                        info!("{} change zone. {:?}: chase canceled", npc_name, *target);
+                        (0., 0.)
+                    } else {
+                        let target_transform = pos_query.get(*target).unwrap();
+                        move_to(target_transform, true, transform, speed)
+                    }
                 }
             }
         };
@@ -315,13 +355,16 @@ pub fn chase_management(
     >,
     close_sensor_query: Query<(Entity, &Parent), With<CharacterCloseSensor>>,
 
+    location_query: Query<&Location>,
+    player_location: Res<State<Location>>,
+
     mut ev_engage_pursuit: EventWriter<EngagePursuitEvent>,
     mut ev_combat: EventWriter<CombatEvent>,
     mut ev_stop_chase: EventWriter<StopChaseEvent>,
 ) {
     for collision_event in collision_events.iter() {
-        let entity_1 = collision_event.entities().0;
-        let entity_2 = collision_event.entities().1;
+        // info!("{:#?}", collision_event);
+        let (entity_1, entity_2) = collision_event.entities();
 
         // if rapier_context.intersection_pair(entity_1, entity_2) == Some(true) {
         //     info!("Some(true) with {:#?}, {:#?}", entity_1, entity_2);
@@ -434,14 +477,31 @@ pub fn chase_management(
                                         };
 
                                         if is_target_type {
-                                            ev_engage_pursuit.send(EngagePursuitEvent {
-                                                npc_entity: **npc,
-                                                target_entity: **character,
-                                            });
-                                            info!(
-                                                "{} detected {}: chase initialized",
-                                                npc_name, character_name
-                                            );
+                                            // The Target muist be in the same zone
+                                            // NOTE: Can be abstracted - target and self location verification
+                                            let player = player_query.single();
+                                            let [npc_location, target_location] =
+                                                if **character == player {
+                                                    [
+                                                        location_query.get(**npc).unwrap(),
+                                                        player_location.get(),
+                                                    ]
+                                                } else {
+                                                    location_query
+                                                        .get_many([**character, **npc])
+                                                        .unwrap()
+                                                };
+
+                                            if npc_location == target_location {
+                                                ev_engage_pursuit.send(EngagePursuitEvent {
+                                                    npc_entity: **npc,
+                                                    target_entity: **character,
+                                                });
+                                                info!(
+                                                    "{} detected {}: chase initialized",
+                                                    npc_name, character_name
+                                                );
+                                            }
                                         }
                                     }
                                 }
@@ -497,9 +557,23 @@ pub fn chase_management(
 }
 
 /// Give velocity x and y value to move forward a certain target
-fn move_to(target_transform: &GlobalTransform, transform: &Transform, speed: &Speed) -> (f32, f32) {
-    let up = target_transform.translation().y > transform.translation.y;
-    let down = target_transform.translation().y < transform.translation.y;
+fn move_to(
+    target_transform: &GlobalTransform,
+    target_is_a_character: bool,
+    transform: &Transform,
+    speed: &Speed,
+) -> (f32, f32) {
+    // REFACTOR: use the max_step possible and see if the difference can be lowered.
+    let target_y_offset = if target_is_a_character {
+        CHAR_HITBOX_Y_OFFSET
+    } else {
+        0.
+    };
+
+    let up = target_transform.translation().y + target_y_offset
+        > transform.translation.y + CHAR_HITBOX_Y_OFFSET;
+    let down = target_transform.translation().y + target_y_offset
+        < transform.translation.y + CHAR_HITBOX_Y_OFFSET;
     let left = target_transform.translation().x < transform.translation.x;
     let right = target_transform.translation().x > transform.translation.x;
 
@@ -518,73 +592,3 @@ fn move_to(target_transform: &GlobalTransform, transform: &Transform, speed: &Sp
 
     (vel_x, vel_y)
 }
-
-/// Give velocity x and y value to move forward a certain vec3
-fn move_to_dest(target_vec3: Vec3, transform: &Transform, speed: &Speed) -> (f32, f32) {
-    let up = target_vec3.y > transform.translation.y;
-    let down = target_vec3.y < transform.translation.y;
-    let left = target_vec3.x < transform.translation.x;
-    let right = target_vec3.x > transform.translation.x;
-
-    let x_axis = -(left as i8) + right as i8;
-    let y_axis = -(down as i8) + up as i8;
-
-    // println!("x: {}, y: {}", x_axis, y_axis);
-
-    let mut vel_x = x_axis as f32 * **speed;
-    let mut vel_y = y_axis as f32 * **speed;
-
-    if x_axis != 0 && y_axis != 0 {
-        vel_x *= (std::f32::consts::PI / 4.).cos();
-        vel_y *= (std::f32::consts::PI / 4.).cos();
-    }
-
-    (vel_x, vel_y)
-}
-
-/// # Parameters
-///
-/// position: of a entity
-/// direction: the middle of the future zone,
-///            is on the middle of the segment [a,c]
-///
-/// # Return
-/// returns true if the entity is on the square around the direction point
-///
-/// # Note
-///
-/// XXX: Rework this Approximation Louche
-fn close(position: Vec3, direction: Vec3, range: f32) -> bool {
-    // direction.x == position.x &&
-    // direction.y == position.y
-
-    let a = Vec3::new(direction.x - range, direction.y + range, direction.z);
-
-    let c = Vec3::new(direction.x + range, direction.y - range, direction.z);
-
-    position.x >= a.x && position.x <= c.x && position.y <= a.y && position.y >= c.y
-}
-
-/**
- * param:
- *  force
- *  range: cuboid ? no ball
- * return:
- *  Vec3
- */
-fn give_a_direction() -> Vec3 {
-    let x =
-        rand::thread_rng().gen_range(-100 * (TILE_SIZE as i32)..100 * (TILE_SIZE as i32)) as f32;
-    let y =
-        rand::thread_rng().gen_range(-100 * (TILE_SIZE as i32)..100 * (TILE_SIZE as i32)) as f32;
-
-    /* shape ideas
-     * (x, y) -> A
-     * (x+1, y-1) -> C
-     * (x+0.5, y-0.5) -> milieu
-     */
-
-    let direction: Vec3 = Vec3::new(x, y, 0.);
-
-    direction
-}
diff --git a/src/characters/player.rs b/src/characters/player.rs
index 5d46e8f..da6361e 100755
--- a/src/characters/player.rs
+++ b/src/characters/player.rs
@@ -43,6 +43,7 @@ pub struct PlayerInteractionSensor;
 #[derive(Component)]
 pub struct PlayerCloseSensor;
 
+/// FIXME: Freeze the player when in dialog (trigger for ex when interacting while running)
 fn player_movement(
     key_bindings: Res<KeyBindings>,
     keyboard_input: Res<Input<KeyCode>>,
diff --git a/src/constants.rs b/src/constants.rs
deleted file mode 100755
index bd9a0f9..0000000
--- a/src/constants.rs
+++ /dev/null
@@ -1,445 +0,0 @@
-// dark blue #213757 = 33/255, 55/255, 87/255
-pub const BACKGROUND_COLOR_INMENU: bevy::render::color::Color =
-    bevy::render::color::Color::rgb(33. / 255., 55. / 255., 87. / 255.);
-// dark purple #25131a = 39/255, 19/255, 26/255
-pub const BACKGROUND_COLOR_INGAME: bevy::render::color::Color =
-    bevy::render::color::Color::rgb(0.153, 0.07, 0.102);
-// pub const BACKGROUND_COLOR: bevy::render::color::Color = bevy::render::color::Color::Rgba {
-//     red: 58. / 256.,
-//     green: 36. / 256.,
-//     blue: 48. / 256.,
-//     alpha: 1.,
-// };
-
-pub const RESOLUTION: f32 = 9. / 16.; // 16. / 9.;
-pub const TILE_SIZE: f32 = 1.;
-
-pub const FRAME_TIME: f32 = 0.1;
-
-pub mod title_screen {
-
-    /* -------------------------------------------------------------------------- */
-    /*                                   Lights                                   */
-    /* -------------------------------------------------------------------------- */
-    pub const FULL_LIGHTS_INDEX: (usize, usize) = (0, 0);
-    pub const BOT_SHUTDOWN_INDEX: (usize, usize) = (1, 1);
-    pub const TOP_SHUTDOWN_INDEX: (usize, usize) = (2, 2);
-    pub const TOWER_RESET_INDEX: (usize, usize) = (3, 3);
-    pub const SMALL_SHUTDOWN_INDEX: (usize, usize) = (4, 12);
-    pub const LEFT_SHUTDOWN_INDEX: (usize, usize) = (13, 20);
-
-    pub const MANOR_LIGHTS_PATTERN_INDEXES: &[(usize, usize); 6] = &[
-        FULL_LIGHTS_INDEX,
-        TOWER_RESET_INDEX,
-        SMALL_SHUTDOWN_INDEX,
-        TOP_SHUTDOWN_INDEX,
-        BOT_SHUTDOWN_INDEX,
-        LEFT_SHUTDOWN_INDEX,
-    ];
-
-    /* -------------------------------------------------------------------------- */
-    /*                                    Title                                   */
-    /* -------------------------------------------------------------------------- */
-
-    pub const TITLE_FLEX_BOT_DELTA_S: u64 = 2;
-    // stay twice more time in the top position
-    pub const TITLE_FLEX_TOP_DELTA_S: u64 = TITLE_FLEX_BOT_DELTA_S * 2;
-    pub const TITLE_FLEX_TOP: f32 = 0.;
-    pub const TITLE_FLEX_BOT: f32 = -5.;
-}
-
-pub mod interactions {
-    pub const INTERACT_BUTTON_Z: f32 = 20.;
-    pub const INTERACT_BUTTON_SCALE: f32 = 0.25;
-
-    // REFACTOR: INTERACTION_ID
-}
-
-pub mod ui {
-    pub mod dialogs {
-        use bevy::prelude::Color;
-
-        pub const DIALOG_PANEL_ANIMATION_OFFSET: f32 = -1000.;
-        pub const DIALOG_BOX_UPDATE_DELTA_S: f32 = 0.05;
-        pub const DIALOG_PANEL_ANIMATION_TIME_MS: u64 = 500;
-        pub const SCROLL_SIZE: (f32, f32) = (490., 11700. / 45.);
-        pub const SCROLL_ANIMATION_DELTA_S: f32 = 0.1;
-        pub const SCROLL_ANIMATION_FRAMES_NUMBER: usize = 45;
-
-        pub const FIRST_BUTTON_TOP_VAL: f32 = 690.;
-        pub const BUTTON_SPACING: f32 = 320.;
-        pub const BUTTON_LEFT_VAL: f32 = -52.;
-
-        pub const TRANSPARENT_BUTTON: Color = Color::rgba(0., 0., 0., 0.);
-        // pub const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
-        pub const NORMAL_BUTTON: Color = Color::rgba(0.1, 0.1, 0.1, 0.1);
-        pub const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
-        pub const PRESSED_BUTTON: Color = Color::rgb(0.35, 0.75, 0.35);
-    }
-}
-
-pub mod character {
-    pub const CHAR_SCALE: f32 = 0.6 * super::TILE_SIZE;
-
-    pub const CHAR_HITBOX_HEIGHT: f32 = 1.5 * CHAR_SCALE;
-    pub const CHAR_HITBOX_WIDTH: f32 = 5. * CHAR_SCALE;
-    pub const CHAR_HITBOX_Y_OFFSET: f32 = -6.25;
-    pub const CHAR_SENSOR_Y_OFFSET: f32 = -1.25;
-
-    pub const COLUMN_FRAME_RUN_END: usize = 3;
-    pub const COLUMN_FRAME_IDLE_START: usize = 4;
-    pub const COLUMN_FRAME_IDLE_END: usize = 5;
-
-    pub const SPRITESHEET_COLUMN_NUMBER: usize = 6;
-
-    pub mod player {
-        use crate::animations::sprite_sheet_animation::CharacterState;
-
-        use super::{
-            COLUMN_FRAME_IDLE_END, COLUMN_FRAME_IDLE_START, COLUMN_FRAME_RUN_END,
-            SPRITESHEET_COLUMN_NUMBER,
-        };
-
-        pub const PLAYER_WIDTH: f32 = 12.;
-        pub const PLAYER_HEIGHT: f32 = 15.;
-        pub const PLAYER_SCALE: f32 = super::CHAR_SCALE;
-        pub const PLAYER_SPAWN: (f32, f32, f32) = (-24., -150., 0.);
-
-        pub const CAMERA_INTERPOLATION: f32 = 0.1;
-
-        /* -------------------------------------------------------------------------- */
-        /*                                  Animation                                 */
-        /* -------------------------------------------------------------------------- */
-
-        pub const PLAYER_LINE: usize = 1;
-        pub const PLAYER_LINE_START: usize = PLAYER_LINE * SPRITESHEET_COLUMN_NUMBER;
-        // (start_frame, end_frame, next_state)
-        pub const PLAYER_RUN_FRAMES: (usize, usize, CharacterState) = (
-            PLAYER_LINE_START,
-            PLAYER_LINE_START + COLUMN_FRAME_RUN_END,
-            // CharacterState::Idle,
-            CharacterState::Run,
-        );
-        pub const PLAYER_IDLE_FRAMES: (usize, usize, CharacterState) = (
-            PLAYER_LINE_START + COLUMN_FRAME_IDLE_START,
-            PLAYER_LINE_START + COLUMN_FRAME_IDLE_END,
-            CharacterState::Idle,
-        );
-    }
-
-    pub mod npcs {
-        use crate::constants::{
-            interactions::INTERACT_BUTTON_Z, locations::main_room::THRONE_POSITION, TILE_SIZE,
-        };
-
-        pub const NPC_SCALE: f32 = super::CHAR_SCALE;
-
-        pub const CHARACTER_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
-            (15. * TILE_SIZE, 10. * TILE_SIZE, INTERACT_BUTTON_Z);
-
-        pub const OLF_CAT_SCALE: f32 = 0.5;
-        pub const OLF_CAT_POSITION: (f32, f32, f32) = (-104., 134., 0.);
-        pub const SUPREME_GOD_SPAWN_POSITION: (f32, f32, f32) = THRONE_POSITION;
-        pub const OLF_SPAWN_POSITION: (f32, f32, f32) = OLF_CAT_POSITION;
-
-        pub const NPC_TALK_INTERACTION_ID: u32 = 10;
-
-        /* -------------------------------------------------------------------------- */
-        /*                                  Animation                                 */
-        /* -------------------------------------------------------------------------- */
-
-        pub const ADMIRAL_LINE: usize = 0;
-        pub const FABIEN_LOYAL_LINE: usize = 2;
-        pub const FABIEN_DISLOYAL_LINE: usize = 3;
-        pub const OLF_LINE: usize = 4;
-        pub const OLF_GHOST_LINE: usize = 5;
-        pub const FOOL_LINE: usize = 6;
-        pub const SUPREME_GOD_LINE: usize = 7;
-        pub const GENERAL_LINE: usize = 8;
-        pub const HEALER_V1_LINE: usize = 9;
-        pub const HEALER_V2_LINE: usize = 10;
-        pub const FABICURION_LINE: usize = 11;
-        pub const VAMPIRE_LINE: usize = 12;
-        pub const AGENT_LINE: usize = 13;
-        pub const BLACK_CAT_LINE: usize = 14;
-        pub const BLUE_CAT_LINE: usize = 15;
-
-        pub const CAT_SWITCH_Z_OFFSET: f32 = 0.;
-        pub const OLF_CAT_ANIMATION_DELTA: f32 = 0.5;
-        pub const OLF_CAT_HITBOX_OFFSET: (f32, f32, f32) = (0., -5., 0.);
-
-        pub mod movement {
-            use crate::constants::TILE_SIZE;
-
-            pub const REST_TIMER: u64 = 3;
-            // TODO: adjust EVASION_TIMER / FAIR_PLAY_TIMER
-            pub const EVASION_TIMER: u64 = 5;
-
-            pub const NPC_SPEED_LEADER: f32 = 70. * TILE_SIZE;
-            pub const NPC_SPEED: f32 = 50. * TILE_SIZE; // -> Speed::default()
-        }
-    }
-
-    pub mod dialog {
-        // Flibittygibbit
-
-        pub const RANDOM_DIALOG: &str = "1:
-  source: Fabien
-  content:
-    text:
-      - Enfant, j'ai eu un poney
-      - Mais j'ai toujours voulu un agneau
-    exit_state: 2\n";
-    }
-}
-
-pub mod locations {
-
-    /*
-    | Layer              | Back Z, Front Z |
-    | ------------------ | --------------- |
-    | Character          |      depend     |
-    | Balcony            | 3.0,        --- |
-    | Balcony Doors      | 3.0,        11. |
-    | Hall               | 3.5,        8.0 |
-    | Hall Props         | 3.6,        8.1 |
-    | Hall Statue        | 3.6,        8.1 |
-    | Hall Door          | 3.6,        8.1 |
-    | Hall Chandeliers   | ---,        8.1 |
-    | Temple             | 2.0,        7.0 |
-    | Temple Plants      | 2.1,        7.1 |
-    | Temple Pillars     | 2.1,        7.1 |
-    | Temple Throne      | 2.1,        7.1 |
-    | Temple Statues     | 2.2,        7.2 |
-    | Temple Brazier     | 2.2,        7.2 |
-    | Temple Chandeliers | ---,        7.3 |
-    | Secret Room        | 1.0,        6.0 |
-    | Secret Room Panels | 1.1,        6.1 |
-    | Roof               | ---,        11. |
-     */
-
-    pub const MAP_START_Y: f32 = -170.;
-    pub const MAP_END_Y: f32 = 165.;
-    pub const MAP_START_Z: f32 = 11.;
-    pub const MAP_END_Z: f32 = 1.;
-    pub const MAP_DISTANCE_IN_Y: f32 = MAP_END_Y - MAP_START_Y;
-    pub const MAP_DISTANCE_IN_Z: f32 = MAP_END_Z - MAP_START_Z;
-    // `Z_UNIT` is the equivalent of the y value of 1 z
-    pub const Z_UNIT: f32 = MAP_DISTANCE_IN_Y / MAP_DISTANCE_IN_Z;
-    // `Y_UNIT` is the equivalent of the z value of 1 y
-    pub const Y_UNIT: f32 = 1. / Z_UNIT;
-
-    // In `locations::temple::y_to_z_conversion`
-    pub const WILL_BE_COMPUTE_LATER: f32 = 0.;
-
-    pub const CHANDELIER_SIZE: (f32, f32) = (20., 10.);
-    pub const CHANDELIER_TRANSPARENCY_COLOR: f32 = 170. / 255.;
-    pub const CHANDELIER_PLAIN_COLOR: f32 = 1.;
-    pub const CHANDELIER_FLAME_POSITIONS: [(f32, f32, f32); 3] = [
-        (-6.5, -2., PROPS_Z), // left
-        (-0.5, -2., PROPS_Z), // center
-        (5.5, -2., PROPS_Z),  // right
-    ];
-
-    pub const GROUND_Z: f32 = 0.5;
-    pub const ROOF_Z: f32 = 11.;
-    // just enoguht to be above parent :) (smile from Horor Humanum Est <3)
-    pub const PROPS_Z: f32 = 0.01;
-
-    pub mod hall {
-        use crate::constants::{interactions::INTERACT_BUTTON_Z, TILE_SIZE};
-
-        use super::{
-            MAP_DISTANCE_IN_Z, MAP_START_Y, PROPS_Z, ROOF_Z, WILL_BE_COMPUTE_LATER, Y_UNIT,
-        };
-
-        // HALL_END_Y
-        // FIXME: hair hang over the temple door (could be like the second_layer of fake wall)
-        pub const HALL_EXIT_Y: f32 = -89.; // -92.
-        pub const HALL_Z: f32 = (HALL_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
-        pub const UP_DOOR_Z: f32 = 10.;
-        pub const UP_DOOR_POSITION: (f32, f32, f32) = (0., 0., UP_DOOR_Z);
-        pub const BALCONY_Z: f32 = 3.;
-        pub const BALCONY_POSITION: (f32, f32, f32) = (0., 0., BALCONY_Z - HALL_Z);
-
-        pub const BALCONY_COVER_POSITION: (f32, f32, f32) = (114., -165., 0.1);
-        pub const BALCONY_COVER_SIZE: (f32, f32) = (60., 70.);
-
-        pub const HALL_FROM_TEMPLE_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-24., -105., 0.);
-        pub const HALL_FROM_BALCONY_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (80., -160., 0.);
-        pub const BALCONY_LOCATION_SENSOR_SIZE: (f32, f32) = (13., 6.5);
-        pub const BALCONY_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (95., -162.5, 0.);
-
-        pub const BOX_INTERACTION_ID: u32 = 0;
-        pub const BOX_POSITION: (f32, f32, f32) =
-            (-121.5 * TILE_SIZE, -158. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-        pub const BOX_SENSOR_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
-        pub const BOX_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
-            (12. * TILE_SIZE, 7. * TILE_SIZE, INTERACT_BUTTON_Z);
-
-        pub const DOOR_INTERACTION_ID: u32 = 1;
-        pub const DOOR_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
-            (17.5 * TILE_SIZE, -3.5 * TILE_SIZE, INTERACT_BUTTON_Z);
-        pub const DOOR_POSITION: (f32, f32, f32) =
-            (-24. * TILE_SIZE, -88. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-        pub const DOOR_SENSOR_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
-        pub const DOOR_COLLIDER_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
-        pub const DOOR_OPEN_DELTA_S: f32 = 0.2;
-        pub const TEMPLE_DOOR_SWITCH_Z_OFFSET_CLOSED: f32 = 0.25;
-        pub const TEMPLE_DOOR_SWITCH_Z_OFFSET_OPENED: f32 = 0.3;
-
-        pub const STATUE_POSITION: (f32, f32, f32) = (59., -101., WILL_BE_COMPUTE_LATER);
-        pub const STATUE_INTERACTION_ID: u32 = 2;
-        pub const STATUE_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
-            (-8.3 * TILE_SIZE, 0., INTERACT_BUTTON_Z);
-
-        const LIGHT_Z: f32 = ROOF_Z;
-        pub const HALL_CHANDELIER_POSITIONS: [(f32, f32, f32); 2] = [
-            (-77.5 * TILE_SIZE, -125. * TILE_SIZE, LIGHT_Z), // left
-            (29.5 * TILE_SIZE, -125. * TILE_SIZE, LIGHT_Z),  // right
-        ];
-        pub const WALL_LIGHT_POSITIONS: [(f32, f32, f32); 4] = [
-            (-87. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z), // far left
-            (-47. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z), // center left
-            (-2. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z),  // center right
-            (38. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z),  // far right
-        ];
-        pub const LIGHT_SUPPORT_OFFSET: (f32, f32, f32) = (0.5, -4.5, PROPS_Z);
-    }
-
-    pub mod main_room {
-        use crate::constants::{interactions::INTERACT_BUTTON_Z, TILE_SIZE};
-
-        use super::{
-            MAP_DISTANCE_IN_Z, MAP_START_Y, PROPS_Z, ROOF_Z, WILL_BE_COMPUTE_LATER, Y_UNIT,
-        };
-
-        pub const TEMPLE_EXIT_Y: f32 = 87.;
-        pub const MAIN_ROOM_Z: f32 = (TEMPLE_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
-
-        pub const TEMPLE_HALL_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-24., -94., 0.);
-        pub const TEMPLE_SECRET_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-44.5, 80., 0.);
-
-        pub const PILLAR_SWITCH_Z_OFFSET: f32 = 0.1;
-        pub const PILLAR_HITBOX_Y_OFFSET: f32 = -12.5;
-        pub const PILLAR_POSITIONS: [(f32, f32, f32); 6] = [
-            // 1    4
-            // 2    5
-            // 3    6
-            (-49.5 * TILE_SIZE, 25.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // 1
-            (-49.5 * TILE_SIZE, -14.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // 2
-            (-49.5 * TILE_SIZE, -54.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // 3
-            (1.5 * TILE_SIZE, 25.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // 4
-            (1.5 * TILE_SIZE, -14.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // 5
-            (1.5 * TILE_SIZE, -54.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // 6
-        ];
-
-        pub const BANNERS_POSITION: (f32, f32, f32) = (-20. * TILE_SIZE, 80. * TILE_SIZE, 0.);
-
-        pub const THRONE_SWITCH_Z_OFFSET: f32 = -0.1;
-        pub const THRONE_POSITION: (f32, f32, f32) =
-            (-24. * TILE_SIZE, 71.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-
-        const CHANDELIER_Z: f32 = ROOF_Z;
-        pub const TEMPLE_CHANDELIER_POSITIONS: [(f32, f32, f32); 4] = [
-            (-77.5 * TILE_SIZE, 6. * TILE_SIZE, CHANDELIER_Z), // left top
-            (-77.5 * TILE_SIZE, -40. * TILE_SIZE, CHANDELIER_Z), // left bottom
-            (29.5 * TILE_SIZE, 6. * TILE_SIZE, CHANDELIER_Z),  // right top
-            (29.5 * TILE_SIZE, -40. * TILE_SIZE, CHANDELIER_Z), // right bottom
-        ];
-
-        pub const PLANTS_SWITCH_Z_OFFSET: f32 = 0.5;
-        pub const PLANTS_POSITIONS: [(f32, f32, f32); 4] = [
-            (-125.5 * TILE_SIZE, 44. * TILE_SIZE, WILL_BE_COMPUTE_LATER), // TopLeft
-            (-125.5 * TILE_SIZE, -27. * TILE_SIZE, WILL_BE_COMPUTE_LATER), // BottomLeft
-            (77.5 * TILE_SIZE, 44. * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // TopRight
-            (77.5 * TILE_SIZE, -27. * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // BottomRight
-        ];
-
-        pub const BRAZIER_Z_OFFSET: f32 = -0.1;
-        pub const BRAZIER_FLAME_OFFSET: (f32, f32, f32) = (0., 11.5, 0.);
-        pub const BRAZIERS_POSITIONS: [(f32, f32, f32); 4] = [
-            (-116.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // LeftLeft
-            (-83.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // LeftRight
-            (35.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // RightLeft
-            (68.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // RightRight
-        ];
-
-        // pub const STATUE_SWITCH_Z_OFFSET: f32 = 0.;
-        // FIXME: Why the Y of cat/fabien statue are different ??
-        pub const CAT_STATUE_POSITION: (f32, f32, f32) =
-            (-100. * TILE_SIZE, 75. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-        pub const FABIEN_STATUE_POSITION: (f32, f32, f32) =
-            (52. * TILE_SIZE, 77. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-
-        pub const BANNER_INTERACTION_ID: u32 = 3;
-        pub const BANNER_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
-            (0. * TILE_SIZE, 0. * TILE_SIZE, INTERACT_BUTTON_Z);
-        pub const BANNER_POSITION: (f32, f32, f32) = (-44.5 * TILE_SIZE, 91. * TILE_SIZE, PROPS_Z);
-        pub const BANNER_SENSOR_OFFSET: (f32, f32, f32) = (0., 0., 0.);
-        pub const BANNER_COLLIDER_OFFSET: (f32, f32, f32) = (0., 0.5 * TILE_SIZE, 0.);
-        pub const BANNER_OPEN_DELTA_S: f32 = 0.1;
-
-        pub mod landmarks {
-            // use super::*;
-            use crate::constants::TILE_SIZE;
-
-            pub const LANDMARK_CAT_STATUE_LEFT: (f32, f32, f32) =
-                (-110. * TILE_SIZE, 70. * TILE_SIZE, 0.);
-            pub const LANDMARK_CAT_STATUE_MIDDLE: (f32, f32, f32) =
-                (-100. * TILE_SIZE, 65. * TILE_SIZE, 0.);
-            pub const LANDMARK_CAT_STATUE_RIGHT: (f32, f32, f32) =
-                (-90. * TILE_SIZE, 70. * TILE_SIZE, 0.);
-
-            pub const LANDMARK_FABIEN_STATUE_LEFT: (f32, f32, f32) =
-                (-42. * TILE_SIZE, 70. * TILE_SIZE, 0.);
-            pub const LANDMARK_FABIEN_STATUE_MIDDLE: (f32, f32, f32) =
-                (-52. * TILE_SIZE, 65. * TILE_SIZE, 0.);
-            pub const LANDMARK_FABIEN_STATUE_RIGHT: (f32, f32, f32) =
-                (-62. * TILE_SIZE, 70. * TILE_SIZE, 0.);
-        }
-    }
-
-    pub mod secret_room {
-        use crate::constants::TILE_SIZE;
-
-        use super::{
-            MAP_DISTANCE_IN_Z, MAP_END_Y, MAP_START_Y, PROPS_Z, WILL_BE_COMPUTE_LATER, Y_UNIT,
-        };
-
-        pub const SECRET_ROOM_EXIT_Y: f32 = MAP_END_Y;
-        pub const SECRET_ROOM_Z: f32 =
-            (SECRET_ROOM_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
-
-        pub const SECRET_LOCATION_SENSOR_POSITION: (f32, f32, f32) =
-            (-44.5, SECRET_ROOM_TRIGGER_Y, 0.);
-
-        pub const SECRET_ROOM_TRIGGER_Y: f32 = 85.5;
-        pub const SECRET_ROOM_TRIGGER_CUBOID: (f32, f32) = (7., 5.);
-        pub const SECRET_ROOM_TRIGGER_POSITION: (f32, f32, f32) =
-            (-44.5, SECRET_ROOM_TRIGGER_Y, 0.);
-        pub const SECRET_ROOM_COVER_POSITION: (f32, f32, f32) = (-24., 161., 6.9);
-        pub const SECRET_ROOM_COVER_SIZE: (f32, f32) = (250., 100.);
-
-        pub const SECOND_FAKE_WALL_SWITCH_Z_OFFSET: f32 = -2.4;
-
-        pub const FAKE_STONE_POSITION: (f32, f32, f32) = (0., 0., WILL_BE_COMPUTE_LATER);
-        pub const FAKE_STONE_SWITCH_Z_OFFSET: f32 = -2.5;
-
-        pub const FLOWER_PANEL_SWITCH_Z_OFFSET: f32 = 0.3;
-        pub const FLOWER_PANEL_POSITIONS: [(f32, f32, f32); 5] = [
-            (-116. * TILE_SIZE, 100.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // 1
-            (-83. * TILE_SIZE, 100.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // 2
-            (35. * TILE_SIZE, 100.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // 3
-            (68. * TILE_SIZE, 100.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // 4
-            (-105.5 * TILE_SIZE, 165.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // Repair
-        ];
-
-        pub const WALL_POT_POSITION: (f32, f32, f32) =
-            (-59.5 * TILE_SIZE, 171.5 * TILE_SIZE, PROPS_Z);
-
-        pub const STAIRS_RAMP_POSITION: (f32, f32, f32) =
-            (-64.5 * TILE_SIZE, 141. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
-        pub const STAIRS_RAMP_SWITCH_Z_OFFSET: f32 = -0.1;
-    }
-}
diff --git a/src/constants/character.rs b/src/constants/character.rs
new file mode 100644
index 0000000..433d8f5
--- /dev/null
+++ b/src/constants/character.rs
@@ -0,0 +1,120 @@
+pub const CHAR_SCALE: f32 = 0.6 * super::TILE_SIZE;
+
+pub const CHAR_HITBOX_HEIGHT: f32 = 1.5 * CHAR_SCALE;
+pub const CHAR_HITBOX_WIDTH: f32 = 5. * CHAR_SCALE;
+pub const CHAR_HITBOX_Y_OFFSET: f32 = -6.25;
+pub const CHAR_SENSOR_Y_OFFSET: f32 = -1.25;
+
+pub const COLUMN_FRAME_RUN_END: usize = 3;
+pub const COLUMN_FRAME_IDLE_START: usize = 4;
+pub const COLUMN_FRAME_IDLE_END: usize = 5;
+
+pub const SPRITESHEET_LINE_NUMBER: usize = 16;
+pub const SPRITESHEET_COLUMN_NUMBER: usize = 6;
+
+pub mod player {
+    use crate::animations::sprite_sheet_animation::CharacterState;
+
+    use super::{
+        COLUMN_FRAME_IDLE_END, COLUMN_FRAME_IDLE_START, COLUMN_FRAME_RUN_END,
+        SPRITESHEET_COLUMN_NUMBER,
+    };
+
+    pub const PLAYER_WIDTH: f32 = 12.;
+    pub const PLAYER_HEIGHT: f32 = 15.;
+    pub const PLAYER_SCALE: f32 = super::CHAR_SCALE;
+    pub const PLAYER_SPAWN: (f32, f32, f32) = (-24., -150., 0.);
+
+    pub const CAMERA_INTERPOLATION: f32 = 0.1;
+
+    /* -------------------------------------------------------------------------- */
+    /*                                  Animation                                 */
+    /* -------------------------------------------------------------------------- */
+
+    pub const PLAYER_LINE: usize = 1;
+    pub const PLAYER_LINE_START: usize = PLAYER_LINE * SPRITESHEET_COLUMN_NUMBER;
+    // (start_frame, end_frame, next_state)
+    pub const PLAYER_RUN_FRAMES: (usize, usize, CharacterState) = (
+        PLAYER_LINE_START,
+        PLAYER_LINE_START + COLUMN_FRAME_RUN_END,
+        // CharacterState::Idle,
+        CharacterState::Run,
+    );
+    pub const PLAYER_IDLE_FRAMES: (usize, usize, CharacterState) = (
+        PLAYER_LINE_START + COLUMN_FRAME_IDLE_START,
+        PLAYER_LINE_START + COLUMN_FRAME_IDLE_END,
+        CharacterState::Idle,
+    );
+}
+
+pub mod npcs {
+    use crate::constants::{
+        interactions::INTERACT_BUTTON_Z,
+        locations::main_room::{
+            landmarks::{LANDMARK_AUDIENCE, LANDMARK_CAT_STATUE},
+            THRONE_POSITION,
+        },
+        TILE_SIZE,
+    };
+
+    pub const NPC_SCALE: f32 = super::CHAR_SCALE;
+
+    pub const CHARACTER_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
+        (15. * TILE_SIZE, 10. * TILE_SIZE, INTERACT_BUTTON_Z);
+
+    pub const OLF_CAT_SCALE: f32 = 0.5;
+    pub const OLF_CAT_POSITION: (f32, f32, f32) = (-104., 134., 0.);
+    pub const SUPREME_GOD_SPAWN_POSITION: (f32, f32, f32) = THRONE_POSITION;
+    pub const OLF_SPAWN_POSITION: (f32, f32, f32) = OLF_CAT_POSITION;
+    pub const VAMPIRE_SPAWN_POSITION: (f32, f32, f32) = LANDMARK_CAT_STATUE[0].0;
+    pub const FABIEN_SPAWN_POSITION: (f32, f32, f32) = LANDMARK_AUDIENCE;
+
+    pub const NPC_TALK_INTERACTION_ID: u32 = 10;
+
+    /* -------------------------------------------------------------------------- */
+    /*                                  Animation                                 */
+    /* -------------------------------------------------------------------------- */
+
+    pub const ADMIRAL_LINE: usize = 0;
+    pub const FABIEN_LOYAL_LINE: usize = 2;
+    pub const FABIEN_DISLOYAL_LINE: usize = 3;
+    pub const OLF_LINE: usize = 4;
+    pub const OLF_GHOST_LINE: usize = 5;
+    pub const FOOL_LINE: usize = 6;
+    pub const SUPREME_GOD_LINE: usize = 7;
+    pub const GENERAL_LINE: usize = 8;
+    pub const HEALER_V1_LINE: usize = 9;
+    pub const HEALER_V2_LINE: usize = 10;
+    pub const FABICURION_LINE: usize = 11;
+    pub const VAMPIRE_LINE: usize = 12;
+    pub const AGENT_LINE: usize = 13;
+    pub const BLACK_CAT_LINE: usize = 14;
+    pub const BLUE_CAT_LINE: usize = 15;
+
+    pub const CAT_SWITCH_Z_OFFSET: f32 = 0.;
+    pub const OLF_CAT_ANIMATION_DELTA: f32 = 0.5;
+    pub const OLF_CAT_HITBOX_OFFSET: (f32, f32, f32) = (0., -5., 0.);
+
+    pub mod movement {
+        use crate::constants::TILE_SIZE;
+
+        pub const REST_TIMER: u64 = 3;
+        // TODO: adjust EVASION_TIMER / FAIR_PLAY_TIMER
+        pub const EVASION_TIMER: u64 = 5;
+
+        pub const NPC_SPEED_LEADER: f32 = 70. * TILE_SIZE;
+        pub const NPC_SPEED: f32 = 50. * TILE_SIZE; // -> Speed::default()
+    }
+}
+
+pub mod dialog {
+    // Flibittygibbit
+
+    pub const RANDOM_DIALOG: &str = "1:
+source: Fabien
+content:
+text:
+  - Enfant, j'ai eu un poney
+  - Mais j'ai toujours voulu un agneau
+exit_state: 2\n";
+}
diff --git a/src/constants/locations/hall/landmarks.rs b/src/constants/locations/hall/landmarks.rs
new file mode 100644
index 0000000..951321c
--- /dev/null
+++ b/src/constants/locations/hall/landmarks.rs
@@ -0,0 +1,77 @@
+use crate::{constants::TILE_SIZE, locations::landmarks::Direction};
+
+use super::{BOXES_X, BOXES_Y, STATUE_X, STATUE_Y};
+
+pub const LANDMARK_GROUPS: [([((f32, f32, f32), &str, Option<Direction>); 3], &str); 2] = [
+    (LANDMARK_STATUE, "Hall Statue"),
+    (LANDMARK_BALCONY, "Balcony"),
+];
+
+pub const LANDMARK_SINGLETONS: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (LANDMARK_BOX_BEHIND, "Box Behind", None),
+    (LANDMARK_BOX_RIGHT, "Box Right", None),
+    (
+        LANDMARK_TOP_LEFT_CORNER,
+        "Top Left Corner",
+        Some(Direction::Right),
+    ),
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                   Groups                                   */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_STATUE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (STATUE_X - 10.) * TILE_SIZE,
+            (STATUE_Y - 10.) * TILE_SIZE,
+            0.,
+        ),
+        "Left",
+        Some(Direction::Right),
+    ),
+    (
+        (STATUE_X * TILE_SIZE, (STATUE_Y - 15.) * TILE_SIZE, 0.),
+        "Middle",
+        None,
+    ),
+    (
+        (
+            (STATUE_X + 10.) * TILE_SIZE,
+            (STATUE_Y - 10.) * TILE_SIZE,
+            0.,
+        ),
+        "Right",
+        Some(Direction::Left),
+    ),
+];
+
+pub const LANDMARK_BALCONY: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (125. * TILE_SIZE, -157.5 * TILE_SIZE, 0.),
+        "Balcony Up",
+        Some(Direction::Right),
+    ),
+    (
+        (122.5 * TILE_SIZE, -167.5 * TILE_SIZE, 0.),
+        "Balcony Middle",
+        Some(Direction::Right),
+    ),
+    (
+        (115. * TILE_SIZE, -172.5 * TILE_SIZE, 0.),
+        "Balcony Down",
+        Some(Direction::Right),
+    ),
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                 Singletons                                 */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_BOX_BEHIND: (f32, f32, f32) =
+    (BOXES_X * TILE_SIZE, (BOXES_Y + 10.) * TILE_SIZE, 0.);
+pub const LANDMARK_BOX_RIGHT: (f32, f32, f32) =
+    ((BOXES_X + 10.) * TILE_SIZE, BOXES_Y * TILE_SIZE, 0.);
+pub const LANDMARK_TOP_LEFT_CORNER: (f32, f32, f32) =
+    (BOXES_X * TILE_SIZE, (BOXES_Y + 40.) * TILE_SIZE, 0.);
diff --git a/src/constants/locations/hall/mod.rs b/src/constants/locations/hall/mod.rs
new file mode 100644
index 0000000..ef95282
--- /dev/null
+++ b/src/constants/locations/hall/mod.rs
@@ -0,0 +1,68 @@
+pub mod landmarks;
+
+use super::{MAP_DISTANCE_IN_Z, MAP_START_Y, PROPS_Z, ROOF_Z, WILL_BE_COMPUTE_LATER, Y_UNIT};
+use crate::constants::{interactions::INTERACT_BUTTON_Z, TILE_SIZE};
+
+// HALL_END_Y
+// FIXME: hair hang over the temple door (could be like the second_layer of fake wall)
+pub const HALL_EXIT_Y: f32 = -89.; // -92.
+pub const HALL_Z: f32 = (HALL_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
+pub const UP_DOOR_Z: f32 = 10.;
+pub const UP_DOOR_POSITION: (f32, f32, f32) = (0., 0., UP_DOOR_Z);
+pub const BALCONY_Z: f32 = 3.;
+pub const BALCONY_POSITION: (f32, f32, f32) = (0., 0., BALCONY_Z - HALL_Z);
+
+pub const BALCONY_COVER_POSITION: (f32, f32, f32) = (114., -165., 0.1);
+pub const BALCONY_COVER_SIZE: (f32, f32) = (60., 70.);
+
+pub const HALL_FROM_TEMPLE_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-24., -105., 0.);
+pub const HALL_FROM_BALCONY_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (80., -160., 0.);
+pub const BALCONY_LOCATION_SENSOR_SIZE: (f32, f32) = (13., 6.5);
+pub const BALCONY_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (95., -162.5, 0.);
+
+pub const BOX_INTERACTION_ID: u32 = 0;
+pub const BOXES_X: f32 = -121.5;
+pub const BOXES_Y: f32 = -158.;
+pub const BOX_POSITION: (f32, f32, f32) = (
+    BOXES_X * TILE_SIZE,
+    BOXES_Y * TILE_SIZE,
+    WILL_BE_COMPUTE_LATER,
+);
+pub const BOX_SENSOR_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
+pub const BOX_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
+    (12. * TILE_SIZE, 7. * TILE_SIZE, INTERACT_BUTTON_Z);
+
+pub const DOOR_INTERACTION_ID: u32 = 1;
+pub const DOOR_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
+    (17.5 * TILE_SIZE, -3.5 * TILE_SIZE, INTERACT_BUTTON_Z);
+pub const DOOR_POSITION: (f32, f32, f32) =
+    (-24. * TILE_SIZE, -88. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
+pub const DOOR_SENSOR_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
+pub const DOOR_COLLIDER_OFFSET: (f32, f32, f32) = (0., -10. * TILE_SIZE, 0.);
+pub const DOOR_OPEN_DELTA_S: f32 = 0.2;
+pub const TEMPLE_DOOR_SWITCH_Z_OFFSET_CLOSED: f32 = 0.25;
+pub const TEMPLE_DOOR_SWITCH_Z_OFFSET_OPENED: f32 = 0.3;
+
+pub const STATUE_X: f32 = 59.;
+pub const STATUE_Y: f32 = -101.;
+pub const STATUE_POSITION: (f32, f32, f32) = (
+    STATUE_X * TILE_SIZE,
+    STATUE_Y * TILE_SIZE,
+    WILL_BE_COMPUTE_LATER,
+);
+pub const STATUE_INTERACTION_ID: u32 = 2;
+pub const STATUE_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
+    (-8.3 * TILE_SIZE, 0., INTERACT_BUTTON_Z);
+
+const LIGHT_Z: f32 = ROOF_Z;
+pub const HALL_CHANDELIER_POSITIONS: [(f32, f32, f32); 2] = [
+    (-77.5 * TILE_SIZE, -125. * TILE_SIZE, LIGHT_Z), // left
+    (29.5 * TILE_SIZE, -125. * TILE_SIZE, LIGHT_Z),  // right
+];
+pub const WALL_LIGHT_POSITIONS: [(f32, f32, f32); 4] = [
+    (-87. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z), // far left
+    (-47. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z), // center left
+    (-2. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z),  // center right
+    (38. * TILE_SIZE, -74. * TILE_SIZE, LIGHT_Z),  // far right
+];
+pub const LIGHT_SUPPORT_OFFSET: (f32, f32, f32) = (0.5, -4.5, PROPS_Z);
diff --git a/src/constants/locations/main_room/landmarks.rs b/src/constants/locations/main_room/landmarks.rs
new file mode 100644
index 0000000..6241041
--- /dev/null
+++ b/src/constants/locations/main_room/landmarks.rs
@@ -0,0 +1,494 @@
+use super::*;
+use crate::{constants::TILE_SIZE, locations::landmarks::Direction};
+
+pub const LANDMARK_SENSOR_SIZE: f32 = 2.5;
+
+pub const LANDMARK_GROUPS: [([((f32, f32, f32), &str, Option<Direction>); 3], &str); 8] = [
+    (LANDMARK_CAT_STATUE, "Cat Statue"),
+    (LANDMARK_FABIEN_STATUE, "Fabien Statue"),
+    (LANDMARK_PLANTS_TOP_LEFT, "Plants Top Left"),
+    (
+        LANDMARK_PLANTS_BOTTOM_LEFT_UPPER_SIDE,
+        "Plants Bot Left UpperPart",
+    ),
+    (
+        LANDMARK_PLANTS_BOTTOM_LEFT_LOWER_SIDE,
+        "Plants Bot Left LowerPart",
+    ),
+    (LANDMARK_PLANTS_TOP_RIGHT, "Plants Top Right"),
+    (
+        LANDMARK_PLANTS_BOTTOM_RIGHT_UPPER_SIDE,
+        "Plants Bot Right UpperPart",
+    ),
+    (
+        LANDMARK_PLANTS_BOTTOM_RIGHT_LOWER_SIDE,
+        "Plants Bot Right LowerPart",
+    ),
+];
+
+pub const LANDMARK_SINGLETONS: [((f32, f32, f32), &str, Option<Direction>); 8] = [
+    (LANDMARK_THRONE_SIT, "Throne Sit", None),
+    (LANDMARK_THRONE_LEFT_SIDE, "Throne Left Side", None),
+    (LANDMARK_THRONE_RIGHT_SIDE, "Throne Right Side", None),
+    (LANDMARK_STAIRS_LEFT, "Stairs Left", None),
+    (LANDMARK_STAIRS_RIGHT, "Stairs Right", None),
+    (LANDMARK_AUDIENCE, "Audience", None),
+    (
+        LANDMARK_CAT_STATUE_BEHIND,
+        "Behind Cat Statue",
+        Some(Direction::Right),
+    ),
+    (
+        LANDMARK_FABIEN_STATUE_BEHIND,
+        "Behind Fabien Statue",
+        Some(Direction::Right),
+    ),
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                   Statues                                  */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_CAT_STATUE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            CAT_STATUE_X - 10. * TILE_SIZE,
+            STATUE_Y - 25. * TILE_SIZE,
+            0.,
+        ),
+        "Left",
+        Some(Direction::Right),
+    ),
+    (
+        (CAT_STATUE_X * TILE_SIZE, (STATUE_Y - 35.) * TILE_SIZE, 0.),
+        "Middle",
+        None,
+    ),
+    (
+        (
+            (CAT_STATUE_X + 10.) * TILE_SIZE,
+            (STATUE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "Right",
+        Some(Direction::Left),
+    ),
+];
+
+pub const LANDMARK_CAT_STATUE_BEHIND: (f32, f32, f32) = (
+    CAT_STATUE_X + 10. * TILE_SIZE,
+    (STATUE_Y - 5.) * TILE_SIZE,
+    0.,
+);
+
+pub const LANDMARK_FABIEN_STATUE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (FABIEN_STATUE_X - 10.) * TILE_SIZE,
+            (STATUE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "Left",
+        Some(Direction::Right),
+    ),
+    (
+        (
+            FABIEN_STATUE_X * TILE_SIZE,
+            (STATUE_Y - 35.) * TILE_SIZE,
+            0.,
+        ),
+        "Middle",
+        None,
+    ),
+    (
+        (
+            FABIEN_STATUE_X + 10. * TILE_SIZE,
+            STATUE_Y - 25. * TILE_SIZE,
+            0.,
+        ),
+        "Right",
+        Some(Direction::Left),
+    ),
+];
+
+pub const LANDMARK_FABIEN_STATUE_BEHIND: (f32, f32, f32) = (
+    (FABIEN_STATUE_X - 10.) * TILE_SIZE,
+    (STATUE_Y - 5.) * TILE_SIZE,
+    0.,
+);
+
+/* -------------------------------------------------------------------------- */
+/*                                   Plants                                   */
+/* -------------------------------------------------------------------------- */
+
+// ----- Left -----
+
+pub const LANDMARK_PLANTS_TOP_LEFT: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    // ----- Bot Side -----
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 5.) * TILE_SIZE,
+            0.,
+        ),
+        "TL Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 20.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 15.) * TILE_SIZE,
+            0.,
+        ),
+        "TL Middle Right",
+        Some(Direction::Left),
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "TL Down",
+        None,
+    ),
+];
+
+pub const LANDMARK_PLANTS_BOTTOM_LEFT_UPPER_SIDE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 5.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 20.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 15.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Middle Right",
+        Some(Direction::Left),
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 25.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Down",
+        None,
+    ),
+];
+
+pub const LANDMARK_PLANTS_BOTTOM_LEFT_LOWER_SIDE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 5.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 20.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 15.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Middle Right",
+        Some(Direction::Left),
+    ),
+    (
+        (
+            (PLANTS_LEFT_SIDE_X + 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "BL Down",
+        None,
+    ),
+];
+
+// ----- Right -----
+
+pub const LANDMARK_PLANTS_TOP_RIGHT: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    // ----- Bot Side -----
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 5.) * TILE_SIZE,
+            0.,
+        ),
+        "TR Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 20.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 15.) * TILE_SIZE,
+            0.,
+        ),
+        "TR Middle Left",
+        Some(Direction::Right),
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_FIRST_LINE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "TR Down",
+        None,
+    ),
+];
+
+pub const LANDMARK_PLANTS_BOTTOM_RIGHT_UPPER_SIDE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 5.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 20.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 15.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Middle Left",
+        Some(Direction::Right),
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y + 25.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Down",
+        None,
+    ),
+];
+
+pub const LANDMARK_PLANTS_BOTTOM_RIGHT_LOWER_SIDE: [((f32, f32, f32), &str, Option<Direction>); 3] = [
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 5.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Up",
+        None,
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 20.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 15.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Middle Left",
+        Some(Direction::Right),
+    ),
+    (
+        (
+            (PLANTS_RIGHT_SIDE_X - 15.) * TILE_SIZE,
+            (PLANTS_SECOND_LINE_Y - 25.) * TILE_SIZE,
+            0.,
+        ),
+        "BR Down",
+        None,
+    ),
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                  Audience                                  */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_AUDIENCE: (f32, f32, f32) =
+    (THRONE_X * TILE_SIZE, (THRONE_Y - 50.) * TILE_SIZE, 0.);
+
+/* -------------------------------------------------------------------------- */
+/*                              Throne and Sides                              */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_THRONE_SIT: (f32, f32, f32) =
+    (THRONE_X * TILE_SIZE, (THRONE_Y - 6.) * TILE_SIZE, 0.);
+
+pub const LANDMARK_THRONE_RIGHT_SIDE: (f32, f32, f32) = (
+    (THRONE_X - 20.) * TILE_SIZE,
+    (THRONE_Y - 10.) * TILE_SIZE,
+    0.,
+);
+pub const LANDMARK_THRONE_LEFT_SIDE: (f32, f32, f32) = (
+    (THRONE_X + 20.) * TILE_SIZE,
+    (THRONE_Y - 10.) * TILE_SIZE,
+    0.,
+);
+
+pub const LANDMARK_STAIRS_RIGHT: (f32, f32, f32) = (
+    (THRONE_X - 35.) * TILE_SIZE,
+    (THRONE_Y - 30.) * TILE_SIZE,
+    0.,
+);
+pub const LANDMARK_STAIRS_LEFT: (f32, f32, f32) = (
+    (THRONE_X + 35.) * TILE_SIZE,
+    (THRONE_Y - 30.) * TILE_SIZE,
+    0.,
+);
+
+/* -------------------------------------------------------------------------- */
+/*                                   Pillars                                  */
+/* -------------------------------------------------------------------------- */
+
+pub const OUTER_X_OFFSET: f32 = 10.;
+pub const INNER_X_OFFSET: f32 = 10.;
+pub const INNER_Y_OFFSET: f32 = 5.;
+
+// each pillar has two landmarks
+pub const LANDMARK_PILLARS: [([((f32, f32, f32), &str, Option<Direction>); 2], &str); 6] = [
+    (
+        [
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X - OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_FIRST_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Right),
+            ),
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X + INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_FIRST_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Right),
+            ),
+        ],
+        "First Pillar",
+    ),
+    (
+        [
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X - OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_SECOND_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Right),
+            ),
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X + INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_SECOND_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Right),
+            ),
+        ],
+        "Second Pillar",
+    ),
+    (
+        [
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X - OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_THIRD_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Right),
+            ),
+            (
+                (
+                    (PILLAR_FIRST_COLUMN_X + INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_THIRD_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Right),
+            ),
+        ],
+        "Third Pillar",
+    ),
+    (
+        [
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X + OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_FIRST_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Left),
+            ),
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X - INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_FIRST_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Left),
+            ),
+        ],
+        "Fourth Pillar",
+    ),
+    (
+        [
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X + OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_SECOND_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Left),
+            ),
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X - INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_SECOND_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Left),
+            ),
+        ],
+        "Fifth Pillar",
+    ),
+    (
+        [
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X + OUTER_X_OFFSET) * TILE_SIZE,
+                    PILLAR_THIRD_LINE_Y * TILE_SIZE,
+                    0.,
+                ),
+                "Outer Side",
+                Some(Direction::Left),
+            ),
+            (
+                (
+                    (PILLAR_SECOND_COLUMN_X - INNER_X_OFFSET) * TILE_SIZE,
+                    (PILLAR_THIRD_LINE_Y - INNER_Y_OFFSET) * TILE_SIZE,
+                    0.,
+                ),
+                "Inner Side",
+                Some(Direction::Left),
+            ),
+        ],
+        "Sixth Pillar",
+    ),
+];
diff --git a/src/constants/locations/main_room/mod.rs b/src/constants/locations/main_room/mod.rs
new file mode 100644
index 0000000..345144c
--- /dev/null
+++ b/src/constants/locations/main_room/mod.rs
@@ -0,0 +1,142 @@
+pub mod landmarks;
+
+use crate::constants::{interactions::INTERACT_BUTTON_Z, TILE_SIZE};
+
+use super::{MAP_DISTANCE_IN_Z, MAP_START_Y, PROPS_Z, ROOF_Z, WILL_BE_COMPUTE_LATER, Y_UNIT};
+
+pub const TEMPLE_EXIT_Y: f32 = 87.;
+pub const MAIN_ROOM_Z: f32 = (TEMPLE_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
+
+pub const TEMPLE_HALL_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-24., -94., 0.);
+pub const TEMPLE_SECRET_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-44.5, 80., 0.);
+
+pub const PILLAR_SWITCH_Z_OFFSET: f32 = 0.1;
+pub const PILLAR_HITBOX_Y_OFFSET: f32 = -12.5;
+pub const PILLAR_FIRST_COLUMN_X: f32 = -49.5;
+pub const PILLAR_SECOND_COLUMN_X: f32 = 1.5;
+pub const PILLAR_FIRST_LINE_Y: f32 = 22.5;
+pub const PILLAR_SECOND_LINE_Y: f32 = -14.5;
+pub const PILLAR_THIRD_LINE_Y: f32 = -54.5;
+pub const PILLAR_POSITIONS: [(f32, f32, f32); 6] = [
+    // 1    4
+    // 2    5
+    // 3    6
+    // ----- 1 -----
+    (
+        PILLAR_FIRST_COLUMN_X * TILE_SIZE,
+        PILLAR_FIRST_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 2 -----
+    (
+        PILLAR_FIRST_COLUMN_X * TILE_SIZE,
+        PILLAR_SECOND_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 3 -----
+    (
+        PILLAR_FIRST_COLUMN_X * TILE_SIZE,
+        PILLAR_THIRD_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 4 -----
+    (
+        PILLAR_SECOND_COLUMN_X * TILE_SIZE,
+        PILLAR_FIRST_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 5 -----
+    (
+        PILLAR_SECOND_COLUMN_X * TILE_SIZE,
+        PILLAR_SECOND_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 6 -----
+    (
+        PILLAR_SECOND_COLUMN_X * TILE_SIZE,
+        PILLAR_THIRD_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+];
+
+pub const BANNERS_POSITION: (f32, f32, f32) = (-20. * TILE_SIZE, 80. * TILE_SIZE, 0.);
+
+pub const THRONE_SWITCH_Z_OFFSET: f32 = -0.1;
+pub const THRONE_X: f32 = -24.;
+pub const THRONE_Y: f32 = 71.5;
+pub const THRONE_POSITION: (f32, f32, f32) = (
+    THRONE_X * TILE_SIZE,
+    THRONE_Y * TILE_SIZE,
+    WILL_BE_COMPUTE_LATER,
+);
+
+const CHANDELIER_Z: f32 = ROOF_Z;
+pub const TEMPLE_CHANDELIER_POSITIONS: [(f32, f32, f32); 4] = [
+    (-77.5 * TILE_SIZE, 6. * TILE_SIZE, CHANDELIER_Z), // left top
+    (-77.5 * TILE_SIZE, -40. * TILE_SIZE, CHANDELIER_Z), // left bottom
+    (29.5 * TILE_SIZE, 6. * TILE_SIZE, CHANDELIER_Z),  // right top
+    (29.5 * TILE_SIZE, -40. * TILE_SIZE, CHANDELIER_Z), // right bottom
+];
+
+pub const PLANTS_SWITCH_Z_OFFSET: f32 = 0.5;
+pub const PLANTS_LEFT_SIDE_X: f32 = -125.5;
+pub const PLANTS_RIGHT_SIDE_X: f32 = 77.5;
+pub const PLANTS_FIRST_LINE_Y: f32 = 44.;
+pub const PLANTS_SECOND_LINE_Y: f32 = -27.;
+pub const PLANTS_POSITIONS: [(f32, f32, f32); 4] = [
+    // TopLeft
+    (
+        PLANTS_LEFT_SIDE_X * TILE_SIZE,
+        PLANTS_FIRST_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // BottomLeft
+    (
+        PLANTS_LEFT_SIDE_X * TILE_SIZE,
+        PLANTS_SECOND_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // TopRight
+    (
+        PLANTS_RIGHT_SIDE_X * TILE_SIZE,
+        PLANTS_FIRST_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // BottomRight
+    (
+        PLANTS_RIGHT_SIDE_X * TILE_SIZE,
+        PLANTS_SECOND_LINE_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+];
+
+pub const BRAZIER_Z_OFFSET: f32 = -0.1;
+pub const BRAZIER_FLAME_OFFSET: (f32, f32, f32) = (0., 11.5, 0.);
+pub const BRAZIERS_POSITIONS: [(f32, f32, f32); 4] = [
+    (-116.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER), // LeftLeft
+    (-83.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),  // LeftRight
+    (35.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // RightLeft
+    (68.5 * TILE_SIZE, 63.5 * TILE_SIZE, WILL_BE_COMPUTE_LATER),   // RightRight
+];
+
+pub const STATUE_Y: f32 = 75.;
+pub const CAT_STATUE_X: f32 = -100.;
+pub const CAT_STATUE_POSITION: (f32, f32, f32) = (
+    CAT_STATUE_X * TILE_SIZE,
+    STATUE_Y * TILE_SIZE,
+    WILL_BE_COMPUTE_LATER,
+);
+pub const FABIEN_STATUE_X: f32 = 52.;
+pub const FABIEN_STATUE_POSITION: (f32, f32, f32) = (
+    FABIEN_STATUE_X * TILE_SIZE,
+    STATUE_Y * TILE_SIZE,
+    WILL_BE_COMPUTE_LATER,
+);
+
+pub const BANNER_INTERACTION_ID: u32 = 3;
+pub const BANNER_INTERACT_BUTTON_POSITION: (f32, f32, f32) =
+    (0. * TILE_SIZE, 0. * TILE_SIZE, INTERACT_BUTTON_Z);
+pub const BANNER_POSITION: (f32, f32, f32) = (-44.5 * TILE_SIZE, 91. * TILE_SIZE, PROPS_Z);
+pub const BANNER_SENSOR_OFFSET: (f32, f32, f32) = (0., 0., 0.);
+pub const BANNER_COLLIDER_OFFSET: (f32, f32, f32) = (0., 0.5 * TILE_SIZE, 0.);
+pub const BANNER_OPEN_DELTA_S: f32 = 0.1;
diff --git a/src/constants/locations/mod.rs b/src/constants/locations/mod.rs
new file mode 100644
index 0000000..4f57ada
--- /dev/null
+++ b/src/constants/locations/mod.rs
@@ -0,0 +1,54 @@
+pub mod hall;
+pub mod main_room;
+pub mod secret_room;
+
+/*
+| Layer              | Back Z, Front Z |
+| ------------------ | --------------- |
+| Character          |      depend     |
+| Balcony            | 3.0,        --- |
+| Balcony Doors      | 3.0,        11. |
+| Hall               | 3.5,        8.0 |
+| Hall Props         | 3.6,        8.1 |
+| Hall Statue        | 3.6,        8.1 |
+| Hall Door          | 3.6,        8.1 |
+| Hall Chandeliers   | ---,        8.1 |
+| Temple             | 2.0,        7.0 |
+| Temple Plants      | 2.1,        7.1 |
+| Temple Pillars     | 2.1,        7.1 |
+| Temple Throne      | 2.1,        7.1 |
+| Temple Statues     | 2.2,        7.2 |
+| Temple Brazier     | 2.2,        7.2 |
+| Temple Chandeliers | ---,        7.3 |
+| Secret Room        | 1.0,        6.0 |
+| Secret Room Panels | 1.1,        6.1 |
+| Roof               | ---,        11. |
+ */
+
+pub const MAP_START_Y: f32 = -170.;
+pub const MAP_END_Y: f32 = 165.;
+pub const MAP_START_Z: f32 = 11.;
+pub const MAP_END_Z: f32 = 1.;
+pub const MAP_DISTANCE_IN_Y: f32 = MAP_END_Y - MAP_START_Y;
+pub const MAP_DISTANCE_IN_Z: f32 = MAP_END_Z - MAP_START_Z;
+// `Z_UNIT` is the equivalent of the y value of 1 z
+pub const Z_UNIT: f32 = MAP_DISTANCE_IN_Y / MAP_DISTANCE_IN_Z;
+// `Y_UNIT` is the equivalent of the z value of 1 y
+pub const Y_UNIT: f32 = 1. / Z_UNIT;
+
+// In `locations::temple::y_to_z_conversion`
+pub const WILL_BE_COMPUTE_LATER: f32 = 0.;
+
+pub const CHANDELIER_SIZE: (f32, f32) = (20., 10.);
+pub const CHANDELIER_TRANSPARENCY_COLOR: f32 = 170. / 255.;
+pub const CHANDELIER_PLAIN_COLOR: f32 = 1.;
+pub const CHANDELIER_FLAME_POSITIONS: [(f32, f32, f32); 3] = [
+    (-6.5, -2., PROPS_Z), // left
+    (-0.5, -2., PROPS_Z), // center
+    (5.5, -2., PROPS_Z),  // right
+];
+
+pub const GROUND_Z: f32 = 0.5;
+pub const ROOF_Z: f32 = 11.;
+// just enoguht to be above parent :) (smile from Horor Humanum Est <3)
+pub const PROPS_Z: f32 = 0.01;
diff --git a/src/constants/locations/secret_room/landmarks.rs b/src/constants/locations/secret_room/landmarks.rs
new file mode 100644
index 0000000..43adaa8
--- /dev/null
+++ b/src/constants/locations/secret_room/landmarks.rs
@@ -0,0 +1,70 @@
+use crate::{constants::TILE_SIZE, locations::landmarks::Direction};
+
+use super::{FLOWER_PANELS_X, FLOWER_PANEL_Y, FLOWER_REPAIR_PANEL_Y};
+
+pub const LANDMARK_SINGLETONS: [((f32, f32, f32), &str, Option<Direction>); 5] = [
+    (LANDMARKS_CORRIDOR_FRONT, "Corridor Front", None),
+    (LANDMARKS_EXIT_ROOM_TOP_LEFT, "Exit Top Left", None),
+    (LANDMARKS_EXIT_ROOM_TOP_RIGHT, "Exit Room Top Right", None),
+    (LANDMARKS_EXIT_ROOM_BOT_LEFT, "Exit Room Bot Left", None),
+    (LANDMARKS_EXIT_ROOM_BOT_RIGHT, "Exit Room Bot Right", None),
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                Flower Panels                               */
+/* -------------------------------------------------------------------------- */
+
+pub const LANDMARK_FLOWER_PANEL_OFFSET: f32 = 20.;
+pub const LANDMARKS_FLOWER_PANELS: [((f32, f32, f32), &str, Option<Direction>); 5] = [
+    (
+        (
+            FLOWER_PANELS_X[0] * TILE_SIZE,
+            (FLOWER_PANEL_Y - LANDMARK_FLOWER_PANEL_OFFSET) * TILE_SIZE,
+            0.,
+        ),
+        "Far Left",
+        None,
+    ),
+    (
+        (
+            FLOWER_PANELS_X[1] * TILE_SIZE,
+            (FLOWER_PANEL_Y - LANDMARK_FLOWER_PANEL_OFFSET) * TILE_SIZE,
+            0.,
+        ),
+        "Left",
+        None,
+    ),
+    (
+        (
+            FLOWER_PANELS_X[2] * TILE_SIZE,
+            (FLOWER_PANEL_Y - LANDMARK_FLOWER_PANEL_OFFSET) * TILE_SIZE,
+            0.,
+        ),
+        "Right",
+        None,
+    ),
+    (
+        (
+            FLOWER_PANELS_X[3] * TILE_SIZE,
+            (FLOWER_PANEL_Y - LANDMARK_FLOWER_PANEL_OFFSET) * TILE_SIZE,
+            0.,
+        ),
+        "Far Right",
+        None,
+    ),
+    (
+        (
+            FLOWER_PANELS_X[4] * TILE_SIZE,
+            (FLOWER_REPAIR_PANEL_Y - LANDMARK_FLOWER_PANEL_OFFSET) * TILE_SIZE,
+            0.,
+        ),
+        "Repair",
+        None,
+    ),
+];
+
+pub const LANDMARKS_CORRIDOR_FRONT: (f32, f32, f32) = (-40. * TILE_SIZE, 156. * TILE_SIZE, 0.);
+pub const LANDMARKS_EXIT_ROOM_TOP_LEFT: (f32, f32, f32) = (14. * TILE_SIZE, 154. * TILE_SIZE, 0.);
+pub const LANDMARKS_EXIT_ROOM_TOP_RIGHT: (f32, f32, f32) = (75. * TILE_SIZE, 154. * TILE_SIZE, 0.);
+pub const LANDMARKS_EXIT_ROOM_BOT_LEFT: (f32, f32, f32) = (14. * TILE_SIZE, 120. * TILE_SIZE, 0.);
+pub const LANDMARKS_EXIT_ROOM_BOT_RIGHT: (f32, f32, f32) = (75. * TILE_SIZE, 120. * TILE_SIZE, 0.);
diff --git a/src/constants/locations/secret_room/mod.rs b/src/constants/locations/secret_room/mod.rs
new file mode 100644
index 0000000..815ade2
--- /dev/null
+++ b/src/constants/locations/secret_room/mod.rs
@@ -0,0 +1,63 @@
+pub mod landmarks;
+
+use super::{MAP_DISTANCE_IN_Z, MAP_END_Y, MAP_START_Y, PROPS_Z, WILL_BE_COMPUTE_LATER, Y_UNIT};
+use crate::constants::TILE_SIZE;
+
+pub const SECRET_ROOM_EXIT_Y: f32 = MAP_END_Y;
+pub const SECRET_ROOM_Z: f32 = (SECRET_ROOM_EXIT_Y - MAP_START_Y) * Y_UNIT - MAP_DISTANCE_IN_Z;
+
+pub const SECRET_LOCATION_SENSOR_POSITION: (f32, f32, f32) = (-44.5, SECRET_ROOM_TRIGGER_Y, 0.);
+
+pub const SECRET_ROOM_TRIGGER_Y: f32 = 85.5;
+pub const SECRET_ROOM_TRIGGER_CUBOID: (f32, f32) = (7., 5.);
+pub const SECRET_ROOM_TRIGGER_POSITION: (f32, f32, f32) = (-44.5, SECRET_ROOM_TRIGGER_Y, 0.);
+pub const SECRET_ROOM_COVER_POSITION: (f32, f32, f32) = (-24., 161., 6.9);
+pub const SECRET_ROOM_COVER_SIZE: (f32, f32) = (250., 100.);
+
+pub const SECOND_FAKE_WALL_SWITCH_Z_OFFSET: f32 = -2.4;
+
+pub const FAKE_STONE_POSITION: (f32, f32, f32) = (0., 0., WILL_BE_COMPUTE_LATER);
+pub const FAKE_STONE_SWITCH_Z_OFFSET: f32 = -2.5;
+
+pub const FLOWER_PANEL_SWITCH_Z_OFFSET: f32 = 0.3;
+pub const FLOWER_PANELS_X: [f32; 5] = [-116., -83., 35., 68., -105.5];
+pub const FLOWER_PANEL_Y: f32 = 100.5;
+pub const FLOWER_REPAIR_PANEL_Y: f32 = 165.5;
+pub const FLOWER_PANEL_POSITIONS: [(f32, f32, f32); 5] = [
+    // ----- 1 -----
+    (
+        FLOWER_PANELS_X[0] * TILE_SIZE,
+        FLOWER_PANEL_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 2 -----
+    (
+        FLOWER_PANELS_X[1] * TILE_SIZE,
+        FLOWER_PANEL_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 3 -----
+    (
+        FLOWER_PANELS_X[2] * TILE_SIZE,
+        FLOWER_PANEL_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- 4 -----
+    (
+        FLOWER_PANELS_X[3] * TILE_SIZE,
+        FLOWER_PANEL_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+    // ----- Repair -----
+    (
+        FLOWER_PANELS_X[4] * TILE_SIZE,
+        FLOWER_REPAIR_PANEL_Y * TILE_SIZE,
+        WILL_BE_COMPUTE_LATER,
+    ),
+];
+
+pub const WALL_POT_POSITION: (f32, f32, f32) = (-59.5 * TILE_SIZE, 171.5 * TILE_SIZE, PROPS_Z);
+
+pub const STAIRS_RAMP_POSITION: (f32, f32, f32) =
+    (-64.5 * TILE_SIZE, 141. * TILE_SIZE, WILL_BE_COMPUTE_LATER);
+pub const STAIRS_RAMP_SWITCH_Z_OFFSET: f32 = -0.1;
diff --git a/src/constants/mod.rs b/src/constants/mod.rs
new file mode 100755
index 0000000..02fb34a
--- /dev/null
+++ b/src/constants/mod.rs
@@ -0,0 +1,29 @@
+pub mod character;
+pub mod locations;
+pub mod title_screen;
+pub mod ui;
+
+// dark blue #213757 = 33/255, 55/255, 87/255
+pub const BACKGROUND_COLOR_INMENU: bevy::render::color::Color =
+    bevy::render::color::Color::rgb(33. / 255., 55. / 255., 87. / 255.);
+// dark purple #25131a = 39/255, 19/255, 26/255
+pub const BACKGROUND_COLOR_INGAME: bevy::render::color::Color =
+    bevy::render::color::Color::rgb(0.153, 0.07, 0.102);
+// pub const BACKGROUND_COLOR: bevy::render::color::Color = bevy::render::color::Color::Rgba {
+//     red: 58. / 256.,
+//     green: 36. / 256.,
+//     blue: 48. / 256.,
+//     alpha: 1.,
+// };
+
+pub const RESOLUTION: f32 = 9. / 16.; // 16. / 9.;
+pub const TILE_SIZE: f32 = 1.;
+
+pub const FRAME_TIME: f32 = 0.1;
+
+pub mod interactions {
+    pub const INTERACT_BUTTON_Z: f32 = 20.;
+    pub const INTERACT_BUTTON_SCALE: f32 = 0.25;
+
+    // REFACTOR: INTERACTION_ID
+}
diff --git a/src/constants/title_screen.rs b/src/constants/title_screen.rs
new file mode 100644
index 0000000..c608943
--- /dev/null
+++ b/src/constants/title_screen.rs
@@ -0,0 +1,28 @@
+/* -------------------------------------------------------------------------- */
+/*                                   Lights                                   */
+/* -------------------------------------------------------------------------- */
+pub const FULL_LIGHTS_INDEX: (usize, usize) = (0, 0);
+pub const BOT_SHUTDOWN_INDEX: (usize, usize) = (1, 1);
+pub const TOP_SHUTDOWN_INDEX: (usize, usize) = (2, 2);
+pub const TOWER_RESET_INDEX: (usize, usize) = (3, 3);
+pub const SMALL_SHUTDOWN_INDEX: (usize, usize) = (4, 12);
+pub const LEFT_SHUTDOWN_INDEX: (usize, usize) = (13, 20);
+
+pub const MANOR_LIGHTS_PATTERN_INDEXES: &[(usize, usize); 6] = &[
+    FULL_LIGHTS_INDEX,
+    TOWER_RESET_INDEX,
+    SMALL_SHUTDOWN_INDEX,
+    TOP_SHUTDOWN_INDEX,
+    BOT_SHUTDOWN_INDEX,
+    LEFT_SHUTDOWN_INDEX,
+];
+
+/* -------------------------------------------------------------------------- */
+/*                                    Title                                   */
+/* -------------------------------------------------------------------------- */
+
+pub const TITLE_FLEX_BOT_DELTA_S: u64 = 2;
+// stay twice more time in the top position
+pub const TITLE_FLEX_TOP_DELTA_S: u64 = TITLE_FLEX_BOT_DELTA_S * 2;
+pub const TITLE_FLEX_TOP: f32 = 0.;
+pub const TITLE_FLEX_BOT: f32 = -5.;
diff --git a/src/constants/ui.rs b/src/constants/ui.rs
new file mode 100644
index 0000000..3fcc100
--- /dev/null
+++ b/src/constants/ui.rs
@@ -0,0 +1,20 @@
+pub mod dialogs {
+    use bevy::prelude::Color;
+
+    pub const DIALOG_PANEL_ANIMATION_OFFSET: f32 = -1000.;
+    pub const DIALOG_BOX_UPDATE_DELTA_S: f32 = 0.05;
+    pub const DIALOG_PANEL_ANIMATION_TIME_MS: u64 = 500;
+    pub const SCROLL_SIZE: (f32, f32) = (490., 11700. / 45.);
+    pub const SCROLL_ANIMATION_DELTA_S: f32 = 0.1;
+    pub const SCROLL_ANIMATION_FRAMES_NUMBER: usize = 45;
+
+    pub const FIRST_BUTTON_TOP_VAL: f32 = 690.;
+    pub const BUTTON_SPACING: f32 = 320.;
+    pub const BUTTON_LEFT_VAL: f32 = -52.;
+
+    pub const TRANSPARENT_BUTTON: Color = Color::rgba(0., 0., 0., 0.);
+    // pub const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
+    pub const NORMAL_BUTTON: Color = Color::rgba(0.1, 0.1, 0.1, 0.1);
+    pub const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
+    pub const PRESSED_BUTTON: Color = Color::rgb(0.35, 0.75, 0.35);
+}
diff --git a/src/debug.rs b/src/debug.rs
index df60667..8493913 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -7,7 +7,10 @@ use crate::{
     },
     characters::npcs::movement::{Chaser, NPCBehavior, TargetSeeker, TargetType},
     collisions::{TesselatedCollider, TesselatedColliderConfig},
-    locations::temple::{OverlappingEntity, PlayerLocation},
+    locations::{
+        landmarks::Landmark,
+        temple::{Location, OverlappingEntity},
+    },
     menu::{ManorLightsPattern, ManorLightsTimer},
     GameState,
 };
@@ -19,10 +22,10 @@ impl Plugin for DebugPlugin {
         if cfg!(debug_assertions) {
             app.add_plugins((WorldInspectorPlugin::new(),))
                 .register_type::<GameState>()
-                .register_type::<PlayerLocation>()
+                .register_type::<Location>()
                 .add_plugins((
                     StateInspectorPlugin::<GameState>::default(),
-                    StateInspectorPlugin::<PlayerLocation>::default(),
+                    StateInspectorPlugin::<Location>::default(),
                 ))
                 /* -------------------------------------------------------------------------- */
                 /*                              Global Animation                              */
@@ -47,6 +50,7 @@ impl Plugin for DebugPlugin {
                 /*                                     Map                                    */
                 /* -------------------------------------------------------------------------- */
                 .register_type::<OverlappingEntity>()
+                .register_type::<Landmark>()
                 /* -------------------------------------------------------------------------- */
                 /*                                   Hitbox                                   */
                 /* -------------------------------------------------------------------------- */
diff --git a/src/interactions.rs b/src/interactions.rs
index 41eb96b..a3dff37 100755
--- a/src/interactions.rs
+++ b/src/interactions.rs
@@ -1,8 +1,8 @@
+use crate::collisions::CollisionEventExt;
 use crate::{
-    characters::npcs::CharacterInteractionEvent,
+    characters::{npcs::CharacterInteractionEvent, player::PlayerInteractionSensor},
     constants::{
         character::npcs::{CHARACTER_INTERACT_BUTTON_POSITION, NPC_TALK_INTERACTION_ID},
-        interactions::INTERACT_BUTTON_SCALE,
         locations::{
             hall::{BOX_INTERACTION_ID, DOOR_INTERACTION_ID, DOOR_OPEN_DELTA_S},
             main_room::{BANNER_INTERACTION_ID, BANNER_OPEN_DELTA_S},
@@ -41,7 +41,7 @@ pub struct InteractionIconEvent {
 ///
 /// The first children must be the interaction sensor
 /// REFACTOR: foolproof the children sensor obligation (by pointing at it directly)
-#[derive(Debug, Default, Component)]
+#[derive(Copy, Clone, Debug, Default, Component)]
 pub struct Interactible {
     pub icon_translation: Vec3,
     pub interaction_id: u32,
@@ -74,7 +74,7 @@ impl Interactible {
 
 #[derive(Resource)]
 pub struct InteractionResources {
-    interact_button: Handle<Image>,
+    pub interact_button: Handle<Image>,
 }
 
 pub fn setup_interactions(mut commands: Commands, asset_server: Res<AssetServer>) {
@@ -84,55 +84,37 @@ pub fn setup_interactions(mut commands: Commands, asset_server: Res<AssetServer>
     });
 }
 
-/// REFACTOR: to only the character hitbox triggers it
+/// BUG: When interact with an object, a random npc who's moving can be triggered at the same time
 fn interaction_icon_events(
     mut collision_events: EventReader<CollisionEvent>,
+    interaction_sensor_query: Query<&Parent, With<InteractionSensor>>,
+    player_interaction_sensor_query: Query<Entity, With<PlayerInteractionSensor>>,
+
     mut interaction_icon_event: EventWriter<InteractionIconEvent>,
-    // mut secret_room_trigger_event: EventWriter<SecretRoomTriggerEvent>,
-    interactibles_query: Query<(Entity, &Children), With<Interactible>>,
-    // secret_room_sensor_query: Query<Entity, With<SecretRoomSensor>>,
-    interaction_sensor_query: Query<Entity, With<InteractionSensor>>,
 ) {
     for collision_event in collision_events.iter() {
         // info!("{:#?}", collision_event);
-        match collision_event {
-            CollisionEvent::Started(e1, e2, _) => {
-                for (entity, children) in interactibles_query.iter() {
-                    match interaction_sensor_query.get(children[0]) {
-                        Err(e) => error!("hint: The Interactible must have as first children an Interaction Sensor.\n{}",e),
-                        Ok(interaction_sensor) => if *e1 == interaction_sensor || *e2 == interaction_sensor {
-                            interaction_icon_event.send(InteractionIconEvent {
-                                entering_range: true,
-                                entity,
-                            });
-                        },
-                    }
-                }
-            }
-            CollisionEvent::Stopped(e1, e2, _) => {
-                for (entity, children) in interactibles_query.iter() {
-                    match interaction_sensor_query.get(children[0]) {
-                        Err(e) => error!("hint: The Interactible must have as first children an Interaction Sensor.\n{}",e),
-                        Ok(interaction_sensor) =>
-                            if *e1 == interaction_sensor || *e2 == interaction_sensor {
-                                interaction_icon_event.send(InteractionIconEvent {
-                                    entering_range: false,
-                                    entity,
-                                });
-                            },
-                    }
-                }
-            }
+        let (e1, e2) = collision_event.entities();
+
+        if let (Ok(interacted), Err(_), Err(_), Ok(_)) | (Err(_), Ok(interacted), Ok(_), Err(_)) = (
+            interaction_sensor_query.get(e1),
+            interaction_sensor_query.get(e2),
+            player_interaction_sensor_query.get(e1),
+            player_interaction_sensor_query.get(e2),
+        ) {
+            interaction_icon_event.send(InteractionIconEvent {
+                entering_range: collision_event.is_started(),
+                entity: **interacted,
+            });
         }
     }
 }
 
+/// REFACTOR: don't (de)spawn the icon but (de)activate it
 pub fn interaction_icon(
-    mut commands: Commands,
     mut interaction_icon_events: EventReader<InteractionIconEvent>,
     mut interactibles_query: Query<(&Children, &mut Interactible)>,
-    interaction_resources: Res<InteractionResources>,
-    interact_icon_query: Query<Entity, With<InteractIcon>>,
+    mut interact_icon_query: Query<&mut Visibility, With<InteractIcon>>,
 ) {
     for InteractionIconEvent {
         entering_range,
@@ -142,34 +124,21 @@ pub fn interaction_icon(
         let (children, mut interactible) = interactibles_query.get_mut(*entity).unwrap();
         interactible.in_range = *entering_range;
 
-        if *entering_range {
-            commands.entity(*entity).with_children(|parent| {
-                parent.spawn((
-                    SpriteBundle {
-                        texture: interaction_resources.interact_button.clone(),
-                        transform: Transform {
-                            translation: interactible.icon_translation,
-                            scale: Vec3::splat(INTERACT_BUTTON_SCALE),
-                            ..default()
-                        },
-                        ..default()
-                    },
-                    InteractIcon,
-                ));
-            });
-        } else {
-            let mut found = false;
-            for child in children {
-                if let Ok(interact_icon) = interact_icon_query.get(*child) {
-                    commands.entity(interact_icon).despawn();
-                    found = true;
-                    break;
-                }
-            }
-            if !found {
-                warn!("There is no Interaction Icon in {:?}", *entity)
+        let mut found = false;
+        for child in children {
+            if let Ok(mut interact_icon_visibility) = interact_icon_query.get_mut(*child) {
+                *interact_icon_visibility = if *entering_range {
+                    Visibility::Inherited
+                } else {
+                    Visibility::Hidden
+                };
+                found = true;
+                break;
             }
         }
+        if !found {
+            error!("Theres is no Interaction Icon in {:?}", *entity)
+        }
     }
 }
 
diff --git a/src/locations/landmarks.rs b/src/locations/landmarks.rs
index 2c71c11..87bdce5 100755
--- a/src/locations/landmarks.rs
+++ b/src/locations/landmarks.rs
@@ -4,8 +4,7 @@
 //! For example, it could be the throne side, statue admiration, etc.
 
 use bevy::prelude::*;
-use bevy_ecs::query::{ReadOnlyWorldQuery, WorldQuery};
-use bevy_rapier2d::prelude::{Collider, CollisionEvent, Sensor};
+use bevy_rapier2d::prelude::{ActiveEvents, Collider, CollisionEvent, Sensor};
 use rand::seq::IteratorRandom;
 use std::time::Duration;
 
@@ -16,10 +15,17 @@ use crate::{
         CharacterHitbox,
     },
     collisions::CollisionEventExt,
-    constants::{character::npcs::movement::REST_TIMER, locations::main_room::landmarks::*},
+    constants::{
+        character::npcs::movement::REST_TIMER,
+        locations::{
+            hall,
+            main_room::{self, landmarks::LANDMARK_SENSOR_SIZE},
+            secret_room,
+        },
+    },
 };
 
-use super::temple::PlayerLocation;
+use super::temple::Location;
 
 pub struct LandmarkPlugin;
 
@@ -38,34 +44,50 @@ impl Plugin for LandmarkPlugin {
 /// to occupy one of the free landmark.
 /// The npc will reserved the landmark, only the player can occupy a reserved landmark.
 /// A occupied landmark can only be freed by the occupant.
-#[derive(PartialEq, Eq, Default, Component)]
+#[derive(PartialEq, Eq, Debug, Reflect, Default, Component)]
 pub enum LandmarkStatus {
     #[default]
     Free,
     Reserved,
-    Occupied,
+    OccupiedBy(Entity),
 }
 
-/// TEMP: if there is only the field `status` just use the enum instead.
-#[derive(Component)]
+#[derive(Clone, Copy, Reflect, Debug, Component)]
+pub enum Direction {
+    Right,
+    Left,
+}
+
+impl From<Direction> for bool {
+    fn from(direction: Direction) -> bool {
+        match direction {
+            Direction::Left => true,
+            Direction::Right => false,
+        }
+    }
+}
+
+#[derive(Reflect, Debug, Component)]
 pub struct Landmark {
     pub status: LandmarkStatus,
-    /// DOC: ambiguous name
-    pub location: PlayerLocation,
+    pub location: Location,
+    /// Used for `flip_x`.
+    pub direction: Option<Direction>,
 }
 
 impl Landmark {
-    pub fn new(landmark_location: PlayerLocation) -> Self {
+    pub fn new(landmark_location: Location, direction: Option<Direction>) -> Self {
         Landmark {
             status: LandmarkStatus::default(),
             location: landmark_location,
+            direction,
         }
     }
 }
 
 #[derive(Debug)]
 pub enum LandmarkReservationError {
-    EmptyQuery,
+    NoFreeLandmarks,
 }
 
 /// TODO: Create an impl to automatictly Reserved a free landmark
@@ -73,14 +95,16 @@ pub enum LandmarkReservationError {
 /// LandmarkReservationError
 pub fn reserved_random_free_landmark(
     landmark_sensor_query: &mut Query<(Entity, &mut Landmark), With<Sensor>>,
+    location: Location,
 ) -> Result<Entity, LandmarkReservationError> {
     match (*landmark_sensor_query)
         .iter_mut()
-        .filter(|(_, landmark)| landmark.status == LandmarkStatus::Free)
+        .filter(|(_, landmark)| {
+            landmark.status == LandmarkStatus::Free && landmark.location == location
+        })
         .choose(&mut rand::thread_rng())
     {
-        // create custom error
-        None => Err(LandmarkReservationError::EmptyQuery),
+        None => Err(LandmarkReservationError::NoFreeLandmarks),
         Some((free_random_landmark, mut landmark)) => {
             landmark.status = LandmarkStatus::Reserved;
             Ok(free_random_landmark)
@@ -95,74 +119,104 @@ pub struct LandmarkGroup;
 /*                             Landmark Collision                             */
 /* -------------------------------------------------------------------------- */
 
+/// NOTE: To force NPCs to one particular spot of the landmark, create/use a `CharacterPrecisePosition` with is a sensor limited to point
 fn landmark_arrival(
     mut collision_events: EventReader<CollisionEvent>,
     mut commands: Commands,
 
     character_hitbox_query: Query<(Entity, &Parent, &Name), With<CharacterHitbox>>,
-    mut npc_query: Query<(&mut NPCBehavior, &Name), With<NPC>>,
+    mut npc_query: Query<(Entity, &mut NPCBehavior, &Name), With<NPC>>,
     player_query: Query<Entity, With<Player>>,
 
     mut landmark_sensor_query: Query<(Entity, &mut Landmark), With<Sensor>>,
     // parent_query: Query<&Parent>,
 ) {
     for collision_event in collision_events.iter() {
-        let entity_1 = collision_event.entities().0;
-        let entity_2 = collision_event.entities().1;
+        // info!("{:#?}", collision_event);
+        let (entity_1, entity_2) = collision_event.entities();
 
-        match (
+        if let (Err(_), Ok((character_hitbox, character_parent, _name)))
+        | (Ok((character_hitbox, character_parent, _name)), Err(_)) = (
             character_hitbox_query.get(entity_1),
             character_hitbox_query.get(entity_2),
         ) {
-            (Err(_), Ok((character_hitbox, character_parent, name)))
-            | (Ok((character_hitbox, character_parent, name)), Err(_)) => {
-                let potential_landmark = if character_hitbox == entity_1 {
-                    entity_2
-                } else {
-                    entity_1
-                };
-                if let Ok((landmark_entity, mut landmark)) =
-                    landmark_sensor_query.get_mut(potential_landmark)
-                {
-                    if let Ok((mut behavior, _npc_name)) = npc_query.get_mut(**character_parent) {
-                        if let NPCBehavior::LandmarkSeeking(landmark_destination) = *behavior {
-                            if landmark_destination == landmark_entity {
-                                match landmark.status {
-                                    LandmarkStatus::Occupied => {
-                                        // send an event to redirect the npc
-                                        warn!("This landmark {:?} was claimed before the NPC {:?} arrived", landmark_entity, **character_parent)
-                                    }
-                                    _ => {
-                                        landmark.status = LandmarkStatus::Occupied;
-                                        // TODO: Or start dialog with the other
-                                        info!(target: "Start Rest", "{:?}, {}", **character_parent, name);
-                                        commands.entity(**character_parent).insert(RestTime {
-                                            timer: Timer::new(
-                                                Duration::from_secs(REST_TIMER),
-                                                TimerMode::Once,
-                                            ),
-                                        });
-                                        let next_destination = reserved_random_free_landmark(
-                                            &mut landmark_sensor_query,
-                                        )
-                                        .unwrap();
+            let potential_landmark = if character_hitbox == entity_1 {
+                entity_2
+            } else {
+                entity_1
+            };
+            if let Ok((landmark_entity, mut landmark)) =
+                landmark_sensor_query.get_mut(potential_landmark)
+            {
+                if let Ok((npc, mut behavior, _npc_name)) = npc_query.get_mut(**character_parent) {
+                    if let NPCBehavior::LandmarkSeeking(landmark_destination, location) = *behavior
+                    {
+                        // A npc enters/exits a landmark sensor
+                        match landmark.status {
+                            LandmarkStatus::OccupiedBy(occupant) => {
+                                if collision_event.is_started()
+                                    && landmark_destination == landmark_entity
+                                {
+                                    // info!("This landmark {:?} was claimed before the NPC {:?} arrived", landmark_entity, **character_parent)
+                                    let next_destination = reserved_random_free_landmark(
+                                        &mut landmark_sensor_query,
+                                        location,
+                                    )
+                                    .unwrap();
+                                    *behavior =
+                                        NPCBehavior::LandmarkSeeking(next_destination, location);
+                                } else if collision_event.is_stopped() && occupant == npc {
+                                    landmark.status = LandmarkStatus::Free;
+                                    commands.entity(**character_parent).remove::<Direction>();
+                                }
+                            }
+                            _ => {
+                                if collision_event.is_started()
+                                    && landmark_destination == landmark_entity
+                                {
+                                    landmark.status = LandmarkStatus::OccupiedBy(npc);
 
-                                        *behavior = NPCBehavior::LandmarkSeeking(next_destination);
+                                    if let Some(forced_direction) = landmark.direction {
+                                        // info!("Forced Direction for {npc:?}: {forced_direction:?}",);
+                                        commands
+                                            .entity(**character_parent)
+                                            .insert(forced_direction);
                                     }
+                                    // TODO: Or start dialog with the other
+                                    // info!(target: "Start Rest", "{:?}, {}", **character_parent, _name);
+                                    commands.entity(**character_parent).insert(RestTime {
+                                        timer: Timer::new(
+                                            Duration::from_secs(REST_TIMER),
+                                            TimerMode::Once,
+                                        ),
+                                    });
+                                    let next_destination = reserved_random_free_landmark(
+                                        &mut landmark_sensor_query,
+                                        location,
+                                    )
+                                    .unwrap();
+                                    *behavior =
+                                        NPCBehavior::LandmarkSeeking(next_destination, location);
                                 }
                             }
                         }
-                    } else if player_query.get(**character_parent).is_ok() {
-                        match landmark.status {
-                            LandmarkStatus::Occupied => {}
-                            LandmarkStatus::Free | LandmarkStatus::Reserved => {
-                                landmark.status = LandmarkStatus::Occupied
+                    }
+                } else if player_query.get(**character_parent).is_ok() {
+                    // The player enters/exits a landmark
+                    match landmark.status {
+                        LandmarkStatus::OccupiedBy(occupant) => {
+                            if collision_event.is_stopped() && occupant == **character_parent {
+                                landmark.status = LandmarkStatus::Free;
+                            }
+                        }
+                        LandmarkStatus::Free | LandmarkStatus::Reserved => {
+                            if collision_event.is_started() {
+                                landmark.status = LandmarkStatus::OccupiedBy(**character_parent)
                             }
                         }
                     }
                 }
             }
-            _ => {}
         }
     }
 }
@@ -173,77 +227,104 @@ fn landmark_arrival(
 
 fn spawn_landmarks(mut commands: Commands) {
     commands
-        .spawn(TransformBundle::default())
+        .spawn((TransformBundle::default(), Name::new("Landmarks")))
         .with_children(|parent| {
-            parent
-                .spawn((
-                    LandmarkGroup,
-                    TransformBundle::default(),
-                    Name::new("Cat Statue Discussion Group"),
-                ))
-                .with_children(|parent| {
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_CAT_STATUE_LEFT.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Cat Statue Left"),
-                    ));
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_CAT_STATUE_MIDDLE.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Cat Statue Middle"),
-                    ));
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_CAT_STATUE_RIGHT.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Cat Statue Right"),
-                    ));
-                });
-            parent
-                .spawn((
-                    LandmarkGroup,
-                    TransformBundle::default(),
-                    Name::new("Fabien Statue Discussion Group"),
-                ))
-                .with_children(|parent| {
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_FABIEN_STATUE_LEFT.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Fabien Statue Left"),
-                    ));
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_FABIEN_STATUE_MIDDLE.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Fabien Statue Middle"),
-                    ));
-                    parent.spawn((
-                        Landmark::new(PlayerLocation::Temple),
-                        TransformBundle::from_transform(Transform::from_translation(
-                            LANDMARK_FABIEN_STATUE_RIGHT.into(),
-                        )),
-                        Collider::ball(5.),
-                        Sensor,
-                        Name::new("Landmark Fabien Statue Right"),
-                    ));
-                });
+            let landmark_sensor = (
+                Collider::ball(LANDMARK_SENSOR_SIZE),
+                ActiveEvents::COLLISION_EVENTS,
+                Sensor,
+            );
+
+            let mut secret_room_singletons = secret_room::landmarks::LANDMARK_SINGLETONS.to_vec();
+            secret_room_singletons.extend(secret_room::landmarks::LANDMARKS_FLOWER_PANELS.to_vec());
+
+            let zone_landmarks = [
+                (
+                    "Hall",
+                    Location::Hall,
+                    hall::landmarks::LANDMARK_GROUPS.to_vec(),
+                    hall::landmarks::LANDMARK_SINGLETONS.to_vec(),
+                ),
+                (
+                    "Temple",
+                    Location::Temple,
+                    main_room::landmarks::LANDMARK_GROUPS.to_vec(),
+                    main_room::landmarks::LANDMARK_SINGLETONS.to_vec(),
+                ),
+                (
+                    "SecretRoom",
+                    Location::SecretRoom,
+                    Vec::new(),
+                    secret_room_singletons,
+                ),
+            ];
+
+            for (name, location, groups, singletons) in zone_landmarks {
+                parent
+                    .spawn((TransformBundle::default(), Name::new(name)))
+                    .with_children(|parent| {
+                        // ----- Groups -----
+                        for (group, group_name) in groups {
+                            parent
+                                .spawn((
+                                    LandmarkGroup,
+                                    TransformBundle::default(),
+                                    Name::new(format!("{group_name} Discussion Group")),
+                                ))
+                                .with_children(|parent| {
+                                    for (position, landmark_name, landmark_direction) in group {
+                                        parent.spawn((
+                                            Landmark::new(location, landmark_direction),
+                                            TransformBundle::from_transform(
+                                                Transform::from_translation(position.into()),
+                                            ),
+                                            Name::new(format!(
+                                                "Landmark {group_name} {landmark_name}"
+                                            )),
+                                            landmark_sensor.clone(),
+                                        ));
+                                    }
+                                });
+                        }
+
+                        // ----- Singletons -----
+                        for (position, landmark_name, landmark_direction) in singletons {
+                            parent.spawn((
+                                Landmark::new(location, landmark_direction),
+                                TransformBundle::from_transform(Transform::from_translation(
+                                    position.into(),
+                                )),
+                                Name::new(format!("Landmark {landmark_name}")),
+                                landmark_sensor.clone(),
+                            ));
+                        }
+
+                        if location == Location::Temple {
+                            for (landmarks, pillar_name) in main_room::landmarks::LANDMARK_PILLARS {
+                                parent
+                                    .spawn((
+                                        TransformBundle::default(),
+                                        Name::new(format!("{pillar_name}'s landmarks")),
+                                    ))
+                                    .with_children(|parent| {
+                                        for (position, landmark_name, landmark_direction) in
+                                            landmarks
+                                        {
+                                            parent.spawn((
+                                                Landmark::new(location, landmark_direction),
+                                                TransformBundle::from_transform(
+                                                    Transform::from_translation(position.into()),
+                                                ),
+                                                Name::new(format!(
+                                                    "Landmark {pillar_name} {landmark_name}"
+                                                )),
+                                                landmark_sensor.clone(),
+                                            ));
+                                        }
+                                    });
+                            }
+                        }
+                    });
+            }
         });
 }
diff --git a/src/locations/temple/hall.rs b/src/locations/temple/hall.rs
index 801f84e..ddca7a4 100644
--- a/src/locations/temple/hall.rs
+++ b/src/locations/temple/hall.rs
@@ -11,13 +11,14 @@ use crate::{
     characters::CharacterHitbox,
     collisions::{TesselatedCollider, TesselatedColliderConfig},
     constants::{
+        interactions::INTERACT_BUTTON_SCALE,
         locations::{hall::*, CHANDELIER_FLAME_POSITIONS},
         BACKGROUND_COLOR_INGAME,
     },
-    interactions::{Interactible, InteractionSensor},
+    interactions::{InteractIcon, Interactible, InteractionResources, InteractionSensor},
     locations::temple::{
-        Chandelier, DoorColliderClosed, DoorState, Flame, LocationSensor, OverlappingEntity,
-        PlayerLocation, WallCollider,
+        Chandelier, DoorColliderClosed, DoorState, Flame, Location, LocationSensor,
+        OverlappingEntity, WallCollider,
     },
 };
 
@@ -125,6 +126,7 @@ pub fn setup_hall(
     mut commands: Commands,
     mut texture_atlases: ResMut<Assets<TextureAtlas>>,
     asset_server: Res<AssetServer>,
+    interaction_resources: Res<InteractionResources>,
 ) {
     /* -------------------------------------------------------------------------- */
     /*                                Assets Loader                               */
@@ -262,7 +264,7 @@ pub fn setup_hall(
                 ActiveEvents::COLLISION_EVENTS,
                 Sensor,
                 LocationSensor {
-                    location: PlayerLocation::Hall,
+                    location: Location::Hall,
                 },
                 Name::new("Hall Sensor from Temple"),
             ));
@@ -296,7 +298,7 @@ pub fn setup_hall(
                                 },
                             },
                             Transform::default(),
-                            WallCollider(PlayerLocation::Hall),
+                            WallCollider(Location::Hall),
                         ));
                     }
                 });
@@ -321,6 +323,20 @@ pub fn setup_hall(
                         InteractionSensor,
                     ));
 
+                    parent.spawn((
+                        SpriteBundle {
+                            texture: interaction_resources.interact_button.clone(),
+                            transform: Transform {
+                                translation: BOX_INTERACT_BUTTON_POSITION.into(),
+                                scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                                ..default()
+                            },
+                            visibility: Visibility::Hidden,
+                            ..default()
+                        },
+                        InteractIcon,
+                    ));
+
                     parent.spawn((
                         TesselatedCollider {
                             texture: props_hitbox,
@@ -355,6 +371,20 @@ pub fn setup_hall(
                         InteractionSensor,
                     ));
 
+                    parent.spawn((
+                        SpriteBundle {
+                            texture: interaction_resources.interact_button.clone(),
+                            transform: Transform {
+                                translation: BOX_INTERACT_BUTTON_POSITION.into(),
+                                scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                                ..default()
+                            },
+                            visibility: Visibility::Hidden,
+                            ..default()
+                        },
+                        InteractIcon,
+                    ));
+
                     parent.spawn((
                         TesselatedCollider {
                             texture: door_collider,
@@ -415,6 +445,20 @@ pub fn setup_hall(
                         InteractionSensor,
                     ));
 
+                    parent.spawn((
+                        SpriteBundle {
+                            texture: interaction_resources.interact_button.clone(),
+                            transform: Transform {
+                                translation: BOX_INTERACT_BUTTON_POSITION.into(),
+                                scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                                ..default()
+                            },
+                            visibility: Visibility::Hidden,
+                            ..default()
+                        },
+                        InteractIcon,
+                    ));
+
                     parent.spawn((
                         TesselatedCollider {
                             texture: statue_hitbox,
diff --git a/src/locations/temple/main_room.rs b/src/locations/temple/main_room.rs
index d3df019..102c4c1 100644
--- a/src/locations/temple/main_room.rs
+++ b/src/locations/temple/main_room.rs
@@ -5,12 +5,15 @@ use std::time::Duration;
 use crate::{
     animations::sprite_sheet_animation::{AnimationDuration, SpriteSheetAnimation},
     collisions::{TesselatedCollider, TesselatedColliderConfig},
-    constants::locations::{main_room::*, CHANDELIER_FLAME_POSITIONS},
-    interactions::{Interactible, InteractionSensor},
+    constants::{
+        interactions::INTERACT_BUTTON_SCALE,
+        locations::{main_room::*, CHANDELIER_FLAME_POSITIONS},
+    },
+    interactions::{InteractIcon, Interactible, InteractionResources, InteractionSensor},
     locations::temple::{
         secret_room::{AddSecretRoomCoverEvent, RemoveSecretRoomCoverEvent},
-        Chandelier, DoorColliderClosed, DoorState, Flame, LocationSensor, OverlappingEntity,
-        PlayerLocation, WallCollider,
+        Chandelier, DoorColliderClosed, DoorState, Flame, Location, LocationSensor,
+        OverlappingEntity, WallCollider,
     },
 };
 
@@ -44,13 +47,13 @@ pub struct SecretBannerEvent(pub DoorState);
 /// REFACTOR: SecretRoomCover
 pub fn secret_banner_interaction(
     mut secret_banner_event: EventReader<SecretBannerEvent>,
-    player_location: Res<State<PlayerLocation>>,
+    player_location: Res<State<Location>>,
 
     mut remove_secret_room_cover_event: EventWriter<RemoveSecretRoomCoverEvent>,
     mut add_secret_room_cover_event: EventWriter<AddSecretRoomCoverEvent>,
 ) {
     for SecretBannerEvent(door_state) in secret_banner_event.iter() {
-        if player_location.get() == &PlayerLocation::Temple {
+        if player_location.get() == &Location::Temple {
             match *door_state {
                 DoorState::Closed => {
                     remove_secret_room_cover_event.send(RemoveSecretRoomCoverEvent)
@@ -71,6 +74,7 @@ pub fn setup_main_room(
     mut commands: Commands,
     mut texture_atlases: ResMut<Assets<TextureAtlas>>,
     asset_server: Res<AssetServer>,
+    interaction_resources: Res<InteractionResources>,
 ) {
     /* -------------------------------------------------------------------------- */
     /*                                Assets Loader                               */
@@ -181,7 +185,7 @@ pub fn setup_main_room(
                 ActiveEvents::COLLISION_EVENTS,
                 Sensor,
                 LocationSensor {
-                    location: PlayerLocation::Temple,
+                    location: Location::Temple,
                 },
                 Name::new("Temple Sensor from Hall"),
             ));
@@ -192,7 +196,7 @@ pub fn setup_main_room(
                 ActiveEvents::COLLISION_EVENTS,
                 Sensor,
                 LocationSensor {
-                    location: PlayerLocation::Temple,
+                    location: Location::Temple,
                 },
                 Name::new("Temple Sensor from Secret Room"),
             ));
@@ -214,7 +218,7 @@ pub fn setup_main_room(
                                 },
                             },
                             Transform::default(),
-                            WallCollider(PlayerLocation::Temple),
+                            WallCollider(Location::Temple),
                         ));
                     }
                 });
@@ -243,6 +247,20 @@ pub fn setup_main_room(
                         InteractionSensor,
                     ));
 
+                    parent.spawn((
+                        SpriteBundle {
+                            texture: interaction_resources.interact_button.clone(),
+                            transform: Transform {
+                                translation: BANNER_INTERACT_BUTTON_POSITION.into(),
+                                scale: Vec3::splat(INTERACT_BUTTON_SCALE),
+                                ..default()
+                            },
+                            visibility: Visibility::Hidden,
+                            ..default()
+                        },
+                        InteractIcon,
+                    ));
+
                     parent.spawn((
                         TesselatedCollider {
                             texture: banner_collider,
diff --git a/src/locations/temple/mod.rs b/src/locations/temple/mod.rs
old mode 100644
new mode 100755
index a2fb663..53f6872
--- a/src/locations/temple/mod.rs
+++ b/src/locations/temple/mod.rs
@@ -19,8 +19,8 @@ pub mod secret_room;
 #[derive(Component, Deref, DerefMut)]
 pub struct ZPosition(f32);
 
-#[derive(Clone, Eq, PartialEq, Debug, Hash, Default, Reflect, States)]
-pub enum PlayerLocation {
+#[derive(Copy, Clone, Eq, PartialEq, Debug, Hash, Default, Reflect, Component, States)]
+pub enum Location {
     #[default]
     Hall,
     Temple,
@@ -31,7 +31,7 @@ pub struct TemplePlugin;
 
 impl Plugin for TemplePlugin {
     fn build(&self, app: &mut App) {
-        app.add_state::<PlayerLocation>()
+        app.add_state::<Location>()
             .add_event::<main_room::SecretBannerEvent>()
             .add_event::<hall::PropsInteractionEvent>()
             .add_event::<secret_room::SecretRoomTriggerEvent>()
@@ -70,15 +70,15 @@ impl Plugin for TemplePlugin {
                 main_room::secret_banner_interaction.run_if(in_temple_or_secret_room),
             )
             .add_systems(
-                OnEnter(PlayerLocation::Hall),
+                OnEnter(Location::Hall),
                 control_wall_collider.run_if(playing),
             )
             .add_systems(
-                OnEnter(PlayerLocation::Temple),
+                OnEnter(Location::Temple),
                 control_wall_collider.run_if(playing),
             )
             .add_systems(
-                OnEnter(PlayerLocation::SecretRoom),
+                OnEnter(Location::SecretRoom),
                 control_wall_collider.run_if(playing),
             );
     }
@@ -88,26 +88,23 @@ impl Plugin for TemplePlugin {
 /*                               Run If Systems                               */
 /* -------------------------------------------------------------------------- */
 
-fn in_hall(location: Res<State<PlayerLocation>>, game_state: Res<State<GameState>>) -> bool {
-    location.get() == &PlayerLocation::Hall && game_state.get() == &GameState::Playing
+fn in_hall(location: Res<State<Location>>, game_state: Res<State<GameState>>) -> bool {
+    location.get() == &Location::Hall && game_state.get() == &GameState::Playing
 }
 
-fn _in_temple(location: Res<State<PlayerLocation>>, game_state: Res<State<GameState>>) -> bool {
-    location.get() == &PlayerLocation::Temple && game_state.get() == &GameState::Playing
+fn _in_temple(location: Res<State<Location>>, game_state: Res<State<GameState>>) -> bool {
+    location.get() == &Location::Temple && game_state.get() == &GameState::Playing
 }
 
-fn _in_secret_room(
-    location: Res<State<PlayerLocation>>,
-    game_state: Res<State<GameState>>,
-) -> bool {
-    location.get() == &PlayerLocation::SecretRoom && game_state.get() == &GameState::Playing
+fn _in_secret_room(location: Res<State<Location>>, game_state: Res<State<GameState>>) -> bool {
+    location.get() == &Location::SecretRoom && game_state.get() == &GameState::Playing
 }
 
 fn in_temple_or_secret_room(
-    location: Res<State<PlayerLocation>>,
+    location: Res<State<Location>>,
     game_state: Res<State<GameState>>,
 ) -> bool {
-    (location.get() == &PlayerLocation::SecretRoom || location.get() == &PlayerLocation::Temple)
+    (location.get() == &Location::SecretRoom || location.get() == &Location::Temple)
         && game_state.get() == &GameState::Playing
 }
 
@@ -133,11 +130,11 @@ pub struct Chandelier;
 pub struct Flame;
 
 #[derive(Component)]
-pub struct WallCollider(pub PlayerLocation);
+pub struct WallCollider(pub Location);
 
 #[derive(Component)]
 pub struct LocationSensor {
-    pub location: PlayerLocation,
+    pub location: Location,
 }
 
 /// TODO: make it work
@@ -200,8 +197,8 @@ pub fn location_event(
     location_sensor_query: Query<(Entity, &LocationSensor)>,
     character_hitbox_query: Query<(Entity, &Parent), With<CharacterHitbox>>,
 
-    location: Res<State<PlayerLocation>>,
-    mut next_location: ResMut<NextState<PlayerLocation>>,
+    location: Res<State<Location>>,
+    mut next_location: ResMut<NextState<Location>>,
 ) {
     for collision_event in collision_events.iter() {
         match collision_event {
@@ -228,7 +225,7 @@ pub fn location_event(
                             || (*e1 == character_hitbox && *e2 == location_sensor)
                         {
                             if location.get() != &location_point.location {
-                                next_location.set(location_point.location.clone());
+                                next_location.set(location_point.location);
                             }
                             break;
                         }
@@ -244,7 +241,7 @@ pub fn location_event(
 /// NOTE: Instead of OnEnter(...), just check if the state has changed
 fn control_wall_collider(
     mut commands: Commands,
-    player_location: Res<State<PlayerLocation>>,
+    player_location: Res<State<Location>>,
     wall_colliders_query: Query<(Entity, &WallCollider)>,
 ) {
     let current_location = player_location.get();
@@ -323,6 +320,7 @@ pub fn door_interact(
     }
 }
 
+/// FIXME: When spamming the door, an event can drop and the sprite.index can overflow
 pub fn open_close_door(
     time: Res<Time>,
     texture_atlases: Res<Assets<TextureAtlas>>,
@@ -359,26 +357,18 @@ pub fn open_close_door(
 
                 if sprite.index >= texture_atlas.len() - 1 {
                     commands.entity(entity).remove::<DoorInteract>();
-                    match door_collider_closed_query.get(children[1]) {
-                        Err(e) => warn!("{}", e),
-                        Ok(collider) => {
+
+                    for child in children {
+                        if let Ok(collider) = door_collider_closed_query.get(*child) {
                             commands.entity(collider).insert(Sensor);
+                        } else if let Ok(collider) = door_collider_opened_query.get(*child) {
+                            commands.entity(collider).remove::<Sensor>();
                         }
                     }
-                    *door_state = DoorState::Opened;
 
-                    match temple_door_query.get_mut(entity) {
-                        Err(_) => {}
-                        Ok(mut ovelapping_setting) => {
-                            match door_collider_opened_query.get_many([children[2], children[3]]) {
-                                Err(e) => warn!("{}", e),
-                                Ok([collider_1, collider_2]) => {
-                                    commands.entity(collider_1).remove::<Sensor>();
-                                    commands.entity(collider_2).remove::<Sensor>();
-                                }
-                            }
-                            ovelapping_setting.z_offset = TEMPLE_DOOR_SWITCH_Z_OFFSET_OPENED;
-                        }
+                    *door_state = DoorState::Opened;
+                    if let Ok(mut ovelapping_setting) = temple_door_query.get_mut(entity) {
+                        ovelapping_setting.z_offset = TEMPLE_DOOR_SWITCH_Z_OFFSET_OPENED;
                     }
                 }
             } else if *door_state == DoorState::Closing {
@@ -386,26 +376,18 @@ pub fn open_close_door(
 
                 if sprite.index == 0 {
                     commands.entity(entity).remove::<DoorInteract>();
-                    match door_collider_closed_query.get(children[1]) {
-                        Err(e) => warn!("{}", e),
-                        Ok(collider) => {
+
+                    for child in children {
+                        if let Ok(collider) = door_collider_closed_query.get(*child) {
                             commands.entity(collider).remove::<Sensor>();
+                        } else if let Ok(collider) = door_collider_opened_query.get(*child) {
+                            commands.entity(collider).insert(Sensor);
                         }
                     }
-                    *door_state = DoorState::Closed;
 
-                    match temple_door_query.get_mut(entity) {
-                        Err(_) => {}
-                        Ok(mut ovelapping_setting) => {
-                            match door_collider_opened_query.get_many([children[2], children[3]]) {
-                                Err(e) => warn!("{}", e),
-                                Ok([collider_1, collider_2]) => {
-                                    commands.entity(collider_1).insert(Sensor);
-                                    commands.entity(collider_2).insert(Sensor);
-                                }
-                            }
-                            ovelapping_setting.z_offset = TEMPLE_DOOR_SWITCH_Z_OFFSET_CLOSED;
-                        }
+                    *door_state = DoorState::Closed;
+                    if let Ok(mut ovelapping_setting) = temple_door_query.get_mut(entity) {
+                        ovelapping_setting.z_offset = TEMPLE_DOOR_SWITCH_Z_OFFSET_CLOSED;
                     }
                 }
             }
diff --git a/src/locations/temple/secret_room.rs b/src/locations/temple/secret_room.rs
index 3a07529..6aeefdc 100644
--- a/src/locations/temple/secret_room.rs
+++ b/src/locations/temple/secret_room.rs
@@ -9,7 +9,7 @@ use crate::{
     },
     collisions::{TesselatedCollider, TesselatedColliderConfig},
     constants::{locations::secret_room::*, BACKGROUND_COLOR_INGAME},
-    locations::temple::{LocationSensor, OverlappingEntity, PlayerLocation, WallCollider},
+    locations::temple::{Location, LocationSensor, OverlappingEntity, WallCollider},
 };
 
 /* -------------------------------------------------------------------------- */
@@ -44,6 +44,7 @@ pub struct SecretRoomTriggerEvent {
     pub started: bool,
 }
 
+/// IDEA: Only remove the cover when entering the secret room
 #[derive(Event)]
 pub struct RemoveSecretRoomCoverEvent;
 
@@ -97,13 +98,13 @@ pub fn add_secret_room_cover(
 
 /// OPTIMIZE: OnEnter of secretRoom => visibility on, OnExit => off
 pub fn second_layer_fake_wall_visibility(
-    location: Res<State<PlayerLocation>>,
+    location: Res<State<Location>>,
     mut second_layer_fake_wall_query: Query<&mut Visibility, With<SecondLayerFakeWall>>,
 ) {
     if location.is_changed() {
         let mut visibility = second_layer_fake_wall_query.single_mut();
         *visibility = match location.get() {
-            PlayerLocation::SecretRoom => Visibility::Inherited,
+            Location::SecretRoom => Visibility::Inherited,
             _ => Visibility::Hidden,
         };
     }
@@ -291,7 +292,7 @@ pub fn setup_secret_room(
                 ActiveEvents::COLLISION_EVENTS,
                 Sensor,
                 LocationSensor {
-                    location: PlayerLocation::SecretRoom,
+                    location: Location::SecretRoom,
                 },
                 Name::new("Secret Sensor from Temple"),
             ));
@@ -313,7 +314,7 @@ pub fn setup_secret_room(
                                 },
                             },
                             Transform::default(),
-                            WallCollider(PlayerLocation::SecretRoom),
+                            WallCollider(Location::SecretRoom),
                         ));
                     }
                 });
diff --git a/src/main.rs b/src/main.rs
index c29b522..066e5a3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -153,3 +153,7 @@ pub fn in_menu(game_state: Res<State<GameState>>) -> bool {
 pub fn hud_closed(hud_state: Res<State<HUDState>>) -> bool {
     hud_state.get() == &HUDState::Closed
 }
+
+pub fn hud_opened(hud_state: Res<State<HUDState>>) -> bool {
+    hud_state.get() != &HUDState::Closed
+}