diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm
index 47cc22dae5e1..772561dbf4a6 100644
--- a/code/_globalvars/lists/mapping_globals.dm
+++ b/code/_globalvars/lists/mapping_globals.dm
@@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(teleporter_landmarks)
 
 GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST))
 GLOBAL_LIST_EMPTY(nightmare_landmarks)
+GLOBAL_LIST_EMPTY(nightmare_landmark_tags_removed)
 
 GLOBAL_LIST_EMPTY(ship_areas)
 
diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
index a7afb80ef080..bf3b952edcf5 100644
--- a/code/game/objects/effects/landmarks/landmarks.dm
+++ b/code/game/objects/effects/landmarks/landmarks.dm
@@ -90,9 +90,11 @@
 		return
 	GLOB.nightmare_landmarks[insert_tag] = get_turf(src)
 /obj/effect/landmark/nightmare/Destroy()
-	if(insert_tag && autoremove \
-	   && GLOB.nightmare_landmarks[insert_tag] == get_turf(src))
-		GLOB.nightmare_landmarks.Remove(insert_tag)
+	if(insert_tag)
+		var/turf/turf = get_turf(src)
+		if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf)
+			GLOB.nightmare_landmarks.Remove(insert_tag)
+		GLOB.nightmare_landmark_tags_removed += insert_tag
 	return ..()
 
 /obj/effect/landmark/ert_spawns/distress
diff --git a/code/modules/nightmare/nmnodes/mapload.dm b/code/modules/nightmare/nmnodes/mapload.dm
index 4b9ae2a3014b..0687399a6612 100644
--- a/code/modules/nightmare/nmnodes/mapload.dm
+++ b/code/modules/nightmare/nmnodes/mapload.dm
@@ -94,7 +94,7 @@
 	. = ..()
 	if(!.) return
 	var/dir_path = context.get_file_path(filepath, "map")
-	var/regex/matcher = new(@"^([0-9]+)([\.\+])([^_]+)(_.*)?\.dmm$", "i")
+	var/regex/matcher = new(@"^([0-9]+)([\.\+])(([^_]+)(_.*))?\.dmm$", "i")
 	var/list/dircontents = flist(dir_path)
 	for(var/filename in dircontents)
 		if(!matcher.Find(filename))
diff --git a/code/modules/nightmare/nmtasks/mapload.dm b/code/modules/nightmare/nmtasks/mapload.dm
index d53b5663197d..a49bbbabdde5 100644
--- a/code/modules/nightmare/nmtasks/mapload.dm
+++ b/code/modules/nightmare/nmtasks/mapload.dm
@@ -34,16 +34,13 @@
 /datum/nmtask/mapload/proc/step_parse()
 	. = TRUE
 	if(!fexists(filepath))
-		log_debug("Nightmare Mapload: File does not exist: [filepath]")
-		return
+		CRASH("Nightmare Mapload: File does not exist: [filepath]")
 	if(!parsed)
 		parsed = new(file(filepath))
 		if(!parsed?.bounds)
-			log_debug("Nightmare Mapload: File loading failed: [filepath]")
-			return
+			CRASH("Nightmare Mapload: File loading failed: [filepath]")
 		if(isnull(parsed.bounds[1]))
-			log_debug("Nightmare Mapload: Map parsing failed: [filepath]")
-			return
+			CRASH("Nightmare Mapload: Map parsing failed: [filepath]")
 	return FALSE
 
 /datum/nmtask/mapload/proc/step_loadmap(list/statsmap)
@@ -51,19 +48,21 @@
 	UNTIL(!Master.map_loading)
 	target_turf = GLOB.nightmare_landmarks[landmark]
 	if(!target_turf?.z)
-		log_debug("Nightmare Mapload: Could not find landmark: [landmark]")
-		return
+		if(landmark in GLOB.nightmare_landmark_tags_removed)
+			log_debug("Nightmare Mapload: Could not find landmark: [landmark] because it was deleted")
+			return
+		else
+			CRASH("Nightmare Mapload: Could not find landmark: [landmark]")
 	var/result = parsed.load(target_turf.x, target_turf.y, target_turf.z, crop_map = TRUE, no_changeturf = FALSE, place_on_top = FALSE, delete = replace)
 	if(!result || !parsed.bounds)
-		log_debug("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]")
-		return
+		CRASH("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]")
 	return FALSE
 
 /datum/nmtask/mapload/proc/step_init(list/statsmap)
 	if(initialize_boundary_contents())
 		log_debug("Nightmare Mapload: Loaded '[filepath]' at '[landmark]' ([target_turf.x], [target_turf.y], [target_turf.z])")
 		return FALSE
