diff --git a/3D/Maps/Factory4.map b/3D/Maps/Factory4.map
index fbba2889..18b9d7ec 100644
--- a/3D/Maps/Factory4.map
+++ b/3D/Maps/Factory4.map
@@ -2562,31 +2562,17 @@
 }
 // entity 108
 {
-"classname" "marker_spawn_enemy"
-"origin" "164 64 22"
-"resource_path" "res://Resources/Enemies/Fairy_Guard_3D.tres"
-}
-// entity 109
-{
-"classname" "marker_spawn_enemy"
-"origin" "48 128 26"
-"resource_path" "res://Resources/Enemies/Fairy_Guard_3D.tres"
-"autospawn" "0"
-"targetname" "camera_1"
-}
-// entity 110
-{
 "classname" "marker_spawn_item"
 "origin" "-40 -28 30"
 "resource_path" "res://Resources/Items/IcicleRepeater.tres"
 }
-// entity 111
+// entity 109
 {
 "classname" "marker_spawn_item"
 "origin" "-40 -40 30"
 "resource_path" "res://Resources/Items/Ammo1.tres"
 }
-// entity 112
+// entity 110
 {
 "classname" "trigger_area"
 "target" "door_intro"
@@ -2601,26 +2587,20 @@
 ( 96 28 20 ) ( 96 28 21 ) ( 96 29 20 ) special/trigger [ 0 1 0 4 ] [ 0 0 -1 0 ] 90 1 1
 }
 }
-// entity 113
+// entity 111
 {
 "classname" "actor_keypad"
 "origin" "152 -56 32"
 "angles" "0 90 0"
 }
-// entity 114
-{
-"classname" "marker_spawn_enemy"
-"origin" "132 144 22"
-"resource_path" "res://Resources/Enemies/Fairy_Guard_3D.tres"
-}
-// entity 115
+// entity 112
 {
 "classname" "actor_door_1"
 "origin" "-312 324 72"
 "angles" "0 90 0"
 "targetname" "door_3"
 }
-// entity 116
+// entity 113
 {
 "classname" "acid_area"
 // brush 0
@@ -2660,7 +2640,7 @@
 ( -264 184 40 ) ( -264 184 41 ) ( -264 185 40 ) special/clip [ 0 -1 0 -8 ] [ 0 0 -1 0 ] 90 1 1
 }
 }
-// entity 117
+// entity 114
 {
 "classname" "actor_emitter_floor"
 "origin" "-220 220 60"
@@ -2670,7 +2650,7 @@
 "targetname" "danmaku_room_1"
 "indestructible" "1"
 }
-// entity 118
+// entity 115
 {
 "classname" "trigger_area"
 "target" "danmaku_room_1"
@@ -2685,7 +2665,7 @@
 ( -288 312 64 ) ( -288 312 65 ) ( -288 313 64 ) special/trigger [ 0 1 0 8 ] [ 0 0 -1 0 ] 270 1 1
 }
 }
-// entity 119
+// entity 116
 {
 "classname" "actor_emitter_floor"
 "origin" "-348 220 60"
@@ -2695,234 +2675,235 @@
 "targetname" "danmaku_room_1"
 "indestructible" "1"
 }
-// entity 120
+// entity 117
 {
 "classname" "actor_stairs_mini"
 "origin" "-448 264 60"
 "angles" "0 90 0"
 }
-// entity 121
+// entity 118
 {
 "classname" "actor_stairs_mini"
 "origin" "-432 264 60"
 "angles" "0 90 0"
 }
-// entity 122
+// entity 119
 {
 "classname" "actor_stairs_mini"
 "origin" "-432 176 60"
 "angles" "0 -90 0"
 }
-// entity 123
+// entity 120
 {
 "classname" "actor_stairs_mini"
 "origin" "-448 176 60"
 "angles" "0 -90 0"
 }
-// entity 124
+// entity 121
 {
 "classname" "actor_door_1"
 "origin" "-216 116 72"
 "angles" "0 90 0"
 }
-// entity 125
+// entity 122
 {
 "classname" "actor_door_1"
 "origin" "-100 168 72"
 "targetname" "door_5"
 }
-// entity 126
+// entity 123
 {
 "classname" "actor_switch"
 "origin" "-252 120 76"
 "angles" "0 90 0"
 }
-// entity 127
+// entity 124
 {
 "classname" "actor_controlpad"
 "origin" "-96 304 72"
 "target" "door_2"
 }
-// entity 128
+// entity 125
 {
 "classname" "actor_controlpad"
 "origin" "-292 328 72"
 "angles" "0 90 0"
 "target" "door_3"
 }
-// entity 129
+// entity 126
 {
 "classname" "actor_controlpad"
 "origin" "-152 164 72"
 "target" "door_5"
 }
-// entity 130
+// entity 127
 {
 "classname" "actor_securitycamera"
 "origin" "-272 24 76"
 }
-// entity 131
+// entity 128
 {
 "classname" "actor_box_red"
 "origin" "-216 24 60"
 }
-// entity 132
+// entity 129
 {
 "classname" "actor_box_blue_tall"
 "origin" "-172 28 65"
 }
-// entity 133
+// entity 130
 {
 "classname" "actor_box_blue_tall"
 "origin" "-256 80 65"
 }
