diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
index ad4ee2168f1..a120424a39c 100644
--- a/Resources/Maps/_NF/Dungeon/cave_factory.yml
+++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -8996,7 +8996,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 1
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 213
     components:
@@ -9373,7 +9373,7 @@ entities:
     - type: Transform
       pos: 25.49259,25.48387
       parent: 1
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 1164
     components:
@@ -14359,14 +14359,14 @@ entities:
     - type: Transform
       pos: 9.5,12.5
       parent: 1
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 663
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 1
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1564
     components:
@@ -14388,7 +14388,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,3.5
       parent: 1
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 43
     components:
@@ -14485,7 +14485,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,46.5
       parent: 1
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 931
     components:
@@ -14547,7 +14547,7 @@ entities:
     - type: Transform
       pos: 14.5,44.5
       parent: 1
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 328
     components:
diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
index a7aa1a0decc..41e2353f81b 100644
--- a/Resources/Maps/_NF/Dungeon/experiment.yml
+++ b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -6725,7 +6725,7 @@ entities:
     - type: Transform
       pos: 14.5,34.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 742
     components:
@@ -7000,7 +7000,7 @@ entities:
     - type: Transform
       pos: 33.42354,40.437122
       parent: 1653
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 645
     components:
@@ -10817,7 +10817,7 @@ entities:
     - type: Transform
       pos: 27.5,7.5
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 636
     components:
@@ -10866,7 +10866,7 @@ entities:
     - type: Transform
       pos: 9.5,27.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 467
     components:
@@ -10946,7 +10946,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 33.5,3.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 632
     components:
@@ -10970,7 +10970,7 @@ entities:
     - type: Transform
       pos: 44.5,3.5
       parent: 1653
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 473
     components:
@@ -11153,7 +11153,7 @@ entities:
     - type: Transform
       pos: 2.5,8.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 446
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index de7e1ab96dc..f191d6c3c27 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -8208,7 +8208,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 588
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 209
     components:
@@ -12808,7 +12808,7 @@ entities:
     - type: Transform
       pos: 16.5,24.5
       parent: 588
-- proto: WindoorAssemblySecure
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 696
     components:
@@ -12827,7 +12827,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,25.5
       parent: 588
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 1761
     components:
@@ -12841,7 +12841,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,47.5
       parent: 588
-- proto: WindoorSecureBrigLocked
+- proto: WindoorSecureBrigLockedDungeon
   entities:
   - uid: 339
     components:
@@ -12849,7 +12849,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,2.5
       parent: 588
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1569
     components:
@@ -12857,14 +12857,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,45.5
       parent: 588
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorSecureMedicalLockedDungeon
   entities:
   - uid: 1408
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 588
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 252
     components:
@@ -12913,7 +12913,7 @@ entities:
     - type: Transform
       pos: 21.5,27.5
       parent: 588
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 480
     components:
@@ -13024,7 +13024,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 588
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 936
     components:
@@ -13131,7 +13131,7 @@ entities:
     - type: Transform
       pos: 24.5,47.5
       parent: 588
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 97
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
index d14ec6493ab..f5840b32812 100644
--- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -8262,7 +8262,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 588
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 209
     components:
@@ -12968,7 +12968,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,25.5
       parent: 588
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 1837
     components:
@@ -12976,7 +12976,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,4.5
       parent: 588
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1569
     components:
@@ -12990,14 +12990,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 588
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorSecureMedicalLockedDungeon
   entities:
   - uid: 1408
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 588
-- proto: WindoorSecureMercenaryLocked
+- proto: WindoorSecureMercenaryLockedDungeon
   entities:
   - uid: 252
     components:
@@ -13053,7 +13053,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,2.5
       parent: 588
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 1053
     components:
@@ -13066,7 +13066,7 @@ entities:
     - type: Transform
       pos: 21.5,27.5
       parent: 588
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 480
     components:
@@ -13172,7 +13172,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,44.5
       parent: 588
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 936
     components:
@@ -13279,7 +13279,7 @@ entities:
     - type: Transform
       pos: 24.5,47.5
       parent: 588
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 97
     components:
diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
index 17fcf040469..13d8a9a4176 100644
--- a/Resources/Maps/_NF/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -2755,7 +2755,7 @@ entities:
     - type: Transform
       pos: 36.5,26.5
       parent: 2
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 288
     components:
@@ -6506,7 +6506,7 @@ entities:
     - type: Transform
       pos: 39.5,32.5
       parent: 2
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 142
     components:
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
index 8007bdae116..a89efc67a70 100644
--- a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
+++ b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -8162,7 +8162,7 @@ entities:
     - type: Transform
       pos: 18.5,52.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 178
     components:
@@ -8993,7 +8993,7 @@ entities:
     - type: Transform
       pos: 19.5,32.5
       parent: 1653
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 6
     components:
@@ -9157,7 +9157,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 43.5,4.5
       parent: 1653
-- proto: PlasmaWindowDirectional
+- proto: PlasmaWindowDirectionalDungeon
   entities:
   - uid: 486
     components:
@@ -16016,7 +16016,7 @@ entities:
     - type: Transform
       pos: 18.551561,15.604378
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 143
     components:
@@ -16029,7 +16029,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 1653
-- proto: WindoorPlasma
+- proto: WindoorPlasmaDungeon
   entities:
   - uid: 864
     components:
@@ -16153,7 +16153,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,39.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 343
     components:
@@ -16207,7 +16207,7 @@ entities:
     - type: Transform
       pos: 5.5,15.5
       parent: 1653
-- proto: WindoorSecurePlasma
+- proto: WindoorSecurePlasmaDungeon
   entities:
   - uid: 699
     components:
@@ -16226,7 +16226,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,18.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 169
     components:
@@ -16267,7 +16267,7 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 319
     components:
diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
index 453f74ff2fb..f48d0eac78c 100644
--- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -7366,7 +7366,7 @@ entities:
     - type: Transform
       pos: 14.5,34.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 11
     components:
@@ -13552,7 +13552,7 @@ entities:
     - type: Transform
       pos: 40.5,0.5
       parent: 1653
-- proto: UraniumReinforcedWindowDirectional
+- proto: UraniumReinforcedWindowDirectionalDungeon
   entities:
   - uid: 852
     components:
@@ -13600,7 +13600,7 @@ entities:
     - type: Transform
       pos: 34.5,36.5
       parent: 1653
-- proto: UraniumWindowDirectional
+- proto: UraniumWindowDirectionalDungeon
   entities:
   - uid: 1833
     components:
@@ -14429,7 +14429,7 @@ entities:
     - type: Transform
       pos: 26.5,19.5
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 127
     components:
@@ -14522,7 +14522,7 @@ entities:
     - type: Transform
       pos: 4.5,43.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 691
     components:
@@ -14624,7 +14624,7 @@ entities:
     - type: Transform
       pos: 51.5,13.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 632
     components:
@@ -14648,7 +14648,7 @@ entities:
     - type: Transform
       pos: 44.5,3.5
       parent: 1653
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 500
     components:
@@ -14706,7 +14706,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,6.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 76
     components:
diff --git a/Resources/Maps/_NF/Dungeon/spaceplatform.yml b/Resources/Maps/_NF/Dungeon/spaceplatform.yml
index fd0809c4088..c2c39461151 100644
--- a/Resources/Maps/_NF/Dungeon/spaceplatform.yml
+++ b/Resources/Maps/_NF/Dungeon/spaceplatform.yml
@@ -1598,7 +1598,7 @@ entities:
     - type: Transform
       pos: -35.5,5.5
       parent: 6
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 2
     components:
diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
index cc35e158396..0997d99b756 100644
--- a/Resources/Maps/_NF/Dungeon/virology_lab.yml
+++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -8356,7 +8356,7 @@ entities:
     - type: Transform
       pos: 49.5,4.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 397
     components:
@@ -14125,7 +14125,7 @@ entities:
     - type: Transform
       pos: 26.5,19.5
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 636
     components:
@@ -14174,7 +14174,7 @@ entities:
     - type: Transform
       pos: 9.5,27.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 216
     components:
@@ -14324,7 +14324,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,1.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 307
     components:
@@ -14428,7 +14428,7 @@ entities:
     - type: Transform
       pos: 10.5,39.5
       parent: 1653
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 473
     components:
@@ -14560,7 +14560,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,6.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 219
     components:
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 61143da8242..89bf1b058b4 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -125,7 +125,7 @@
       Entrance: LavaBrigEntrance
       EntranceFlank: BaseWindow
       Junction: BaseAirlock