-	log_debug("Nightmare Mapload: Loaded map file but could not initialize: '[filepath]' at ([target_turf.x], [target_turf.y], [target_turf.z])")
+	stack_trace("Nightmare Mapload: Loaded map file but could not initialize: '[filepath]' at ([target_turf.x], [target_turf.y], [target_turf.z])")
 	return TRUE
 
 /// Initialize atoms/areas in bounds - basically a Nightmare version of [/datum/map_template/initTemplateBounds]
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 26b6d156f840..b605e7115c10 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -12602,7 +12602,7 @@
 /area/bigredv2/outside/office_complex)
 "aLh" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1north"
+	insert_tag = "lz1north_mining"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -27195,6 +27195,12 @@
 	icon_state = "red"
 	},
 /area/bigredv2/outside/marshal_office)
+"cGv" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "containerroom_xenos"
+	},
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/outside/nw/ceiling)
 "cGQ" = (
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/floor{
@@ -28358,7 +28364,7 @@
 /area/bigredv2/outside/dorms)
 "ers" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "etatunnel"
+	insert_tag = "etatunnel_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -28711,7 +28717,7 @@
 /area/bigredv2/caves/mining)
 "eUT" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro-rock"
+	insert_tag = "viro-rock_open"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/virology)
@@ -31090,7 +31096,7 @@
 /area/bigredv2/outside/space_port_lz2)
 "iIp" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "chapel"
+	insert_tag = "chapel_cult"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/chapel)
@@ -31315,7 +31321,7 @@
 /area/bigredv2/caves/mining)
 "jcn" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "tcomms"
+	insert_tag = "tcomms_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -31467,7 +31473,7 @@
 	dir = 5
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "dorms"
+	insert_tag = "dorms_party"
 	},
 /turf/open/floor,
 /area/bigredv2/outside/dorms)
@@ -33265,7 +33271,7 @@
 /area/bigredv2/caves/mining)
 "lMt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cargo"
+	insert_tag = "cargo_containers"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/cargo)
@@ -33280,7 +33286,7 @@
 /area/bigredv2/caves_lambda)
 "lMB" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1cave"
+	insert_tag = "lz1cave_flank"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -34454,7 +34460,7 @@
 /area/bigredv2/outside/filtration_cave_cas)
 "nGt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "admin"
+	insert_tag = "admin_pmc"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/admin_building)
@@ -35469,7 +35475,7 @@
 /area/bigredv2/outside/admin_building)
 "pdN" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1entrance"
+	insert_tag = "lz1entrance_v2"
 	},
 /turf/open/mars,
 /area/bigredv2/outside/nw)
@@ -36590,7 +36596,7 @@
 /area/bigredv2/caves/mining)
 "qTu" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro"
+	insert_tag = "viro_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -36927,7 +36933,7 @@
 /area/bigredv2/caves/mining)
 "rrl" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "filtration"
+	insert_tag = "filtration_restored"
 	},
 /turf/open/mars_cave{
 	icon_state = "mars_cave_2"
@@ -38943,7 +38949,7 @@
 /area/bigredv2/caves/mining)
 "tYM" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "prison"
+	insert_tag = "prison_breakout"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/marshal_office)
@@ -39277,7 +39283,7 @@
 /area/bigredv2/caves/mining)
 "uCD" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "reactor"
+	insert_tag = "reactor_meltdown"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -39883,7 +39889,7 @@
 /area/bigredv2/caves/eta/research)
 "vvi" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1containers"
+	insert_tag = "lz1containers_scramble"
 	},
 /turf/open/floor{
 	dir = 4;
@@ -41717,7 +41723,7 @@
 /area/bigredv2/outside/n)
 "yfe" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "eta"
+	insert_tag = "eta_carp"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves/eta/xenobiology)
@@ -49956,7 +49962,7 @@ axv
 anp
 anp
 anp
-anp
+cGv
 ajx
 ajY
 akK
diff --git a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
index 6aa3dfd2cfc2..bfce848e5656 100644
--- a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
+++ b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
@@ -36,12 +36,8 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/nw)
 "i" = (
-/obj/structure/machinery/light{
-	dir = 1;
-	icon_state = "tube1"
-	},
-/turf/open/floor/plating,
-/area/bigredv2/outside/nw)
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/outside/telecomm/warehouse)
 "j" = (
 /turf/open/floor/plating,
 /area/bigredv2/outside/nw)