-// entity 134
+// entity 131
 {
 "classname" "actor_box_green"
 "origin" "-192 44 60"
 }
-// entity 135
+// entity 132
 {
 "classname" "actor_box_blue"
 "origin" "-192 8 60"
 }
-// entity 136
+// entity 133
 {
 "classname" "actor_box_blue"
 "origin" "-192 24 60"
 }
-// entity 137
+// entity 134
 {
 "classname" "actor_table"
 "origin" "-156 12 60"
 }
-// entity 138
+// entity 135
 {
 "classname" "actor_table"
 "origin" "-140 12 60"
 }
-// entity 139
+// entity 136
 {
 "classname" "actor_table"
 "origin" "-124 12 60"
 }
-// entity 140
+// entity 137
 {
 "classname" "actor_box_wood"
 "origin" "-152 36 60"
 "angles" "0 90 0"
 }
-// entity 141
+// entity 138
 {
 "classname" "actor_box_wood"
 "origin" "-136 36 60"
 "angles" "0 90 0"
 }
-// entity 142
+// entity 139
 {
 "classname" "actor_box_wood"
 "origin" "-128 48 60"
 "angles" "0 90 0"
 }
-// entity 143
+// entity 140
 {
 "classname" "actor_box_wood"
 "origin" "-120 36 60"
 "angles" "0 90 0"
 }
-// entity 144
+// entity 141
 {
 "classname" "actor_box_wood"
 "origin" "-144 48 60"
 "angles" "0 90 0"
 }
-// entity 145
+// entity 142
 {
 "classname" "actor_locker"
 "origin" "-268 0 68"
 }
-// entity 146
+// entity 143
 {
 "classname" "actor_teleporter"
 "origin" "-240 0 57"
 }
-// entity 147
+// entity 144
 {
 "classname" "actor_tank_standalone"
 "origin" "-400 128 64"
 }
-// entity 148
+// entity 145
 {
 "classname" "actor_tank_standalone"
 "origin" "-416 128 64"
 }
-// entity 149
+// entity 146
 {
 "classname" "actor_tank_standalone"
 "origin" "-432 128 64"
 }
-// entity 150
+// entity 147
 {
 "classname" "actor_tank_standalone"
 "origin" "-448 128 64"
 }
-// entity 151
+// entity 148
 {
 "classname" "actor_tank_standalone"
 "origin" "-464 128 64"
 }
-// entity 152
+// entity 149
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 128 80"
 }
-// entity 153
+// entity 150
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 160 80"
 }
-// entity 154
+// entity 151
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 192 80"
 }
-// entity 155
+// entity 152
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 240 80"
 }
-// entity 156
+// entity 153
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 272 80"
 }
-// entity 157
+// entity 154
 {
 "classname" "actor_tube_straight_long"
 "origin" "-464 304 80"
 }
-// entity 158
+// entity 155
 {
 "classname" "actor_tube_straight"
 "origin" "-464 216 80"
 }
-// entity 159
+// entity 156
 {
 "classname" "marker_spawn_enemy"
 "origin" "124 272 22"
 "resource_path" "res://Resources/Enemies/Fairy_Guard_3D.tres"
+"targetname" "room_1"
 }
-// entity 160
+// entity 157
 {
 "classname" "actor_box_blue_tall"
 "origin" "176 8 25"
 }
-// entity 161
+// entity 158
 {
 "classname" "actor_box_blue_tall"
 "origin" "176 48 25"
 }
-// entity 162
+// entity 159
 {
 "classname" "solid_bullet_permeable"
 // brush 0
@@ -2935,7 +2916,7 @@
 ( 184 16 16 ) ( 184 16 17 ) ( 184 17 16 ) Various/Various3 [ 6.123233995736766e-17 1 0 4 ] [ 0 0 -1 8 ] 270 1 1
 }
 }
-// entity 163
+// entity 160
 {
 "classname" "solid_bullet_permeable"
 // brush 0
@@ -2948,3 +2929,58 @@
 ( 184 36 16 ) ( 184 36 17 ) ( 184 37 16 ) Various/Various3 [ 6.123233995736766e-17 1 0 0 ] [ 0 0 -1 8 ] 180 1 1
 }
 }
