diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/produced.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/produced.yml
index fa56ea9af3..2ab4c1a07b 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/produced.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/produced.yml
@@ -7,4 +7,7 @@
   - type: Sprite
     sprite: _CP14/Clothing/Head/Produced/wreath.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Head/Produced/wreath.rsi
\ No newline at end of file
+    sprite: _CP14/Clothing/Head/Produced/wreath.rsi
+  - type: Construction
+    graph: CP14HeadWreath
+    node: cp14headwreath
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
index 99ca79eac3..abdbfc4f07 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
@@ -46,6 +46,7 @@
     tags:
     - CP14FitInMortar
     - CP14AlchemicalHerbals
+    - CP14BloodFlower
 
 - type: entity
   id: CP14AgaricMushroom
@@ -255,6 +256,7 @@
     tags:
     - CP14FitInMortar
     - CP14AlchemicalHerbals
+    - CP14Dayflin
 
 - type: entity
   id: CP14AirLily
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
index 3aca82ae56..15349e4887 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
@@ -72,6 +72,9 @@
   - type: CP14DelayedIgnitionSource
   - type: CP14IgnitionModifier
     hideCaution: true
+  - type: Construction
+    graph: CP14Torch
+    node: cp14torch
   - type: MeleeWeapon
     attackRate: 1.5
     wideAnimationRotation: 240
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml
index aac866834a..de4c5470ac 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml
@@ -10,6 +10,8 @@
           steps:
             - material: CP14WoodenPlanks
               amount: 2
+            - material: CP14Cloth
+              amount: 1
               doAfter: 2
     - node: CP14WoodenBed
       entity: CP14WoodenBed
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml
similarity index 89%
rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml
rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml
index 2825b2eba2..f17c22a0fc 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/cabinets.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml
@@ -12,9 +12,10 @@
               amount: 3
             - material: CP14Nail
               amount: 2
-              doAfter: 4
+            - tool: CP14Hammering
+              doAfter: 2
     - node: CP14WoodenCabinet
-      entity: CP14WoodenCabinet 
+      entity: CP14WoodenCabinet
 
 - type: constructionGraph
   id: CP14IronCabinet
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml
similarity index 85%
rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml
rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml
index e283c08b52..5eb283f587 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/closets.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml
@@ -12,6 +12,7 @@
               amount: 4
             - material: CP14Nail
               amount: 2
+            - tool: CP14Hammering
               doAfter: 4
     - node: CP14WoodenCloset
-      entity: CP14WoodenCloset 
\ No newline at end of file
+      entity: CP14WoodenCloset
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml
index 47cb3f03cc..c3ecfa6907 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml
@@ -17,40 +17,3 @@
 
     - node: CP14Bonfire
       entity: CP14Bonfire
-
-- type: constructionGraph
-  id: CP14WallmountTorch
-  start: start
-  graph:
-    - node: start
-      actions:
-        - !type:DestroyEntity {}
-      edges:
-        - to: CP14WallmountTorch
-          steps:
-            - material: CP14WoodenPlanks
-              amount: 3
-              doAfter: 3
-            - material: CP14Cloth
-              amount: 1
-              doAfter: 1
-
-    - node: CP14WallmountTorch
-      entity: CP14WallmountTorch
-
-- type: constructionGraph
-  id: CP14WallmountLampEmpty
-  start: start
-  graph:
-    - node: start
-      actions:
-        - !type:DestroyEntity {}
-      edges:
-        - to: CP14WallmountLampEmpty
-          steps:
-            - material: CP14CopperBar
-              amount: 3
-              doAfter: 3
-
-    - node: CP14WallmountLampEmpty
-      entity: CP14WallmountLampEmpty
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml
index 48ef6f0d55..dd84b37b14 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml
@@ -9,7 +9,7 @@
         - to: CP14ChairWooden
           steps:
             - material: CP14WoodenPlanks