@@ -130,6 +126,84 @@
 /obj/structure/machinery/light,
 /turf/open/floor/plating,
 /area/bigredv2/outside/nw)
+"D" = (
+/obj/effect/landmark/static_comms/net_one,
+/turf/open/floor{
+	icon_state = "bcircuit"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"H" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/turf/open/floor/plating{
+	dir = 10;
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"K" = (
+/turf/open/floor{
+	icon_state = "bcircuit"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"O" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/plating{
+	dir = 8;
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"S" = (
+/obj/structure/machinery/power/apc{
+	dir = 1;
+	start_charge = 0
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	layer = 2.5;
+	pixel_x = -1
+	},
+/turf/open/floor/plating{
+	dir = 4;
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"T" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/turf/open/floor/plating{
+	dir = 6;
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"V" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
+"Z" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	layer = 2.5;
+	pixel_x = -1
+	},
+/turf/open/floor/plating{
+	dir = 4;
+	icon_state = "warnplate"
+	},
+/area/bigredv2/outside/telecomm/warehouse)
 
 (1,1,1) = {"
 b
@@ -144,10 +218,10 @@ b
 b
 "}
 (2,1,1) = {"
-b
-e
-j
-j
+i
+O
+O
+H
 q
 j
 u
@@ -156,10 +230,10 @@ j
 b
 "}
 (3,1,1) = {"
-b
-f
-j
-j
+i
+K
+D
+V
 q
 j
 v
@@ -168,10 +242,10 @@ y
 b
 "}
 (4,1,1) = {"
-b
-g
-m
-j
+i
+K
+K
+V
 q
 j
 j
@@ -180,10 +254,10 @@ j
 b
 "}
 (5,1,1) = {"
-b
-h
-m
-j
+i
+S
+Z
+T
 q
 j
 j
@@ -194,7 +268,7 @@ b
 (6,1,1) = {"
 b
 g
-j
+m
 j
 r
 j
@@ -205,8 +279,8 @@ b
 "}
 (7,1,1) = {"
 b
-g
-j
+h
+m
 j
 q
 j
@@ -217,7 +291,7 @@ b
 "}
 (8,1,1) = {"
 b
-i
+f
 j
 j
 q
@@ -301,7 +375,7 @@ b
 "}
 (15,1,1) = {"
 b
-j
+e
 j
 j
 q
diff --git a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm b/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm
deleted file mode 100644
index 69d091b39d02..000000000000
--- a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm
+++ /dev/null
@@ -1,214 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_18"
-	},
-/area/bigredv2/caves_north)
-"b" = (
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"c" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"d" = (
-/turf/open/mars_cave,
-/area/bigredv2/caves_north)
-"e" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_north)
-"f" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_7"
-	},
-/area/bigredv2/caves_north)
-"g" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"h" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"j" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
-	},
-/area/bigredv2/caves_north)
-"m" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_14"
-	},
-/area/bigredv2/caves_north)
-"n" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
-	},
-/area/bigredv2/caves_north)
-"o" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_17"
-	},
-/area/bigredv2/caves_north)
-"s" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_15"
-	},
-/area/bigredv2/caves_north)
-"C" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_6"
-	},
-/area/bigredv2/caves_north)
-"H" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_19"
-	},
-/area/bigredv2/caves_north)
-"M" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_5"
-	},
-/area/bigredv2/caves_north)
-"S" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_7"
-	},
-/area/bigredv2/caves_lambda)
-"Z" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_16"
-	},
-/area/bigredv2/caves_lambda)
-
-(1,1,1) = {"
-a
-d
-e
-m
-C
-n
-H
-e
-e
-s
-"}
-(2,1,1) = {"
-b
-f
-s
-n
-j
-n
-o
-e
-e
-m
-"}
-(3,1,1) = {"
-b
-b
-s
-M
-n
-H
-d
-b
-b
-b
-"}
-(4,1,1) = {"
-b
-b
-g
-Z
-Z
-b
-b
-b
-b
-b
-"}
-(5,1,1) = {"
-b
-c
-c
-c
-c
-c
-b
-b
-b
-b
-"}
-(6,1,1) = {"
-b
-c
-c
-c
-h
-c
-c
-b
-b
-b
-"}
-(7,1,1) = {"
-S
-c
-c
-c
-c
-c
-c
-b
-c
-c
-"}
-(8,1,1) = {"
-c
-c
-c
-c
-c
-c
-c
-g
-c
-c
-"}
-(9,1,1) = {"
-c
-h
-c
-c
-c
-h
-c
-g
-c
-c
-"}
-(10,1,1) = {"
-c
-c
-c
-c
-c
-c
-c
-g
-c
-h
-"}
diff --git a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm b/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm
deleted file mode 100644
index 96ed195a9bee..000000000000
--- a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm
+++ /dev/null
@@ -1,53 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/obj/item/prop/helmetgarb/rosary{
-	pixel_y = 6
-	},
-/turf/template_noop,
-/area/template_noop)
-"d" = (
-/obj/item/clothing/head/soft/blue{
-	pixel_x = 5
-	},
-/turf/template_noop,
-/area/template_noop)
-"g" = (
-/obj/item/weapon/gun/pistol/holdout{
-	pixel_x = -4
-	},
-/turf/template_noop,
-/area/template_noop)
-"A" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/template_noop,
-/area/template_noop)
-"K" = (
-/obj/item/limb/arm/l_arm{
-	dir = 8
-	},
-/obj/item/limb/arm/r_arm,
-/obj/item/limb/foot/l_foot{
-	dir = 1;
-	pixel_y = 21
-	},
-/obj/item/limb/head{
-	dir = 4;
-	pixel_x = 6
-	},
-/obj/effect/decal/cleanable/blood,
-/turf/template_noop,
-/area/template_noop)
-"M" = (
-/turf/template_noop,
-/area/template_noop)
-
-(1,1,1) = {"
-d
-A
-a
-"}
-(2,1,1) = {"
-K
-g
-M
-"}
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index 4e06de75bc43..a86fb326152d 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -62185,7 +62185,7 @@
 /area/desert_dam/exterior/valley/valley_telecoms)
 "lrn" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "damtemple"
+	insert_tag = "damtemple_intact"
 	},
 /turf/open/desert/dirt{
 	icon_state = "desert_transition_edge1"
@@ -65097,7 +65097,7 @@
 	icon_state = "S"
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "shipgone"
+	insert_tag = "shipgone_northlz"
 	},
 /turf/open/floor/prison{
 	dir = 10;
@@ -65450,7 +65450,7 @@
 /area/desert_dam/interior/dam_interior/garage)
 "wrl" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cavein"
+	insert_tag = "cavein_engineering"
 	},
 /turf/closed/wall/rock/orange,
 /area/desert_dam/exterior/rock)
@@ -66042,7 +66042,7 @@
 	icon_state = "road_edge_decal3"
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "minievac"
+	insert_tag = "minievac_westresearch"
 	},
 /turf/open/asphalt,
 /area/desert_dam/exterior/valley/valley_wilderness)
diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/unused/30.labs-elevator_alternate.dmm
similarity index 100%
rename from maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm
rename to maps/map_files/Ice_Colony_v3/sprinkles/unused/30.labs-elevator_alternate.dmm
diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm
similarity index 100%
rename from maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm
rename to maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index b7e9fc262f6e..b63b0895a23b 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -4520,7 +4520,7 @@
 /area/kutjevo/exterior/runoff_river)
 "fNe" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cleaningprog"
+	insert_tag = "cleaningprog_botany"
 	},
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/botany)
@@ -8021,7 +8021,7 @@
 /area/kutjevo/interior/colony_central/mine_elevator)
 "kPw" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "trappedmonke"