+// entity 161
+{
+"classname" "marker_spawn_enemy_fairy_guard"
+"origin" "164 136 22"
+}
+// entity 162
+{
+"classname" "marker_spawn_enemy_fairy_guard"
+"origin" "168 72 22"
+}
+// entity 163
+{
+"classname" "marker_spawn_enemy_fairy_guard"
+"origin" "132 188 22"
+}
+// entity 164
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "56 172 22"
+}
+// entity 165
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "132 232 22"
+}
+// entity 166
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "84 272 62"
+}
+// entity 167
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "-76 220 62"
+}
+// entity 168
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "-188 364 62"
+}
+// entity 169
+{
+"classname" "marker_spawn_enemy_fairy_small"
+"origin" "-260 396 62"
+}
+// entity 170
+{
+"classname" "marker_spawn_enemy_fairy_guard"
+"origin" "-140 388 62"
+}
+// entity 171
+{
+"classname" "marker_spawn_enemy_fairy_guard"
+"origin" "48 128 22"
+}
diff --git a/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres b/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres
new file mode 100644
index 00000000..40674fb8
--- /dev/null
+++ b/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres
@@ -0,0 +1,23 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDBaseClass" load_steps=4 format=3 uid="uid://cwrcrupms7h4d"]
+
+[ext_resource type="Script" uid="uid://ck575aqs1sbrb" path="res://addons/func_godot/src/fgd/func_godot_fgd_base_class.gd" id="1_5bcmp"]
+[ext_resource type="Resource" uid="uid://5bc1qysixhmh" path="res://3D/TrenchBroom/EntityDefinitions/base/actor_base.tres" id="1_f3dmh"]
+[ext_resource type="Resource" uid="uid://c1utxplehq2jl" path="res://3D/TrenchBroom/EntityDefinitions/base/targetname_base.tres" id="2_foxys"]
+
+[resource]
+script = ExtResource("1_5bcmp")
+classname = "Enemy"
+base_classes = Array[Resource]([ExtResource("1_f3dmh"), ExtResource("2_foxys")])
+class_properties = {
+"autospawn": true,
+"respource_path": ""
+}
+class_property_descriptions = {
+"autospawn": "Whether to spawn automatically or not",
+"resource_path": "Path to the enemy resource"
+}
+meta_properties = {
+"color": Color(0.91852677, 0.5792049, 0.5792049, 1),
+"size": AABB(-4, -4, 6, 4, 4, 6)
+}
+metadata/_custom_type_script = "uid://ck575aqs1sbrb"
diff --git a/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres
index 6cbcc148..49d91879 100644
--- a/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres
+++ b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres
@@ -1,7 +1,6 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDPointClass" load_steps=5 format=3 uid="uid://cd8kf5wey5n8n"]
+[gd_resource type="Resource" script_class="FuncGodotFGDPointClass" load_steps=4 format=3 uid="uid://cd8kf5wey5n8n"]
 
