diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 5f8b9bd62..7543743a2 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -259,122 +259,62 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Aft Primary Hallway"
 	icon_state = "hallA"
 
-/area/hallway/primary/aft/upper
-	name = "Upper Aft Primary Hallway"
-	icon_state = "hallA"
-
 /area/hallway/primary/fore
 	name = "Fore Primary Hallway"
 	icon_state = "hallF"
 
-/area/hallway/primary/fore/upper
-	name = "Upper Fore Primary Hallway"
-	icon_state = "hallF"
-
 /area/hallway/primary/starboard
 	name = "Starboard Primary Hallway"
 	icon_state = "hallS"
 
-/area/hallway/primary/starboard/upper
-	name = "Upper Starboard Primary Hallway"
-	icon_state = "hallS"
-
 /area/hallway/primary/starboard/aft
 	name = "Starboard Quarter Primary Hallway"
 	icon_state = "hallAS"
 
-/area/hallway/primary/starboard/aft/upper
-	name = "Upper Starboard Quarter Primary Hallway"
-	icon_state = "hallAS"
-
 /area/hallway/primary/starboard/fore
 	name = "Starboard Bow Primary Hallway"
 	icon_state = "hallFS"
 
-/area/hallway/primary/starboard/fore/upper
-	name = "Upper Starboard Bow Primary Hallway"
-	icon_state = "hallFS"
-
 /area/hallway/primary/port
 	name = "Port Primary Hallway"
 	icon_state = "hallP"
 
-/area/hallway/primary/port/upper
-	name = "Upper Port Primary Hallway"
-	icon_state = "hallP"
-
 /area/hallway/primary/port/aft
 	name = "Port Quarter Primary Hallway"
 	icon_state = "hallAP"
 
-/area/hallway/primary/port/aft/upper
-	name = "Upper Port Quarter Primary Hallway"
-	icon_state = "hallAP"
-
 /area/hallway/primary/port/fore
 	name = "Port Bow Primary Hallway"
 	icon_state = "hallFP"
 
-/area/hallway/primary/port/fore/upper
-	name = "Upper Port Bow Primary Hallway"
-	icon_state = "hallFP"
-
 /area/hallway/primary/central
 	name = "Central Primary Hallway"
 	icon_state = "hallC"
 
-/area/hallway/primary/central/upper
-	name = "Upper Central Primary Hallway"
-	icon_state = "hallC"
-
 /area/hallway/secondary/command
 	name = "Command Hallway"
 	icon_state = "bridge_hallway"
 
-/area/hallway/secondary/command/upper
-	name = "Upper Command Hallway"
-	icon_state = "bridge_hallway"
-
 /area/hallway/secondary/construction
 	name = "Construction Area"
 	icon_state = "construction"
 
-/area/hallway/secondary/construction/upper
-	name = "Upper Construction Area"
-	icon_state = "construction"
-
 /area/hallway/secondary/exit
 	name = "Escape Shuttle Hallway"
 	icon_state = "escape"
 
-/area/hallway/secondary/exit/upper
-	name = "Upper Escape Shuttle Hallway"
-	icon_state = "escape"
-
 /area/hallway/secondary/exit/departure_lounge
 	name = "Departure Lounge"
 	icon_state = "escape_lounge"
 
-/area/hallway/secondary/exit/departure_lounge/upper
-	name = "Upper Departure Lounge"
-	icon_state = "escape_lounge"
-
 /area/hallway/secondary/entry
 	name = "Arrival Shuttle Hallway"
 	icon_state = "entry"
 
-/area/hallway/secondary/entry/upper
-	name = "Upper Arrival Shuttle Hallway"
-	icon_state = "entry"
-
 /area/hallway/secondary/service
 	name = "Service Hallway"
 	icon_state = "hall_service"
 
-/area/hallway/secondary/service/upper
-	name = "Upper Service Hallway"
-	icon_state = "hall_service"
-
 //Command
 
 /area/bridge
@@ -460,11 +400,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "Sleep"
 	safe = TRUE
 
-/area/crew_quarters/dorms/upper
-	name = "Upper Dormitories"
-	icon_state = "Sleep"
-	safe = TRUE
-
 /area/crew_quarters/dorms/male
 	name = "Male Dorm"
 	icon_state = "Sleep"
@@ -481,10 +416,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Dormitory Toilets"
 	icon_state = "toilet"
 