-              amount: 4
+              amount: 2
               doAfter: 2
     - node: CP14ChairWooden
       entity: CP14ChairWooden
@@ -25,7 +25,7 @@
         - to: CP14BenchWood
           steps:
             - material: CP14WoodenPlanks
-              amount: 5
+              amount: 3
               doAfter: 2
     - node: CP14BenchWood
       entity: CP14BenchWood
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
index 1fcc6b8f18..9d104229c4 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
@@ -9,7 +9,7 @@
         - to: CP14TableWooden
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14TableWooden
       entity: CP14TableWooden
@@ -25,7 +25,7 @@
         - to: CP14TableWoodenRound
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14TableWoodenRound
       entity: CP14TableWoodenRound
@@ -41,7 +41,7 @@
         - to: CP14TableWoodenCounter
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14TableWoodenCounter
       entity: CP14TableWoodenCounter
@@ -57,7 +57,7 @@
         - to: CP14Workbench
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14Workbench
       entity: CP14Workbench
@@ -73,7 +73,7 @@
         - to: CP14WorkbenchCooking
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14WorkbenchCooking
       entity: CP14WorkbenchCooking
@@ -89,7 +89,7 @@
         - to: CP14WorkbenchSewing
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
     - node: CP14WorkbenchSewing
-      entity: CP14WorkbenchSewing
\ No newline at end of file
+      entity: CP14WorkbenchSewing
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml
index b522f2c372..a487fdadb9 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml
@@ -25,6 +25,6 @@
               doAfter: 1
             - tool: CP14Hammering
               doAfter: 2
-              
+
     - node: CP14WoodenChest
-      entity: CP14WoodenChest
\ No newline at end of file
+      entity: CP14WoodenChest
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
index c2bb950f5d..56b6707a47 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
@@ -9,11 +9,11 @@
             - !type:SnapToGrid
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
             - material: CP14Cloth
               amount: 2
             - material: CP14Nail
               amount: 1
               doAfter: 4
     - node: CP14CrateCoffin
-      entity: CP14CrateCoffin 
\ No newline at end of file
+      entity: CP14CrateCoffin
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/wooden_fence.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml
similarity index 100%
rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/wooden_fence.yml
rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml
new file mode 100644
index 0000000000..2293692b79
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml
@@ -0,0 +1,36 @@
+- type: constructionGraph
+  id: CP14WallmountTorch
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: CP14WallmountTorch
+          steps:
+            - material: CP14WoodenPlanks
+              amount: 3
+              doAfter: 3
+            - material: CP14Cloth
+              amount: 1
+              doAfter: 1
+
+    - node: CP14WallmountTorch
+      entity: CP14WallmountTorch
+
+- type: constructionGraph
+  id: CP14WallmountLampEmpty
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: CP14WallmountLampEmpty
+          steps:
+            - material: CP14CopperBar
+              amount: 3
+              doAfter: 3
+
+    - node: CP14WallmountLampEmpty
+      entity: CP14WallmountLampEmpty
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml
similarity index 95%
rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml
rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml
index 6cd5f2c592..c273b9d16b 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/shelfs.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml
@@ -28,4 +28,4 @@
               amount: 2
               doAfter: 2
     - node: CP14WallmountBarShelfB
-      entity: CP14WallmountBarShelfB
\ No newline at end of file
+      entity: CP14WallmountBarShelfB
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/farming.yml b/Resources/Prototypes/_CP14/Recipes/Construction/farming.yml
index 431502854d..7d1a627056 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/farming.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/farming.yml
@@ -1,12 +1,12 @@
 - type: construction
   crystallPunkAllowed: true
-  name: Seedbed
+  name: seedbed
   description: A wooden tub with a pile of earth adapted for growing plants. Can only be built on dirt tiles.
   id: CP14SeedbedWooden
   graph: CP14Seedbed
   startNode: start
   targetNode: CP14SeedbedWooden