-      WallMounts: ScienceLabsWalls
+      WallMounts: NanoTrasenFasilityWallmounts # Frontier: ScienceLabsWalls<NanoTrasenFasilityWallmounts
       Window: BaseWindow
     whitelists:
       Rooms:
@@ -133,19 +133,21 @@
         - LavaBrig
   layers:
   - !type:PrototypeDunGen
-    proto: PlanetBase
+    proto: Everything # Frontier: PlanetBase<Everything
 
 - type: dungeonConfig
   id: Mineshaft
   data:
     entities:
       Walls: WallRock # Frontier: enclose the mineshaft in rock
+      CornerWalls: WallRock # Frontier: CornerWalls: WallRock
       Cabling: Catwalk
     spawnGroups:
       CornerClutter: MineshaftClutter
       Entrance: BaseWoodWall
       EntranceFlank: BaseWoodWall
       Junction: BaseWoodSupport
+      WallMounts: NanoTrasenFasilityWallmounts # Frontier:added WallMounts: NanoTrasenFasilityWallmounts
       Window: BaseWoodWall
     tiles:
       FallbackTile: FloorCaveDrought
@@ -155,7 +157,7 @@
         - Mineshaft
   layers:
   - !type:PrototypeDunGen
-    proto: PlanetBase
+    proto: Everything # Frontier: PlanetBase<Everything
 
 - type: dungeonConfig
   id: SnowyLabs
@@ -200,7 +202,7 @@
 - type: entitySpawnEntry
   id: BaseWindow
   entries:
-  - id: GrilleDungeon # Frontier: Grille<GrilleDungeon
+  - id: GrilleDungeon # Frontier: GrilleDungeon<GrilleDungeon
   - id: WindowDungeon # Frontier: Window<WindowDungeon
 
 # Lava brig
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
index 0371c11c4b1..959e7b0b767 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
@@ -2,9 +2,32 @@
 - type: entity
   id: GrilleDungeon
   parent: Grille
-  noSpawn: true
+  #noSpawn: true
   suffix: DO NOT MAP, Dungeon only
+  description: A covered in soot and grime grille.
   components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/grille.rsi
+      layers:
+      - state: grille
+      - state: electrified
+        sprite: Effects/electricity.rsi
+        map: ["enum.ElectrifiedLayers.Powered"]
+        shader: unshaded
+        visible: false
+      - state: rust
+        sprite: Decals/dirty.rsi
+      - state: dirtheavy-mono
+        sprite: Decals/dirty.rsi
+      - state: dirtheavy
+        sprite: Decals/dirty.rsi
+    - type: Icon
+      layers:
+      - sprite: Structures/Walls/grille.rsi
+        state: grille
+      - sprite: Decals/dirty.rsi
+        state: rust
     - type: Fixtures
       fixtures:
         fix1:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windoor.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windoor.yml
new file mode 100644
index 00000000000..53dee11cd25
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windoor.yml
@@ -0,0 +1,87 @@
+# Special windoors for dungeons that block lasers
+# Base
+- type: entity
+  id: WindoorMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: A windoor with murky glass, it's hard to see what's on the other side.
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/windoor.rsi
+    color: "#ffd38c"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,-0.36"
+        density: 1500
+        mask:
+        - TabletopMachineMask
+        layer:
+        - AirlockLayer # Blocks lasers, but not LoS
+
+# Common windoor
+- type: entity
+  id: WindoorDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - Windoor
+  noSpawn: true
+
+# Secure windoor
+- type: entity
+  id: WindoorSecureDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecure
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecureEngineeringLockedDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecureEngineeringLocked
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecureBrigLockedDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecureBrigLocked
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecureMedicalLockedDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecureMedicalLocked
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecureSecurityLockedDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecureSecurityLocked
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecureMercenaryLockedDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecureMercenaryLocked
+  noSpawn: true
+
+- type: entity
+  id: WindoorPlasmaDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorPlasma
+  noSpawn: true
+
+- type: entity
+  id: WindoorSecurePlasmaDungeon
+  parent:
+  - WindoorMurkyDungeon
+  - WindoorSecurePlasma
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
index 32b86cf2e6e..7f096bcb9e7 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
@@ -16,6 +16,24 @@
         layer:
         - WallLayer # Blocks lasers, but not LoS
 
