diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index cce417c245b2..9f2be9bbe2a3 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -145,8 +145,13 @@
 /area/ship/hallway/central)
 "bx" = (
 /obj/structure/chair/sofa/brown/old/left/directional/south,
-/obj/machinery/firealarm/directional/north,
+/obj/machinery/firealarm/directional/north{
+	pixel_x = 4
+	},
 /obj/machinery/airalarm/directional/east,
+/obj/machinery/newscaster/directional/north{
+	pixel_x = -10
+	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "bE" = (
@@ -455,15 +460,16 @@
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -20;
-	pixel_y = 7
-	},
-/obj/structure/cable/cyan{
-	icon_state = "1-2"
+	pixel_y = 13
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/structure/cable/cyan{
+	icon_state = "0-1"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
 "hd" = (
@@ -1007,6 +1013,7 @@
 	pixel_y = 20
 	},
 /obj/structure/chair,
+/obj/machinery/newscaster/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "oE" = (
@@ -1518,11 +1525,14 @@
 /turf/closed/wall,
 /area/ship/hallway/central)
 "yx" = (
-/obj/structure/cable/cyan{
-	icon_state = "1-2"
+/obj/structure/closet/wall/directional/west,
+/obj/item/soap{
+	pixel_x = -1;
+	pixel_y = -2
 	},
-/obj/structure/sign/poster/contraband/smoke{
-	pixel_x = -32
+/obj/item/towel{
+	pixel_y = 4;
+	pixel_x = -3
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
@@ -1840,8 +1850,8 @@
 	layer = 2.89
 	},
 /obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
@@ -2073,13 +2083,12 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "HP" = (
-/obj/structure/toilet{
-	dir = 8;
-	pixel_x = 4
-	},
 /obj/machinery/light/dim/directional/east,
-/obj/effect/decal/cleanable/vomit/old{
-	pixel_x = -7
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
@@ -2710,11 +2719,20 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
 "Qe" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable/cyan{
-	icon_state = "0-1"
+/obj/structure/window{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/structure/curtain,
+/obj/machinery/shower{
+	dir = 1;
+	pixel_y = 0
+	},
+/obj/item/bikehorn/rubberducky/plasticducky{
+	pixel_x = -2;
+	pixel_y = 3
+	},
+/obj/structure/catwalk/over/plated_catwalk/white,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/crew/toilet)
 "Qg" = (
 /obj/machinery/power/smes/engineering,
@@ -2893,20 +2911,13 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Tl" = (
-/obj/structure/window{
-	dir = 1
-	},
-/obj/structure/curtain,
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/item/soap{
-	pixel_x = -6;
-	pixel_y = -7
+/obj/structure/toilet{
+	dir = 1;
+	pixel_y = 0
 	},
-/obj/item/bikehorn/rubberducky/plasticducky{
-	pixel_x = -2;
-	pixel_y = 4
+/obj/effect/decal/cleanable/vomit/old{
+	pixel_y = 12;
+	pixel_x = -6
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)