-  category: construction-category-furniture
+  category: construction-category-structures
   icon:
     sprite: _CP14/Structures/Specific/Farming/seedbed.rsi
     state: seedbed_default
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
index 5f19680b96..25379ec207 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
@@ -1,6 +1,6 @@
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden chair
+  name: wooden chair
   description: Made of the most common planks. Simple and effective!
   id: CP14ChairWooden
   graph: CP14Seat
@@ -18,7 +18,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden table
+  name: wooden table
   description: A simple table made of boards.
   id: CP14TableWooden
   graph: CP14TableWooden
@@ -36,7 +36,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden table (round)
+  name: wooden table (round)
   description: A simple table made of boards.
   id: CP14TableWoodenRound
   graph: CP14TableWoodenRound
@@ -54,7 +54,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden counter
+  name: wooden counter
   description: A simple table made of boards.
   id: CP14TableWoodenCounter
   graph: CP14TableWoodenCounter
@@ -72,27 +72,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wallmount torch
-  description: A torch attached to the wall
-  id: CP14WallmountTorch
-  graph: CP14WallmountTorch
-  startNode: start
-  targetNode: CP14WallmountTorch
-  category: construction-category-furniture
-  icon:
-    sprite: _CP14/Structures/Furniture/wallmount_torch.rsi
-    state: fire
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  canRotate: true
-  conditions:
-    - !type:TileNotBlocked
-    - !type:CP14WallRequired
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Wallmount orders board
+  name: wallmount orders board
   description: Is there a job for a witcher?
   id: CP14WallmountOrdersBorder
   graph: CP14WallmountOrdersBorder
@@ -110,26 +90,6 @@
     - !type:TileNotBlocked
     - !type:CP14WallRequired
 
-- type: construction
-  crystallPunkAllowed: true
-  name: Crystal wall lamp
-  description: A simple wallmount magical device that converts crystal energy into bright light.
-  id: CP14WallmountLampEmpty
-  graph: CP14WallmountLampEmpty
-  startNode: start
-  targetNode: CP14WallmountLampEmpty
-  category: construction-category-furniture
-  icon:
-    sprite: _CP14/Structures/Wallmount/wallmount_lamp.rsi
-    state: base
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: true
-  canRotate: true
-  conditions:
-    - !type:TileNotBlocked
-    - !type:CP14WallRequired
-
 - type: construction
   crystallPunkAllowed: true
   id: CP14Mannequin
@@ -207,7 +167,7 @@
 - type: construction
   crystallPunkAllowed: true
   id: CP14WoodenBed
-  name: Wooden bed
+  name: wooden bed
   description: Comfortable bed for sleeping.
   graph: CP14WoodenBed
   startNode: start
@@ -225,7 +185,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wood bench
+  name: wood bench
   description: A bench carved from wood, a comfortable part of the interior designed for sitting and relaxing.
   id: CP14BenchWood
   graph: CP14BenchWood
@@ -244,7 +204,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Curtains white
+  name: curtains white
   description: Two hanging sheets made of white fabric.
   id: CP14CurtainsWhite
   graph: CP14Curtains
@@ -263,7 +223,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Curtains blue
+  name: curtains blue
   description: Two hanging sheets made of blue fabric.
   id: CP14CurtainsBlue
   graph: CP14Curtains
@@ -282,7 +242,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Curtains red
+  name: curtains red
   description: Two hanging sheets made of red fabric.
   id: CP14CurtainsRed
   graph: CP14Curtains
@@ -299,120 +259,56 @@
   conditions:
     - !type:EmptyOrWindowValidInTile 
 
-# Small fence
-
 - type: construction
   crystallPunkAllowed: true
-  id: CP14FenceWoodSmallStraight
-  name: small wooden fence
-  description: A small wooden fence. It protects the area from unnecessary visitors who don't have a towel.
-  graph: CP14FenceWood
+  name: wooden closet
+  description: A simple wooden wardrobe for storing clothes and other things.
+  id: CP14WoodenCloset
+  graph: CP14WoodenCloset
   startNode: start