+- type: entity
+  id: WindowDirectionalMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: A murky glass window, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,-0.36"
+        density: 1500
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer # Blocks lasers, but not LoS
+
 # Common window
 - type: entity
   id: WindowDungeon
@@ -23,6 +41,15 @@
   - WindowMurkyDungeon
   - Window
   noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/window.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/window.rsi
+    state: full
+    color: "#ffd38c"
 
 # Reinforced window
 - type: entity
@@ -31,6 +58,14 @@
   - WindowMurkyDungeon
   - ReinforcedWindow
   noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_window.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/reinforced_window.rsi
+    color: "#ffd38c"
 
 # Mining window
 - type: entity
@@ -40,6 +75,13 @@
   - MiningWindow
   noSpawn: true
   components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/mining.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/mining.rsi
+    color: "#ffd38c"
   - type: Destructible # Made it as durable as common window
     thresholds:
     - trigger:
@@ -64,6 +106,14 @@
   - WindowMurkyDungeon
   - PlasmaWindow
   noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/plasma_window.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/plasma_window.rsi
+    color: "#ffd38c"
 
 # Plasma reinforced window
 - type: entity
@@ -72,6 +122,14 @@
   - WindowMurkyDungeon
   - ReinforcedPlasmaWindow
   noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/reinforced_plasma_window.rsi
+    color: "#ffd38c"
 
 # Uranium reinforced window
 - type: entity
@@ -80,3 +138,125 @@
   - WindowMurkyDungeon
   - ReinforcedUraniumWindow
   noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_uranium_window.rsi
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/reinforced_uranium_window.rsi
+    color: "#ffd38c"
+
+# Directional
+- type: entity
+  id: WindowDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - WindowDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Structures/Windows/directional.rsi
+    state: window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: window
+    color: "#ffd38c"
+
+- type: entity
+  id: WindowFrostedDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - WindowFrostedDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: frosted_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: frosted_window
+    color: "#ffd38c"
+
+- type: entity
+  id: WindowReinforcedDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - WindowReinforcedDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: reinforced_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: reinforced_window
+    color: "#ffd38c"
+
+- type: entity
+  id: PlasmaWindowDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - PlasmaWindowDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: plasma_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: plasma_window
+    color: "#ffd38c"
+
+- type: entity
+  id: PlasmaReinforcedWindowDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - PlasmaReinforcedWindowDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: plasma_reinforced_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: plasma_reinforced_window
+    color: "#ffd38c"
+
+- type: entity
+  id: UraniumWindowDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - UraniumWindowDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_window
+    color: "#ffd38c"
+
+- type: entity
+  id: UraniumReinforcedWindowDirectionalDungeon
+  parent:
+  - WindowDirectionalMurkyDungeon
+  - UraniumReinforcedWindowDirectional
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_reinforced_window
+    color: "#ffd38c"
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_reinforced_window
+    color: "#ffd38c"
diff --git a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
index 181a8cc8a8f..75aa48f905a 100644
--- a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
@@ -187,9 +187,17 @@
   data:
     colors:
       Decals: "#5E7C16"
+    entities:
+      Cabling: CableApcExtension
+      CornerWalls: WallReinforced
+      Walls: WallSolid
     spawnGroups:
+      CornerClutter: BaseClutter
       Entrance: MercenaryAirlockNF
+      EntranceFlank: BaseWindow
+      Junction: MercenaryAirlockNF
       WallMounts: LavaMercenaryWallMountsNF
+      Window: BaseWindow
     whitelists:
       Rooms:
         tags:
@@ -323,3 +331,19 @@
   entries:
     - id: GrilleDungeon
     - id: MiningWindowDungeon
+
+## Wallmounts
+- type: entitySpawnEntry
+  id: NanoTrasenFasilityWallmounts
+  entries:
+  - id: RandomPosterLegit
+    orGroup: content
+  - id: ExtinguisherCabinetFilled
+    prob: 0.2
+    orGroup: content
+  - id: IntercomCommon
+    prob: 0.1
+    orGroup: content
+  - id: DefibrillatorCabinetFilled
+    prob: 0.05
+    orGroup: content