diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl
index 7bce1e024e..8d49bea216 100644
--- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl
+++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl
@@ -1,4 +1,3 @@
-cp14-modifier-gold-ore = gold ore
 cp14-modifier-iron-ore = iron ore
 cp14-modifier-copper-ore = copper ore
 cp14-modifier-mithril-ore = mithril ore
diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl
index b649733e79..73543d788f 100644
--- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl
+++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl
@@ -1,4 +1,3 @@
-cp14-modifier-gold-ore = золотая руда
 cp14-modifier-iron-ore = железная руда
 cp14-modifier-copper-ore = медная руда
 cp14-modifier-mithril-ore = мифриловая руда
diff --git a/Resources/Maps/_CP14/Frigid_Coast_d.yml b/Resources/Maps/_CP14/Frigid_Coast_d.yml
index 56ddd8b520..80b6fee2a9 100644
--- a/Resources/Maps/_CP14/Frigid_Coast_d.yml
+++ b/Resources/Maps/_CP14/Frigid_Coast_d.yml
@@ -177526,7 +177526,7 @@ entities:
     - type: Transform
       pos: 28.5,43.5
       parent: 1
-- proto: CP14WallStoneGoldOre
+- proto: CP14WallStoneCopperOre
   entities:
   - uid: 29488
     components:
diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml
index 23f5419949..098f86dada 100644
--- a/Resources/Maps/_CP14/comoss.yml
+++ b/Resources/Maps/_CP14/comoss.yml
@@ -83491,7 +83491,7 @@ entities:
     - type: Transform
       pos: 8.5,49.5
       parent: 1
-- proto: CP14WallStoneGoldOre
+- proto: CP14WallStoneIronOre
   entities:
   - uid: 14355
     components:
diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml
index 0188f5c009..b1386d43fb 100644
--- a/Resources/Maps/_CP14/comoss_d.yml
+++ b/Resources/Maps/_CP14/comoss_d.yml
@@ -120715,7 +120715,7 @@ entities:
     - type: Transform
       pos: -25.5,4.5
       parent: 1
-- proto: CP14WallStoneGoldOre
+- proto: CP14WallStoneCopperOre
   entities:
   - uid: 22956
     components:
@@ -120909,7 +120909,7 @@ entities:
     - type: Transform
       pos: -62.5,11.5
       parent: 1
-- proto: CP14WallStoneMithrilOre
+- proto: CP14WallStoneIronOre
   entities:
   - uid: 23055
     components:
diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
index e3a65ab542..9af536d05e 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -75,11 +75,10 @@
   - type: StorageFill
     contents:
       - id: HandLabeler #TODO custom cp14 labeler
-      - id: CP14WoodenPlanks10
+      - id: CP14WoodenPlanks20
       - id: CP14CopperBar10
       - id: CP14CopperBar10
       - id: CP14IronBar10
-      - id: CP14GoldBar5
       - id: CP14PaperFolderRed
       - id: CP14PenFeather
         amount: 1
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
index 3305dbcf89..f92fd78edb 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
@@ -24,7 +24,9 @@
     sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi
   - type: PhysicalComposition
     materialComposition:
-      CP14Gold: 2
+      CP14Gold: 5
+  - type: StaticPrice
+    price: 20
 
 - type: entity
   parent: CP14ClothingJewelleryBase
@@ -41,3 +43,8 @@
     sprite: _CP14/Clothing/Rings/Amulet/amulet_mana.rsi
   - type: CP14MagicManacostModify
     globalModifier: 0.9
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 5
+  - type: StaticPrice
+    price: 30
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
index 373692a526..4d14347059 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
@@ -97,7 +97,7 @@
   parent: BaseItem
   name: gold bar
   description: A warm to the touch, soft piece of refined gold.
-  categories: [ ForkFiltered ]
+  categories: [ ForkFiltered, DoNotMap ]
   components:
   - type: Item
     size: Normal
@@ -123,6 +123,7 @@
 - type: entity
   id: CP14GoldBar5
   parent: CP14GoldBar1
+  categories: [ DoNotMap ]
   suffix: 5
   components:
   - type: Stack
@@ -131,6 +132,7 @@
 - type: entity
   id: CP14GoldBar10
   parent: CP14GoldBar1
+  categories: [ DoNotMap ]
   suffix: 10
   components:
   - type: Stack
@@ -186,7 +188,7 @@
   parent: BaseItem
   name: mithril bar
   description: A warm to the touch, soft piece of refined mithril.