-  targetNode: CP14FenceWoodSmallStraight
+  targetNode: CP14WoodenCloset
   category: construction-category-furniture
   icon:
-    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
-    state: straight
+    sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi
+    state: icon
   objectType: Structure
   placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
+  canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
 
 - type: construction
   crystallPunkAllowed: true
-  id: CP14FenceWoodSmallCorner
-  name: small wooden fence (corner)
-  description: A small wooden fence. It protects the area from unnecessary visitors who don't have a towel.
-  graph: CP14FenceWood
+  name: wooden cabinet
+  description: An ordinary wooden cabinet for simple knickknacks.
+  id: CP14WoodenCabinet
+  graph: CP14WoodenCabinet
   startNode: start
-  targetNode: CP14FenceWoodSmallCorner
+  targetNode: CP14WoodenCabinet
   category: construction-category-furniture
   icon:
-    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
-    state: corner
+    sprite: _CP14/Structures/Storage/Dressers/wood_cabinet.rsi
+    state: icon
   objectType: Structure
   placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
+  canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
 
 - type: construction
   crystallPunkAllowed: true
-  id: CP14FenceWoodSmallGate
-  name: small wooden fence (door)
-  description: Looking at this gate, a familiar image pops up in your head. Where's my piggy?
-  graph: CP14FenceWood
+  name: iron cabinet
+  description: An ordinary iron cabinet for simple knickknacks.
+  id: CP14IronCabinet
+  graph: CP14IronCabinet
   startNode: start
-  targetNode: CP14FenceWoodSmallGate
+  targetNode: CP14IronCabinet
   category: construction-category-furniture
   icon:
-    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
-    state: door_opened
+    sprite: _CP14/Structures/Storage/Dressers/iron_cabinet.rsi
+    state: icon
   objectType: Structure
   placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-    - !type:TileNotBlocked
-
-# Fence
-
-- type: construction
-  crystallPunkAllowed: true
-  id: CP14FenceWoodStraight
-  name: wooden fence
-  description: A wooden fence. Don't plant splinters!
-  graph: CP14FenceWood
-  startNode: start
-  targetNode: CP14FenceWoodStraight
-  category: construction-category-furniture
-  icon:
-    sprite: _CP14/Structures/Fences/wooden_fence.rsi
-    state: straight
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-    - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  id: CP14FenceWoodCorner
-  name: wooden fence
-  description: A wooden fence. Don't plant splinters!
-  graph: CP14FenceWood
-  startNode: start
-  targetNode: CP14FenceWoodCorner
-  category: construction-category-furniture
-  icon:
-    sprite: _CP14/Structures/Fences/wooden_fence.rsi
-    state: corner
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-    - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  id: CP14FenceWoodGate
-  name: wooden fence gate
-  description: Big door in a big fence. For big people.
-  graph: CP14FenceWood
-  startNode: start
-  targetNode: CP14FenceWoodGate
-  category: construction-category-furniture
-  icon:
-    sprite: _CP14/Structures/Fences/wooden_fence.rsi
-    state: door_opened
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: true
+  canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml b/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml
index 59ea11380b..aa0531c4a2 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/storage.yml
@@ -1,6 +1,6 @@
 - type: construction
   crystallPunkAllowed: true
-  name: Dirt pit
+  name: dirt pit
   description: You're wasting dirt to create a hole. Makes sense, doesn't it? Can only be built on dirt tiles.
   id: CP14CrateDirtPitGrave
   graph: CP14CrateDirtPitGrave
@@ -21,7 +21,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden chest
+  name: wooden chest
   description: A simple wooden chest for easy storage of junk.
   id: CP14WoodenChest
   graph: CP14WoodenChest
