diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
index 03a797a43434b..62d50920f36a3 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -35,7 +35,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "s_garage",
+    "id": [ "s_garage", "s_garage_1", "s_garage_2" ],
     "copy-from": "generic_city_building",
     "name": "garage",
     "sym": "O",
@@ -44,49 +44,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "s_garage_roof",
-    "copy-from": "generic_city_building",
-    "name": "garage roof",
-    "sym": "O",
-    "color": "white"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "s_garage_1",
-    "copy-from": "generic_city_building",
-    "name": "garage",
-    "sym": "O",
-    "color": "white",
-    "extend": { "flags": [ "SOURCE_VEHICLES", "SOURCE_FABRICATION" ] }
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "s_garage_roof_1",
-    "copy-from": "generic_city_building",
-    "name": "garage roof",
-    "sym": "O",
-    "color": "white"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "s_garage_2",
-    "copy-from": "generic_city_building",
-    "name": "garage",
-    "sym": "O",
-    "color": "white",
-    "extend": { "flags": [ "SOURCE_VEHICLES", "SOURCE_FABRICATION" ] }
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "s_garage_roof_2",
-    "copy-from": "generic_city_building",
-    "name": "garage roof",
-    "sym": "O",
-    "color": "white"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "s_garage_upper_roof_2",
+    "id": [ "s_garage_roof", "s_garage_roof_1", "s_garage_roof_2", "s_garage_upper_roof_2" ],
     "copy-from": "generic_city_building",
     "name": "garage roof",
     "sym": "O",
@@ -114,15 +72,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "lighthouse_z1",
-    "name": "lighthouse",
-    "sym": "0",
-    "color": "yellow",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lighthouse_z2",
+    "id": [ "lighthouse_z1", "lighthouse_z2", "lighthouse_z4", "lighthouse_z5", "lighthouse_roof" ],
     "name": "lighthouse",
     "sym": "0",
     "color": "yellow",
@@ -136,30 +86,6 @@
     "color": "yellow",
     "see_cost": 5
   },
-  {
-    "type": "overmap_terrain",
-    "id": "lighthouse_z4",
-    "name": "lighthouse",
-    "sym": "0",
-    "color": "yellow",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lighthouse_z5",
-    "name": "lighthouse",
-    "sym": "0",
-    "color": "yellow",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lighthouse_roof",
-    "name": "lighthouse",
-    "sym": "0",
-    "color": "yellow",
-    "see_cost": 5
-  },
   {
     "type": "overmap_terrain",
     "id": "island_sand",
@@ -170,15 +96,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "island_forest",
-    "name": "island",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 1
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "island_forest_thick",
+    "id": [ "island_forest", "island_forest_thick" ],
     "name": "island",
     "sym": "F",
     "color": "green",
@@ -221,24 +139,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_lake",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cabin_lake_roof",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lake_cabin_boathouse",
+    "id": [ "cabin_lake", "lake_cabin_boathouse", "cabin_strange" ],
     "name": "forest",
     "sym": "F",
     "color": "green",
@@ -247,21 +148,12 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "lake_cabin_boathouse_roof",
+    "id": [ "cabin_lake_roof", "lake_cabin_boathouse_roof" ],
     "name": "forest",
     "sym": "F",
     "color": "green",
     "see_cost": 5
   },
