diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm
index e9fd4f9420..ae008df7eb 100644
--- a/maps/tether/submaps/om_ships/aro2.dmm
+++ b/maps/tether/submaps/om_ships/aro2.dmm
@@ -2881,18 +2881,18 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/aroboat2)
 "fH" = (
-/obj/structure/grille,
-/obj/structure/window/phoronreinforced/full,
-/obj/structure/window/phoronreinforced{
-	dir = 1
-	},
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	dir = 8;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
-/turf/simulated/shuttle/plating,
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	icon_state = "window";
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/shuttle/aroboat2)
 "fJ" = (
 /obj/machinery/button/remote/blast_door{
@@ -3050,18 +3050,18 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/aroboat2)
 "fY" = (
-/obj/structure/grille,
-/obj/structure/window/phoronreinforced/full,
 /obj/machinery/door/firedoor/glass,
-/obj/structure/window/phoronreinforced{
-	dir = 4
-	},
 /obj/machinery/door/blast/regular{
 	dir = 1;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
-/turf/simulated/shuttle/plating,
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+	icon_state = "window";
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
 /area/shuttle/aroboat2)
 "fZ" = (
 /obj/machinery/light{
@@ -3150,16 +3150,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/aroboat2)
 "gj" = (
-/obj/structure/grille,
-/obj/structure/window/phoronreinforced/full,
-/obj/structure/window/phoronreinforced,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	dir = 8;
 	icon_state = "pdoor1";
 	id = "aroboatshut"
 	},
-/turf/simulated/shuttle/plating,
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium,
+/turf/simulated/floor/tiled/techmaint,
 /area/shuttle/aroboat2)
 "gk" = (
 /obj/effect/overmap/visitable/ship/aro2,