@@ -39,61 +39,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden closet
-  description: A simple wooden wardrobe for storing clothes and other things.
-  id: CP14WoodenCloset
-  graph: CP14WoodenCloset
-  startNode: start
-  targetNode: CP14WoodenCloset
-  category: construction-category-storage
-  icon:
-    sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi
-    state: icon
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Wooden cabinet
-  description: An ordinary wooden cabinet for simple knickknacks.
-  id: CP14WoodenCabinet
-  graph: CP14WoodenCabinet
-  startNode: start
-  targetNode: CP14WoodenCabinet
-  category: construction-category-storage
-  icon:
-    sprite: _CP14/Structures/Storage/Dressers/wood_cabinet.rsi
-    state: icon
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Iron cabinet
-  description: An ordinary iron cabinet for simple knickknacks.
-  id: CP14IronCabinet
-  graph: CP14IronCabinet
-  startNode: start
-  targetNode: CP14IronCabinet
-  category: construction-category-storage
-  icon:
-    sprite: _CP14/Structures/Storage/Dressers/iron_cabinet.rsi
-    state: icon
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Small wooden crate
+  name: small wooden crate
   description: A small wooden crate for storing everything.
   id: CP14SmallWoodenCrate
   graph: CP14SmallWoodenCrate
@@ -111,7 +57,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Large wooden crate
+  name: large wooden crate
   description: A large wooden crate for storing a lot of things.
   id: CP14LargeWoodenCrate
   graph: CP14LargeWoodenCrate
@@ -129,7 +75,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Coffin
+  name: coffin
   description: A comfortable and nice looking coffin to comfortably await your resurrection.
   id: CP14CrateCoffin
   graph: CP14CrateCoffin
@@ -147,7 +93,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden barrel
+  name: wooden barrel
   description: The simplest design for storing liquids.
   id: CP14BaseBarrel
   graph: CP14BaseBarrel
@@ -165,7 +111,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden crane barrel
+  name: wooden crane barrel
   description: Large lying barrel with tap, for storing valuable liquids.
   id: CP14CraneBarrel
   graph: CP14CraneBarrel
@@ -184,7 +130,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden small crane barrel
+  name: wooden small crane barrel
   description: A small lying barrel with a tap to quickly pour liquid into mugs.
   id: CP14CraneBarrelSmall
   graph: CP14CraneBarrelSmall