-[ext_resource type="Resource" uid="uid://5bc1qysixhmh" path="res://3D/TrenchBroom/EntityDefinitions/base/actor_base.tres" id="1_yd0db"]
-[ext_resource type="Resource" uid="uid://c1utxplehq2jl" path="res://3D/TrenchBroom/EntityDefinitions/base/targetname_base.tres" id="2_yd0db"]
+[ext_resource type="Resource" uid="uid://cwrcrupms7h4d" path="res://3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres" id="1_nx3pd"]
 [ext_resource type="Script" uid="uid://cxsqwtsqd8w33" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class.gd" id="3_rwtar"]
 [ext_resource type="Script" uid="uid://00rbjdb4mnb0" path="res://Scripts/Actors/EnemyMarker3D.cs" id="4_7cqxf"]
 
@@ -12,15 +11,7 @@ apply_rotation_on_map_build = false
 apply_scale_on_map_build = false
 classname = "marker_spawn_enemy"
 description = "Enemy Spawn Marker"
-base_classes = Array[Resource]([ExtResource("1_yd0db"), ExtResource("2_yd0db")])
-class_properties = {
-"autospawn": true,
-"resource_path": ""
-}
-class_property_descriptions = {
-"autospawn": "Whether to spawn automatically or not",
-"resource_path": "Path to the enemy resource"
-}
+base_classes = Array[Resource]([ExtResource("1_nx3pd")])
 meta_properties = {
 "color": Color(0.9229911, 0.41614023, 0.21117541, 1),
 "size": AABB(-4, -4, -6, 4, 4, 6)
diff --git a/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_basefairy.tres b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_guard.tres
similarity index 65%
rename from 3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_basefairy.tres
rename to 3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_guard.tres
index 5b12c965..38232966 100644
--- a/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_basefairy.tres
+++ b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_guard.tres
@@ -1,7 +1,6 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDPointClass" load_steps=5 format=3 uid="uid://cp6w7rgfgtxlk"]
+[gd_resource type="Resource" script_class="FuncGodotFGDPointClass" load_steps=4 format=3 uid="uid://cp6w7rgfgtxlk"]
 
-[ext_resource type="Resource" uid="uid://5bc1qysixhmh" path="res://3D/TrenchBroom/EntityDefinitions/base/actor_base.tres" id="1_4w7c8"]
-[ext_resource type="Resource" uid="uid://kerywjgft7vh" path="res://3D/TrenchBroom/EntityDefinitions/base/target_base.tres" id="2_4yeye"]
+[ext_resource type="Resource" uid="uid://cwrcrupms7h4d" path="res://3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres" id="1_4w7c8"]
 [ext_resource type="Script" uid="uid://cxsqwtsqd8w33" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class.gd" id="2_8rpcj"]
 [ext_resource type="Script" uid="uid://00rbjdb4mnb0" path="res://Scripts/Actors/EnemyMarker3D.cs" id="3_4yeye"]
 
@@ -12,17 +11,16 @@ apply_rotation_on_map_build = false
 apply_scale_on_map_build = false
 classname = "marker_spawn_enemy_fairy_guard"
 description = "Fairy Guard Spawn Marker"
-base_classes = Array[Resource]([ExtResource("1_4w7c8"), ExtResource("2_4yeye")])
+base_classes = Array[Resource]([ExtResource("1_4w7c8")])
 class_properties = {
-"autospawn": true,
 "resource_path": "res://Resources/Enemies/Fairy_Guard_3D.tres"
 }
 class_property_descriptions = {
-"autospawn": "Whether to spawn automatically or not",
 "resource_path": "Path to the enemy resource"
 }
 meta_properties = {
 "color": Color(0.9229911, 0.41614023, 0.21117541, 1),
+"model": "{ \"path\": \"textures\\Markers\\FairyGuard.png\", \"scale\": 1 }",
 "size": AABB(-4, -4, -6, 4, 4, 6)
 }
 node_class = "Marker3D"
diff --git a/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_small.tres b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_small.tres
new file mode 100644
index 00000000..d2c9c94c
--- /dev/null
+++ b/3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_small.tres
@@ -0,0 +1,24 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDPointClass" load_steps=4 format=3 uid="uid://dxpm148kxfaqp"]
+
+[ext_resource type="Resource" uid="uid://cwrcrupms7h4d" path="res://3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres" id="1_p3l7c"]
+[ext_resource type="Script" uid="uid://cxsqwtsqd8w33" path="res://addons/func_godot/src/fgd/func_godot_fgd_point_class.gd" id="2_660wb"]
+[ext_resource type="Script" uid="uid://00rbjdb4mnb0" path="res://Scripts/Actors/EnemyMarker3D.cs" id="3_gywpy"]
+
+[resource]
+script = ExtResource("2_660wb")
+script_class = ExtResource("3_gywpy")
+apply_rotation_on_map_build = false
+apply_scale_on_map_build = false
+classname = "marker_spawn_enemy_fairy_small"
+description = "Small Fairy Spawn Marker"
+base_classes = Array[Resource]([ExtResource("1_p3l7c")])
+class_properties = {
+"resource_path": "res://Resources/Enemies/Base_Fairy_3D.tres"
+}
+meta_properties = {
+"color": Color(0.9229911, 0.41614023, 0.21117541, 1),
+"model": "{ \"path\": \"textures\\Markers\\FairySmall.png\", \"scale\": 1 }",
+"size": AABB(-4, -4, -6, 4, 4, 6)
+}
+node_class = "Marker3D"
+metadata/_custom_type_script = "uid://cxsqwtsqd8w33"
diff --git a/3D/TrenchBroom/fgd_base.tres b/3D/TrenchBroom/fgd_base.tres
index a8a506b7..43ce81be 100644
--- a/3D/TrenchBroom/fgd_base.tres
+++ b/3D/TrenchBroom/fgd_base.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=16 format=3 uid="uid://onsfttdpojex"]
+[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=17 format=3 uid="uid://onsfttdpojex"]
 
 [ext_resource type="Resource" uid="uid://kerywjgft7vh" path="res://3D/TrenchBroom/EntityDefinitions/base/target_base.tres" id="1_abw2p"]
 [ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_p3xok"]
@@ -15,7 +15,8 @@
 [ext_resource type="Resource" uid="uid://cy0telb0x1l4k" path="res://3D/TrenchBroom/EntityDefinitions/base/Script_path.tres" id="12_ueg06"]
 [ext_resource type="Resource" uid="uid://0u5qbphjq045" path="res://3D/TrenchBroom/EntityDefinitions/base/emitter_base.tres" id="13_hm8wc"]
 [ext_resource type="Resource" uid="uid://bpdbncl6tswbj" path="res://3D/TrenchBroom/EntityDefinitions/base/activation_counts_base.tres" id="14_hblj5"]
+[ext_resource type="Resource" uid="uid://cwrcrupms7h4d" path="res://3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres" id="15_y0q5l"]
 
 [resource]
 script = ExtResource("1_p3xok")
-entity_definitions = Array[Resource]([ExtResource("1_abw2p"), ExtResource("2_entxp"), ExtResource("1_wfoxw"), ExtResource("5_mkw5g"), ExtResource("2_abw2p"), ExtResource("6_1xsdl"), ExtResource("7_2isdf"), ExtResource("8_2isdf"), ExtResource("9_htav4"), ExtResource("10_vqlk3"), ExtResource("11_pydck"), ExtResource("12_ueg06"), ExtResource("13_hm8wc"), ExtResource("14_hblj5")])
+entity_definitions = Array[Resource]([ExtResource("1_abw2p"), ExtResource("2_entxp"), ExtResource("1_wfoxw"), ExtResource("5_mkw5g"), ExtResource("2_abw2p"), ExtResource("6_1xsdl"), ExtResource("7_2isdf"), ExtResource("8_2isdf"), ExtResource("9_htav4"), ExtResource("10_vqlk3"), ExtResource("11_pydck"), ExtResource("12_ueg06"), ExtResource("13_hm8wc"), ExtResource("14_hblj5"), ExtResource("15_y0q5l")])
diff --git a/3D/TrenchBroom/fgd_enemies.tres b/3D/TrenchBroom/fgd_enemies.tres
new file mode 100644
index 00000000..3e3e7394
--- /dev/null
+++ b/3D/TrenchBroom/fgd_enemies.tres
@@ -0,0 +1,11 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=5 format=3 uid="uid://orkweel5r31c"]
+
+[ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_3d3gq"]
+[ext_resource type="Resource" uid="uid://cd8kf5wey5n8n" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres" id="1_6m3ln"]
+[ext_resource type="Resource" uid="uid://cp6w7rgfgtxlk" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_guard.tres" id="2_lpp7a"]
+[ext_resource type="Resource" uid="uid://dxpm148kxfaqp" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy_fairy_small.tres" id="3_tge2p"]
+
+[resource]
+script = ExtResource("1_3d3gq")
+entity_definitions = Array[Resource]([ExtResource("1_6m3ln"), ExtResource("2_lpp7a"), ExtResource("3_tge2p")])
+metadata/_custom_type_script = "uid://drlmgulwbjwqu"
diff --git a/3D/TrenchBroom/fgd_items.tres b/3D/TrenchBroom/fgd_items.tres
new file mode 100644
index 00000000..5013d188
--- /dev/null
+++ b/3D/TrenchBroom/fgd_items.tres
@@ -0,0 +1,9 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=3 format=3 uid="uid://m6ei61ol3htg"]
+
+[ext_resource type="Resource" uid="uid://n7nb0h11j0nh" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/ItemSpawners/marker_spawn_item.tres" id="1_1p0ll"]
+[ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_8tjb5"]
+
+[resource]
+script = ExtResource("1_8tjb5")
+entity_definitions = Array[Resource]([ExtResource("1_1p0ll")])
+metadata/_custom_type_script = "uid://drlmgulwbjwqu"
diff --git a/3D/TrenchBroom/fgd_main.tres b/3D/TrenchBroom/fgd_main.tres
index 31ebf165..dc286a3b 100644
--- a/3D/TrenchBroom/fgd_main.tres
+++ b/3D/TrenchBroom/fgd_main.tres
@@ -1,14 +1,16 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=8 format=3 uid="uid://cxqi6r6nblcn3"]
+[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=10 format=3 uid="uid://cxqi6r6nblcn3"]
 
 [ext_resource type="Resource" uid="uid://nayxb8n7see2" path="res://addons/func_godot/fgd/phong_base.tres" id="1_24lxq"]
 [ext_resource type="Resource" uid="uid://onsfttdpojex" path="res://3D/TrenchBroom/fgd_base.tres" id="1_dlwdq"]
 [ext_resource type="Resource" uid="uid://dgkdkac8ppgnq" path="res://3D/TrenchBroom/fgd_solid.tres" id="2_bci5m"]
 [ext_resource type="Resource" uid="uid://b700sa4be6dfa" path="res://3D/TrenchBroom/fgd_point.tres" id="3_0gbih"]
+[ext_resource type="Resource" uid="uid://orkweel5r31c" path="res://3D/TrenchBroom/fgd_enemies.tres" id="4_bci5m"]
+[ext_resource type="Resource" uid="uid://m6ei61ol3htg" path="res://3D/TrenchBroom/fgd_items.tres" id="5_0gbih"]
 [ext_resource type="Resource" uid="uid://b2cwp7m1sekps" path="res://3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres" id="5_6tkjn"]
 [ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="6_24lxq"]
 [ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="7_m2ebq"]
 
 [resource]
 script = ExtResource("7_m2ebq")
-base_fgd_files = Array[Resource]([ExtResource("1_dlwdq"), ExtResource("2_bci5m"), ExtResource("3_0gbih")])
+base_fgd_files = Array[Resource]([ExtResource("1_dlwdq"), ExtResource("2_bci5m"), ExtResource("3_0gbih"), ExtResource("4_bci5m"), ExtResource("5_0gbih")])
 entity_definitions = Array[Resource]([ExtResource("1_24lxq"), ExtResource("5_6tkjn"), ExtResource("6_24lxq")])
diff --git a/3D/TrenchBroom/fgd_point.tres b/3D/TrenchBroom/fgd_point.tres
index d1d4c807..2eb8e61e 100644
--- a/3D/TrenchBroom/fgd_point.tres
+++ b/3D/TrenchBroom/fgd_point.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=56 format=3 uid="uid://b700sa4be6dfa"]
+[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=54 format=3 uid="uid://b700sa4be6dfa"]
 
 [ext_resource type="Resource" uid="uid://ia1t5p4mhom3" path="res://3D/TrenchBroom/EntityDefinitions/point/lights/light_omni.tres" id="1_7vcj1"]
 [ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_lykim"]
@@ -52,10 +52,8 @@
 [ext_resource type="Resource" uid="uid://umbceo5tcxni" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_chair.tres" id="49_8hbdx"]
 [ext_resource type="Resource" uid="uid://bhkn5vwemx7nk" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_box_blue_tall.tres" id="50_xpy40"]
 [ext_resource type="Resource" uid="uid://cmdgqpq5e1duq" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/marker_spawn.tres" id="51_mwau1"]
-[ext_resource type="Resource" uid="uid://cd8kf5wey5n8n" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/EnemySpawners/marker_spawn_enemy.tres" id="52_v4gel"]
-[ext_resource type="Resource" uid="uid://n7nb0h11j0nh" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/ItemSpawners/marker_spawn_item.tres" id="53_k53o0"]
 [ext_resource type="Resource" uid="uid://cuhhjj6kx74i0" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_switch.tres" id="54_k53o0"]
 
 [resource]
 script = ExtResource("1_lykim")
-entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8"), ExtResource("20_3v5us"), ExtResource("21_g67cj"), ExtResource("22_iy67w"), ExtResource("23_b5lmu"), ExtResource("24_ndas4"), ExtResource("25_n7wsi"), ExtResource("26_v48k5"), ExtResource("27_ombvk"), ExtResource("28_31lma"), ExtResource("29_louv0"), ExtResource("30_wfgfu"), ExtResource("31_elv2e"), ExtResource("32_elv2e"), ExtResource("33_aawmv"), ExtResource("34_wy0ht"), ExtResource("35_3jqmy"), ExtResource("36_p5b6l"), ExtResource("37_53o7h"), ExtResource("38_mdgca"), ExtResource("39_d6b4f"), ExtResource("40_l3pck"), ExtResource("41_q8hab"), ExtResource("42_ekplg"), ExtResource("43_d7qk0"), ExtResource("44_k6g2u"), ExtResource("45_b4ckg"), ExtResource("46_dyoc0"), ExtResource("47_pa845"), ExtResource("48_lb3ub"), ExtResource("49_8hbdx"), ExtResource("50_xpy40"), ExtResource("51_mwau1"), ExtResource("52_v4gel"), ExtResource("53_k53o0"), ExtResource("54_k53o0")])
+entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8"), ExtResource("20_3v5us"), ExtResource("21_g67cj"), ExtResource("22_iy67w"), ExtResource("23_b5lmu"), ExtResource("24_ndas4"), ExtResource("25_n7wsi"), ExtResource("26_v48k5"), ExtResource("27_ombvk"), ExtResource("28_31lma"), ExtResource("29_louv0"), ExtResource("30_wfgfu"), ExtResource("31_elv2e"), ExtResource("32_elv2e"), ExtResource("33_aawmv"), ExtResource("34_wy0ht"), ExtResource("35_3jqmy"), ExtResource("36_p5b6l"), ExtResource("37_53o7h"), ExtResource("38_mdgca"), ExtResource("39_d6b4f"), ExtResource("40_l3pck"), ExtResource("41_q8hab"), ExtResource("42_ekplg"), ExtResource("43_d7qk0"), ExtResource("44_k6g2u"), ExtResource("45_b4ckg"), ExtResource("46_dyoc0"), ExtResource("47_pa845"), ExtResource("48_lb3ub"), ExtResource("49_8hbdx"), ExtResource("50_xpy40"), ExtResource("51_mwau1"), ExtResource("54_k53o0")])
diff --git a/IsoTest/Factory4.tscn b/IsoTest/Factory4.tscn
index f5c08f1d..7b58097b 100644
--- a/IsoTest/Factory4.tscn
+++ b/IsoTest/Factory4.tscn
@@ -2596,36 +2596,21 @@ shape = SubResource("ConvexPolygonShape3D_f66vw")
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 1.0625, 3)
 MapId = &""
 
-[node name="entity_105_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 1.375, 10.25)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="entity_106_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1.625, 3)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-TargetName = &"camera_1"
-Billboard = true
-
-[node name="entity_107_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"]
+[node name="entity_105_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75, 1.875, -2.5)
 script = ExtResource("81_uulpl")
 Item = ExtResource("82_67tii")
 AutoSpawn = true
 Billboard = true
 
-[node name="entity_108_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"]
+[node name="entity_106_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 1.875, -2.5)
 script = ExtResource("81_uulpl")
 Item = ExtResource("83_iwq7w")
 AutoSpawn = true
 Billboard = true
 
-[node name="entity_109_trigger_area" type="Area3D" parent="FuncGodotMap"]
+[node name="entity_107_trigger_area" type="Area3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.375, 4)
 collision_layer = 4
 collision_mask = 2
@@ -2634,52 +2619,44 @@ script = ExtResource("84_iwq7w")
 Target = "door_intro"
 ActivationType = 5
 
-[node name="entity_109_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_109_trigger_area"]
+[node name="entity_107_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_107_trigger_area"]
 shape = SubResource("ConvexPolygonShape3D_32yyg")
 
-[node name="entity_110_actor_keypad" parent="FuncGodotMap" node_paths=PackedStringArray("Targets") instance=ExtResource("85_k53eg")]
+[node name="entity_108_actor_keypad" parent="FuncGodotMap" node_paths=PackedStringArray("Targets") instance=ExtResource("85_k53eg")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, -3.5, 2, 9.5)
 Targets = Array[ExtResource("66_bk01g")]([])
 RequirementKeys = Array[StringName]([&"BLUE_KEY"])
 
-[node name="entity_111_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 1.375, 8.25)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="entity_112_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
+[node name="entity_109_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 20.25, 4.5, -19.5)
 GroupName = "door_3"
 
-[node name="entity_113_acid_area" type="Area3D" parent="FuncGodotMap" groups=["Acid"]]
+[node name="entity_110_acid_area" type="Area3D" parent="FuncGodotMap" groups=["Acid"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.75, 2.25, -19.75)
 collision_layer = 256
 collision_mask = 2
 script = ExtResource("89_82p5w")
 
-[node name="entity_113_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_110_acid_area"]
 cast_shadow = 0
 mesh = SubResource("ArrayMesh_bux3k")
 
-[node name="entity_113_occluder_instance" type="OccluderInstance3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_occluder_instance" type="OccluderInstance3D" parent="FuncGodotMap/entity_110_acid_area"]
 occluder = SubResource("ArrayOccluder3D_qotpt")
 
-[node name="entity_113_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"]
 shape = SubResource("ConvexPolygonShape3D_cjtkw")
 
-[node name="entity_113_brush_1_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_brush_1_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"]
 shape = SubResource("ConvexPolygonShape3D_t0qbk")
 
-[node name="entity_113_brush_2_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_brush_2_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"]
 shape = SubResource("ConvexPolygonShape3D_6e6fe")
 
-[node name="entity_113_brush_3_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_113_acid_area"]
+[node name="entity_110_brush_3_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"]
 shape = SubResource("ConvexPolygonShape3D_cqyqj")
 
-[node name="entity_114_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")]
+[node name="entity_111_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.75, 3.75, -13.75)
 Script = ExtResource("91_tfdl3")
 ActivationGroup = "danmaku_room_1"
@@ -2687,7 +2664,7 @@ EmitOnStart = false
 Indestructible = true
 Health = 5.0
 
-[node name="entity_115_trigger_area" type="Area3D" parent="FuncGodotMap"]
+[node name="entity_112_trigger_area" type="Area3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5, 3.75, -19.25)
 collision_layer = 4
 collision_mask = 2
@@ -2696,10 +2673,10 @@ script = ExtResource("84_iwq7w")
 Target = "danmaku_room_1"
 ActivationType = 1
 
-[node name="entity_115_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_115_trigger_area"]
+[node name="entity_112_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_112_trigger_area"]
 shape = SubResource("ConvexPolygonShape3D_jkqpx")
 
-[node name="entity_116_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")]
+[node name="entity_113_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.75, 3.75, -21.75)
 Script = ExtResource("91_tfdl3")
 ActivationGroup = "danmaku_room_1"
@@ -2707,246 +2684,286 @@ EmitOnStart = false
 Indestructible = true
 Health = 5.0
 
-[node name="entity_117_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
+[node name="entity_114_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 16.5, 3.75, -28)
 
-[node name="entity_118_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
+[node name="entity_115_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 16.5, 3.75, -27)
 
-[node name="entity_119_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
+[node name="entity_116_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 11, 3.75, -27)
 
-[node name="entity_120_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
+[node name="entity_117_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 11, 3.75, -28)
 
-[node name="entity_121_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
+[node name="entity_118_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 7.25, 4.5, -13.5)
 
-[node name="entity_122_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
+[node name="entity_119_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10.5, 4.5, -6.25)
 GroupName = "door_5"
 
-[node name="entity_123_actor_switch" parent="FuncGodotMap" instance=ExtResource("93_82p5w")]
+[node name="entity_120_actor_switch" parent="FuncGodotMap" instance=ExtResource("93_82p5w")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 7.5, 4.75, -15.75)
 ActivationType = 6
 
-[node name="entity_124_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
+[node name="entity_121_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19, 4.5, -6)
 TargetGroup = "door_2"
 ActivationType = 6
 
-[node name="entity_125_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
+[node name="entity_122_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 20.5, 4.5, -18.25)
 TargetGroup = "door_3"
 ActivationType = 6
 
-[node name="entity_126_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
+[node name="entity_123_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10.25, 4.5, -9.5)
 TargetGroup = "door_5"
 ActivationType = 6
 
-[node name="entity_127_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")]
+[node name="entity_124_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 4.75, -17)
 ActivationType = 6
 DamageResistances = Array[ExtResource("66_bk01g")]([])
 ActivationType = 6
 
-[node name="entity_128_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")]
+[node name="entity_125_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 3.75, -13.5)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_129_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
+[node name="entity_126_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 4.0625, -10.75)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_130_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
+[node name="entity_127_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.0625, -16)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_131_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")]
+[node name="entity_128_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.75, 3.75, -12)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_132_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")]
+[node name="entity_129_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 3.75, -12)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_133_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")]
+[node name="entity_130_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 3.75, -12)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_134_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
+[node name="entity_131_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -9.75)
 
-[node name="entity_135_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
+[node name="entity_132_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -8.75)
 
-[node name="entity_136_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
+[node name="entity_133_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -7.75)
 
-[node name="entity_137_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
+[node name="entity_134_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -9.5)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_138_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
+[node name="entity_135_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -8.5)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_139_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
+[node name="entity_136_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -8)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_140_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
+[node name="entity_137_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -7.5)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_141_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
+[node name="entity_138_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")]
 transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -9)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_142_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")]
+[node name="entity_139_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 4.25, -16.75)
 
-[node name="entity_143_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")]
+[node name="entity_140_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 3.5625, -15)
 
-[node name="entity_144_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
+[node name="entity_141_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -25)
 
-[node name="entity_145_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
+[node name="entity_142_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -26)
 
-[node name="entity_146_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
+[node name="entity_143_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -27)
 
-[node name="entity_147_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
+[node name="entity_144_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -28)
 
-[node name="entity_148_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
+[node name="entity_145_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -29)
 
-[node name="entity_149_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_146_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 5, -29)
 
-[node name="entity_150_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_147_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10, 5, -29)
 
-[node name="entity_151_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_148_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 12, 5, -29)
 
-[node name="entity_152_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_149_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 15, 5, -29)
 
-[node name="entity_153_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_150_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 17, 5, -29)
 
-[node name="entity_154_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
+[node name="entity_151_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19, 5, -29)
 
-[node name="entity_155_actor_tube_straight" parent="FuncGodotMap" instance=ExtResource("62_qopdo")]
+[node name="entity_152_actor_tube_straight" parent="FuncGodotMap" instance=ExtResource("62_qopdo")]
 transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.5, 5, -29)
 
-[node name="entity_156_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"]
+[node name="entity_153_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 1.375, 7.75)
 script = ExtResource("73_xhmq5")
 Enemy = ExtResource("74_4mxrl")
 AutoSpawn = true
-TargetName = &""
+TargetName = &"room_1"
 Billboard = true
 
-[node name="entity_157_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
+[node name="entity_154_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.5625, 11)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_158_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
+[node name="entity_155_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 1.5625, 11)
 Health = 10.0
 ActivationType = 6
 
-[node name="entity_159_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"]
+[node name="entity_156_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.125, 1.375, 10.75)
 collision_layer = 512
 collision_mask = 0
 
-[node name="entity_159_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_159_solid_bullet_permeable"]
+[node name="entity_156_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"]
 mesh = SubResource("ArrayMesh_wef30")
 
-[node name="entity_159_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_159_solid_bullet_permeable"]
+[node name="entity_156_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"]
 shape = SubResource("ConvexPolygonShape3D_qqk3g")
 
-[node name="entity_160_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"]
+[node name="entity_157_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.375, 1.375, 10.75)
 collision_layer = 512
 collision_mask = 0
 
-[node name="entity_160_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_160_solid_bullet_permeable"]
+[node name="entity_157_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_157_solid_bullet_permeable"]
 mesh = SubResource("ArrayMesh_jglqp")
 
-[node name="entity_160_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_160_solid_bullet_permeable"]
+[node name="entity_157_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_157_solid_bullet_permeable"]
 shape = SubResource("ConvexPolygonShape3D_5qvsf")
 
+[node name="entity_158_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.5, 1.375, 10.25)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("74_4mxrl")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_159_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 1.375, 10.5)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("74_4mxrl")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_160_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.75, 1.375, 8.25)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("74_4mxrl")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_161_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.75, 1.375, 3.5)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_162_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.5, 1.375, 8.25)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_163_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 3.875, 5.25)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_164_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.75, 3.875, -4.75)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_165_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.75, 3.875, -11.75)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_166_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.75, 3.875, -16.25)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("75_4t1lx")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_167_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.25, 3.875, -8.75)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("74_4mxrl")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
+[node name="entity_168_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1.375, 3)
+script = ExtResource("73_xhmq5")
+Enemy = ExtResource("74_4mxrl")
+AutoSpawn = true
+TargetName = &""
+Billboard = true
+
 [node name="Enemies" type="Node3D" parent="."]
 
-[node name="Enemy_Fairy_Guard11" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.026825, 1.4493392, 5.8330383)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="Enemy_Fairy_Guard12" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.026825, 4.050047, 5.8330383)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="Enemy_Fairy_Guard10" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.988495, 1.4493392, 14.407257)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("74_4mxrl")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="Enemy_Fairy_Guard13" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.099335, 1.4493392, 4.3889465)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("75_4t1lx")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="Enemy_Fairy_Guard14" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.138214, 1.4493392, 10.834625)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("75_4t1lx")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
-[node name="Enemy_Fairy_Guard15" type="Marker3D" parent="Enemies"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.185516, 1.4493392, -0.13192749)
-script = ExtResource("73_xhmq5")
-Enemy = ExtResource("75_4t1lx")
-AutoSpawn = true
-TargetName = &""
-Billboard = true
-
 [node name="Items" type="Node3D" parent="."]
 
 [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
diff --git a/textures/Markers/.gdignore b/textures/Markers/.gdignore
new file mode 100644
index 00000000..e69de29b
diff --git a/textures/Markers/FairyGuard.png b/textures/Markers/FairyGuard.png
new file mode 100644
index 00000000..32b06bd5
--- /dev/null
+++ b/textures/Markers/FairyGuard.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d2230b5f17059dbc2e5a4e342241c3007fadf497e0a35201fa60662d42679d
+size 317
diff --git a/textures/Markers/FairySmall.png b/textures/Markers/FairySmall.png
new file mode 100644
index 00000000..40aa5848
--- /dev/null
+++ b/textures/Markers/FairySmall.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:088853909c8c5a01a78ae7d2a155f5c6698f24eea4cf62f409ef6aaf048bd807
+size 268
diff --git a/textures/Markers/Light.png b/textures/Markers/Light.png
new file mode 100644
index 00000000..0e4c0ce1
--- /dev/null
+++ b/textures/Markers/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d63ebd7b1c937bdeebb4c2e0977d6c129c4e4556ba1d5bd4da362f497a39d60
+size 161
diff --git a/textures/Markers/chair.png b/textures/Markers/chair.png
new file mode 100644
index 00000000..e563be00
--- /dev/null
+++ b/textures/Markers/chair.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:caba2f5a8213fecef9f973486d95557176143ff1ef3817c364c6109e5a809fe9
+size 184