diff --git a/code/WorkInProgress/ZomgPonies/Colored-windows.dm b/code/WorkInProgress/ZomgPonies/Colored-windows.dm
index 27a2f16f19f..a49ffe6bae1 100644
--- a/code/WorkInProgress/ZomgPonies/Colored-windows.dm
+++ b/code/WorkInProgress/ZomgPonies/Colored-windows.dm
@@ -19,7 +19,6 @@ var/global/wcCommon
 
 	//BRIG
 	var/wsBrigList = list(
-		/area/security/armoury,
 		/area/security/brig,
 		/area/security/detectives_office,
 		/area/security/hos,
@@ -27,9 +26,11 @@ var/global/wcCommon
 		/area/security/main,
 		/area/security/prison,
 		/area/security/warden,
+		/area/security/range,
 		/area/prison/cell_block/A,
 		/area/prison/cell_block/B,
-		/area/security/processing
+		/area/security/processing,
+		/area/security/armoury
 
 		)
 
diff --git a/maps/tgstation-redux-WIP.dmm b/maps/tgstation-redux-WIP.dmm
index 547e648c774..6e9db115652 100644
--- a/maps/tgstation-redux-WIP.dmm
+++ b/maps/tgstation-redux-WIP.dmm
@@ -537,7 +537,7 @@
 "akq" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/shuttle/siberia/station)
 "akr" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/shuttle/siberia/station)
 "aks" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/glass_security{name = "Firing Range"; req_access_txt = "1"},/turf/simulated/floor,/area/security/range)
-"akt" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area)
+"akt" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/security/range)
 "aku" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass_security{name = "Firing Range"; req_access_txt = "1"},/turf/simulated/floor,/area/security/range)
 "akv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/security/brig)
 "akw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/security/brig)
@@ -767,7 +767,7 @@
 "aoM" = (/obj/machinery/door_control{id = "prison release"; name = "Prisoner Release Room Lockdown"; pixel_x = 5; pixel_y = -5; req_access_txt = "2"},/turf/simulated/wall,/area)
 "aoN" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/processing)
 "aoO" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/prison/cell_block/A)
-"aoP" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor/plating,/area)
+"aoP" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor/plating,/area/prison/cell_block/A)
 "aoQ" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/prison/cell_block/A)
 "aoR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Brig West"; dir = 4; network = list("SS13")},/obj/machinery/power/apc{dir = 8; name = "Prison Cell Block A APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/prison/cell_block/A)
 "aoS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor,/area/prison/cell_block/A)