+	insert_tag = "trappedmonke_andclown"
 	},
 /turf/open/floor/kutjevo/tan/multi_tiles,
 /area/kutjevo/interior/oob)
@@ -9464,7 +9464,7 @@
 /area/kutjevo/interior/complex/med)
 "mIg" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "plinkingspot"
+	insert_tag = "plinkingspot_northlz"
 	},
 /turf/closed/wall/kutjevo/rock/border,
 /area/kutjevo/exterior/scrubland)
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 4e9b9dce43b4..ffe928acf3ae 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -12931,7 +12931,7 @@
 /area/lv624/ground/colony/west_tcomms_road)
 "bTw" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cargospecial"
+	insert_tag = "cargospecial1"
 	},
 /turf/open/floor/vault,
 /area/lv624/lazarus/quartstorage)
@@ -20091,7 +20091,7 @@
 /area/lv624/ground/caves/sand_temple)
 "pca" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "nexuscenter"
+	insert_tag = "nexuscenter_barricaded"
 	},
 /turf/open/floor{
 	dir = 9;
@@ -22332,7 +22332,7 @@
 /area/lv624/lazarus/quartstorage)
 "tgi" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz-containers"
+	insert_tag = "lz-containers_swapped"
 	},
 /turf/open/floor{
 	icon_state = "warning"