@@ -200,43 +146,3 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Bar shelf (1)
-  description: Wall shelves to store your wine collection.
-  id: CP14WallmountBarShelfA
-  graph: CP14WallmountBarShelfA
-  startNode: start
-  targetNode: CP14WallmountBarShelfA
-  category: construction-category-storage
-  icon:
-    sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi
-    state: shelf
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  canRotate: true
-  conditions:
-    - !type:TileNotBlocked
-    - !type:CP14WallRequired
-
-- type: construction
-  crystallPunkAllowed: true
-  name: Bar shelf (2)
-  description: Wall shelves to store your wine collection.
-  id: CP14WallmountBarShelfB
-  graph: CP14WallmountBarShelfB
-  startNode: start
-  targetNode: CP14WallmountBarShelfB
-  category: construction-category-storage
-  icon:
-    sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi
-    state: shelf
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  canRotate: true
-  conditions:
-    - !type:TileNotBlocked
-    - !type:CP14WallRequired
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/structures.yml b/Resources/Prototypes/_CP14/Recipes/Construction/structures.yml
new file mode 100644
index 0000000000..4c8f3581eb
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/structures.yml
@@ -0,0 +1,197 @@
+- type: construction
+  crystallPunkAllowed: true
+  name: wallmount torch
+  description: A torch attached to the wall
+  id: CP14WallmountTorch
+  graph: CP14WallmountTorch
+  startNode: start
+  targetNode: CP14WallmountTorch
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Furniture/wallmount_torch.rsi
+    state: fire
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  canRotate: true
+  conditions:
+    - !type:TileNotBlocked
+    - !type:CP14WallRequired
+
+- type: construction
+  crystallPunkAllowed: true
+  name: crystal wall lamp
+  description: A simple wallmount magical device that converts crystal energy into bright light.
+  id: CP14WallmountLampEmpty
+  graph: CP14WallmountLampEmpty
+  startNode: start
+  targetNode: CP14WallmountLampEmpty
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Wallmount/wallmount_lamp.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  canRotate: true
+  conditions:
+    - !type:TileNotBlocked
+    - !type:CP14WallRequired
+
+# Small fence
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodSmallStraight
+  name: small wooden fence
+  description: A small wooden fence. It protects the area from unnecessary visitors who don't have a towel.
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodSmallStraight
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
+    state: straight
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodSmallCorner
+  name: small wooden fence (corner)
+  description: A small wooden fence. It protects the area from unnecessary visitors who don't have a towel.
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodSmallCorner
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
+    state: corner
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodSmallGate
+  name: small wooden fence (door)
+  description: Looking at this gate, a familiar image pops up in your head. Where's my piggy?
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodSmallGate
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence_small.rsi
+    state: door_opened
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+# Fence
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodStraight
+  name: wooden fence
+  description: A wooden fence. Don't plant splinters!
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodStraight
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence.rsi
+    state: straight
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodCorner
+  name: wooden fence
+  description: A wooden fence. Don't plant splinters!
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodCorner
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence.rsi
+    state: corner
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  crystallPunkAllowed: true
+  id: CP14FenceWoodGate
+  name: wooden fence gate
+  description: Big door in a big fence. For big people.
+  graph: CP14FenceWood
+  startNode: start
+  targetNode: CP14FenceWoodGate
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Fences/wooden_fence.rsi
+    state: door_opened
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  crystallPunkAllowed: true
+  name: bar shelf (1)
+  description: Wall shelves to store your wine collection.
+  id: CP14WallmountBarShelfA
+  graph: CP14WallmountBarShelfA
+  startNode: start
+  targetNode: CP14WallmountBarShelfA
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi
+    state: shelf
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  canRotate: true
+  conditions:
+    - !type:TileNotBlocked
+    - !type:CP14WallRequired
+
+- type: construction
+  crystallPunkAllowed: true
+  name: bar shelf (2)
+  description: Wall shelves to store your wine collection.
+  id: CP14WallmountBarShelfB
+  graph: CP14WallmountBarShelfB
+  startNode: start
+  targetNode: CP14WallmountBarShelfB
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Wallmount/wallmount_bar_shelf.rsi
+    state: shelf
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  canRotate: true
+  conditions:
+    - !type:TileNotBlocked
+    - !type:CP14WallRequired
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml
index 48ebaeb97d..374775dbf7 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml
@@ -1,6 +1,6 @@
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden wall
+  name: wooden wall
   description: Sturdy enough to cover you from threats or cold winds.
   id: CP14WoodenWall
   graph: CP14WallWood
@@ -18,7 +18,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Wooden window
+  name: wooden window
   description: A wooden wall with a glass window in it.
   id: CP14WindowWooden
   graph: CP14WallWood
@@ -36,7 +36,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Earth cliffs
+  name: earth cliffs
   description: A tall pile of dirt. Can a house be built from it?
   id: CP14WallDirt
   graph: CP14WallDirt
@@ -54,7 +54,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Stone wall
+  name: stone wall
   description: Sturdy enough to cover you from threats or cold winds.
   id: CP14WallStonebrick
   graph: CP14WallStonebrick
@@ -72,7 +72,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Iron grille
+  name: iron grille
   description: Strong iron grille.
   id: CP14FenceIronGrilleStraight
   graph: CP14FenceIronGrilleStraight
@@ -91,7 +91,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: Iron grille window
+  name: iron grille window
   description: The upper half of the solid grid.
   id: CP14FenceIronGrilleWindowStraight
   graph: CP14FenceIronGrilleWindowStraight
diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/head_wreath.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/head_wreath.yml
new file mode 100644
index 0000000000..069541a681
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/head_wreath.yml
@@ -0,0 +1,22 @@
+- type: constructionGraph
+  id: CP14HeadWreath
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cp14headwreath
+      steps:
+      - tag: CP14BloodFlower
+        name: blood rose
+        icon:
+          sprite: _CP14/Objects/Flora/Wild/red_rose.rsi
+          state: base1
+      - tag: CP14Dayflin
+        name: yellow dayflin
+        icon:
+          sprite: _CP14/Objects/Flora/Wild/yellow_dayflin.rsi
+          state: base1
+        doAfter: 2
+
+  - node: cp14headwreath
+    entity: CP14ClothingHeadWreath
diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/torch.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/torch.yml
new file mode 100644
index 0000000000..9968fae8ac
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/torch.yml
@@ -0,0 +1,16 @@
+- type: constructionGraph
+  id: CP14Torch
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cp14torch
+      steps:
+      - material: CP14WoodenPlanks
+        amount: 3
+      - material: CP14Cloth
+        amount: 1
+        doAfter: 4
+
+  - node: cp14torch
+    entity: CP14Torch
diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml
new file mode 100644
index 0000000000..be7b201d19
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml
@@ -0,0 +1,13 @@
+- type: construction
+  crystallPunkAllowed: true
+  name: floral wreath
+  id: cp14headwreath
+  graph: CP14HeadWreath
+  startNode: start
+  targetNode: cp14headwreath
+  category: construction-category-clothing
+  objectType: Item
+  description: A simple flower decoration. That's so sweet.
+  icon:
+    sprite: _CP14/Clothing/Head/Produced/wreath.rsi
+    state: icon
diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml
index e2f0f7552c..11e72d4f6d 100644
--- a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml
@@ -25,3 +25,17 @@
   icon:
     sprite: _CP14/Objects/Specific/Medical/medical.rsi
     state: bandage
+
+- type: construction
+  crystallPunkAllowed: true
+  name: torch
+  id: cp14torch
+  graph: CP14Torch
+  startNode: start
+  targetNode: cp14torch
+  category: construction-category-tools
+  objectType: Item
+  description: If darkness has become a nuisance, a good method is to lighten it up.
+  icon:
+    sprite: _CP14/Objects/Tools/torch.rsi
+    state: torch-unlit
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
index b2993991fe..190face717 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -264,21 +264,6 @@
     knowledge: ClothingSewing
   result: CP14ClothingHeadBandanaYellow
 
-- type: CP14Recipe
-  id: CP14ClothingHeadWreath
-  tag: CP14RecipeSewing
-  craftTime: 2
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14BloodFlower
-    count: 2
-  - !type:ProtoIdResource
-    protoId: CP14Dayflin
-    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
-  result: CP14ClothingHeadWreath
-
 - type: CP14Recipe
   id: CP14ClothingShirtMercenary
   tag: CP14RecipeSewing
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
index 4b5d13f5da..30055cea84 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
@@ -47,19 +47,6 @@
     count: 1
   result: CP14BaseMop
 
-- type: CP14Recipe
-  id: CP14Torch
-  tag: CP14RecipeWorkbench
-  craftTime: 4
-  requirements:
-  - !type:StackResource
-    stack: CP14WoodenPlanks
-    count: 3
-  - !type:StackResource
-    stack: CP14Cloth
-    count: 1
-  result: CP14Torch
-
 - type: CP14Recipe
   id: CP14Lighter
   tag: CP14RecipeWorkbench
diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml
index 9c5edf88f7..0d41504c86 100644
--- a/Resources/Prototypes/_CP14/tags.yml
+++ b/Resources/Prototypes/_CP14/tags.yml
@@ -126,3 +126,9 @@
 
 - type: Tag
   id: CP14Vial
+
+- type: Tag
+  id: CP14BloodFlower
+
+- type: Tag
+  id: CP14Dayflin