diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
index ad4841a320..7527185ae6 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
@@ -28,6 +28,7 @@
     limits:
       Reward: 1
       Danger: 1
+      GhostRoleDanger: 1
       Fun: 1
       Weather: 1
       MapLight: 1
@@ -48,7 +49,8 @@
     level: 6
     limits:
       Reward: 1
-      Danger: 1
+      Danger: 1.5
+      GhostRoleDanger: 1
       Fun: 1
       Weather: 1
       MapLight: 1
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
index 654cdf854e..971c8f6c86 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -34,7 +34,7 @@
       entity: CP14SpawnMobDinoYumkaraptor
       count: 5
       minGroupSize: 1
-      maxGroupSize: 1
+      maxGroupSize: 2
 
 - type: cp14DemiplaneModifier
   id: MonsterMosquito
@@ -79,8 +79,9 @@
     max: 10
   name: cp14-modifier-skeleton
   generationWeight: 1.5
+  generationProb: 0.5
   categories:
-    Danger: 0.55
+    GhostRoleDanger: 1
   layers:
     - !type:OreDunGen
       entity: CP14SpawnPointGhostDemiplaneSkeleton
@@ -94,8 +95,9 @@
     min: 3
     max: 10
   generationWeight: 0.33
+  generationProb: 0.25
   categories:
-    Danger: 0.55
+    GhostRoleDanger: 1
   layers:
     - !type:OreDunGen
       entity: SpawnPointGhostDemiplaneWendigo
@@ -120,7 +122,7 @@
       entity: CP14MobMonsterMole
       count: 6
       minGroupSize: 1
-      maxGroupSize: 2
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: EnemyIceSpectre
@@ -139,7 +141,7 @@
       entity: CP14MobIceSpectre
       count: 6
       minGroupSize: 1
-      maxGroupSize: 2
+      maxGroupSize: 3
 
 #- type: cp14DemiplaneModifier #Removed to Whistler rebalance
 #  id: EnemyInvisibleWhistler
@@ -169,9 +171,9 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobSlimeElectric
-      count: 3
-      minGroupSize: 4
-      maxGroupSize: 5
+      count: 6
+      minGroupSize: 2
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MobSlimeFire
@@ -186,9 +188,9 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobSlimeFire
-      count: 3
-      minGroupSize: 4
-      maxGroupSize: 5
+      count: 6
+      minGroupSize: 2
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MobSlimeIce
@@ -203,9 +205,9 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobSlimeIce
-      count: 3
-      minGroupSize: 4
-      maxGroupSize: 5
+      count: 6
+      minGroupSize: 2
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MobSlimeBase
@@ -217,9 +219,9 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobSlimeBase
-      count: 3
-      minGroupSize: 4
-      maxGroupSize: 5
+      count: 6
+      minGroupSize: 2
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MobWatcherIce
@@ -236,7 +238,7 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobWatcherIce
-      count: 2
+      count: 8
       minGroupSize: 2
       maxGroupSize: 3
 
@@ -255,6 +257,6 @@
   layers:
     - !type:OreDunGen
       entity: CP14MobWatcherMagma
-      count: 2
+      count: 8
       minGroupSize: 2
       maxGroupSize: 3
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
index 6ae8987689..a4a3cde9c7 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
@@ -17,9 +17,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneIronOre
-      count: 20
+      count: 15
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: IronOreUnderground
@@ -38,9 +38,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneIronOre
-      count: 30
+      count: 20
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: CopperOre
@@ -59,9 +59,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneCopperOre
-      count: 10
-      minGroupSize: 5
-      maxGroupSize: 7
+      count: 15
+      minGroupSize: 1
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: CopperOreUnderground
@@ -80,9 +80,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneCopperOre
-      count: 10
-      minGroupSize: 5
-      maxGroupSize: 7
+      count: 20
+      minGroupSize: 1
+      maxGroupSize: 3
 
 # TIER 2
 
@@ -103,9 +103,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneGoldOre
-      count: 10
+      count: 5
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: GoldOreUnderground
@@ -124,9 +124,9 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneGoldOre
-      count: 20
+      count: 10
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MithrilOre
@@ -147,7 +147,7 @@
       entity: CP14WallStoneMithrilOre 
       count: 10
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: MithrilOreUnderground
@@ -166,6 +166,6 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneMithrilOre 
-      count: 20
+      count: 15
       minGroupSize: 1
-      maxGroupSize: 5
+      maxGroupSize: 3
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml
index b12598c5e3..082788b723 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml
@@ -1,6 +1,9 @@
 - type: cp14DemiplaneModifierCategory
   id: Danger
 
+- type: cp14DemiplaneModifierCategory
+  id: GhostRoleDanger
+
 - type: cp14DemiplaneModifierCategory
   id: Reward