-  {
-    "type": "overmap_terrain",
-    "id": "cabin_strange",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
   {
     "type": "overmap_terrain",
     "id": "cabin_strange_b",
@@ -281,7 +173,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin",
+    "id": [ "cabin", "cabin_1", "cabin_2", "cabin_3", "cabin_4", "cabin_5", "cabin_6", "cabin_7", "cabin_lapin" ],
     "name": "cabin",
     "sym": "C",
     "color": "i_green",
@@ -292,7 +184,17 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof",
+    "id": [
+      "cabin_roof",
+      "cabin_roof_1",
+      "cabin_roof_2",
+      "cabin_roof_3",
+      "cabin_roof_4",
+      "cabin_roof_5",
+      "cabin_roof_6",
+      "cabin_roof_7",
+      "cabin_roof_lapin"
+    ],
     "name": "cabin roof",
     "sym": "C",
     "color": "i_green",
@@ -301,1001 +203,362 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_1",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "id": "dirtroad1_aban1",
+    "name": "forest",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 4
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_1",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build"
+    "id": [ "forest_aban1", "dirtroad2_aban1", "dirtplaza_aban1" ],
+    "name": "forest",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 4
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_2",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "id": "cabin_aban1",
+    "name": "ruined cabin",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 4,
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_2",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build"
+    "id": "barn_aban1",
+    "name": "barn",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 4,
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_3",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "id": "car_corner_aban1",
+    "name": "car corner",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 4
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_3",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build"
+    "id": [ "shipwreck_river_1", "shipwreck_river_2", "shipwreck_river_3", "shipwreck_river_4" ],
+    "name": "shipwreck",
+    "sym": "w",
+    "color": "red",
+    "see_cost": 4
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_4",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "id": [
+      "radio_tower",
+      "radio_tower_even",
+      "radio_tower_even_stair_only",
+      "radio_tower_odd",
+      "radio_tower_top",
+      "radio_tower_1",
+      "radio_tower_roof_1"
+    ],
+    "name": "radio tower",
+    "sym": "X",
+    "color": "light_gray",
+    "see_cost": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_4",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
+    "id": [ "bandit_cabin", "bandit_camp_1", "bandit_camp_2", "bandit_camp_3", "bandit_camp_4" ],
+    "name": "forest",
+    "sym": "F",
+    "color": "green",
     "see_cost": 5,
-    "extras": "build"
+    "//": "RISK_LOW due to risk and safety being based on NPCs perception of what the area may contain",
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_5",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "id": "looted_building",
+    "name": "looted building",
+    "sym": "#",
+    "color": "light_gray",
+    "see_cost": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_5",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build"
+    "id": "debug_ramps",
+    "name": "ramp testing area",
+    "sym": "%",
+    "color": "white",
+    "flags": [ "NO_ROTATE" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_6",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
+    "id": [ "campsite", "campsite_a" ],
+    "name": "campsite",
+    "sym": "+",
+    "color": "green",
     "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
+    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
     "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_6",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
+    "id": "campsite_cabin_incomplete",
+    "name": "incomplete cabin",
+    "sym": "+",
+    "color": "light_green",
     "see_cost": 5,
-    "extras": "build"
+    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_7",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
+    "id": [ "campsite_field_biker", "campsite_field_biker_destroyed" ],
+    "name": "field campsite",
+    "sym": "+",
+    "color": "light_green",
     "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
+    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
     "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_7",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
+    "id": "pond_field",
+    "name": "pond",
+    "sym": ".",
+    "color": "blue",
     "see_cost": 5,
-    "extras": "build"
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_lapin",
-    "name": "cabin",
-    "sym": "C",
-    "color": "i_green",
+    "id": "pond_forest",
+    "name": "basin",
+    "sym": "F",
+    "color": "blue",
     "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "cabin_roof_lapin",
-    "name": "cabin roof",
-    "sym": "C",
-    "color": "i_green",
-    "see_cost": 5,
-    "extras": "build"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "dirtroad1_aban1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "forest_aban1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "dirtroad2_aban1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "dirtplaza_aban1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cabin_aban1",
-    "name": "ruined cabin",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "barn_aban1",
-    "name": "barn",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "car_corner_aban1",
-    "name": "car corner",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "shipwreck_river_1",
-    "name": "shipwreck",
-    "sym": "w",
-    "color": "red",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "shipwreck_river_2",
-    "name": "shipwreck",
-    "sym": "w",
-    "color": "red",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "shipwreck_river_3",
-    "name": "razorclaw nest",
-    "sym": "w",
-    "color": "red",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "shipwreck_river_4",
-    "name": "shipwreck",
-    "sym": "w",
-    "color": "red",
-    "see_cost": 4
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower",
-    "name": "radio tower",
-    "sym": "X",
-    "color": "light_gray",
-    "see_cost": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_even",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_even_stair_only",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_odd",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_top",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_1",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "radio_tower_roof_1",
-    "name": "radio tower roof",
-    "copy-from": "radio_tower"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_cabin",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_camp_1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "//": "RISK_LOW due to risk and safety being based on NPCs perception of what the area may contain",
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_camp_2",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_camp_3",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_camp_4",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "looted_building",
-    "name": "looted building",
-    "sym": "#",
-    "color": "light_gray",
-    "see_cost": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "debug_ramps",
-    "name": "ramp testing area",
-    "sym": "%",
-    "color": "white",
-    "flags": [ "NO_ROTATE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campsite",
-    "name": "campsite",
-    "sym": "+",
-    "color": "green",
-    "see_cost": 5,
-    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campsite_a",
-    "name": "campsites",
-    "sym": "+",
-    "color": "green",
-    "see_cost": 5,
-    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campsite_cabin_incomplete",
-    "name": "incomplete cabin",
-    "sym": "+",
-    "color": "light_green",
-    "see_cost": 5,
-    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campsite_field_biker",
-    "name": "field campsite",
-    "sym": "+",
-    "color": "light_green",
-    "see_cost": 5,
-    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campsite_field_biker_destroyed",
-    "name": "field campsite",
-    "sym": "+",
-    "color": "light_green",
-    "see_cost": 5,
-    "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 },
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "pond_field",
-    "name": "pond",
-    "sym": ".",
-    "color": "blue",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "pond_forest",
-    "name": "basin",
-    "sym": "F",
-    "color": "blue",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "pond_swamp",
-    "name": "bog",
-    "sym": "F",
-    "color": "blue",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hunter_shack",
-    "name": "swamp shack",
-    "sym": "F",
-    "color": "cyan",
-    "see_cost": 5,
-    "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hunter_shack_roof",
-    "name": "swamp shack roof",
-    "sym": "F",
-    "color": "cyan",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hunter_shack_1",
-    "name": "swamp shack",
-    "sym": "F",
-    "color": "cyan",
-    "see_cost": 5,
-    "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "hunter_shack_roof_1",
-    "name": "swamp shack roof",
-    "sym": "F",
-    "color": "cyan",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_1a",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_1b",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_2a",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_2b",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_roof",
-    "name": "campground roof",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_1a_npc",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_1b_npc",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_2a_npc",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_2b_npc",
-    "name": "campground",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "campground_roof_npc",
-    "name": "campground roof",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "desolatebarn",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "desolate barn",
-    "sym": "B",
-    "color": "brown",
-    "extend": { "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_garage_1",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "bandit_garage_2",
-    "name": "forest",
-    "sym": "F",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "ws_giant_sinkhole_1",
-    "name": "giant sinkhole",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "sym": "O",
-    "color": "brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "ws_giant_sinkhole_2",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "giant sinkhole base",
-    "sym": "O",
-    "color": "brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cs_public_space",
-    "copy-from": "generic_city_building",
-    "name": "public space",
-    "color": "i_white"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x1_0",
-    "name": "parking lot",
-    "sym": "O",
-    "color": "dark_gray",
-    "see_cost": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x1_1",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_3x1_0",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_3x1_1",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_3x1_2",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x2_0_0",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x2_0_1",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x2_1_0",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "parking_2x2_1_1",
-    "copy-from": "parking_2x1_0"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_1",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_2",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_3",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_4",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_5",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_6",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_7",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_8",
-    "name": "irradiation plant",
-    "sym": "I",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_9",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_1_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_2_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_3_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_4_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_5_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_6_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_7_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_8_roof",
-    "name": "irradiation plant",
-    "sym": "I",
-    "color": "light_green",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "irradiator_1_9_roof",
-    "name": "irradiation plant",
-    "sym": "i",
-    "color": "light_green",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_1a",
-    "name": "field",
-    "sym": ".",
-    "color": "brown",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2a",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_3a",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_1b",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2b",
-    "name": "crashed airliner",
-    "sym": "A",
-    "color": "red",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_3b",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_1c",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2c",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_3c",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_1d",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2d",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_3d",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_1e",
-    "copy-from": "airliner_1a"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2e",
-    "copy-from": "airliner_1a"
+    "id": "pond_swamp",
+    "name": "bog",
+    "sym": "F",
+    "color": "blue",
+    "see_cost": 5,
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3e",
-    "copy-from": "airliner_1a"
+    "id": [ "hunter_shack", "hunter_shack_1" ],
+    "name": "swamp shack",
+    "sym": "F",
+    "color": "cyan",
+    "see_cost": 5,
+    "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_1f",
-    "copy-from": "airliner_1a"
+    "id": [ "hunter_shack_roof", "hunter_shack_roof_1" ],
+    "name": "swamp shack roof",
+    "sym": "F",
+    "color": "cyan",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2f",
-    "copy-from": "airliner_1a"
+    "id": [
+      "campground_1a",
+      "campground_1b",
+      "campground_2a",
+      "campground_2b",
+      "campground_1a_npc",
+      "campground_1b_npc",
+      "campground_2a_npc",
+      "campground_2b_npc"
+    ],
+    "name": "campground",
+    "sym": "+",
+    "color": "i_green",
+    "see_cost": 5,
+    "mondensity": 2,
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3f",
-    "copy-from": "airliner_1a"
+    "id": [ "campground_roof", "campground_roof_npc" ],
+    "name": "campground roof",
+    "sym": "+",
+    "color": "i_green",
+    "see_cost": 5,
+    "mondensity": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_1g",
-    "copy-from": "airliner_1a"
+    "id": "desolatebarn",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "desolate barn",
+    "sym": "B",
+    "color": "brown",
+    "extend": { "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2g",
-    "copy-from": "airliner_1a"
+    "id": [ "bandit_garage_1", "bandit_garage_2" ],
+    "name": "forest",
+    "sym": "F",
+    "color": "green",
+    "see_cost": 5,
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3g",
-    "copy-from": "airliner_1a"
+    "id": "ws_giant_sinkhole_1",
+    "name": "giant sinkhole",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "sym": "O",
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_1h",
-    "copy-from": "airliner_1a"
+    "id": "ws_giant_sinkhole_2",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "giant sinkhole base",
+    "sym": "O",
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2h",
-    "copy-from": "airliner_1a"
+    "id": "cs_public_space",
+    "copy-from": "generic_city_building",
+    "name": "public space",
+    "color": "i_white"
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3h",
-    "copy-from": "airliner_1a"
+    "id": [
+      "parking_2x1_0",
+      "parking_2x1_1",
+      "parking_2x2_0_0",
+      "parking_2x2_0_1",
+      "parking_2x2_1_0",
+      "parking_2x2_1_1",
+      "parking_3x1_0",
+      "parking_3x1_1",
+      "parking_3x1_2"
+    ],
+    "name": "parking lot",
+    "sym": "O",
+    "color": "dark_gray",
+    "see_cost": 2
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_1i",
-    "copy-from": "airliner_1a"
+    "id": [
+      "irradiator_1_1",
+      "irradiator_1_2",
+      "irradiator_1_3",
+      "irradiator_1_4",
+      "irradiator_1_5",
+      "irradiator_1_6",
+      "irradiator_1_7",
+      "irradiator_1_9"
+    ],
+    "name": "irradiation plant",
+    "sym": "i",
+    "color": "light_green",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2i",
-    "copy-from": "airliner_1a"
+    "id": "irradiator_1_8",
+    "name": "irradiation plant",
+    "sym": "I",
+    "color": "light_green",
+    "see_cost": 5,
+    "flags": [ "SIDEWALK" ]
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3i",
-    "copy-from": "airliner_1a"
+    "id": [
+      "irradiator_1_1_roof",
+      "irradiator_1_2_roof",
+      "irradiator_1_3_roof",
+      "irradiator_1_4_roof",
+      "irradiator_1_5_roof",
+      "irradiator_1_6_roof",
+      "irradiator_1_7_roof",
+      "irradiator_1_9_roof"
+    ],
+    "name": "irradiation plant",
+    "sym": "i",
+    "color": "light_green",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_1j",
-    "copy-from": "airliner_1a"
+    "id": "irradiator_1_8_roof",
+    "name": "irradiation plant",
+    "sym": "I",
+    "color": "light_green",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2j",
-    "copy-from": "airliner_1a"
+    "id": [
+      "airliner_1a",
+      "airliner_2a",
+      "airliner_3a",
+      "airliner_1b",
+      "airliner_3b",
+      "airliner_1c",
+      "airliner_2c",
+      "airliner_3c",
+      "airliner_1d",
+      "airliner_2d",
+      "airliner_3d",
+      "airliner_1e",
+      "airliner_2e",
+      "airliner_3e",
+      "airliner_1f",
+      "airliner_2f",
+      "airliner_3f",
+      "airliner_1g",
+      "airliner_2g",
+      "airliner_3g",
+      "airliner_1h",
+      "airliner_2h",
+      "airliner_3h",
+      "airliner_1i",
+      "airliner_2i",
+      "airliner_3i",
+      "airliner_1j",
+      "airliner_2j",
+      "airliner_3j"
+    ],
+    "name": "field",
+    "sym": ".",
+    "color": "brown",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_3j",
-    "copy-from": "airliner_1a"
+    "id": [ "airliner_2b", "airliner_2b_1", "airliner_2b_-1" ],
+    "name": "crashed airliner",
+    "sym": "A",
+    "color": "red",
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
-    "id": "airliner_2a_1",
+    "id": [ "airliner_2a_1", "airliner_2c_1" ],
     "name": "open air",
     "sym": ".",
     "color": "blue",
     "see_cost": 5
   },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2b_1",
-    "copy-from": "airliner_2b"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2c_1",
-    "copy-from": "airliner_2a_1"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "airliner_2b_-1",
-    "copy-from": "airliner_2b"
-  },
   {
     "type": "overmap_terrain",
     "id": "airliner_2c_-1",
@@ -1316,7 +579,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "lab_subway_vent_shaft-1",
+    "id": [ "lab_subway_vent_shaft-1", "lab_subway_vent_shaft-2", "lab_subway_vent_shaft-3", "lab_subway_vent_shaft-4" ],
     "name": "ventilation shaft",
     "sym": "%",
     "color": "dark_gray",
@@ -1325,193 +588,28 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "lab_subway_vent_shaft-2",
-    "copy-from": "lab_subway_vent_shaft-1"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lab_subway_vent_shaft-3",
-    "copy-from": "lab_subway_vent_shaft-1"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "lab_subway_vent_shaft-4",
-    "copy-from": "lab_subway_vent_shaft-1"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_2",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_3",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_4",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_5",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_6",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_7",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_8",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_9",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_1_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_2_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_3_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_4_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_5_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_6_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_7_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_8_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_9_1",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_1_2",
-    "name": "campground",
-    "sym": "┼",
-    "color": "green",
-    "see_cost": 5,
-    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "cground_2_2",
+    "id": [
+      "cground_1",
+      "cground_1_1",
+      "cground_1_2",
+      "cground_2",
+      "cground_2_1",
+      "cground_2_2",
+      "cground_3",
+      "cground_3_1",
+      "cground_4",
+      "cground_4_1",
+      "cground_5",
+      "cground_5_1",
+      "cground_6",
+      "cground_6_1",
+      "cground_7",
+      "cground_7_1",
+      "cground_8",
+      "cground_8_1",
+      "cground_9",
+      "cground_9_1"
+    ],
     "name": "campground",
     "sym": "┼",
     "color": "green",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
index ed3a697a03360..bbb9c4d5a7bef 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
@@ -1,1681 +1,653 @@
 [
   {
     "type": "overmap_terrain",
-    "id": "sugar_house",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "sugar house",
-    "sym": "S",
-    "color": "i_brown",
-    "extend": { "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW" ] }
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "sugar_house_roof",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "sugar house roof",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "rural_road",
+    "abstract": "generic_rural_road",
     "name": "rural road",
-    "sym": "│",
     "color": "brown",
     "see_cost": 5,
     "mondensity": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "rural_road",
+    "copy-from": "generic_rural_road",
+    "sym": "│"
+  },
   {
     "type": "overmap_terrain",
     "id": "rural_road_3way",
-    "name": "rural road",
-    "sym": "┬",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┬"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_turn",
-    "name": "rural road",
-    "sym": "┐",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┐"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_turn1",
-    "name": "rural road",
-    "sym": "┌",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┌"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_forest",
-    "name": "rural road",
-    "sym": "│",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "│"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_turn_forest",
-    "name": "rural road",
-    "sym": "┐",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┐"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_turn1_forest",
-    "name": "rural road",
-    "sym": "┌",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┌"
   },
   {
     "type": "overmap_terrain",
     "id": "rural_road_3way_forest",
-    "name": "rural road",
-    "sym": "┬",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_road",
+    "sym": "┬"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "abstract": "generic_dirt_road",
+    "copy-from": "generic_rural_road",
+    "name": "dirt road"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_2",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "id": "dirt_road",
+    "copy-from": "generic_dirt_road",
+    "sym": "│"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_2_roof",
-    "name": "farm house roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
+    "id": "dirt_road_3way",
+    "copy-from": "generic_dirt_road",
+    "sym": "┬"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_3",
-    "name": "farm barn",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_turn",
+    "copy-from": "generic_dirt_road",
+    "sym": "┐"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_3_roof",
-    "name": "farm barn roof",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_turn1",
+    "copy-from": "generic_dirt_road",
+    "sym": "┌"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_4",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_forest",
+    "copy-from": "generic_dirt_road",
+    "sym": "│"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_turn_forest",
+    "copy-from": "generic_dirt_road",
+    "sym": "┐"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_turn1_forest",
+    "copy-from": "generic_dirt_road",
+    "sym": "┌"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_7",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "dirt_road_3way_forest",
+    "copy-from": "generic_dirt_road",
+    "sym": "┬"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_8",
-    "name": "farm field",
+    "abstract": "generic_rural_building",
+    "copy-from": "generic_city_building_no_sidewalk",
+    "name": "rural building",
     "sym": "#",
     "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "extend": { "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ] }
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_9",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "sugar_house",
+    "copy-from": "generic_rural_building",
+    "name": "sugar house",
+    "sym": "S"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "sugar_house_roof",
+    "copy-from": "sugar_house",
+    "name": "sugar house roof"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [
+      "2farm_1",
+      "2farm_10",
+      "2farm_12",
+      "2farm_13",
+      "2farm_14",
+      "2farm_15",
+      "2farm_16",
+      "2farm_2",
+      "2farm_5",
+      "2farm_6",
+      "2farm_9",
+      "2farm_roof_15",
+      "farm_1",
+      "farm_4",
+      "farm_5",
+      "farm_6",
+      "farm_7",
+      "farm_8",
+      "farm_9",
+      "farm_isherwood_1",
+      "farm_isherwood_4",
+      "farm_isherwood_5",
+      "farm_isherwood_6",
+      "farm_isherwood_7",
+      "farm_isherwood_8",
+      "farm_isherwood_9",
+      "farm_lot_M",
+      "farm_lot_M1",
+      "farm_lot_wire_straight_h",
+      "farm_lot_wire_straight_h_open",
+      "farm_lot_wire_straight_v",
+      "farm_lot_wire_straight_v_open",
+      "farm_lot_wire_turn_h",
+      "farm_lot_wire_turn_h_open",
+      "farm_lot_wire_turn_uni",
+      "farm_lot_wire_turn_v",
+      "farm_lot_wire_turn_v_open",
+      "farm_stills_1",
+      "farm_stills_10",
+      "farm_stills_2",
+      "farm_stills_5",
+      "farm_stills_6",
+      "farm_stills_9",
+      "horse_farm_1",
+      "horse_farm_11",
+      "horse_farm_12",
+      "horse_farm_14",
+      "horse_farm_15",
+      "horse_farm_16",
+      "horse_farm_3",
+      "horse_farm_5",
+      "horse_farm_6",
+      "horse_farm_8",
+      "horse_farm_isherwood_1",
+      "horse_farm_isherwood_11",
+      "horse_farm_isherwood_12",
+      "horse_farm_isherwood_14",
+      "horse_farm_isherwood_15",
+      "horse_farm_isherwood_16",
+      "horse_farm_isherwood_3",
+      "horse_farm_isherwood_5",
+      "horse_farm_isherwood_6",
+      "horse_farm_isherwood_8"
+    ],
+    "copy-from": "generic_rural_building",
+    "name": "farm field"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [ "farm_2_roof", "farm_isherwood_2_roof", "horse_farm_13_roof", "horse_farm_isherwood_13_roof" ],
+    "copy-from": "generic_rural_building",
+    "name": "farm house roof",
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_2",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_3",
+    "copy-from": "generic_rural_building",
+    "name": "farm barn"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_3",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_3_roof",
+    "copy-from": "farm_3",
+    "name": "farm barn roof"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_roof_3",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [ "2farm_3", "2farm_roof_3", "2farm_4", "2farm_roof_4", "2farm_7", "2farm_8" ],
+    "copy-from": "generic_rural_building",
+    "name": "farm"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_4",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [
+      "farm_2",
+      "horse_farm_isherwood_13",
+      "horse_farm_13",
+      "farm_isherwood_2",
+      "2farm_11",
+      "farm_stills_3",
+      "farm_dairy_twd_4",
+      "2farm_roof_11"
+    ],
+    "copy-from": "generic_rural_building",
+    "name": "farm house",
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_roof_4",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [ "farm_stills_4", "farm_stills_8", "farm_stills_12" ],
+    "copy-from": "generic_rural_building",
+    "name": "grape farm"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_stills_7",
+    "copy-from": "generic_rural_building",
+    "name": "stills",
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_stills_11",
+    "copy-from": "generic_rural_building",
+    "name": "orchard",
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_7",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "orchard_tree_apple",
+    "copy-from": "generic_rural_building",
+    "name": "apple orchard",
+    "sym": "T",
+    "color": "light_green",
+    "mondensity": 3
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_8",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "orchard_processing",
+    "copy-from": "generic_rural_building",
+    "name": "orchard processing",
+    "sym": "T",
+    "color": "i_light_green",
+    "mondensity": 3
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_9",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "orchard_stall",
+    "copy-from": "generic_rural_building",
+    "name": "orchard stall",
+    "sym": "T",
+    "color": "i_light_green",
+    "mondensity": 3
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_10",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [
+      "dairy_farm_NW",
+      "dairy_farm_NE",
+      "dairy_farm_SE",
+      "dairy_farm_SW",
+      "dairy_farm_isherwood_W",
+      "dairy_farm_isherwood_E",
+      "dairy_farm_isherwood_SE",
+      "dairy_farm_isherwood_SW"
+    ],
+    "copy-from": "generic_rural_building",
+    "name": "dairy farm",
+    "sym": "w",
+    "color": "brown",
+    "see_cost": 1,
+    "extend": { "flags": [ "SOURCE_DRINK", "SOURCE_ANIMALS" ] }
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_11",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "id": [ "dairy_farm_SE_roof", "dairy_farm_SW_roof", "dairy_farm_isherwood_SE_roof", "dairy_farm_isherwood_SW_roof" ],
+    "copy-from": "generic_rural_building",
+    "name": "dairy farm roof",
+    "sym": "w"
   },
   {
+    "id": "smokehouse",
     "type": "overmap_terrain",
-    "id": "2farm_roof_11",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_building",
+    "name": "smokehouse",
+    "sym": "u",
+    "color": "brown"
   },
   {
+    "id": "smokehouse_roof",
     "type": "overmap_terrain",
-    "id": "2farm_12",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_building",
+    "name": "smokehouse roof",
+    "color": "brown"
   },
   {
+    "id": "rural_outbuilding",
     "type": "overmap_terrain",
-    "id": "2farm_13",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_building",
+    "name": "outbuilding",
+    "color": "brown"
   },
   {
+    "id": "rural_outbuilding_roof",
     "type": "overmap_terrain",
-    "id": "2farm_14",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_building",
+    "name": "outbuilding roof",
+    "sym": "u",
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_15",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_isherwood_2_cellar",
+    "copy-from": "generic_rural_building",
+    "name": "farm house cellar",
+    "sym": "O"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_roof_15",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_isherwood_3",
+    "copy-from": "generic_rural_building",
+    "name": "farm barn"
   },
   {
     "type": "overmap_terrain",
-    "id": "2farm_16",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_isherwood_3_hayloft",
+    "copy-from": "generic_rural_building",
+    "name": "farm barn hayloft"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_stills_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "farm_isherwood_3_roof",
+    "copy-from": "generic_rural_building",
+    "name": "farm barn roof"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_stills_2",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_3",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_4",
-    "name": "grape farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_7",
-    "name": "stills",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_8",
-    "name": "grape farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_9",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_10",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_11",
-    "name": "orchard",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_stills_12",
-    "name": "grape farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "orchard_tree_apple",
-    "name": "apple orchard",
-    "sym": "T",
-    "color": "light_green",
-    "see_cost": 5,
-    "mondensity": 3
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "orchard_processing",
-    "name": "orchard processing",
-    "sym": "T",
-    "color": "i_light_green",
-    "see_cost": 5,
-    "mondensity": 3
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "orchard_stall",
-    "name": "orchard stall",
-    "sym": "T",
-    "color": "i_light_green",
-    "see_cost": 5,
-    "mondensity": 3
-  },
-  {
-    "id": "dairy_farm_NW",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 1,
-    "flags": [ "SIDEWALK", "SOURCE_FOOD", "SOURCE_DRINK", "SOURCE_SAFETY", "SOURCE_ANIMALS", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "id": "dairy_farm_NE",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 1,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_SE",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_SE_roof",
-    "type": "overmap_terrain",
-    "name": "dairy farm roof",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_SW",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_SW_roof",
-    "type": "overmap_terrain",
-    "name": "dairy farm roof",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_W",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 1,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_E",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 1,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_SE",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_SE_roof",
-    "type": "overmap_terrain",
-    "name": "dairy farm roof",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_SW",
-    "type": "overmap_terrain",
-    "name": "dairy farm",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "dairy_farm_isherwood_SW_roof",
-    "type": "overmap_terrain",
-    "name": "dairy farm roof",
-    "sym": "w",
-    "color": "brown",
-    "see_cost": 5,
-    "flags": [ "SIDEWALK" ]
-  },
-  {
-    "id": "smokehouse",
-    "type": "overmap_terrain",
-    "name": "smokehouse",
-    "sym": "u",
-    "color": "brown",
-    "see_cost": 5
-  },
-  {
-    "id": "smokehouse_roof",
-    "type": "overmap_terrain",
-    "name": "smokehouse roof",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5
-  },
-  {
-    "id": "rural_outbuilding",
-    "type": "overmap_terrain",
-    "name": "outbuilding",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5
-  },
-  {
-    "id": "rural_outbuilding_roof",
-    "type": "overmap_terrain",
-    "name": "outbuilding roof",
-    "sym": "u",
-    "color": "brown",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_2",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_2_cellar",
-    "name": "farm house cellar",
-    "sym": "O",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_2_roof",
-    "name": "farm house roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_3",
-    "name": "farm barn",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_3_hayloft",
-    "name": "farm barn hayloft",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_3_roof",
-    "name": "farm barn roof",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_4",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_7",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_8",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_isherwood_9",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_2",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_3",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_4",
-    "name": "carriage house",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_4_roof",
-    "name": "carriage house roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_7",
-    "name": "horse stable",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_7_hayloft",
-    "name": "horse stable hayloft",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_7_roof",
-    "name": "horse stable roof",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_8",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_9",
-    "name": "green house",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_9_roof",
-    "name": "green house roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_10",
-    "name": "chicken coop",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_10_roof",
-    "name": "chicken coop roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_11",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_12",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_13",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_13_2ndfloor",
-    "name": "farm house 2nd floor",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_13_roof",
-    "name": "farm house roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_14",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_15",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_isherwood_16",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "id": "cemetery_small",
-    "type": "overmap_terrain",
-    "copy-from": "generic_city_building",
-    "name": "small cemetery",
-    "sym": "C",
-    "color": "light_gray"
-  },
-  {
-    "id": "orchard",
-    "type": "overmap_terrain",
-    "copy-from": "generic_city_building",
-    "name": "orchard",
-    "sym": "#",
-    "color": "i_green",
-    "extend": { "flags": [ "SOURCE_FOOD" ] }
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still_roof",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still roof",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still_1",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still_roof_1",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still roof",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still_2",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "moonshine_still_roof_2",
-    "copy-from": "generic_city_building_no_sidewalk",
-    "name": "moonshine still roof",
-    "sym": "S",
-    "color": "i_brown"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "TreeFarm_1b",
-    "name": "tree farm",
-    "sym": "T",
-    "color": "i_green",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_2",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_3",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_4",
-    "name": "carriage house",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_4_roof",
-    "name": "carriage house roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_5",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_6",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_7",
-    "name": "horse stable",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_7_hayloft",
-    "name": "horse stable hayloft",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_7_roof",
-    "name": "horse stable roof",
-    "sym": "&",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_8",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_9",
-    "name": "green house",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_9_roof",
-    "name": "green house roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_10",
-    "name": "chicken coop",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_10_roof",
-    "name": "chicken coop roof",
-    "sym": "o",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_11",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_12",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_13",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_ANIMALS", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_13_2ndfloor",
-    "name": "farm house 2nd floor",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_13_roof",
-    "name": "farm house roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_14",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "horse_farm_15",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_2",
+    "copy-from": "generic_rural_building",
+    "name": "farm field"
   },
   {
     "type": "overmap_terrain",
-    "id": "horse_farm_16",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_4",
+    "copy-from": "generic_rural_building",
+    "name": "carriage house",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_straight_h",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_4_roof",
+    "copy-from": "generic_rural_building",
+    "name": "carriage house roof",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_turn_h",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_7",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_straight_v",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_7_hayloft",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable hayloft",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_turn_v",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_7_roof",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable roof",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_turn_uni",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_9",
+    "name": "green house",
+    "copy-from": "generic_rural_building",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_straight_v_open",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_9_roof",
+    "copy-from": "generic_rural_building",
+    "name": "green house roof",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_straight_h_open",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_10",
+    "copy-from": "generic_rural_building",
+    "name": "chicken coop",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_turn_v_open",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_isherwood_10_roof",
+    "copy-from": "generic_rural_building",
+    "name": "chicken coop roof",
+    "sym": "o"
   },
   {
+    "id": "cemetery_small",
     "type": "overmap_terrain",
-    "id": "farm_lot_wire_turn_h_open",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_city_building",
+    "name": "small cemetery",
+    "sym": "C",
+    "color": "light_gray"
   },
   {
+    "id": "orchard",
     "type": "overmap_terrain",
-    "id": "farm_lot_M",
-    "name": "farm field",
+    "copy-from": "generic_city_building",
+    "name": "orchard",
     "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "color": "i_green",
+    "extend": { "flags": [ "SOURCE_FOOD" ] }
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_lot_M1",
-    "name": "farm field",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [ "moonshine_still", "moonshine_still_1", "moonshine_still_2" ],
+    "copy-from": "generic_rural_building",
+    "name": "moonshine still",
+    "sym": "S"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road",
-    "name": "dirt road",
-    "sym": "│",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": [ "moonshine_still_roof", "moonshine_still_roof_1", "moonshine_still_roof_2" ],
+    "copy-from": "generic_rural_building",
+    "name": "moonshine still roof",
+    "sym": "S"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_3way",
-    "name": "dirt road",
-    "sym": "┬",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "TreeFarm_1b",
+    "copy-from": "generic_rural_building",
+    "name": "tree farm",
+    "sym": "T",
+    "color": "i_green"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_turn",
-    "name": "dirt road",
-    "sym": "┐",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_2",
+    "copy-from": "generic_rural_building",
+    "name": "farm field",
+    "sym": "#"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_turn1",
-    "name": "dirt road",
-    "sym": "┌",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_4",
+    "copy-from": "generic_rural_building",
+    "name": "carriage house",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_forest",
-    "name": "dirt road",
-    "sym": "│",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_4_roof",
+    "copy-from": "generic_rural_building",
+    "name": "carriage house roof",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_turn_forest",
-    "name": "dirt road",
-    "sym": "┐",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_7",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_turn1_forest",
-    "name": "dirt road",
-    "sym": "┌",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_7_hayloft",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable hayloft",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "dirt_road_3way_forest",
-    "name": "dirt road",
-    "sym": "┬",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "id": "horse_farm_7_roof",
+    "copy-from": "generic_rural_building",
+    "name": "horse stable roof",
+    "sym": "&"
   },
   {
     "type": "overmap_terrain",
-    "id": "2silos",
-    "name": "silos",
-    "sym": "O",
-    "color": "brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
+    "id": "horse_farm_9",
+    "copy-from": "generic_rural_building",
+    "name": "green house",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "2silos_1",
-    "name": "silos",
-    "sym": "O",
-    "color": "brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
+    "id": "horse_farm_9_roof",
+    "copy-from": "generic_rural_building",
+    "name": "green house roof",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "2silos_2",
-    "name": "silos",
-    "sym": "O",
-    "color": "brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
+    "id": "horse_farm_10",
+    "copy-from": "generic_rural_building",
+    "name": "chicken coop",
+    "sym": "o"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "horse_farm_10_roof",
+    "copy-from": "generic_rural_building",
+    "name": "chicken coop roof",
+    "sym": "o"
   },
   {
     "type": "overmap_terrain",
-    "id": "2silos_roof",
+    "id": [ "2silos", "2silos_1", "2silos_2", "2silos_roof" ],
+    "copy-from": "generic_rural_building",
     "name": "silos",
     "sym": "O",
-    "color": "brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
     "id": "coop_chicken",
-    "name": "chicken coop",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "copy-from": "generic_rural_building",
+    "name": "chicken coop"
   },
   {
     "type": "overmap_terrain",
     "id": "yard",
+    "copy-from": "generic_rural_building",
     "name": "yard",
-    "sym": "#",
-    "color": "brown",
-    "see_cost": 5,
-    "mondensity": 2
+    "color": "brown"
   },
   {
     "type": "overmap_terrain",
     "id": "house_farm",
+    "copy-from": "generic_rural_building",
     "name": "rural house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
     "id": "house_farm_roof",
+    "copy-from": "generic_rural_building",
     "name": "rural house roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "extras": "build",
-    "mondensity": 2
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_1",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_2",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_3",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_dairy_twd_4",
-    "name": "farm house",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_5",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "id": [
+      "farm_dairy_twd_1",
+      "farm_dairy_twd_2",
+      "farm_dairy_twd_3",
+      "farm_dairy_twd_5",
+      "farm_dairy_twd_9",
+      "farm_dairy_twd_10"
+    ],
+    "copy-from": "generic_rural_building",
+    "name": "farm"
   },
   {
     "type": "overmap_terrain",
     "id": "farm_dairy_twd_6",
+    "copy-from": "generic_rural_building",
     "name": "barn",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
     "id": "farm_dairy_twd_7",
+    "copy-from": "generic_rural_building",
     "name": "farm",
-    "sym": "┬",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "┬"
   },
   {
     "type": "overmap_terrain",
     "id": "farm_dairy_twd_8",
+    "copy-from": "generic_rural_building",
     "name": "farm",
-    "sym": "┘",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_9",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_10",
-    "name": "farm",
-    "sym": "#",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "┘"
   },
   {
     "type": "overmap_terrain",
     "id": "farm_dairy_twd_11",
+    "copy-from": "generic_rural_building",
     "name": "farm road",
-    "sym": "│",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "│"
   },
   {
     "type": "overmap_terrain",
     "id": "farm_dairy_twd_12",
+    "copy-from": "generic_rural_building",
     "name": "barn",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_second_floor_3",
-    "name": "farm house 2nd floor",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_dairy_twd_second_floor_4",
+    "id": [
+      "horse_farm_isherwood_13_2ndfloor",
+      "horse_farm_13_2ndfloor",
+      "farm_dairy_twd_second_floor_3",
+      "farm_dairy_twd_second_floor_4"
+    ],
+    "copy-from": "generic_rural_building",
     "name": "farm house 2nd floor",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_second_floor_5",
-    "name": "barn roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   },
   {
     "type": "overmap_terrain",
-    "id": "farm_dairy_twd_second_floor_6",
+    "id": [ "farm_dairy_twd_second_floor_5", "farm_dairy_twd_second_floor_6", "farm_dairy_twd_second_floor_12" ],
+    "copy-from": "generic_rural_building",
     "name": "barn roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "farm_dairy_twd_second_floor_12",
-    "name": "barn roof",
-    "sym": "^",
-    "color": "i_brown",
-    "see_cost": 5,
-    "mondensity": 2,
-    "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ]
+    "sym": "^"
   }
 ]
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
index 58f367dbc327a..aceb9c17e4519 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
@@ -10,623 +10,184 @@
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_camp_new_0",
+    "id": [ "faction_base_camp_new_0" ],
+    "copy-from": "faction_base_camp_0",
     "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_1",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_2",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "delete": { "flags": [ "NO_ROTATE" ] }
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_camp_3",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [
+      "faction_base_camp_1",
+      "faction_base_camp_2",
+      "faction_base_camp_3",
+      "faction_base_camp_4",
+      "faction_base_camp_5",
+      "faction_base_camp_6",
+      "faction_base_camp_7",
+      "faction_base_camp_8",
+      "faction_base_camp_9",
+      "faction_base_camp_10",
+      "faction_base_camp_11",
+      "faction_base_camp_12",
+      "faction_base_camp_13",
+      "faction_base_camp_14"
+    ],
+    "copy-from": "faction_base_camp_0",
+    "name": "survivor camp"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_camp_4",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_5",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_6",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_7",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_8",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_9",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_10",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_11",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_12",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_13",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_14",
-    "name": "survivor camp",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_15",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_16",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_17",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_18",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_19",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_camp_20",
-    "name": "survivor base",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [
+      "faction_base_camp_15",
+      "faction_base_camp_16",
+      "faction_base_camp_17",
+      "faction_base_camp_18",
+      "faction_base_camp_19",
+      "faction_base_camp_20"
+    ],
+    "copy-from": "faction_base_camp_0",
+    "name": "survivor base"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_farm_0",
+    "copy-from": "faction_base_camp_0",
     "name": "farm survey",