-  categories: [ ForkFiltered ]
+  categories: [ ForkFiltered, DoNotMap ]
   components:
   - type: Item
     size: Normal
@@ -212,6 +214,7 @@
 - type: entity
   id: CP14MithrilBar5
   parent: CP14MithrilBar1
+  categories: [ DoNotMap ]
   suffix: 5
   components:
   - type: Stack
@@ -220,6 +223,7 @@
 - type: entity
   id: CP14MithrilBar10
   parent: CP14MithrilBar1
+  categories: [ DoNotMap ]
   suffix: 10
   components:
   - type: Stack
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml
index e8bcccd2ec..e18a8c2b45 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml
@@ -95,7 +95,7 @@
   parent: BaseItem
   name: gold ore
   description: A piece of soft, pure gold.
-  categories: [ ForkFiltered ]
+  categories: [ ForkFiltered, DoNotMap ]
   components:
   - type: Item
     size: Normal
@@ -121,6 +121,7 @@
 - type: entity
   id: CP14OreGold5
   parent: CP14OreGold1
+  categories: [ DoNotMap ]
   suffix: 5
   components:
   - type: Stack
@@ -129,6 +130,7 @@
 - type: entity
   id: CP14OreGold10
   parent: CP14OreGold1
+  categories: [ DoNotMap ]
   suffix: 10
   components:
   - type: Stack
@@ -141,7 +143,7 @@
   parent: BaseItem
   name: mithril ore
   description: A piece of enchanted, pure mithril.
-  categories: [ ForkFiltered ]
+  categories: [ ForkFiltered, DoNotMap ]
   components:
   - type: Item
     size: Normal
@@ -167,6 +169,7 @@
 - type: entity
   id: CP14OreMithril5
   parent: CP14OreMithril1
+  categories: [ DoNotMap ]
   suffix: 5
   components:
   - type: Stack
@@ -175,6 +178,7 @@
 - type: entity
   id: CP14OreMithril10
   parent: CP14OreMithril1
+  categories: [ DoNotMap ]
   suffix: 10
   components:
   - type: Stack
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml
index ba5e070e7c..6fc3d93ddc 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml
@@ -73,6 +73,7 @@
   id: CP14WallStoneGoldOre
   suffix: gold ore
   parent: CP14WallStone
+  categories: [ DoNotMap ]
   description: A solid stone natural wall. You see the tantalizing particles of gold in it.
   components:
   - type: Sprite
@@ -105,11 +106,14 @@
         acts: ["Destruction"]
   - type: IconSmooth
     base: wall
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   id: CP14WallStoneMithrilOre
   suffix: mithril ore
   parent: CP14WallStone
+  categories: [ DoNotMap ]
   description: A solid stone natural wall. You see the tantalizing particles of mithril in it.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml
index 4969c4f1ec..4798811412 100644
--- a/Resources/Prototypes/_CP14/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Materials/simple.yml
@@ -85,7 +85,7 @@
   unit: materials-unit-bar
   icon: { sprite: _CP14/Objects/Materials/gold_scrap.rsi, state: scrap_3 }
   color: "#FFD700"
-  price: 5
+  price: 8
 
 - type: material
   id: CP14Mithril
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml
index bb76798898..c806743503 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml
@@ -91,42 +91,19 @@
   levels:
     min: 2
     max: 10
-  name: cp14-modifier-gold-ore
   unique: false
   categories:
     Ore: 0.25
   requiredTags:
   - CP14DemiplaneOres
-  - CP14DemiplaneOpenSky
   layers:
     - !type:CP14OreDunGen
       entityMask:
       - CP14WallStone
       entity: CP14WallStoneGoldOre
-      count: 10
-      minGroupSize: 2
-      maxGroupSize: 4
-
-- type: cp14DemiplaneModifier
-  id: GoldOreUnderground
-  levels:
-    min: 2
-    max: 10
-  name: cp14-modifier-gold-ore
-  unique: false
-  categories:
-    Ore: 0.25
-  requiredTags:
-  - CP14DemiplaneOres
-  - CP14DemiplaneUnderground
-  layers:
-    - !type:CP14OreDunGen
-      entityMask:
-      - CP14WallStone
-      entity: CP14WallStoneGoldOre
-      count: 15
-      minGroupSize: 2
-      maxGroupSize: 4
+      count: 5
+      minGroupSize: 1
+      maxGroupSize: 2
 
 - type: cp14DemiplaneModifier
   id: MithrilOre