diff --git a/main_game/assets/maps/downtown.ron b/main_game/assets/maps/downtown.ron
index 39dce92b..91b7d462 100644
--- a/main_game/assets/maps/downtown.ron
+++ b/main_game/assets/maps/downtown.ron
@@ -1,6 +1,6 @@
 (
  zones: (
-  inner: {Zone(Building1Entrance): (zone_group: (12), zone_size: 33, zone_successors: []), Zone(ClinicEntrance): (zone_group: (13), zone_size: 6, zone_successors: []), Zone(ClinicWardEntrance): (zone_group: (14), zone_size: 6, zone_successors: []), Zone(CompoundEntrance): (zone_group: (15), zone_size: 405, zone_successors: []), Zone(MallEntrance): (zone_group: (25), zone_size: 165, zone_successors: []), Zone(PlantShopEntrance): (zone_group: (27), zone_size: 44, zone_successors: []), Zone(SewersEntrance): (zone_group: (30), zone_size: 60, zone_successors: []), Zone(TwinpeaksApartmentEntrance): (zone_group: (32), zone_size: 44, zone_successors: [])},
+  inner: {Zone(Building1Entrance): (zone_group: (11), zone_size: 33, zone_successors: []), Zone(ClinicEntrance): (zone_group: (12), zone_size: 6, zone_successors: []), Zone(ClinicWardEntrance): (zone_group: (13), zone_size: 6, zone_successors: []), Zone(CompoundEntrance): (zone_group: (14), zone_size: 405, zone_successors: []), Zone(MallEntrance): (zone_group: (24), zone_size: 165, zone_successors: []), Zone(PlantShopEntrance): (zone_group: (26), zone_size: 44, zone_successors: []), Zone(SewersEntrance): (zone_group: (29), zone_size: 60, zone_successors: []), Zone(TwinpeaksApartmentEntrance): (zone_group: (31), zone_size: 44, zone_successors: [])},
  ),
  squares: {
   (x: -263, y: -291): [Wall],
diff --git a/main_game/assets/maps/mall.ron b/main_game/assets/maps/mall.ron
index 28e472ff..5d24a918 100644
--- a/main_game/assets/maps/mall.ron
+++ b/main_game/assets/maps/mall.ron
@@ -1,6 +1,6 @@
 (
  zones: (
-  inner: {Zone(Exit): (zone_group: (19), zone_size: 153, zone_successors: [])},
+  inner: {Zone(Exit): (zone_group: (18), zone_size: 153, zone_successors: [])},
  ),
  squares: {
   (x: -43, y: -19): [Empty, Trail],
diff --git a/main_game_lib/src/lib.rs b/main_game_lib/src/lib.rs
index e498a182..e145571d 100644
--- a/main_game_lib/src/lib.rs
+++ b/main_game_lib/src/lib.rs
@@ -18,7 +18,6 @@ pub mod vec2_ext;
 use bevy::{app::AppExit, prelude::*};
 use bevy_pixel_camera::PixelCameraPlugin;
 pub use common_ext;
-use prelude::rscn::TscnInBevy;
 
 use crate::prelude::*;
 
@@ -142,9 +141,3 @@ fn begin_loading_static_assets_on_startup(
 fn exit(mut exit: EventWriter<AppExit>) {
     exit.send(AppExit::Success);
 }
-
-impl<T: TopDownScene> TscnInBevy for T {
-    fn tscn_asset_path() -> String {
-        format!("scenes/{}.tscn", T::name())
-    }
-}
diff --git a/main_game_lib/src/state.rs b/main_game_lib/src/state.rs
index 1a702321..fe2f114f 100644
--- a/main_game_lib/src/state.rs
+++ b/main_game_lib/src/state.rs
@@ -184,19 +184,19 @@ pub fn in_scene_leaving_state(
 /// Helper to check if the state is in _any_ top down scene loading state.
 pub fn in_top_down_loading_state(
 ) -> impl FnMut(Option<Res<State<InTopDownScene>>>) -> bool + Clone {
-    in_state(InTopDownScene(TopDownSceneState::Loading))
+    in_state(InTopDownScene::loading())
 }
 
 /// Helper to check if the state is in _any_ top down scene running state.
 pub fn in_top_down_running_state(
 ) -> impl FnMut(Option<Res<State<InTopDownScene>>>) -> bool + Clone {
-    in_state(InTopDownScene(TopDownSceneState::Running))
+    in_state(InTopDownScene::running())
 }
 
 /// Helper to check if the state is in _any_ top down scene leaving state.
 pub fn in_top_down_leaving_state(
 ) -> impl FnMut(Option<Res<State<InTopDownScene>>>) -> bool + Clone {
-    in_state(InTopDownScene(TopDownSceneState::Leaving))
+    in_state(InTopDownScene::leaving())
 }
 
 impl GlobalGameStateTransition {
@@ -274,13 +274,13 @@ impl ComputedStates for InTopDownScene {
     fn compute(sources: Self::SourceStates) -> Option<Self> {
         match sources {
             Some(GlobalGameState::LoadingTopDownScene(_)) => {
-                Some(InTopDownScene(TopDownSceneState::Loading))
+                Some(InTopDownScene::loading())
             }
             Some(GlobalGameState::RunningTopDownScene(_)) => {
-                Some(InTopDownScene(TopDownSceneState::Running))
+                Some(InTopDownScene::running())
             }
             Some(GlobalGameState::LeavingTopDownScene(_)) => {
-                Some(InTopDownScene(TopDownSceneState::Leaving))
+                Some(InTopDownScene::leaving())
             }
             _ => None,
         }
@@ -307,6 +307,21 @@ impl InTopDownScene {
     pub fn is_running(self) -> bool {
         matches!(self.0, TopDownSceneState::Running)
     }
+
+    /// Constructs this state in running variant.
+    pub fn running() -> Self {
+        Self(TopDownSceneState::Running)
+    }
+
+    /// Constructs this state in loading variant.
+    pub fn loading() -> Self {
+        Self(TopDownSceneState::Loading)
+    }
+
+    /// Constructs this state in leaving variant.
+    pub fn leaving() -> Self {
+        Self(TopDownSceneState::Leaving)
+    }
 }
 
 impl WhichTopDownScene {
diff --git a/main_game_lib/src/top_down.rs b/main_game_lib/src/top_down.rs
index af8ffac5..06952dfa 100644
--- a/main_game_lib/src/top_down.rs
+++ b/main_game_lib/src/top_down.rs
@@ -28,10 +28,10 @@ use leafwing_input_manager::plugin::InputManagerSystem;
 
 use self::inspect_and_interact::ChangeHighlightedInspectLabelEvent;
 use crate::{
-    cutscene::in_cutscene, in_scene_loading_state, in_scene_running_state,
+    cutscene::in_cutscene, in_top_down_loading_state,
     in_top_down_running_state,
     top_down::inspect_and_interact::ChangeHighlightedInspectLabelEventConsumer,
-    InTopDownScene, TopDownSceneState, WhichTopDownScene,
+    InTopDownScene,
 };
 
 /// Does not add any systems, only registers generic-less types.
@@ -48,26 +48,84 @@ impl bevy::app::Plugin for Plugin {
         // Assets
         //
 
+        app.init_asset_loader::<common_assets::ron_loader::Loader<TileMap>>()
+            .init_asset::<TileMap>();
+
         app.add_systems(
-                OnEnter(InTopDownScene(TopDownSceneState::Loading)),
+                OnEnter(InTopDownScene::loading()),
                 common_assets::store::insert_as_resource::<common_story::StoryAssets>,
             )
             .add_systems(
-                OnExit(InTopDownScene(TopDownSceneState::Leaving)),
+                OnExit(InTopDownScene::leaving()),
                 common_assets::store::remove_as_resource::<common_story::StoryAssets>,
             );
 
+        //
+        // TileMap
+        //
+
+        app.add_systems(
+            OnExit(InTopDownScene::running()),
+            layout::systems::remove_resources,
+        )
+        .add_systems(
+            OnEnter(InTopDownScene::loading()),
+            layout::systems::start_loading_map,
+        )
+        .add_systems(
+            First,
+            layout::systems::try_insert_map_as_resource
+                .run_if(in_top_down_loading_state()),
+        )
+        .add_systems(
+            FixedUpdate,
+            actor::animate_movement.run_if(in_top_down_running_state()),
+        )
+        .add_systems(
+            Update,
+            actor::emit_movement_events
+                .run_if(in_top_down_running_state())
+                // so that we can emit this event on current frame
+                .after(actor::player::move_around),
+        )
+        .add_systems(
+            Update,
+            actor::player::move_around
+                .run_if(in_top_down_running_state())
+                .run_if(common_action::move_action_pressed())
+                .run_if(not(crate::dialog::fe::portrait::in_portrait_dialog())),
+        )
+        .add_systems(
+            Update,
+            (
+                actor::npc::drive_behavior,
+                actor::npc::plan_path
+                    .run_if(on_event::<actor::npc::PlanPathEvent>()),
+                actor::npc::run_path,
+            )
+                .chain()
+                .run_if(in_top_down_running_state()),
+        );
+
         //
         // Camera
         //
 
         app.add_systems(
-            OnEnter(InTopDownScene(TopDownSceneState::Loading)),
+            OnEnter(InTopDownScene::loading()),
             common_visuals::camera::spawn,
         )
         .add_systems(
-            OnExit(InTopDownScene(TopDownSceneState::Leaving)),
+            OnExit(InTopDownScene::leaving()),
             common_visuals::camera::despawn,
+        )
+        .add_systems(
+            FixedUpdate,
+            cameras::track_player_with_main_camera
+                .after(actor::animate_movement)
+                .run_if(in_top_down_running_state())
+                .run_if(not(in_cutscene()))
+                .run_if(not(crate::dialog::fe::portrait::in_portrait_dialog())),
         );
 
         //
@@ -122,6 +180,13 @@ impl bevy::app::Plugin for Plugin {
                     )),
             )
                 .run_if(in_top_down_running_state()),
+        )
+        .add_systems(
+            Update,
+            inspect_and_interact::match_interact_label_with_action_event
+                .run_if(in_top_down_running_state())
+                .run_if(on_event::<ActorMovementEvent>())
+                .after(emit_movement_events),
         );
 
         //
@@ -129,11 +194,11 @@ impl bevy::app::Plugin for Plugin {
         //
 
         app.add_systems(
-            OnEnter(InTopDownScene(TopDownSceneState::Running)),
+            OnEnter(InTopDownScene::running()),
             (crate::hud::daybar::spawn, crate::hud::notification::spawn),
         )
         .add_systems(
-            OnExit(InTopDownScene(TopDownSceneState::Running)),
+            OnExit(InTopDownScene::running()),
             (
                 crate::hud::daybar::despawn,
                 crate::hud::notification::despawn,
@@ -159,6 +224,7 @@ impl bevy::app::Plugin for Plugin {
                 .register_type::<InspectLabelCategory>()
                 .register_type::<npc::NpcInTheMap>()
                 .register_type::<npc::PlanPathEvent>()
+                .register_type::<TileMap>()
                 .register_type::<npc::BehaviorLeaf>()
                 .register_type::<npc::BehaviorPaused>();
 
@@ -166,120 +232,34 @@ impl bevy::app::Plugin for Plugin {
                 ResourceInspectorPlugin::<Toolbar>::new()
                     .run_if(resource_exists::<Toolbar>),
             );
+
+            // You can press `Enter` to export the map.
+            // This will overwrite the RON file.
+            // We draw an overlay with tiles that you can edit with left and
+            // right mouse buttons.
+            app.add_systems(
+                OnEnter(InTopDownScene::running()),
+                layout::map_maker::spawn_debug_grid_root,
+            )
+            .add_systems(
+                Update,
+                layout::map_maker::show_tiles_around_cursor
+                    .run_if(in_top_down_running_state()),
+            )
+            .add_systems(
+                Update,
+                (
+                    layout::map_maker::change_square_kind,
+                    layout::map_maker::recolor_squares,
+                    layout::map_maker::update_ui,
+                )
+                    .run_if(in_top_down_running_state())
+                    .chain(),
+            )
+            .add_systems(
+                OnExit(InTopDownScene::leaving()),
+                layout::map_maker::destroy_map,
+            );
         }
     }
 }
-
-/// Registers unique `T` types, asset loader for the map RON file, and systems
-/// including from other packages:
-/// - [`crate::top_down::actor::animate_movement`]
-/// - [`crate::top_down::actor::emit_movement_events`]
-/// - [`crate::top_down::actor::npc::drive_behavior`]
-/// - [`crate::top_down::actor::npc::plan_path`]
-/// - [`crate::top_down::actor::npc::run_path`]
-/// - [`crate::top_down::actor::player::move_around`]
-pub fn default_setup_for_scene<T>(app: &mut App, scene: WhichTopDownScene)
-where
-    T: TopDownScene,
-{
-    debug!("Adding map layout for {}", T::type_path());
-
-    app.init_asset_loader::<common_assets::ron_loader::Loader<TileMap<T>>>()
-        .init_asset::<TileMap<T>>();
-
-    app.add_systems(
-        OnEnter(scene.loading()),
-        layout::systems::start_loading_map::<T>,
-    )
-    .add_systems(
-        First,
-        layout::systems::try_insert_map_as_resource::<T>
-            .run_if(in_scene_loading_state(scene)),
-    )
-    .add_systems(
-        FixedUpdate,
-        actor::animate_movement::<T>.run_if(in_scene_running_state(scene)),
-    )
-    .add_systems(
-        Update,
-        actor::emit_movement_events::<T>
-            .run_if(in_scene_running_state(scene))
-            // so that we can emit this event on current frame
-            .after(actor::player::move_around::<T>),
-    )
-    .add_systems(
-        Update,
-        actor::player::move_around::<T>
-            .run_if(in_scene_running_state(scene))
-            .run_if(common_action::move_action_pressed())
-            .run_if(not(crate::dialog::fe::portrait::in_portrait_dialog())),
-    )
-    .add_systems(
-        Update,
-        (
-            actor::npc::drive_behavior,
-            actor::npc::plan_path::<T>
-                .run_if(on_event::<actor::npc::PlanPathEvent>()),
-            actor::npc::run_path::<T>,
-        )
-            .chain()
-            .run_if(in_scene_running_state(scene)),
-    )
-    .add_systems(
-        OnExit(scene.running()),
-        layout::systems::remove_resources::<T>,
-    );
-
-    debug!("Adding interaction systems for {}", T::type_path());
-    app.add_systems(
-        Update,
-        inspect_and_interact::match_interact_label_with_action_event
-            .run_if(in_scene_running_state(scene))
-            .run_if(on_event::<ActorMovementEvent>())
-            .after(emit_movement_events::<T>),
-    );
-
-    debug!("Adding camera");
-
-    app.add_systems(
-        FixedUpdate,
-        cameras::track_player_with_main_camera
-            .after(actor::animate_movement::<T>)
-            .run_if(in_scene_running_state(scene))
-            .run_if(not(in_cutscene()))
-            .run_if(not(crate::dialog::fe::portrait::in_portrait_dialog())),
-    );
-}
-
-/// You can press `Enter` to export the map.
-/// This will overwrite the RON file.
-/// We draw an overlay with tiles that you can edit with left and right mouse
-/// buttons.
-#[cfg(feature = "devtools")]
-pub fn dev_default_setup_for_scene<T>(app: &mut App, scene: WhichTopDownScene)
-where
-    T: TopDownScene,
-{
-    app.register_type::<TileMap<T>>();
-
-    app.add_systems(
-        OnEnter(scene.running()),
-        layout::map_maker::spawn_debug_grid_root::<T>,
-    )
-    .add_systems(
-        Update,
-        layout::map_maker::show_tiles_around_cursor::<T>
-            .run_if(in_scene_running_state(scene)),
-    )
-    .add_systems(
-        Update,
-        (
-            layout::map_maker::change_square_kind::<T>,
-            layout::map_maker::recolor_squares::<T>,
-            layout::map_maker::update_ui::<T>,
-        )
-            .run_if(in_scene_running_state(scene))
-            .chain(),
-    )
-    .add_systems(OnExit(scene.leaving()), layout::map_maker::destroy_map::<T>);
-}
diff --git a/main_game_lib/src/top_down/actor.rs b/main_game_lib/src/top_down/actor.rs
index 8b68ec74..a8e237dd 100644
--- a/main_game_lib/src/top_down/actor.rs
+++ b/main_game_lib/src/top_down/actor.rs
@@ -23,7 +23,7 @@ use serde::{Deserialize, Serialize};
 
 use self::npc::BehaviorTree;
 use crate::top_down::{
-    layout::{ysort, TileIndex, TopDownScene, LAYOUT},
+    layout::{ysort, TileIndex, LAYOUT},
     npc::NpcInTheMap,
     InspectLabelCategory, Player, TileKind, TileMap,
 };
@@ -181,16 +181,14 @@ pub enum ActorOrCharacter {
 }
 
 /// Sends events when an actor does something interesting.
-/// This system is registered on call to
-/// [`crate::top_down::default_setup_for_scene`].
 ///
 /// If you listen to this event then condition your system to run on
 /// `run_if(on_event::<ActorMovementEvent>)` and
-/// `after(actor::emit_movement_events::<T>)`.
+/// `after(actor::emit_movement_events)`.
 ///
 /// We also emit a zone left event when an actor is despawned.
-pub fn emit_movement_events<T: TopDownScene>(
-    tilemap: Res<TileMap<T>>,
+pub fn emit_movement_events(
+    tilemap: Res<TileMap>,
     mut actor_zone_map: ResMut<ActorZoneMap>,
     mut event: EventWriter<ActorMovementEvent>,
     mut removed: RemovedComponents<Actor>,
@@ -290,9 +288,9 @@ pub fn emit_movement_events<T: TopDownScene>(
 ///
 /// The z is based off y.
 /// See the [`ysort`] for more info.
-pub fn animate_movement<T: TopDownScene>(
+pub fn animate_movement(
     time: Res<Time>,
-    mut tilemap: ResMut<TileMap<T>>,
+    mut tilemap: ResMut<TileMap>,
 
     mut actors: Query<
         (Entity, &mut Actor, &mut TextureAtlas, &mut Transform),
@@ -306,7 +304,7 @@ pub fn animate_movement<T: TopDownScene>(
     for (entity, mut actor, sprite, transform) in actors.iter_mut() {
         debug_assert!(!actor.is_player());
 
-        animate_movement_for_actor::<T>(
+        animate_movement_for_actor(
             &time,
             &mut tilemap,
             entity,
@@ -323,7 +321,7 @@ pub fn animate_movement<T: TopDownScene>(
         player.get_single_mut_or_none()
     {
         debug_assert!(actor.is_player());
-        animate_movement_for_actor::<T>(
+        animate_movement_for_actor(
             &time,
             &mut tilemap,
             entity,
@@ -335,9 +333,9 @@ pub fn animate_movement<T: TopDownScene>(
 }
 
 /// Moves the actor on screen and changes frames for the sprite.
-fn animate_movement_for_actor<T: TopDownScene>(
+fn animate_movement_for_actor(
     time: &Time,
-    tilemap: &mut TileMap<T>,
+    tilemap: &mut TileMap,
     entity: Entity,
     actor: &mut Actor,
     mut sprite: Mut<TextureAtlas>,
@@ -691,7 +689,7 @@ lazy_static! {
     };
 }
 
-impl<T: TopDownScene> TileMap<T> {
+impl TileMap {
     fn replace_actor_tiles(&mut self, entity: Entity, actor: &mut Actor) {
         for (sq, layer) in actor.occupies.drain(..) {
             // we can't assume it to eq the actor's tile because in some rare
@@ -779,6 +777,55 @@ impl<T: TopDownScene> TileMap<T> {
     }
 }
 
+impl ActorMovement {
+    /// Gets mutable reference to the actor target if moving.
+    pub fn target_mut(&mut self) -> Option<&mut ActorTarget> {
+        match self {
+            Self::Target(target) => Some(target),
+            _ => None,
+        }
+    }
+
+    /// Gets reference to the actor target if moving.
+    pub fn target(&self) -> Option<&ActorTarget> {
+        match self {
+            Self::Target(target) => Some(target),
+            _ => None,
+        }
+    }
+
+    /// Whether the actor is not moving.
+    pub fn is_still(&self) -> bool {
+        matches!(self, Self::Still { .. })
+    }
+}
+
+impl Default for ActorMovement {
+    fn default() -> Self {
+        Self::Still {
+            since: Stopwatch::new(),
+        }
+    }
+}
+
+impl From<ActorTarget> for ActorMovement {
+    fn from(target: ActorTarget) -> Self {
+        Self::Target(target)
+    }
+}
+
+impl From<Entity> for ActorOrCharacter {
+    fn from(entity: Entity) -> Self {
+        Self::Actor(entity)
+    }
+}
+
+impl From<Character> for ActorOrCharacter {
+    fn from(character: Character) -> Self {
+        Self::Character(character)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use bevy::ecs::system::SystemId;
@@ -841,7 +888,7 @@ mod tests {
             ],
         );
 
-        let tilemap = w.get_resource::<TileMap<TestScene>>().unwrap();
+        let tilemap = w.get_resource::<TileMap>().unwrap();
 
         let actor_pos = |actor_entity| {
             w.get_entity(actor_entity)
@@ -893,7 +940,7 @@ mod tests {
             )],
         );
 
-        let tilemap = w.get_resource::<TileMap<TestScene>>().unwrap();
+        let tilemap = w.get_resource::<TileMap>().unwrap();
 
         let actor_pos = |actor_entity| {
             w.get_entity(actor_entity)
@@ -945,7 +992,7 @@ mod tests {
             )],
         );
 
-        let tilemap = w.get_resource::<TileMap<TestScene>>().unwrap();
+        let tilemap = w.get_resource::<TileMap>().unwrap();
 
         let actor_pos = |actor_entity| {
             w.get_entity(actor_entity)
@@ -968,21 +1015,12 @@ mod tests {
         assert!(is_actor_alone, "Winnie not alone on {winnie_pos}");
     }
 
-    #[derive(Default, Reflect, Clone, Debug)]
-    struct TestScene;
-
-    impl TopDownScene for TestScene {
-        fn name() -> &'static str {
-            unreachable!()
-        }
-    }
-
     const STEP_TIME: Duration = Duration::from_secs(1);
 
     fn prepare_world() -> (World, SystemId, Entity, Entity) {
         let mut w = World::default();
 
-        w.insert_resource(TileMap::<TestScene>::default());
+        w.insert_resource(TileMap::default());
         w.insert_resource(Time::<()>::default());
 
         // both actors start at the same square
@@ -1018,7 +1056,7 @@ mod tests {
             })
             .id();
 
-        let system_id = w.register_system(animate_movement::<TestScene>);
+        let system_id = w.register_system(animate_movement);
 
         // run it once to initialize the occupied tiles
         w.run_system(system_id).unwrap();
@@ -1055,9 +1093,8 @@ mod tests {
 
             let mut move_actor =
                 |actor_entity, directions: &[GridDirection]| {
-                    let tilemap = TileMap::<TestScene>::clone(
-                        w.get_resource::<TileMap<TestScene>>().unwrap(),
-                    );
+                    let tilemap =
+                        TileMap::clone(w.get_resource::<TileMap>().unwrap());
 
                     let mut entity_ref =
                         w.get_entity_mut(actor_entity).unwrap();
@@ -1094,52 +1131,3 @@ mod tests {
         }
     }
 }
-
-impl ActorMovement {
-    /// Gets mutable reference to the actor target if moving.
-    pub fn target_mut(&mut self) -> Option<&mut ActorTarget> {
-        match self {
-            Self::Target(target) => Some(target),
-            _ => None,
-        }
-    }
-
-    /// Gets reference to the actor target if moving.
-    pub fn target(&self) -> Option<&ActorTarget> {
-        match self {
-            Self::Target(target) => Some(target),
-            _ => None,
-        }
-    }
-
-    /// Whether the actor is not moving.
-    pub fn is_still(&self) -> bool {
-        matches!(self, Self::Still { .. })
-    }
-}
-
-impl Default for ActorMovement {
-    fn default() -> Self {
-        Self::Still {
-            since: Stopwatch::new(),
-        }
-    }
-}
-
-impl From<ActorTarget> for ActorMovement {
-    fn from(target: ActorTarget) -> Self {
-        Self::Target(target)
-    }
-}
-
-impl From<Entity> for ActorOrCharacter {
-    fn from(entity: Entity) -> Self {
-        Self::Actor(entity)
-    }
-}
-
-impl From<Character> for ActorOrCharacter {
-    fn from(character: Character) -> Self {
-        Self::Character(character)
-    }
-}
diff --git a/main_game_lib/src/top_down/actor/npc.rs b/main_game_lib/src/top_down/actor/npc.rs
index 47dec7c2..d12e8c21 100644
--- a/main_game_lib/src/top_down/actor/npc.rs
+++ b/main_game_lib/src/top_down/actor/npc.rs
@@ -19,7 +19,7 @@ use crate::{
     dialog::{self, StartDialogWhenLoaded},
     top_down::{
         inspect_and_interact::ReadyForInteraction, Actor, ActorTarget, Player,
-        TileMap, TopDownScene,
+        TileMap,
     },
 };
 
@@ -179,8 +179,8 @@ pub fn drive_behavior(
 /// If no path can be found, the planned path is set to an empty vector.
 ///
 /// Condition this to run only on new event.
-pub fn plan_path<T: TopDownScene>(
-    map: Res<TileMap<T>>,
+pub fn plan_path(
+    map: Res<TileMap>,
     mut events: EventReader<PlanPathEvent>,
 
     mut actors: Query<(Entity, &Actor, &mut NpcInTheMap)>,
@@ -209,8 +209,8 @@ pub fn plan_path<T: TopDownScene>(
 ///
 /// We only do this if the behavior tree is not paused.
 /// E.g. when the NPC enters a dialog, we don't want it to move.
-pub fn run_path<T: TopDownScene>(
-    map: Res<TileMap<T>>,
+pub fn run_path(
+    map: Res<TileMap>,
 
     mut actors: Query<
         (Entity, &mut Actor, &mut NpcInTheMap),
diff --git a/main_game_lib/src/top_down/actor/player.rs b/main_game_lib/src/top_down/actor/player.rs
index e68f36f9..6306e685 100644
--- a/main_game_lib/src/top_down/actor/player.rs
+++ b/main_game_lib/src/top_down/actor/player.rs
@@ -7,7 +7,7 @@ use common_ext::QueryExt;
 use leafwing_input_manager::action_state::ActionState;
 
 use super::{Actor, ActorTarget};
-use crate::top_down::layout::{TileMap, TopDownScene};
+use crate::top_down::layout::TileMap;
 
 /// The entity that the player controls.
 /// Bound it with [`Actor`] to allow movement.
@@ -23,8 +23,8 @@ pub struct Player;
 pub struct TakeAwayPlayerControl;
 
 /// Use keyboard to move around the player.
-pub fn move_around<T: TopDownScene>(
-    map: Res<TileMap<T>>,
+pub fn move_around(
+    map: Res<TileMap>,
     controls: Res<ActionState<GlobalAction>>,
 
     mut player: Query<
diff --git a/main_game_lib/src/top_down/environmental_objects/door.rs b/main_game_lib/src/top_down/environmental_objects/door.rs
index 0cfca075..05553f5d 100644
--- a/main_game_lib/src/top_down/environmental_objects/door.rs
+++ b/main_game_lib/src/top_down/environmental_objects/door.rs
@@ -10,7 +10,7 @@ use bevy_grid_squared::Square;
 use itertools::Itertools;
 use smallvec::SmallVec;
 
-use crate::top_down::{ActorMovementEvent, TileKind, TileMap, TopDownScene};
+use crate::top_down::{ActorMovementEvent, TileKind, TileMap};
 
 /// For [`Door`]
 pub struct DoorBuilder {
@@ -75,8 +75,8 @@ pub enum DoorOpenCriteria {
 ///
 /// Run this after the [`crate::top_down::actor::emit_movement_events`] system
 /// and only if there are events.
-pub fn toggle<T: TopDownScene>(
-    mut tilemap: ResMut<TileMap<T>>,
+pub fn toggle(
+    mut tilemap: ResMut<TileMap>,
     mut events: EventReader<ActorMovementEvent>,
 
     mut door: Query<(&mut Door, &mut TextureAtlas)>,
@@ -100,8 +100,8 @@ pub fn toggle<T: TopDownScene>(
 ///
 /// Optionally, the door can have an obstacle that's inserted into the map when
 /// the door is closed.
-fn apply_event_to_door_and_map<T: TopDownScene>(
-    tilemap: &mut ResMut<TileMap<T>>,
+fn apply_event_to_door_and_map(
+    tilemap: &mut ResMut<TileMap>,
     door: &mut Door,
     sprite: &mut Mut<'_, TextureAtlas>,
     event: &ActorMovementEvent,
@@ -217,10 +217,7 @@ impl DoorBuilder {
     /// If the door is closed, we insert a wall between the obstacle squares
     /// if set.
     #[must_use]
-    pub fn build_and_insert_obstacle<T: TopDownScene>(
-        self,
-        tilemap: &mut TileMap<T>,
-    ) -> Door {
+    pub fn build_and_insert_obstacle(self, tilemap: &mut TileMap) -> Door {
         let obstacle = self.obstacle.map(|(from, to)| {
             let layers = if matches!(self.initial_state, DoorState::Closed) {
                 bevy_grid_squared::shapes::rectangle_between(from, to)
diff --git a/main_game_lib/src/top_down/inspect_and_interact.rs b/main_game_lib/src/top_down/inspect_and_interact.rs
index 4170bc00..78c7511e 100644
--- a/main_game_lib/src/top_down/inspect_and_interact.rs
+++ b/main_game_lib/src/top_down/inspect_and_interact.rs
@@ -367,8 +367,6 @@ pub(crate) fn highlight_what_would_be_interacted_with(
         .insert(displayed);
 }
 
-/// This is registered in [`crate::top_down::default_setup_for_scene`].
-///
 /// Any logic that listens to [`ActionEvent`]s should be ordered _after_ this.
 pub fn interact(
     mut cmd: Commands,
diff --git a/main_game_lib/src/top_down/layout.rs b/main_game_lib/src/top_down/layout.rs
index b669ee04..642188cb 100644
--- a/main_game_lib/src/top_down/layout.rs
+++ b/main_game_lib/src/top_down/layout.rs
@@ -8,8 +8,6 @@ mod build_pathfinding_graph;
 pub(crate) mod map_maker;
 pub(crate) mod systems;
 
-use std::marker::PhantomData;
-
 use bevy::{
     asset::Asset,
     ecs::{entity::Entity, system::Resource},
@@ -40,13 +38,12 @@ pub type TileIndex = (Square, usize);
 
 /// Some map.
 pub trait TopDownScene: 'static + Send + Sync + TypePath + Default {
-    /// Alphabetical only name of the map.
-    fn name() -> &'static str;
+    //
 }
 
 /// Holds the tiles in a hash map.
 #[derive(Asset, Resource, Serialize, Deserialize, Reflect, Clone, Debug)]
-pub struct TileMap<T: TopDownScene> {
+pub struct TileMap {
     /// Size in number of tiles.
     /// `[left, right, bottom, top]`
     #[serde(default = "default_bounds")]
@@ -56,9 +53,6 @@ pub struct TileMap<T: TopDownScene> {
     zones: TileKindMetas,
     /// There can be multiple layers of tiles on a single square.
     pub(crate) squares: HashMap<Square, SmallVec<[TileKind; 3]>>,
-    #[serde(skip)]
-    #[reflect(ignore)]
-    _phantom: PhantomData<T>,
 }
 
 /// You can change these in the .ron file of the map if you need larger map.
@@ -221,7 +215,7 @@ impl TileKind {
     }
 }
 
-impl<T: TopDownScene> TileMap<T> {
+impl TileMap {
     /// Whether the given square is inside the map.
     #[inline]
     pub fn contains(&self, square: Square) -> bool {
@@ -435,7 +429,7 @@ impl<T: TopDownScene> TileMap<T> {
 }
 
 /// Pathfinding logic.
-impl<T: TopDownScene> TileMap<T> {
+impl TileMap {
     /// No matter how many layers there are, all tile kinds within a single
     /// square must belong to the same zone group.
     #[inline]
@@ -799,34 +793,24 @@ impl TileKindMetas {
     }
 }
 
+impl Default for TileMap {
+    fn default() -> Self {
+        Self {
+            bounds: default_bounds(),
+            zones: TileKindMetas::default(),
+            squares: HashMap::default(),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use bevy::utils::default;
     use bevy_grid_squared::sq;
     use smallvec::smallvec;
 
-    impl<T: TopDownScene> Default for TileMap<T> {
-        fn default() -> Self {
-            Self {
-                bounds: default_bounds(),
-                zones: TileKindMetas::default(),
-                squares: HashMap::default(),
-                _phantom: PhantomData,
-            }
-        }
-    }
-
     use super::*;
 
-    #[derive(Default, Reflect)]
-    struct TestScene;
-
-    impl TopDownScene for TestScene {
-        fn name() -> &'static str {
-            unreachable!()
-        }
-    }
-
     #[test]
     fn it_converts_tile_walk_cost_to_i32() {
         assert_eq!(TileWalkCost::Preferred as i32, 1);
@@ -839,7 +823,7 @@ mod tests {
         use TileWalkCost::*;
 
         let o = sq(0, 0);
-        let mut tilemap = TileMap::<TestScene>::default();
+        let mut tilemap = TileMap::default();
 
         // out of bounds returns none
         assert_eq!(tilemap.walk_cost(sq(-1001, 0), Entity::PLACEHOLDER), None);
@@ -880,7 +864,7 @@ mod tests {
 
     #[test]
     fn it_adds_tiles_to_first_empty_layer() {
-        let mut tilemap = TileMap::<TestScene>::default();
+        let mut tilemap = TileMap::default();
         let sq = sq(0, 0);
 
         assert_eq!(
@@ -904,7 +888,7 @@ mod tests {
 
     #[test]
     fn it_sets_tile_kind_layer() {
-        let mut tilemap = TileMap::<TestScene>::default();
+        let mut tilemap = TileMap::default();
         let sq = sq(0, 0);
 
         assert_eq!(
@@ -935,7 +919,7 @@ mod tests {
 
     #[test]
     fn it_doesnt_do_anything_outside_map_bounds() {
-        let mut tilemap = TileMap::<TestScene>::default();
+        let mut tilemap = TileMap::default();
 
         assert_eq!(
             tilemap.add_tile_to_first_empty_layer(sq(-1001, 0), TileKind::Wall),
@@ -955,15 +939,6 @@ mod tests {
         assert_eq!(std::mem::size_of_val(&square), 56);
     }
 
-    #[derive(Default, Reflect)]
-    struct DevMapTestScene;
-
-    impl TopDownScene for DevMapTestScene {
-        fn name() -> &'static str {
-            unreachable!()
-        }
-    }
-
     /// Test map such that:
     /// ```text
     ///  E<-D<-A=B<->C<->F->G
@@ -1138,8 +1113,7 @@ mod tests {
             (sq(-10, 25), sq(-5, 26), "Going from A to B", default()),
         ];
 
-        let tilemap: TileMap<DevMapTestScene> =
-            ron::de::from_str(DEV_MAP_TEST_RON).unwrap();
+        let tilemap: TileMap = ron::de::from_str(DEV_MAP_TEST_RON).unwrap();
 
         for (
             from,
@@ -1178,8 +1152,7 @@ mod tests {
 
     #[test]
     fn it_finds_path_from_each_square_to_every_other() {
-        let tilemap: TileMap<DevMapTestScene> =
-            ron::de::from_str(DEV_MAP_TEST_RON).unwrap();
+        let tilemap: TileMap = ron::de::from_str(DEV_MAP_TEST_RON).unwrap();
 
         let all_squares =
             || bevy_grid_squared::shapes::rectangle([-11, 0, 15, 28]);
@@ -1209,7 +1182,7 @@ mod tests {
     }
 
     fn search_for_partial_path(
-        tilemap: &TileMap<DevMapTestScene>,
+        tilemap: &TileMap,
         max_partial_steps: usize,
         from: Square,
         to: Square,
diff --git a/main_game_lib/src/top_down/layout/build_pathfinding_graph.rs b/main_game_lib/src/top_down/layout/build_pathfinding_graph.rs
index dee5dcc7..0f6a33d6 100644
--- a/main_game_lib/src/top_down/layout/build_pathfinding_graph.rs
+++ b/main_game_lib/src/top_down/layout/build_pathfinding_graph.rs
@@ -37,7 +37,7 @@ use graphviz_rust::{dot_generator::*, dot_structures::*};
 use itertools::Itertools;
 
 use super::{TileKindMeta, ZoneGroup};
-use crate::top_down::{TileKind, TileMap, TopDownScene};
+use crate::top_down::{TileKind, TileMap};
 
 /// Map of tile kind variant to those other variants (not including
 /// itself - proper supersets) whose instances fully contain it (the key.)
@@ -153,8 +153,8 @@ impl GraphExt for Graph {
 
 impl ZoneTileKindGraph {
     /// Find all relationships between the zone tile kind variants in the
-    /// tile map `T`.
-    pub(crate) fn compute_from<T: TopDownScene>(tilemap: &TileMap<T>) -> Self {
+    /// tile map.
+    pub(crate) fn compute_from(tilemap: &TileMap) -> Self {
         let mut compute_step = GraphComputeStep::default();
         loop {
             match compute_step.next_step(tilemap) {
@@ -466,10 +466,7 @@ impl std::fmt::Debug for ZoneTileKindGraph {
 }
 
 impl GraphComputeStep {
-    fn next_step<T: TopDownScene>(
-        self,
-        map: &TileMap<T>,
-    ) -> GraphComputeResult {
+    fn next_step(self, map: &TileMap) -> GraphComputeResult {
         let next_step = match self {
             Self::Supersets => Self::Subsets {
                 from_supersets: find_supersets(map),
@@ -525,7 +522,7 @@ impl GraphComputeStep {
 }
 
 /// Find which tiles are supersets of which.
-fn find_supersets<T: TopDownScene>(map: &TileMap<T>) -> SupersetsOf {
+fn find_supersets(map: &TileMap) -> SupersetsOf {
     let mut supersets_of: SupersetsOf = default();
     for tiles in map.squares().values() {
         let zones: HashSet<_> = get_zones(tiles).collect();
@@ -568,8 +565,8 @@ fn find_subsets(supersets_of: &SupersetsOf) -> SubsetsOf {
 
 /// Find which tiles overlap in the same square and are not supersets
 /// of each other
-fn find_overlaps<T: TopDownScene>(
-    map: &TileMap<T>,
+fn find_overlaps(
+    map: &TileMap,
     supersets_of: &SupersetsOf,
     subsets_of: &SubsetsOf,
 ) -> Overlaps {
@@ -600,8 +597,8 @@ fn find_overlaps<T: TopDownScene>(
 
 /// Check which non overlapping tiles are walkable neighbors but are not
 /// supersets of each other
-fn find_neighbors<T: TopDownScene>(
-    map: &TileMap<T>,
+fn find_neighbors(
+    map: &TileMap,
     supersets_of: &SupersetsOf,
     subsets_of: &SubsetsOf,
     overlaps: &Overlaps,
@@ -646,9 +643,7 @@ fn find_neighbors<T: TopDownScene>(
     neighbors
 }
 
-fn count_zone_sizes<T: TopDownScene>(
-    map: &TileMap<T>,
-) -> HashMap<TileKind, usize> {
+fn count_zone_sizes(map: &TileMap) -> HashMap<TileKind, usize> {
     map.squares()
         .values()
         .flat_map(|tiles| get_zones(tiles))
diff --git a/main_game_lib/src/top_down/layout/map_maker.rs b/main_game_lib/src/top_down/layout/map_maker.rs
index 2b9be362..58bfc8a1 100644
--- a/main_game_lib/src/top_down/layout/map_maker.rs
+++ b/main_game_lib/src/top_down/layout/map_maker.rs
@@ -18,7 +18,7 @@ use super::{
     build_pathfinding_graph::{GraphExt, ZoneTileKindGraph},
     TileKind, TileMap, LAYOUT,
 };
-use crate::{top_down::layout::TileKindMeta, TopDownScene};
+use crate::{top_down::layout::TileKindMeta, WhichTopDownScene};
 
 #[derive(Component)]
 pub(crate) struct SquareSprite(Square);
@@ -76,10 +76,11 @@ pub(crate) struct DebugLayoutGrid;
 /// Contains:
 /// 1. button to hide the grid with squares that show tile kinds
 /// 2. button to store the map into a file
-pub(crate) fn update_ui<T: TopDownScene>(
+pub(crate) fn update_ui(
     mut contexts: EguiContexts,
     mut toolbar: ResMut<TileMapMakerToolbar>,
-    map: Res<TileMap<T>>,
+    map: Res<TileMap>,
+    scene: Res<State<WhichTopDownScene>>,
 ) {
     let ctx = contexts.ctx_mut();
     bevy_egui::egui::Window::new("Map maker")
@@ -96,12 +97,12 @@ pub(crate) fn update_ui<T: TopDownScene>(
             // 2.
             //
             if ui.button("Store map").clicked() {
-                export_map::<T>(&mut toolbar, &map);
+                export_map(&mut toolbar, &map, **scene);
             }
         });
 }
 
-pub(crate) fn spawn_debug_grid_root<T: TopDownScene>(mut cmd: Commands) {
+pub(crate) fn spawn_debug_grid_root(mut cmd: Commands) {
     cmd.spawn((
         Name::new("Debug Layout Grid"),
         DebugLayoutGrid,
@@ -114,9 +115,9 @@ pub(crate) fn spawn_debug_grid_root<T: TopDownScene>(mut cmd: Commands) {
 
 /// We don't spawn and show all tiles because the map can be huge.
 /// So we get the cursor position and show the tiles around it only.
-pub(crate) fn show_tiles_around_cursor<T: TopDownScene>(
+pub(crate) fn show_tiles_around_cursor(
     mut cmd: Commands,
-    map: Res<TileMap<T>>,
+    map: Res<TileMap>,
     mut toolbar: ResMut<TileMapMakerToolbar>,
 
     windows: Query<&Window, With<PrimaryWindow>>,
@@ -182,7 +183,7 @@ pub(crate) fn show_tiles_around_cursor<T: TopDownScene>(
     }
 }
 
-pub(crate) fn destroy_map<T: TopDownScene>(
+pub(crate) fn destroy_map(
     mut cmd: Commands,
 
     grid: Query<Entity, With<DebugLayoutGrid>>,
@@ -191,9 +192,9 @@ pub(crate) fn destroy_map<T: TopDownScene>(
     cmd.remove_resource::<TileMapMakerToolbar>();
 }
 
-pub(crate) fn change_square_kind<T: TopDownScene>(
+pub(crate) fn change_square_kind(
     mouse: Res<ButtonInput<MouseButton>>,
-    mut map: ResMut<TileMap<T>>,
+    mut map: ResMut<TileMap>,
     mut toolbar: ResMut<TileMapMakerToolbar>,
     keyboard: Res<ButtonInput<KeyCode>>,
 
@@ -252,11 +253,7 @@ pub(crate) fn change_square_kind<T: TopDownScene>(
 }
 
 /// If a square can be painted, paint it.
-fn try_paint<T: TopDownScene>(
-    toolbar: &mut TileMapMakerToolbar,
-    map: &mut TileMap<T>,
-    at: Square,
-) {
+fn try_paint(toolbar: &mut TileMapMakerToolbar, map: &mut TileMap, at: Square) {
     if !map.contains(at) {
         return;
     }
@@ -281,8 +278,8 @@ fn try_paint<T: TopDownScene>(
     copy_entry[toolbar.layer] = toolbar.paint;
 }
 
-pub(crate) fn recolor_squares<T: TopDownScene>(
-    map: ResMut<TileMap<T>>,
+pub(crate) fn recolor_squares(
+    map: ResMut<TileMap>,
     toolbar: Res<TileMapMakerToolbar>,
 
     mut squares: Query<(&SquareSprite, &mut Sprite)>,
@@ -325,9 +322,10 @@ pub(crate) fn recolor_squares<T: TopDownScene>(
     }
 }
 
-fn export_map<T: TopDownScene>(
+fn export_map(
     toolbar: &mut TileMapMakerToolbar,
-    map: &TileMap<T>,
+    map: &TileMap,
+    scene: WhichTopDownScene,
 ) {
     if !toolbar.display_grid {
         return;
@@ -360,11 +358,10 @@ fn export_map<T: TopDownScene>(
         !tiles.is_empty()
     });
 
-    let g = ZoneTileKindGraph::compute_from(&TileMap::<T> {
+    let g = ZoneTileKindGraph::compute_from(&TileMap {
         bounds: map.bounds, // copy bounds info
         squares: toolbar.copy_of_map.clone(),
         zones: default(), // this field is being computed, we don't need it
-        _phantom: default(),
     });
     // metadata for pathfinding
     let zones = g.calculate_zone_tile_metadata();
@@ -389,8 +386,9 @@ fn export_map<T: TopDownScene>(
     };
 
     // for internal use only so who cares about unwraps and paths
+    let scene_name = scene.snake_case();
     std::fs::write(
-        format!("main_game/assets/maps/{}.ron", T::name()),
+        format!("main_game/assets/maps/{scene_name}.ron"),
         ron::ser::to_string_pretty(
             &tilemap_but_sorted,
             PrettyConfig::default()
@@ -403,15 +401,16 @@ fn export_map<T: TopDownScene>(
     )
     .unwrap();
 
-    let dot_g = g.as_dotgraph(T::name());
+    let dot_g = g.as_dotgraph(&scene_name);
     info!("Graphviz dot graph: \n{}", dot_g.as_dot());
 
-    let scene_path =
-        go_back_in_dir_tree_until_path_found(format!("scenes/{}", T::name()));
     match dot_g.into_svg() {
         Ok(svg) => {
-            fs::write(format!("{scene_path}/docs/tile-graph.svg"), svg)
-                .unwrap();
+            let assets_path = go_back_in_dir_tree_until_path_found(
+                "wiki/src/assets/scene-tile-graphs".to_string(),
+            );
+
+            fs::write(format!("{assets_path}/{scene_name}.svg"), svg).unwrap();
         }
         Err(e) => {
             error!("Could not generate svg from dot graph: {e}");
diff --git a/main_game_lib/src/top_down/layout/systems.rs b/main_game_lib/src/top_down/layout/systems.rs
index bdb04598..f042a074 100644
--- a/main_game_lib/src/top_down/layout/systems.rs
+++ b/main_game_lib/src/top_down/layout/systems.rs
@@ -3,15 +3,12 @@ use common_ext::QueryExt;
 
 #[cfg(feature = "devtools")]
 use crate::top_down::layout::map_maker;
-use crate::{
-    top_down::{TileMap, TopDownScene},
-    WhichTopDownScene,
-};
+use crate::{top_down::TileMap, WhichTopDownScene};
 
 /// Tells the game to start loading the map.
 /// We need to keep checking for this to be done by calling
 /// [`try_insert_map_as_resource`].
-pub(crate) fn start_loading_map<T: TopDownScene>(
+pub(crate) fn start_loading_map(
     mut cmd: Commands,
     assets: Res<AssetServer>,
     scene: Res<State<WhichTopDownScene>>,
@@ -19,7 +16,7 @@ pub(crate) fn start_loading_map<T: TopDownScene>(
     let scene_name = scene.snake_case();
     let asset_path = format!("maps/{scene_name}.ron");
     debug!("Loading map {scene_name} from {asset_path}");
-    let handle: Handle<TileMap<T>> = assets.load(asset_path);
+    let handle: Handle<TileMap> = assets.load(asset_path);
     cmd.spawn((Name::new(format!("TileMap for {scene_name}")), handle));
 }
 
@@ -29,10 +26,10 @@ pub(crate) fn start_loading_map<T: TopDownScene>(
 ///
 /// You should then check for the map as a resource in your systems and continue
 /// with your game.
-pub(crate) fn try_insert_map_as_resource<T: TopDownScene>(
+pub(crate) fn try_insert_map_as_resource(
     mut cmd: Commands,
-    mut map_assets: ResMut<Assets<TileMap<T>>>,
-    map: Query<(Entity, &Handle<TileMap<T>>)>,
+    mut map_assets: ResMut<Assets<TileMap>>,
+    map: Query<(Entity, &Handle<TileMap>)>,
 ) {
     let Some((entity, map)) = map.get_single_or_none() else {
         // if the map does no longer exist as a component handle, we either did
@@ -61,8 +58,8 @@ pub(crate) fn try_insert_map_as_resource<T: TopDownScene>(
     }
 }
 
-pub(crate) fn remove_resources<T: TopDownScene>(mut cmd: Commands) {
-    cmd.remove_resource::<TileMap<T>>();
+pub(crate) fn remove_resources(mut cmd: Commands) {
+    cmd.remove_resource::<TileMap>();
     cmd.remove_resource::<crate::top_down::actor::ActorZoneMap>();
 
     #[cfg(feature = "devtools")]
diff --git a/scenes/building1_basement1/docs/tile-graph.svg b/scenes/building1_basement1/docs/tile-graph.svg
deleted file mode 100644
index 1828765a..00000000
--- a/scenes/building1_basement1/docs/tile-graph.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_building1_basement1 Pages: 1 -->
-<svg width="624pt" height="184pt"
- viewBox="0.00 0.00 624.34 184.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 180)">
-<title>graph_building1_basement1</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-180 620.34,-180 620.34,4 -4,4"/>
-<g id="clust1" class="cluster">
-<title>cluster_upperapartmentwallhidden</title>
-<polygon fill="none" stroke="black" points="316.34,-8 316.34,-168 608.34,-168 608.34,-8 316.34,-8"/>
-</g>
-<!-- basementdoor -->
-<g id="node1" class="node">
-<title>basementdoor</title>
-<ellipse fill="none" stroke="black" cx="77.34" cy="-142" rx="77.19" ry="18"/>
-<text text-anchor="middle" x="77.34" y="-138.3" font-family="Times,serif" font-size="14.00">basementdoor</text>
-</g>
-<!-- elevator -->
-<g id="node2" class="node">
-<title>elevator</title>
-<ellipse fill="none" stroke="black" cx="239.34" cy="-142" rx="48.99" ry="18"/>
-<text text-anchor="middle" x="239.34" y="-138.3" font-family="Times,serif" font-size="14.00">elevator</text>
-</g>
-<!-- upperapartmentdoor -->
-<g id="node3" class="node">
-<title>upperapartmentdoor</title>
-<ellipse fill="none" stroke="black" cx="462.34" cy="-34" rx="107.78" ry="18"/>
-<text text-anchor="middle" x="462.34" y="-30.3" font-family="Times,serif" font-size="14.00">upperapartmentdoor</text>
-</g>
-<!-- upperapartmentwallhidden -->
-<g id="node4" class="node">
-<title>upperapartmentwallhidden</title>
-<ellipse fill="none" stroke="black" cx="462.34" cy="-142" rx="137.58" ry="18"/>
-<text text-anchor="middle" x="462.34" y="-138.3" font-family="Times,serif" font-size="14.00">upperapartmentwallhidden</text>
-</g>
-<!-- upperapartmentwallhidden&#45;&gt;upperapartmentdoor -->
-<g id="edge1" class="edge">
-<title>upperapartmentwallhidden&#45;&gt;upperapartmentdoor</title>
-<path fill="none" stroke="black" d="M462.34,-123.97C462.34,-107.38 462.34,-81.88 462.34,-62.43"/>
-<polygon fill="black" stroke="black" points="465.84,-62.34 462.34,-52.34 458.84,-62.34 465.84,-62.34"/>
-</g>
-</g>
-</svg>
diff --git a/scenes/building1_basement1/src/layout.rs b/scenes/building1_basement1/src/layout.rs
index ea1738ea..007254ac 100644
--- a/scenes/building1_basement1/src/layout.rs
+++ b/scenes/building1_basement1/src/layout.rs
@@ -42,7 +42,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Building1Basement1>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(
                     rscn::tscn_loaded_but_not_spawned::<Building1Basement1>(),
                 ),
@@ -50,10 +50,10 @@ impl bevy::app::Plugin for Plugin {
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
         .add_systems(
             Update,
-            environmental_objects::door::toggle::<Building1Basement1>
+            environmental_objects::door::toggle
                 .run_if(in_scene_running_state(THIS_SCENE))
                 .run_if(movement_event_emitted())
-                .after(actor::emit_movement_events::<Building1Basement1>),
+                .after(actor::emit_movement_events),
         )
         .add_systems(
             Update,
@@ -78,7 +78,7 @@ impl bevy::app::Plugin for Plugin {
             watch_entry_to_apartment::system
                 .run_if(in_scene_running_state(THIS_SCENE))
                 .run_if(movement_event_emitted())
-                .after(actor::emit_movement_events::<Building1Basement1>),
+                .after(actor::emit_movement_events),
         );
     }
 }
diff --git a/scenes/building1_basement1/src/lib.rs b/scenes/building1_basement1/src/lib.rs
index c16b0c3d..45c8f0bf 100644
--- a/scenes/building1_basement1/src/lib.rs
+++ b/scenes/building1_basement1/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Building1Basement1;
 
-impl TopDownScene for Building1Basement1 {
-    fn name() -> &'static str {
-        "building1_basement1"
+impl TopDownScene for Building1Basement1 {}
+
+impl main_game_lib::rscn::TscnInBevy for Building1Basement1 {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -34,13 +36,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<Building1Basement1Action>();
 
-    top_down::default_setup_for_scene::<Building1Basement1>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Building1Basement1>(
-        app, THIS_SCENE,
-    );
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -82,7 +77,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Building1Basement1>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/building1_basement2/docs/tile-graph.svg b/scenes/building1_basement2/docs/tile-graph.svg
deleted file mode 100644
index 2072bbb0..00000000
--- a/scenes/building1_basement2/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_building1_basement2 Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_building1_basement2</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/building1_basement2/src/layout.rs b/scenes/building1_basement2/src/layout.rs
index 452b0c5b..91ffb9c7 100644
--- a/scenes/building1_basement2/src/layout.rs
+++ b/scenes/building1_basement2/src/layout.rs
@@ -26,7 +26,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Building1Basement2>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(
                     rscn::tscn_loaded_but_not_spawned::<Building1Basement2>(),
                 ),
diff --git a/scenes/building1_basement2/src/lib.rs b/scenes/building1_basement2/src/lib.rs
index cad606b8..cf555866 100644
--- a/scenes/building1_basement2/src/lib.rs
+++ b/scenes/building1_basement2/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Building1Basement2;
 
-impl TopDownScene for Building1Basement2 {
-    fn name() -> &'static str {
-        "building1_basement2"
+impl TopDownScene for Building1Basement2 {}
+
+impl main_game_lib::rscn::TscnInBevy for Building1Basement2 {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,13 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<Building1Basement2Action>();
 
-    top_down::default_setup_for_scene::<Building1Basement2>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Building1Basement2>(
-        app, THIS_SCENE,
-    );
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -81,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Building1Basement2>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/building1_player_floor/src/actor.rs b/scenes/building1_player_floor/src/actor.rs
index dc52a861..b1f8c700 100644
--- a/scenes/building1_player_floor/src/actor.rs
+++ b/scenes/building1_player_floor/src/actor.rs
@@ -56,7 +56,7 @@ impl bevy::app::Plugin for Plugin {
             toggle_zone_hints
                 .run_if(movement_event_emitted())
                 .run_if(in_scene_running_state(THIS_SCENE))
-                .after(emit_movement_events::<Building1PlayerFloor>),
+                .after(emit_movement_events),
         );
     }
 }
diff --git a/scenes/building1_player_floor/src/layout.rs b/scenes/building1_player_floor/src/layout.rs
index 65102050..89429f84 100644
--- a/scenes/building1_player_floor/src/layout.rs
+++ b/scenes/building1_player_floor/src/layout.rs
@@ -40,7 +40,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Building1PlayerFloor>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<
                     Building1PlayerFloor,
                 >()),
@@ -50,11 +50,11 @@ impl bevy::app::Plugin for Plugin {
             Update,
             (
                 watch_entry_to_hallway::system,
-                environmental_objects::door::toggle::<Building1PlayerFloor>,
+                environmental_objects::door::toggle,
             )
                 .run_if(in_scene_running_state(THIS_SCENE))
                 .run_if(movement_event_emitted())
-                .after(actor::emit_movement_events::<Building1PlayerFloor>),
+                .after(actor::emit_movement_events),
         );
     }
 }
@@ -87,7 +87,7 @@ struct Spawner<'a> {
     asset_server: &'a AssetServer,
     atlases: &'a mut Assets<TextureAtlasLayout>,
     daybar_event: &'a mut Events<UpdateDayBarEvent>,
-    tilemap: &'a mut TileMap<Building1PlayerFloor>,
+    tilemap: &'a mut TileMap,
     zone_to_inspect_label_entity: &'a mut ZoneToInspectLabelEntity,
 }
 
@@ -99,7 +99,7 @@ fn spawn(
     asset_server: Res<AssetServer>,
     mut tscn: ResMut<Assets<TscnTree>>,
     mut atlas_layouts: ResMut<Assets<TextureAtlasLayout>>,
-    mut tilemap: ResMut<TileMap<Building1PlayerFloor>>,
+    mut tilemap: ResMut<TileMap>,
     mut daybar_event: ResMut<Events<UpdateDayBarEvent>>,
 
     mut q: Query<&mut TscnTreeHandle<Building1PlayerFloor>>,
diff --git a/scenes/building1_player_floor/src/layout/watch_entry_to_hallway.rs b/scenes/building1_player_floor/src/layout/watch_entry_to_hallway.rs
index e55335ee..b3ba096c 100644
--- a/scenes/building1_player_floor/src/layout/watch_entry_to_hallway.rs
+++ b/scenes/building1_player_floor/src/layout/watch_entry_to_hallway.rs
@@ -24,7 +24,7 @@ const HALLWAY_FADE_OUT_TRANSITION_DURATION: Duration = from_millis(1500);
 /// When an NPC leaves the hallway, remove the hallway component.
 pub(super) fn system(
     mut cmd: Commands,
-    tilemap: Res<TileMap<Building1PlayerFloor>>,
+    tilemap: Res<TileMap>,
     mut movement_events: EventReader<ActorMovementEvent>,
     mut lerp_event: EventWriter<BeginInterpolationEvent>,
 
@@ -127,7 +127,7 @@ fn on_player_left_hallway(
 }
 
 fn on_npc_entered_hallway(
-    tilemap: &TileMap<Building1PlayerFloor>,
+    tilemap: &TileMap,
     cmd: &mut Commands,
     lerp_event: &mut EventWriter<BeginInterpolationEvent>,
     player: &Query<&Actor, With<Player>>,
diff --git a/scenes/building1_player_floor/src/lib.rs b/scenes/building1_player_floor/src/lib.rs
index de339ee1..b3f4d3e3 100644
--- a/scenes/building1_player_floor/src/lib.rs
+++ b/scenes/building1_player_floor/src/lib.rs
@@ -19,9 +19,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Building1PlayerFloor;
 
-impl TopDownScene for Building1PlayerFloor {
-    fn name() -> &'static str {
-        "building1_player_floor"
+impl TopDownScene for Building1PlayerFloor {}
+
+impl main_game_lib::rscn::TscnInBevy for Building1PlayerFloor {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -38,13 +40,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<Building1PlayerFloorAction>();
 
-    top_down::default_setup_for_scene::<Building1PlayerFloor>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Building1PlayerFloor>(
-        app, THIS_SCENE,
-    );
-
     debug!("Adding plugins");
 
     app.add_plugins((layout::Plugin, actor::Plugin));
@@ -86,7 +81,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Building1PlayerFloor>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/clinic/docs/tile-graph.svg b/scenes/clinic/docs/tile-graph.svg
deleted file mode 100644
index ee994126..00000000
--- a/scenes/clinic/docs/tile-graph.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_clinic Pages: 1 -->
-<svg width="164pt" height="44pt"
- viewBox="0.00 0.00 164.44 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_clinic</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 160.44,-40 160.44,4 -4,4"/>
-<!-- door -->
-<g id="node1" class="node">
-<title>door</title>
-<ellipse fill="none" stroke="black" cx="31.85" cy="-18" rx="31.7" ry="18"/>
-<text text-anchor="middle" x="31.85" y="-14.3" font-family="Times,serif" font-size="14.00">door</text>
-</g>
-<!-- exit -->
-<g id="node2" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="127.85" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="127.85" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/clinic/src/layout.rs b/scenes/clinic/src/layout.rs
index 5454dacb..e5657db4 100644
--- a/scenes/clinic/src/layout.rs
+++ b/scenes/clinic/src/layout.rs
@@ -31,7 +31,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Clinic>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<Clinic>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
@@ -43,10 +43,10 @@ impl bevy::app::Plugin for Plugin {
         )
         .add_systems(
             Update,
-            environmental_objects::door::toggle::<Clinic>
+            environmental_objects::door::toggle
                 .run_if(in_scene_running_state(THIS_SCENE))
                 .run_if(movement_event_emitted())
-                .after(actor::emit_movement_events::<Clinic>),
+                .after(actor::emit_movement_events),
         );
     }
 }
diff --git a/scenes/clinic/src/lib.rs b/scenes/clinic/src/lib.rs
index 8b11aa53..22a66bc8 100644
--- a/scenes/clinic/src/lib.rs
+++ b/scenes/clinic/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Clinic;
 
-impl TopDownScene for Clinic {
-    fn name() -> &'static str {
-        "clinic"
+impl TopDownScene for Clinic {}
+
+impl main_game_lib::rscn::TscnInBevy for Clinic {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,11 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<ClinicAction>();
 
-    top_down::default_setup_for_scene::<Clinic>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Clinic>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -79,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Clinic>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/clinic_ward/docs/tile-graph.svg b/scenes/clinic_ward/docs/tile-graph.svg
deleted file mode 100644
index b8a68bac..00000000
--- a/scenes/clinic_ward/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_clinic_ward Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_clinic_ward</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/clinic_ward/src/layout.rs b/scenes/clinic_ward/src/layout.rs
index ae6ca1bd..9e541f97 100644
--- a/scenes/clinic_ward/src/layout.rs
+++ b/scenes/clinic_ward/src/layout.rs
@@ -25,7 +25,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<ClinicWard>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<ClinicWard>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/clinic_ward/src/lib.rs b/scenes/clinic_ward/src/lib.rs
index b5ff1b4a..b78dead8 100644
--- a/scenes/clinic_ward/src/lib.rs
+++ b/scenes/clinic_ward/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct ClinicWard;
 
-impl TopDownScene for ClinicWard {
-    fn name() -> &'static str {
-        "clinic_ward"
+impl TopDownScene for ClinicWard {}
+
+impl main_game_lib::rscn::TscnInBevy for ClinicWard {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,11 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<ClinicWardAction>();
 
-    top_down::default_setup_for_scene::<ClinicWard>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<ClinicWard>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -79,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<ClinicWard>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/compound/docs/tile-graph.svg b/scenes/compound/docs/tile-graph.svg
deleted file mode 100644
index 53549e90..00000000
--- a/scenes/compound/docs/tile-graph.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_compound Pages: 1 -->
-<svg width="360pt" height="44pt"
- viewBox="0.00 0.00 359.94 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_compound</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 355.94,-40 355.94,4 -4,4"/>
-<!-- towerentrance -->
-<g id="node1" class="node">
-<title>towerentrance</title>
-<ellipse fill="none" stroke="black" cx="78.64" cy="-18" rx="78.79" ry="18"/>
-<text text-anchor="middle" x="78.64" y="-14.3" font-family="Times,serif" font-size="14.00">towerentrance</text>
-</g>
-<!-- gotodowntown -->
-<g id="node2" class="node">
-<title>gotodowntown</title>
-<ellipse fill="none" stroke="black" cx="272.64" cy="-18" rx="79.09" ry="18"/>
-<text text-anchor="middle" x="272.64" y="-14.3" font-family="Times,serif" font-size="14.00">gotodowntown</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/compound/src/layout.rs b/scenes/compound/src/layout.rs
index 7906d673..3de03855 100644
--- a/scenes/compound/src/layout.rs
+++ b/scenes/compound/src/layout.rs
@@ -29,7 +29,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Compound>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<Compound>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/compound/src/lib.rs b/scenes/compound/src/lib.rs
index 98ffec2a..79254e24 100644
--- a/scenes/compound/src/lib.rs
+++ b/scenes/compound/src/lib.rs
@@ -18,9 +18,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Compound;
 
-impl TopDownScene for Compound {
-    fn name() -> &'static str {
-        "compound"
+impl TopDownScene for Compound {}
+
+impl main_game_lib::rscn::TscnInBevy for Compound {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -35,11 +37,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<CompoundAction>();
 
-    top_down::default_setup_for_scene::<Compound>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Compound>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -81,7 +78,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Compound>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/compound_tower/docs/tile-graph.svg b/scenes/compound_tower/docs/tile-graph.svg
deleted file mode 100644
index 13973152..00000000
--- a/scenes/compound_tower/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_compound_tower Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_compound_tower</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/compound_tower/src/layout.rs b/scenes/compound_tower/src/layout.rs
index afb694dc..61db993c 100644
--- a/scenes/compound_tower/src/layout.rs
+++ b/scenes/compound_tower/src/layout.rs
@@ -25,7 +25,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<CompoundTower>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<CompoundTower>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/compound_tower/src/lib.rs b/scenes/compound_tower/src/lib.rs
index e70878f9..8ff28432 100644
--- a/scenes/compound_tower/src/lib.rs
+++ b/scenes/compound_tower/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct CompoundTower;
 
-impl TopDownScene for CompoundTower {
-    fn name() -> &'static str {
-        "compound_tower"
+impl TopDownScene for CompoundTower {}
+
+impl main_game_lib::rscn::TscnInBevy for CompoundTower {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,11 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<CompoundTowerAction>();
 
-    top_down::default_setup_for_scene::<CompoundTower>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<CompoundTower>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -79,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<CompoundTower>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/downtown/src/layout.rs b/scenes/downtown/src/layout.rs
index 2fc6d94f..7d5238b7 100644
--- a/scenes/downtown/src/layout.rs
+++ b/scenes/downtown/src/layout.rs
@@ -40,7 +40,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Downtown>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(any_with_component::<MainCamera>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<Downtown>()),
         )
diff --git a/scenes/downtown/src/lib.rs b/scenes/downtown/src/lib.rs
index 0f4ba24d..d3d16a98 100644
--- a/scenes/downtown/src/lib.rs
+++ b/scenes/downtown/src/lib.rs
@@ -15,9 +15,11 @@ use prelude::*;
 #[derive(TypePath, Default)]
 pub(crate) struct Downtown;
 
-impl TopDownScene for Downtown {
-    fn name() -> &'static str {
-        "downtown"
+impl TopDownScene for Downtown {}
+
+impl main_game_lib::rscn::TscnInBevy for Downtown {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -38,11 +40,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<DowntownAction>();
 
-    top_down::default_setup_for_scene::<Downtown>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Downtown>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -83,7 +80,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Downtown>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/mall/src/layout.rs b/scenes/mall/src/layout.rs
index 8bb6636f..7dabf819 100644
--- a/scenes/mall/src/layout.rs
+++ b/scenes/mall/src/layout.rs
@@ -33,7 +33,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Mall>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<Mall>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/mall/src/lib.rs b/scenes/mall/src/lib.rs
index 13be1131..1b0b56e7 100644
--- a/scenes/mall/src/lib.rs
+++ b/scenes/mall/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Mall;
 
-impl TopDownScene for Mall {
-    fn name() -> &'static str {
-        "mall"
+impl TopDownScene for Mall {}
+
+impl main_game_lib::rscn::TscnInBevy for Mall {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -34,11 +36,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<MallAction>();
 
-    top_down::default_setup_for_scene::<Mall>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Mall>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -80,7 +77,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Mall>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/plant_shop/docs/tile-graph.svg b/scenes/plant_shop/docs/tile-graph.svg
deleted file mode 100644
index b527a2aa..00000000
--- a/scenes/plant_shop/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_plant_shop Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_plant_shop</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/plant_shop/src/layout.rs b/scenes/plant_shop/src/layout.rs
index 8b9f6f59..55a30ecb 100644
--- a/scenes/plant_shop/src/layout.rs
+++ b/scenes/plant_shop/src/layout.rs
@@ -25,7 +25,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<PlantShop>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<PlantShop>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/plant_shop/src/lib.rs b/scenes/plant_shop/src/lib.rs
index acda8a46..238272a9 100644
--- a/scenes/plant_shop/src/lib.rs
+++ b/scenes/plant_shop/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct PlantShop;
 
-impl TopDownScene for PlantShop {
-    fn name() -> &'static str {
-        "plant_shop"
+impl TopDownScene for PlantShop {}
+
+impl main_game_lib::rscn::TscnInBevy for PlantShop {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,11 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<PlantShopAction>();
 
-    top_down::default_setup_for_scene::<PlantShop>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<PlantShop>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -79,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<PlantShop>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/sewers/docs/tile-graph.svg b/scenes/sewers/docs/tile-graph.svg
deleted file mode 100644
index 9282912a..00000000
--- a/scenes/sewers/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_sewers Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_sewers</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/sewers/src/layout.rs b/scenes/sewers/src/layout.rs
index 5c8c49ca..ed13e0a5 100644
--- a/scenes/sewers/src/layout.rs
+++ b/scenes/sewers/src/layout.rs
@@ -25,7 +25,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<Sewers>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(rscn::tscn_loaded_but_not_spawned::<Sewers>()),
         )
         .add_systems(OnExit(THIS_SCENE.leaving()), despawn)
diff --git a/scenes/sewers/src/lib.rs b/scenes/sewers/src/lib.rs
index ddb68936..2cbb8075 100644
--- a/scenes/sewers/src/lib.rs
+++ b/scenes/sewers/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct Sewers;
 
-impl TopDownScene for Sewers {
-    fn name() -> &'static str {
-        "sewers"
+impl TopDownScene for Sewers {}
+
+impl main_game_lib::rscn::TscnInBevy for Sewers {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,11 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<SewersAction>();
 
-    top_down::default_setup_for_scene::<Sewers>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<Sewers>(app, THIS_SCENE);
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -79,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<Sewers>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/twinpeaks_apartment/docs/tile-graph.svg b/scenes/twinpeaks_apartment/docs/tile-graph.svg
deleted file mode 100644
index 5d17759e..00000000
--- a/scenes/twinpeaks_apartment/docs/tile-graph.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: graph_twinpeaks_apartment Pages: 1 -->
-<svg width="65pt" height="44pt"
- viewBox="0.00 0.00 65.19 44.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 40)">
-<title>graph_twinpeaks_apartment</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-40 61.19,-40 61.19,4 -4,4"/>
-<!-- exit -->
-<g id="node1" class="node">
-<title>exit</title>
-<ellipse fill="none" stroke="black" cx="28.6" cy="-18" rx="28.7" ry="18"/>
-<text text-anchor="middle" x="28.6" y="-14.3" font-family="Times,serif" font-size="14.00">exit</text>
-</g>
-</g>
-</svg>
diff --git a/scenes/twinpeaks_apartment/src/layout.rs b/scenes/twinpeaks_apartment/src/layout.rs
index 34f9a8e7..4b2cb06f 100644
--- a/scenes/twinpeaks_apartment/src/layout.rs
+++ b/scenes/twinpeaks_apartment/src/layout.rs
@@ -25,7 +25,7 @@ impl bevy::app::Plugin for Plugin {
             Update,
             spawn
                 .run_if(in_scene_loading_state(THIS_SCENE))
-                .run_if(resource_exists::<TileMap<TwinpeaksApartment>>)
+                .run_if(resource_exists::<TileMap>)
                 .run_if(
                     rscn::tscn_loaded_but_not_spawned::<TwinpeaksApartment>(),
                 ),
diff --git a/scenes/twinpeaks_apartment/src/lib.rs b/scenes/twinpeaks_apartment/src/lib.rs
index ce503227..37b487ab 100644
--- a/scenes/twinpeaks_apartment/src/lib.rs
+++ b/scenes/twinpeaks_apartment/src/lib.rs
@@ -17,9 +17,11 @@ use crate::layout::LayoutEntity;
 #[derive(TypePath, Default, Debug)]
 pub struct TwinpeaksApartment;
 
-impl TopDownScene for TwinpeaksApartment {
-    fn name() -> &'static str {
-        "twinpeaks_apartment"
+impl TopDownScene for TwinpeaksApartment {}
+
+impl main_game_lib::rscn::TscnInBevy for TwinpeaksApartment {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", THIS_SCENE.snake_case())
     }
 }
 
@@ -33,13 +35,6 @@ pub fn add(app: &mut App) {
 
     app.add_event::<TwinpeaksApartmentAction>();
 
-    top_down::default_setup_for_scene::<TwinpeaksApartment>(app, THIS_SCENE);
-
-    #[cfg(feature = "devtools")]
-    top_down::dev_default_setup_for_scene::<TwinpeaksApartment>(
-        app, THIS_SCENE,
-    );
-
     debug!("Adding plugins");
 
     app.add_plugins(layout::Plugin);
@@ -81,7 +76,7 @@ pub fn add(app: &mut App) {
 
 fn finish_when_everything_loaded(
     mut next_loading_state: ResMut<NextState<LoadingScreenState>>,
-    map: Option<Res<top_down::TileMap<TwinpeaksApartment>>>,
+    map: Option<Res<top_down::TileMap>>,
 ) {
     if map.is_none() {
         return;
diff --git a/scenes/building1_player_floor/docs/tile-graph.svg b/wiki/src/assets/scene-tile-graphs/building1_player_floor.svg
similarity index 100%
rename from scenes/building1_player_floor/docs/tile-graph.svg
rename to wiki/src/assets/scene-tile-graphs/building1_player_floor.svg
diff --git a/scenes/downtown/docs/tile-graph.svg b/wiki/src/assets/scene-tile-graphs/downtown.svg
similarity index 100%
rename from scenes/downtown/docs/tile-graph.svg
rename to wiki/src/assets/scene-tile-graphs/downtown.svg
diff --git a/scenes/mall/docs/tile-graph.svg b/wiki/src/assets/scene-tile-graphs/mall.svg
similarity index 100%
rename from scenes/mall/docs/tile-graph.svg
rename to wiki/src/assets/scene-tile-graphs/mall.svg