-    "sym": "+",
-    "color": "i_brown",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "i_brown"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_farm_1",
-    "name": "farm",
-    "sym": "+",
-    "color": "i_brown",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_farm_2",
-    "name": "farm",
-    "sym": "+",
-    "color": "i_brown",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_farm_3",
-    "name": "farm",
-    "sym": "+",
-    "color": "i_brown",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_farm_4",
-    "name": "farm",
-    "sym": "+",
-    "color": "i_brown",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [ "faction_base_farm_1", "faction_base_farm_2", "faction_base_farm_3", "faction_base_farm_4" ],
+    "copy-from": "faction_base_farm_0",
+    "name": "farm"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_garage_0",
+    "copy-from": "faction_base_camp_0",
     "name": "garage survey",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_garage_1",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_garage_2",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_garage_3",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_garage_4",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "i_light_gray"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_garage_5",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_garage_6",
-    "name": "garage",
-    "sym": "+",
-    "color": "i_light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [
+      "faction_base_garage_1",
+      "faction_base_garage_2",
+      "faction_base_garage_3",
+      "faction_base_garage_4",
+      "faction_base_garage_5",
+      "faction_base_garage_6"
+    ],
+    "copy-from": "faction_base_garage_0",
+    "name": "garage"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_kitchen_0",
+    "copy-from": "faction_base_camp_0",
     "name": "kitchen survey",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "i_green"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_kitchen_1",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_2",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_3",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_4",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_5",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_6",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_7",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_kitchen_8",