-/area/crew_quarters/toilet/upper
-	name = "Upper Dormitory Toilets"
-	icon_state = "toilet"
-
 /area/crew_quarters/toilet/auxiliary
 	name = "Auxiliary Restrooms"
 	icon_state = "toilet"
@@ -513,10 +444,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Locker Room"
 	icon_state = "locker"
 
-/area/crew_quarters/locker/upper
-	name = "Upper Locker Room"
-	icon_state = "locker"
-
 /area/crew_quarters/lounge
 	name = "Lounge"
 	icon_state = "yellow"
@@ -822,11 +749,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "medbay"
 	music = 'sound/ambience/signal.ogg'
 
-/area/medical/medbay/upper
-	name = "Upper Medbay"
-	icon_state = "medbay"
-	music = 'sound/ambience/signal.ogg'
-
 	//Medbay is a large area, these additional areas help level out APC load.
 
 /area/medical/medbay/zone2
diff --git a/goon/icons/obj/power.dmi b/goon/icons/obj/power.dmi
index bb787c0b3..f70f5b51c 100644
Binary files a/goon/icons/obj/power.dmi and b/goon/icons/obj/power.dmi differ
diff --git a/hyperstation/code/game/area/Space_Station_13_areas.dm b/hyperstation/code/game/area/Space_Station_13_areas.dm
index cf8c345c2..b601d2c74 100644
--- a/hyperstation/code/game/area/Space_Station_13_areas.dm
+++ b/hyperstation/code/game/area/Space_Station_13_areas.dm
@@ -29,3 +29,420 @@
 /area/security/lambent
 	name = "Lambent's Quarters"
 	icon_state = "detective"