-    "name": "kitchen",
-    "sym": "+",
-    "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [
+      "faction_base_kitchen_1",
+      "faction_base_kitchen_2",
+      "faction_base_kitchen_3",
+      "faction_base_kitchen_4",
+      "faction_base_kitchen_5",
+      "faction_base_kitchen_6",
+      "faction_base_kitchen_7",
+      "faction_base_kitchen_8"
+    ],
+    "copy-from": "faction_base_kitchen_0",
+    "name": "kitchen"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_hide_site_0",
-    "name": "hide site",
-    "sym": "+",
-    "color": "white",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_N_0",
-    "name": "trench",
-    "sym": "X",
-    "color": "light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "copy-from": "faction_base_camp_0",
+    "name": "hide site"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_wall_level_E_0",
+    "id": [ "faction_wall_level_N_0", "faction_wall_level_E_0", "faction_wall_level_S_0", "faction_wall_level_W_0" ],
+    "copy-from": "faction_base_camp_0",
     "name": "trench",
     "sym": "X",
-    "color": "light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "light_gray"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_wall_level_S_0",
-    "name": "trench",
-    "sym": "X",
-    "color": "light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_W_0",
-    "name": "trench",
-    "sym": "X",
-    "color": "light_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_N_1",
+    "id": [ "faction_wall_level_N_1", "faction_wall_level_E_1", "faction_wall_level_S_1", "faction_wall_level_W_1" ],
+    "copy-from": "faction_base_camp_0",
     "name": "spiked trench",
     "sym": "X",