+
+//In hindsight a lot of how this set up was stupid and I should probably redo it -Dahl
+//Upper Hallways
+/area/hallway/primary/aft/upper
+	name = "Upper Aft Primary Hallway"
+	icon_state = "hallA"
+
+/area/hallway/primary/fore/upper
+	name = "Upper Fore Primary Hallway"
+	icon_state = "hallF"
+
+/area/hallway/primary/starboard/upper
+	name = "Upper Starboard Primary Hallway"
+	icon_state = "hallS"
+
+/area/hallway/primary/starboard/aft/upper
+	name = "Upper Starboard Quarter Primary Hallway"
+	icon_state = "hallAS"
+
+/area/hallway/primary/starboard/fore/upper
+	name = "Upper Starboard Bow Primary Hallway"
+	icon_state = "hallFS"
+
+/area/hallway/primary/port/upper
+	name = "Upper Port Primary Hallway"
+	icon_state = "hallP"
+
+/area/hallway/primary/port/aft/upper
+	name = "Upper Port Quarter Primary Hallway"
+	icon_state = "hallAP"
+
+/area/hallway/primary/port/fore/upper
+	name = "Upper Port Bow Primary Hallway"
+	icon_state = "hallFP"
+
+/area/hallway/primary/central/upper
+	name = "Upper Central Primary Hallway"
+	icon_state = "hallC"
+
+/area/hallway/secondary/command/upper
+	name = "Upper Command Hallway"
+	icon_state = "bridge_hallway"
+
+/area/hallway/secondary/construction/upper
+	name = "Upper Construction Area"
+	icon_state = "construction"
+
+/area/hallway/secondary/exit/upper
+	name = "Upper Escape Shuttle Hallway"
+	icon_state = "escape"
+
+/area/hallway/secondary/exit/departure_lounge/upper
+	name = "Upper Departure Lounge"
+	icon_state = "escape_lounge"
+
+/area/hallway/secondary/entry/upper
+	name = "Upper Arrival Shuttle Hallway"
+	icon_state = "entry"
+
+/area/hallway/secondary/service/upper
+	name = "Upper Service Hallway"
+	icon_state = "hall_service"
+
+//Upper Dorms
+/area/crew_quarters/dorms/upper
+	name = "Upper Dormitories"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/toilet/upper
+	name = "Upper Dormitory Toilets"
+	icon_state = "toilet"
+
+/area/crew_quarters/locker/upper
+	name = "Upper Locker Room"
+	icon_state = "locker"
+
+//Upper Medbay
+/area/medical/medbay/upper
+	name = "Upper Medbay"
+	icon_state = "medbay"
+	music = 'sound/ambience/signal.ogg'
+
+//Upper Maints
+//Departments
+
+/area/maintenance/department/chapel/upper
+	name = "Upper Chapel Maintenance"
+	icon_state = "maint_chapel"
+
+/area/maintenance/department/chapel/monastery/upper
+	name = "Upper Monastery Maintenance"
+	icon_state = "maint_monastery"
+
+/area/maintenance/department/crew_quarters/bar/upper
+	name = "Upper Bar Maintenance"
+	icon_state = "maint_bar"
+
+/area/maintenance/department/crew_quarters/dorms/upper
+	name = "Upper Dormitory Maintenance"
+	icon_state = "maint_dorms"
+
+/area/maintenance/department/crew_quarters/locker/upper
+	name = "Upper Locker Room Maintenance"
+	icon_state = "maint_locker"
+
+/area/maintenance/department/eva/upper
+	name = "Upper EVA Maintenance"
+	icon_state = "maint_eva"
+
+/area/maintenance/department/electrical/upper
+	name = "Upper Electrical Maintenance"
+	icon_state = "maint_electrical"
+
+/area/maintenance/department/engine/atmos/upper
+	name = "Upper Atmospherics Maintenance"
+	icon_state = "maint_atmos"
+
+/area/maintenance/department/security/upper
+	name = "Upper Security Maintenance"
+	icon_state = "maint_sec"
+
+/area/maintenance/department/security/brig/upper
+	name = "Upper Brig Maintenance"
+	icon_state = "maint_brig"
+
+/area/maintenance/department/medical/upper
+	name = "Upper Medbay Maintenance"
+	icon_state = "medbay_maint"
+
+/area/maintenance/department/medical/morgue/upper
+	name = "Upper Morgue Maintenance"
+	icon_state = "morgue_maint"
+
+/area/maintenance/department/science/upper
+	name = "Upper Science Maintenance"
+	icon_state = "maint_sci"
+
+/area/maintenance/department/cargo/upper
+	name = "Upper Cargo Maintenance"
+	icon_state = "maint_cargo"
+
+/area/maintenance/department/bridge/upper
+	name = "Upper Bridge Maintenance"
+	icon_state = "maint_bridge"
+
+/area/maintenance/department/engine/upper
+	name = "Upper Engineering Maintenance"
+	icon_state = "maint_engi"
+
+/area/maintenance/department/science/xenobiology/upper
+	name = "Upper Xenobiology Maintenance"
+	icon_state = "xenomaint"
+	xenobiology_compatible = TRUE
+
+
+//Generic
+
+/area/maintenance/arrivals/north/upper
+	name = "Upper Arrivals North Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/arrivals/north_2/upper
+	name = "Upper Arrivals North Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/aft/upper
+	name = "Upper Aft Maintenance"
+	icon_state = "amaint"
+
+/area/maintenance/aft/secondary/upper
+	name = "Upper Aft Maintenance"
+	icon_state = "amaint_2"
+
+/area/maintenance/central/upper
+	name = "Upper Central Maintenance"
+	icon_state = "maintcentral"
+
+/area/maintenance/central/secondary/upper
+	name = "Upper Central Maintenance"
+	icon_state = "maintcentral"
+
+/area/maintenance/fore/upper
+	name = "Upper Fore Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/fore/secondary/upper
+	name = "Upper Fore Maintenance"
+	icon_state = "fmaint_2"
+
+/area/maintenance/starboard/upper
+	name = "Upper Starboard Maintenance"
+	icon_state = "smaint"
+
+/area/maintenance/starboard/central/upper
+	name = "Upper Central Starboard Maintenance"
+	icon_state = "smaint"
+
+/area/maintenance/starboard/aft/upper
+	name = "Upper Starboard Quarter Maintenance"
+	icon_state = "asmaint"
+
+/area/maintenance/starboard/fore/upper
+	name = "Upper Starboard Bow Maintenance"
+	icon_state = "fsmaint"
+
+/area/maintenance/port/upper
+	name = "Upper Port Maintenance"
+	icon_state = "pmaint"
+
+/area/maintenance/port/central/upper
+	name = "Upper Central Port Maintenance"
+	icon_state = "maintcentral"
+
+/area/maintenance/port/aft/upper
+	name = "Upper Port Quarter Maintenance"
+	icon_state = "apmaint"
+
+/area/maintenance/port/fore/upper
+	name = "Upper Port Bow Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/disposal/upper
+	name = "Upper Waste Disposal"
+	icon_state = "disposal"
+
+/area/maintenance/disposal/incinerator/upper
+	name = "Upper Incinerator"
+	icon_state = "disposal"
+
+//Solar Maint
+
+/area/maintenance/solars/upper
+	name = "Upper Solar Maintenance"
+	icon_state = "yellow"
+
+/area/maintenance/solars/port/upper
+	name = "Upper Port Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/port/aft/upper
+	name = "Upper Port Quarter Solar Maintenance"
+	icon_state = "SolarcontrolAP"
+
+/area/maintenance/solars/port/fore/upper
+	name = "Upper Port Bow Solar Maintenance"
+	icon_state = "SolarcontrolFP"
+
+/area/maintenance/solars/starboard/upper
+	name = "Upper Starboard Solar Maintenance"
+	icon_state = "SolarcontrolS"
+
+/area/maintenance/solars/starboard/aft/upper
+	name = "Upper Starboard Quarter Solar Maintenance"
+	icon_state = "SolarcontrolAS"
+
+/area/maintenance/solars/starboard/fore/upper
+	name = "Upper Starboard Bow Solar Maintenance"
+	icon_state = "SolarcontrolFS"
+
+/area/maintenance/solars/aux/port/upper
+	name = "Upper Port Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+/area/maintenance/solars/aux/port/aft/upper
+	name = "Upper Port Quarter Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolAP"
+
+/area/maintenance/solars/aux/port/fore/upper
+	name = "Upper Port Bow Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+/area/maintenance/solars/aux/starboard/upper
+	name = "Upper Starboard Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+/area/maintenance/solars/aux/starboard/aft/upper
+	name = "Upper Starboard Quarter Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+/area/maintenance/solars/aux/starboard/fore/upper
+	name = "Upper Starboard Bow Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
+
+//Upper Security
+/area/security/upper
+	name = "Upper Security"
+	icon_state = "security"
+	ambientsounds = HIGHSEC
+
+/area/security/main/upper
+	name = "Upper Security Office"
+	icon_state = "security"
+
+/area/security/brig/upper
+	name = "Upper Brig"
+	icon_state = "brig"
+
+/area/security/courtroom/upper
+	name = "Upper Courtroom"
+	icon_state = "courtroom"
+
+/area/security/prison/upper
+	name = "Upper Prison Wing"
+	icon_state = "sec_prison"
+
+/area/security/processing/upper
+	name = "Upper Labor Shuttle Dock"
+	icon_state = "sec_prison"
+
+/area/security/processing/cremation/upper
+	name = "Upper Security Crematorium"
+	icon_state = "sec_prison"
+
+/area/security/warden/upper
+	name = "Upper Brig Control"
+	icon_state = "Warden"
+
+/area/security/armory/upper
+	name = "Upper Armory"
+	icon_state = "armory"
+
+/area/security/detectives_office/upper
+	name = Upper "Detective's Office"
+	icon_state = "detective"
+	ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
+
+/area/security/detectives_office/private_investigators_office/upper
+	name = "Upper Private Investigator's Office"
+	icon_state = "detective"
+
+/area/security/range/upper
+	name = "Upper Firing Range"
+	icon_state = "firingrange"
+
+//Misc security
+/area/security/locker
+	name = "Security Locker Room"
+	icon_state = "brig"
+
+/area/security/visitation
+	name = "Security Visitation"
+	icon_state = "brig"
+
+//Misc Dorms
+/area/crew_quarters/dorms/A
+	name = "Dormitories A"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/B
+	name = "Dormitories B"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/C
+	name = "Dormitories C"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/D
+	name = "Dormitories D"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/E
+	name = "Dormitories E"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/F
+	name = "Dormitories F"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/G
+	name = "Dormitories G"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/dorms/H
+	name = "Dormitories H"
+	icon_state = "Sleep"
+	safe = TRUE
+
+/area/crew_quarters/park
+	name = "Park"
+	icon_state = "yellow"
+
+/area/janitor/upper
+	name = "Upper Custodial Closet"
+
+/area/storage/A
+	name = "Storage Office A"
+	icon_state = "storage"
+
+/area/storage/B
+	name = "Storage Office B"
+	icon_state = "storage"
+	
+/area/storage/C
+	name = "Storage Office C"
+	icon_state = "storage"
+
+/area/storage/D
+	name = "Storage Office D"
+	icon_state = "storage"
+
+/area/theatre/blackbox
+	name = "Theatre Blackbox"
+	icon_state = "Theatre"
+
+//Misc cargo
+/area/quartermaster/mail
+	name = "Mail Office"
+	icon_state = "cargo_delivery"
+
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index d0ccf6ea9..bb2885b20 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