-    "color": "dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_E_1",
-    "name": "spiked trench",
-    "sym": "X",
-    "color": "dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_S_1",
-    "name": "spiked trench",
-    "sym": "X",
-    "color": "dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_wall_level_W_1",
-    "name": "spiked trench",
-    "sym": "X",
-    "color": "dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "dark_gray"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_workshop_0",
+    "copy-from": "faction_base_camp_0",
     "name": "fabrication workshop survey",
-    "sym": "+",
-    "color": "cyan",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE" ]
+    "color": "cyan"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_blacksmith_0",
+    "copy-from": "faction_base_camp_0",
     "name": "blacksmith survey",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_1",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_2",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_3",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_4",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_5",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_6",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_7",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_8",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_9",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "i_dark_gray"
   },
   {
     "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_10",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_11",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "faction_base_blacksmith_12",
-    "name": "blacksmith shop",
-    "sym": "+",
-    "color": "i_dark_gray",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "id": [
+      "faction_base_blacksmith_1",
+      "faction_base_blacksmith_2",
+      "faction_base_blacksmith_3",
+      "faction_base_blacksmith_4",
+      "faction_base_blacksmith_5",
+      "faction_base_blacksmith_6",
+      "faction_base_blacksmith_7",
+      "faction_base_blacksmith_8",
+      "faction_base_blacksmith_9",
+      "faction_base_blacksmith_10",
+      "faction_base_blacksmith_11",
+      "faction_base_blacksmith_12"
+    ],
+    "copy-from": "faction_base_blacksmith_0",
+    "name": "blacksmith shop"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_livestock_0",
+    "copy-from": "faction_base_camp_0",
     "name": "livestock survey",
-    "sym": "+",
-    "color": "pink",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE", "SOURCE_PEOPLE" ]
+    "color": "pink"
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_storehouse_0",
+    "copy-from": "faction_base_camp_0",
     "name": "store house survey",
-    "sym": "+",
     "color": "cyan",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE" ]
+    "delete": { "flags": [ "SOURCE_PEOPLE" ] }
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_saltworks_0",
+    "copy-from": "faction_base_camp_0",
     "name": "saltworks survey",
-    "sym": "+",
     "color": "red",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE" ]
+    "delete": { "flags": [ "SOURCE_PEOPLE" ] }
   },
   {
     "type": "overmap_terrain",
     "id": "faction_base_canteen_0",
+    "copy-from": "faction_base_camp_0",
     "name": "canteen survey",
-    "sym": "+",
     "color": "i_green",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE" ]
+    "delete": { "flags": [ "SOURCE_PEOPLE" ] }
   }
 ]