diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
index ee72007a63973..4b86e646dddfd 100644
--- a/data/json/itemgroups/food.json
+++ b/data/json/itemgroups/food.json
@@ -851,5 +851,45 @@
       [ "eggnog_spiked", 5 ],
       [ "drink_martini", 10 ]
     ]
+  },
+  {
+    "id": "barbecue",
+    "type": "item_group",
+    "items": [
+      [ "beer", 15 ],
+      [ "meat", 65 ],
+      [ "glazed_tenderloin", 55 ],
+      [ "fish", 10 ],
+      [ "fish_smoked", 5 ],
+      [ "meat_smoked", 60 ],
+      [ "sausage", 35 ],
+      [ "bratwurst_sausage", 30 ],
+      [ "hotdogs_frozen", 65 ],
+      [ "hotdogs_cooked", 65 ],
+      [ "chilidogs", 30 ],
+      [ "currywurst", 15 ],
+      [ "lettuce", 45 ],
+      [ "tomato", 45 ],
+      [ "onion", 30 ],
+      [ "chili_pepper", 30 ],
+      [ "corn", 20 ],
+      [ "irradiated_lettuce", 20 ],
+      [ "irradiated_tomato", 20 ],
+      [ "irradiated_onion", 5 ],
+      [ "irradiated_corn", 10 ],
+      [ "bacon", 20 ],
+      [ "potato_baked", 15 ],
+      [ "bread", 40 ],
+      [ "ketchup", 80 ],
+      [ "mustard", 75 ],
+      { "item": "pickle", "prob": 20, "charges": 6, "container-item": "jar_glass_sealed" },
+      [ "pickle", 20 ],
+      [ "cheeseburger", 30 ],
+      [ "hamburger", 70 ],
+      [ "cheese", 45 ],
+      [ "ceramic_plate", 30 ],
+      [ "knife_steak", 45 ],
+      [ "tongs", 60 ]
+    ]
   }
 ]
diff --git a/data/json/mapgen/house/house_library.json b/data/json/mapgen/house/house_library.json
index 495ff05f76019..3440171434f8c 100644
--- a/data/json/mapgen/house/house_library.json
+++ b/data/json/mapgen/house/house_library.json
@@ -2,117 +2,56 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 100,
+    "om_terrain": [ "house_library" ],
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "...............P........",
-        ".--vv--;--vv-----------.",
-        ".|Y         Y|ooooo  R|.",
-        ".|           |o       v.",
-        ".|    nn     |o       v.",
-        ".| h  nnh    |   K   r|.",
-        ".|    nn    0|0      r|.",
-        ".v    nnh    |   Kc  r|.",
-        ".v    nn     |o       v.",
-        ".| h        C|o       v.",
-        ".|      h   C|oooo   R|.",
-        ".|h         C|----+---|.",
-        ".|------ -----     K  |.",
-        ".|f   c|    ?????    K|.",
-        ".vO   c|        ?     v.",
-        ".vC    +     n  ?     v.",
-        ".|S    |              |.",
-        ".|--+------+------+---|.",
-        ".|B   |        |      |.",
-        ".|B   +        |      v.",
-        ".v   S|   @@   |  @@  v.",
-        ".|t   |   @@d  |  @@ d|.",
-        ".---------vv-----------.",
-        "........................"
-      ],
-      "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] }
+        "......---......p........",
+        ".##oo##*##oo###########.",
+        ".#y  h  L   y|RRRRRvyR#.",
+        ".#           |R      Ho.",
+        ".#r   ff     |R      Ho.",
+        ".#rh  ffh    |   EE  r#.",
+        ".#r  hff    a|a  ssT r#^",
+        ".o    ffh    |   EE  r#.",
+        ".oc h        |R      Ho.",
+        ".#|||||||  |||R      Ho.",
+        ".#y666     |>|RRRR   R#.",
+        ".#7        | |||||+|||#.",
+        ".#4 JA               T#.",
+        ".#O J A   HHHHHs     E#.",
+        ".o1 JA    H ll       so.",
+        ".o5       H          Eo.",
+        ".#23 Y       xxx      #.",
+        ".#||+||||||+||||||+|||#.",
+        ".#B!!Q|TE   ydd|sE  II#.",
+        ".#B!!!+        |y    ho.",
+        ".o!!!S|Ih @@  b|  @@  o.",
+        ".#t!!8|I  @@s D|D @@ d#.",
+        ".#########oo###########.",
+        "............^..........."
       ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "0": "t_floor",
-        ";": "t_door_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "B": "t_floor",
-        "C": "t_floor",
-        "Y": "t_floor",
-        "R": "t_floor",
-        "O": "t_floor",
-        "P": "t_grass",
-        "S": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "r": "t_floor",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "0": "f_fireplace",
-        "?": "f_sofa",
-        "@": "f_bed",
-        "Y": "f_rack_coat",
-        "R": "f_stool",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "K": "f_armchair",
-        "O": "f_oven",
-        "P": "f_mailbox",
-        "S": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "r": "f_rack"
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        ":": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "&": "t_region_groundcover_urban",
+        "$": "t_railing_h",
+        "_": "t_pavement",
+        "G": "t_concrete",
+        "K": "t_concrete",
+        "~": "t_concrete",
+        "j": "t_concrete",
+        "!": "t_linoleum_gray",
+        "8": "t_linoleum_gray",
+        "t": "t_linoleum_gray",
+        "9": "t_linoleum_gray",
+        "S": "t_linoleum_gray",
+        "Q": "t_linoleum_gray",
+        "[": "t_door_glass_c"
       },
-      "toilets": { "t": {  } },
-      "items": {
-        "Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
-        "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
-      },
-      "place_loot": [
-        { "group": "bed", "x": [ 10, 11 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "bed", "x": [ 18, 19 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "bedroom", "x": [ 7, 21 ], "y": [ 18, 21 ], "chance": 80, "repeat": [ 1, 6 ] },
-        { "group": "livingroom", "x": [ 8, 21 ], "y": [ 13, 16 ], "chance": 85, "repeat": [ 1, 5 ] },
-        { "group": "guns_pistol_common", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 },
-        { "group": "dresser", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "dresser", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 2, 6 ], "y": [ 13, 16 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 2, 2 ], "y": [ 15, 15 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "fridge", "x": [ 2, 2 ], "y": [ 13, 13 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "dining", "x": [ 6, 7 ], "y": [ 4, 8 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "oven", "x": [ 2, 2 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "softdrugs", "x": [ 2, 4 ], "y": [ 18, 21 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 2, 4 ], "y": [ 18, 21 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 15, 18 ], "y": [ 2, 2 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "novels", "x": [ 14, 14 ], "y": [ 2, 4 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "textbooks", "x": [ 14, 14 ], "y": [ 2, 4 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "novels", "x": [ 14, 14 ], "y": [ 8, 10 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "textbooks", "x": [ 14, 14 ], "y": [ 8, 10 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 15, 17 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "homebooks", "x": [ 18, 18 ], "y": [ 7, 7 ], "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "alcohol", "x": [ 21, 21 ], "y": [ 5, 7 ], "chance": 75, "repeat": [ 1, 2 ] }
-      ],
+      "furniture": { "&": "f_region_flower" },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
     }
   }
diff --git a/data/json/mapgen/house/house_modern_lx.json b/data/json/mapgen/house/house_modern_lx.json
index 3c1a5e1943e74..1647255f21199 100644
--- a/data/json/mapgen/house/house_modern_lx.json
+++ b/data/json/mapgen/house/house_modern_lx.json
@@ -2,114 +2,100 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_modern_1" ],
     "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "...........#.....s.....#",
-        "...........#....Zs.....#",
-        "...........#.....s.....#",
-        "...........#.....s.....#",
-        "...........RRRVVR+RVVRRR",
-        "...........R????  ?   0R",
-        ".~~~~~~~~~~V      ?  n V",
-        ".~~~~~~~~~~V   ?  ?    V",
-        ".~~~~~~~~~~V????    ???V",
-        ".~~~~~~~~~~R           V",
-        ".~~      ~~Rr          V",
-        ".RRRR[RRRRRR           R",
-        ".Ro     oRP    hhhhhh  R",
-        ".V  ppp oR     nnnnnn  R",
-        ".V  ppp  R  RRRRRRRRRRRR",
-        ".V       R      +     R.",
-        ".R           n  Rr  c V.",
-        ".RoK hK    ????cRr  c R.",
-        ".RRRRRRR++RRRRRRR     V.",
-        ".R  d@@     kkkPROffccR.",
-        ".R   @@      h  RRRRRRR.",
-        ".R              + tS BR.",
-        ".RRRVVVVVVVVVVRRR    BR.",
-        "................RRVRVRR."
+        "...........%....&-&....%",
+        "........:..%....p-&..:.%",
+        "..:........%.:..&-&....%",
+        ".......:...%....&-&....%",
+        "...:.......###$$#*#$$###",
+        ".....jjj...#HHHHL H   a#",
+        ".~~~~~~~~~~$      H  l $",
+        ".~~~~~~~~~~$      H    $",
+        ".~~~~~~~~~~#   H       $",
+        ".~~~~~~~~~~#HHHH   sHHH$",
+        ".~~______~^#M          $",
+        ".####[######           #",
+        ".#R     R#y    AAAAAA  #",
+        ".$  eee R#     ffffff  #",
+        ".$  eee  #  ############",
+        ".$       #      +    y#^",
+        ".#          l   #6 J y$.",
+        ".#RE hE   sHHH#>#6 J 7#.",
+        ".#######++#######4   3$.",
+        ".#T d@@    bIIIy#1FO52#.",
+        ".#D  @@      h  #######.",
+        ".#E             +!tS!B#.",
+        ".###$$$$$$$$$$###8!!!B#.",
+        "................##$#$##."
       ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "#": "t_shrub",
-        "+": "t_door_metal_c",
-        ".": "t_grass",
-        "Z": "t_grass",
-        "0": "t_floor",
-        "?": "t_floor",
-        "@": "t_floor",
-        "B": "t_floor",
-        "D": "t_floor",
-        "K": "t_floor",
-        "O": "t_floor",
-        "P": "t_floor",
-        "R": "t_rock",
-        "S": "t_floor",
-        "V": "t_wall_glass",
-        "[": "t_door_glass_c",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "p": "t_floor",
-        "r": "t_floor",
-        "s": "t_sidewalk",
-        "~": "t_water_sh"
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        ":": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "&": "t_region_groundcover_urban",
+        "j": "t_region_groundcover_urban",
+        "#": "t_rock_wall",
+        "_": "t_concrete",
+        "~": "t_water_pool_shallow_outdoors",
+        "!": "t_linoleum_gray",
+        "8": "t_linoleum_gray",
+        "t": "t_linoleum_gray",
+        "B": "t_linoleum_gray",
+        "S": "t_linoleum_gray",
+        "Q": "t_linoleum_gray",
+        "$": "t_wall_glass",
+        "[": "t_door_glass_c"
       },
-      "furniture": {
-        "0": "f_fireplace",
-        "?": "f_sofa",
-        "@": "f_bed",
-        "Z": "f_mailbox",
-        "B": "f_bathtub",
-        "D": "f_trashcan",
-        "K": "f_armchair",
-        "O": "f_oven",
-        "P": "f_indoor_plant",
-        "S": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "k": "f_desk",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "p": "f_pool_table",
-        "r": "f_rack"
-      },
-      "toilets": { "t": {  } },
-      "items": { "Z": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
+      "furniture": { "&": "f_region_flower" },
       "place_loot": [
-        { "group": "bed", "x": [ 5, 6 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "bedroom", "x": [ 6, 7 ], "y": [ 19, 20 ], "chance": 80, "repeat": [ 1, 5 ] },
-        { "group": "livingroom", "x": [ 12, 15 ], "y": [ 5, 8 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 12, 15 ], "y": [ 19, 21 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 9, 15 ], "y": [ 15, 17 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "dresser", "x": [ 4, 4 ], "y": [ 19, 19 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "fridge", "x": [ 18, 19 ], "y": [ 19, 19 ], "chance": 90, "repeat": [ 1, 6 ] },
-        { "group": "kitchen", "x": [ 20, 21 ], "y": [ 19, 19 ], "chance": 60, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 17, 17 ], "y": [ 16, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 20, 20 ], "y": [ 16, 17 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "produce", "x": [ 17, 17 ], "y": [ 17, 17 ], "chance": 65, "repeat": [ 1, 2 ] },
-        { "group": "novels", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 85, "repeat": [ 1, 3 ] },
         { "group": "textbooks", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 40, "repeat": [ 1, 2 ] },
         { "group": "alcohol", "x": [ 2, 2 ], "y": [ 12, 12 ], "chance": 65, "repeat": [ 1, 2 ] },
         { "group": "alcohol", "x": [ 8, 8 ], "y": [ 12, 13 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "pool_table", "x": [ 4, 6 ], "y": [ 13, 14 ], "chance": 90, "repeat": [ 1, 6 ] },
-        { "group": "office", "x": [ 11, 15 ], "y": [ 19, 21 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "oven", "x": [ 17, 17 ], "y": [ 19, 19 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 17, 21 ], "y": [ 21, 22 ], "chance": 95, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 17, 21 ], "y": [ 21, 22 ], "chance": 75, "repeat": [ 1, 3 ] },
         { "item": "katana", "x": [ 12, 12 ], "y": [ 10, 10 ], "chance": 2 },
         { "item": "katana_inferior", "x": [ 12, 12 ], "y": [ 10, 10 ], "chance": 8 },
         { "item": "spiral_stone", "x": [ 12, 12 ], "y": [ 10, 10 ], "chance": 25 }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_modern_1_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "           |222222222223",
+        "           |..........~3",
+        "           |..oo...oo..3",
+        "           |...........3",
+        "           |...........3",
+        "           |...........3",
+        "           |...........3",
+        " |2222222225......X....3",
+        " |.....................3",
+        " |...oooo..............3",
+        " |...oooo.............53",
+        " |....................3 ",
+        " |....................3 ",
+        " |.................=..3 ",
+        " |....................3 ",
+        " |.................&..3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |--------------|.....3 ",
+        "                |-----3 "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_patio.json b/data/json/mapgen/house/house_patio.json
index 6063efbaf828b..c683c5c331cb1 100644
--- a/data/json/mapgen/house/house_patio.json
+++ b/data/json/mapgen/house/house_patio.json
@@ -1,165 +1,117 @@
 [
-  {
-    "id": "barbecue",
-    "type": "item_group",
-    "items": [
-      [ "beer", 15 ],
-      [ "meat", 65 ],
-      [ "glazed_tenderloin", 55 ],
-      [ "fish", 10 ],
-      [ "fish_smoked", 5 ],
-      [ "meat_smoked", 60 ],
-      [ "sausage", 35 ],
-      [ "bratwurst_sausage", 30 ],
-      [ "hotdogs_frozen", 65 ],
-      [ "hotdogs_cooked", 65 ],
-      [ "chilidogs", 30 ],
-      [ "currywurst", 15 ],
-      [ "lettuce", 45 ],
-      [ "tomato", 45 ],
-      [ "onion", 30 ],
-      [ "chili_pepper", 30 ],
-      [ "corn", 20 ],
-      [ "irradiated_lettuce", 20 ],
-      [ "irradiated_tomato", 20 ],
-      [ "irradiated_onion", 5 ],
-      [ "irradiated_corn", 10 ],
-      [ "bacon", 20 ],
-      [ "potato_baked", 15 ],
-      [ "bread", 40 ],
-      [ "ketchup", 80 ],
-      [ "mustard", 75 ],
-      { "item": "pickle", "prob": 20, "charges": 6, "container-item": "jar_glass_sealed" },
-      [ "pickle", 20 ],
-      [ "cheeseburger", 30 ],
-      [ "hamburger", 70 ],
-      [ "cheese", 45 ],
-      [ "ceramic_plate", 30 ],
-      [ "knife_steak", 45 ],
-      [ "tongs", 60 ]
-    ]
-  },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 300,
+    "om_terrain": [ "house_patio" ],
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".sssssss...s............",
-        ".sssssssP--;v--vv--vv--.",
-        ".sssssss.|Y   oo ????n|.",
-        ".sssssss.v            v.",
-        ".sssssss.|   --   nnn |.",
-        ".sssssss.|   hnh     D|.",
-        ".sssssss.v   hnh      v.",
-        ".sssssss.|           c|.",
-        ".sssssss.|   -----|  c|.",
-        ".ssssssss;   |U((t|  Sv.",
-        ".sssssss.|   +((BB|fOC|.",
-        ".........|   |----|---|.",
-        ".........|   +    +  d|.",
-        ".........v   |o   |---|.",
-        "......1..v   |d     @@|.",
-        ".........|-[----v---v-|.",
-        ".........##ss##########.",
-        "...........ss...........",
-        "..#......ssssssssssss...",
-        "...#.....sssHsHssssss...",
-        ".T.......sssNNNssssss...",
-        ".........sssHsHssssss...",
-        "........................",
-        "........................"
-      ],
-      "set": [
-        { "point": "terrain", "id": "t_tree_young", "x": [ 13, 22 ], "y": [ 0, 0 ], "chance": 10 },
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 22, 23 ], "repeat": [ 9, 17 ] },
-        { "point": "furniture", "id": "f_dahlia", "x": [ 8, 8 ], "y": [ 1, 8 ], "repeat": [ 1, 2 ] }
+        "._______p&---...........",
+        "._______.##*o##oo##oo##.",
+        "._______^#y  RRR HHHHs#.",
+        "._______.o            o.",
+        "._______.#   ###  lll #.",
+        "._______.#   hfh     Y#.",
+        "._______.o   hfh     4o.",
+        "._______.#           3#.",
+        "._______.#   ||||||6 2#.",
+        "._______~*   |St8Q|7 5o.",
+        "._______~#L  +(((9|FO1#.",
+        "~~~~~~~~~#IA |||||||||#.",
+        ".:.....~%#I  +  yb|Dzd#.",
+        "..&&&..~%o$  |@   ||+|#.",
+        "..&X&.:~%o>  |@sT    I#.",
+        "..&&&..~%##[####o###o##.",
+        ".:.....~.%%~~%%%%%%%%%^.",
+        ".......~...~~...........",
+        ".......~.~~~~~~~~jjj~...",
+        ".......~.~~~G~G~~~K~~...",
+        ".......~~~~~KKK~~~~~~...",
+        ".........~~~G~G~~~~~~...",
+        ".............:.......:..",
+        ".........:.............."
       ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "#": "t_shrub",
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        ":": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "&": "t_region_groundcover_urban",
+        "$": "t_railing_h",
+        "_": "t_pavement",
+        "G": "t_concrete",
+        "K": "t_concrete",
+        "~": "t_concrete",
+        "j": "t_concrete",
         "(": "t_linoleum_gray",
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "P": "t_grass",
-        "1": "t_tree_peach",
-        ";": "t_door_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "Y": "t_floor",
-        "B": "t_linoleum_gray",
-        "C": "t_floor",
-        "D": "t_floor",
-        "H": "t_sidewalk",
-        "N": "t_sidewalk",
-        "O": "t_floor",
-        "S": "t_floor",
-        "T": "t_tree",
-        "U": "t_linoleum_gray",
-        "[": "t_door_glass_c",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "s": "t_sidewalk",
+        "8": "t_linoleum_gray",
         "t": "t_linoleum_gray",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "D": "f_trashcan",
-        "H": "f_chair",
-        "N": "f_table",
-        "P": "f_mailbox",
-        "Y": "f_rack_coat",
-        "O": "f_oven",
-        "S": "f_sink",
-        "U": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "n": "f_table",
-        "o": "f_bookcase"
-      },
-      "toilets": { "t": {  } },
-      "items": {
-        "Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
-        "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
+        "9": "t_linoleum_gray",
+        "S": "t_linoleum_gray",
+        "Q": "t_linoleum_gray",
+        "[": "t_door_glass_c"
       },
+      "furniture": { "&": "f_region_flower" },
+      "set": [ { "point": "furniture", "id": "f_dahlia", "x": [ 8, 8 ], "y": [ 1, 8 ], "repeat": [ 1, 2 ] } ],
       "place_loot": [
-        { "group": "bedroom", "x": [ 15, 17 ], "y": [ 12, 14 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "bed", "x": [ 20, 21 ], "y": [ 14, 14 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "shirts", "x": [ 21, 21 ], "y": [ 12, 12 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 14, 14 ], "y": [ 14, 14 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "homebooks", "x": [ 14, 15 ], "y": [ 2, 2 ], "chance": 65, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 14, 14 ], "y": [ 13, 13 ], "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "fridge", "x": [ 19, 19 ], "y": [ 10, 10 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 20, 20 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "pasta", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "cannedfood", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 21, 21 ], "y": [ 7, 8 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "trash", "x": [ 21, 21 ], "y": [ 5, 5 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "dining", "x": [ 14, 14 ], "y": [ 5, 6 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "livingroom", "x": [ 17, 21 ], "y": [ 2, 3 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "softdrugs", "x": [ 14, 17 ], "y": [ 9, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 14, 17 ], "y": [ 9, 10 ], "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "barbecue", "x": [ 12, 14 ], "y": [ 20, 20 ], "chance": 75, "repeat": [ 1, 4 ] },
         { "item": "television", "x": [ 19, 19 ], "y": [ 4, 4 ], "chance": 75 },
         { "item": "char_smoker", "x": [ 18, 18 ], "y": [ 19, 19 ], "chance": 85 },
         { "item": "charcoal", "x": [ 18, 18 ], "y": [ 19, 19 ], "chance": 60, "repeat": [ 1, 3 ] }
       ],
+      "place_nested": [
+        {
+          "chunks": [
+            [ "null", 10 ],
+            [ "roof_6x6_garden_4", 15 ],
+            [ "roof_6x6_garden_1", 15 ],
+            [ "greenhouse_6x6_herbal", 20 ],
+            [ "greenhouse_6x6_vegetable", 25 ],
+            [ "pond_6x6", 20 ],
+            [ "shed_6x6_junk", 25 ],
+            [ "shed_6x6_woodworker", 20 ]
+          ],
+          "x": 1,
+          "y": 17
+        }
+      ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 5, "y": 4, "chance": 10, "rotation": 90 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_patio_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "         |2222222222223 ",
+        "         5............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |------------5 ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_porch.json b/data/json/mapgen/house/house_porch.json
index ca5e375269780..d47c7666b51da 100644
--- a/data/json/mapgen/house/house_porch.json
+++ b/data/json/mapgen/house/house_porch.json
@@ -2,135 +2,96 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 300,
+    "om_terrain": [ "house_porch" ],
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".....#ss#......sssssss..",
-        "......ss.......sssssss..",
-        ".....#ss#......sssssss..",
-        "......ssp......sssssss..",
-        ".....#ssssssssssssssss..",
-        "..igigssgigi...sssssss..",
-        ".IAAAI  IAAAI..sssssss..",
-        ".a          a..sssssss..",
-        ".anbb    bb a..sssssss..",
-        ".|-v--::--v-|..sssssss..",
-        ".|nnnn  P  D|..sssssss..",
-        ".|          |..#######..",
-        ".|??nK     0--vv---vv-|.",
-        ".|              Kc   f|.",
-        ".|6     hNNNh   Kc   Ov.",
-        ".|c     hNNNh    -   Sv.",
-        ".|c  D              DC|.",
-        ".--vv-- -------+---+--|.",
-        "......| |@@ d|t(U|d  n|.",
-        "...1..| +    |BB(+  @@|.",
-        "......+ |    |---|o @@|.",
-        "......|n|oo  +d|d+   n|.",
-        "......-v--vv-------vv--.",
+        ".....:--p......!!!!!!!..",
+        "......--.......!!!!!!!..",
+        ".....:--:......!!!!!!!..",
+        "......--:......!!!!!!!..",
+        ".....:---------!!!!!!!..",
+        ".%%%%%--%%%%%..!!!!!!!..",
+        ".$___$~~$___$..!!!!!!!..",
+        "._~~~~~~~~~~_..!!!!!!!..",
+        "._GKG~~~~jj~_..!!!!!!!..",
+        ".##o##**##o##..!!!!!!!..",
+        ".#ssxx  y  y#..!!!!!!!..",
+        ".#          #^.%%%%%%%..",
+        ".#         a##oo###oo##.",
+        ".#HHsE          AJ347F#.",
+        ".#r      hfh    AJ   Oo.",
+        ".#rA     hfh         5o.",
+        ".#r  Y          66Y 12#.",
+        ".##oo## |||||||+|||+||#.",
+        ".....^# |@@ d|t(S|d  s#.",
+        "...:..+ +  AI|8(9|b @@#.",
+        "......# |   I|||||R @@#.",
+        "......#>|RR  +D|D+   s#.",
+        "......#o##oo#######oo##.",
         "........................"
       ],
-      "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 11 ], "repeat": [ 2, 5 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 4, 8 ] }
-      ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "#": "t_shrub",
-        "(": "t_linoleum_gray",
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "p": "t_grass",
-        "0": "t_floor",
-        "1": "t_tree_pine",
-        "6": "t_console_broken",
-        ":": "t_door_locked_interior",
-        "?": "t_floor",
-        "@": "t_floor",
-        "A": "t_railing_h",
-        "B": "t_linoleum_gray",
-        "C": "t_floor",
-        "D": "t_floor",
-        "I": "t_column",
-        "K": "t_floor",
-        "N": "t_carpet_red",
-        "O": "t_floor",
-        "P": "t_floor",
-        "S": "t_floor",
-        "U": "t_linoleum_gray",
-        "a": "t_railing_v",
-        "b": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "g": "t_grass",
-        "h": "t_carpet_red",
-        "i": "t_grass",
-        "n": "t_floor",
-        "o": "t_floor",
-        "s": "t_sidewalk",
+        "~": "t_thconc_floor",
+        "j": "t_thconc_floor",
+        "G": "t_thconc_floor",
+        "K": "t_thconc_floor",
+        "!": "t_concrete",
+        ":": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "_": "t_railing",
+        "%": "t_region_groundcover_urban",
+        "9": "t_linoleum_gray",
         "t": "t_linoleum_gray",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "0": "f_fireplace",
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "D": "f_trashcan",
-        "K": "f_armchair",
-        "N": "f_table",
-        "O": "f_oven",
-        "P": "f_indoor_plant",
-        "S": "f_sink",
-        "U": "f_sink",
-        "b": "f_bench",
-        "p": "f_mailbox",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "g": "f_bluebell",
-        "h": "f_chair",
-        "i": "f_dahlia",
-        "n": "f_table",
-        "o": "f_bookcase"
+        "S": "t_linoleum_gray",
+        "8": "t_linoleum_gray",
+        "(": "t_linoleum_gray",
+        "$": "t_column",
+        "f": "t_carpet_red",
+        "h": "t_carpet_red"
       },
-      "toilets": { "t": {  } },
-      "items": { "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
+      "furniture": { "%": "f_region_flower" },
       "place_loot": [
-        { "group": "bedroom", "x": [ 18, 21 ], "y": [ 18, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "bed", "x": [ 20, 21 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "dresser", "x": [ 18, 18 ], "y": [ 18, 18 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "shirts", "x": [ 16, 16 ], "y": [ 21, 21 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "bedroom", "x": [ 9, 12 ], "y": [ 18, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "bed", "x": [ 9, 10 ], "y": [ 18, 18 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 12, 12 ], "y": [ 18, 18 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "shirts", "x": [ 14, 14 ], "y": [ 21, 21 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 18, 18 ], "y": [ 20, 20 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 9, 10 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "magazines", "x": [ 7, 7 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 21, 21 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 21, 21 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "pasta", "x": [ 21, 21 ], "y": [ 16, 16 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "cannedfood", "x": [ 21, 21 ], "y": [ 16, 16 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 17, 21 ], "y": [ 13, 16 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "trash", "x": [ 20, 20 ], "y": [ 16, 16 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "dining", "x": [ 9, 11 ], "y": [ 14, 15 ], "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 2, 10 ], "y": [ 10, 12 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "trash", "x": [ 11, 11 ], "y": [ 10, 10 ], "chance": 60, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 14, 16 ], "y": [ 18, 19 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 14, 16 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "office", "x": [ 2, 4 ], "y": [ 13, 16 ], "chance": 50, "repeat": [ 1, 3 ] },
-        { "group": "trash", "x": [ 5, 5 ], "y": [ 16, 16 ], "chance": 70, "repeat": [ 1, 2 ] },
         { "group": "alcohol", "x": [ 2, 2 ], "y": [ 8, 8 ], "chance": 15 },
         { "item": "television", "x": [ 4, 4 ], "y": [ 10, 10 ], "chance": 75 }
       ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_porch_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        " ............           ",
+        " ............           ",
+        " ............           ",
+        " |22222222223           ",
+        " |..........3           ",
+        " |..........3           ",
+        " |.........~52222222223 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |.............=......3 ",
+        " |----5...............3 ",
+        "      |...............3 ",
+        "      |.....&.........3 ",
+        "      |...............3 ",
+        "      |...............3 ",
+        "      |---------------3 ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_rv.json b/data/json/mapgen/house/house_rv.json
index 8bfbc34ccf9bb..9c1e4fe18d53a 100644
--- a/data/json/mapgen/house/house_rv.json
+++ b/data/json/mapgen/house/house_rv.json
@@ -2,112 +2,86 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_rv" ],
     "weight": 300,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".#ssssssss..###...s.....",
-        ".#ssssssssp----vv-;----.",
-        ".#ssssssss.|ooo      ?|.",
-        ".#ssssssss.|    n    ?|.",
-        ".#ssssssss.|         ?|.",
-        ".#ssssssss.|????      |.",
-        ".#ssssssss.|          |.",
-        ".#ssssssss.|    hhh   v.",
-        "..sssssssss;    nnn   v.",
-        "..ssssssss.|Y   nnn   v.",
-        "..ssssssss.|    hhh   v.",
-        "..ssssssss.|          |.",
-        ".|---------|+-----+---|.",
-        ".vSCfO     | | t     B|.",
-        ".v         + |      BBv.",
-        ".v ccc  rrr| + S    BB|.",
-        ".|---------| |--------|.",
-        ".|d        | |  rrrr  |.",
-        ".|@@       | |        |.",
-        ".|@@       + +  rrrr  |.",
-        ".|         | |        |.",
-        ".|         | |  cccc  |.",
-        ".----vv-----v----------.",
-        "........................"
-      ],
-      "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] }
+        ".%~~~~~~~~p.%%%..---....",
+        ".%~~~~~~~~.####oo#*####.",
+        ".%~~~~~~~~.#RRR  L   E#.",
+        ".%~~~~~~~~.#         s#.",
+        ".%~~~~~~~~.# ll      E#.",
+        ".%~~~~~~~~.#HHHH     T#.",
+        ".%~~~~~~~~.#          #.",
+        ".%~~~~~~~~.#L    hhh  o.",
+        "..~~~~~~~~~*     fff  o.",
+        "..~~~~~~~~.#     hhh  o.",
+        "..~~~~~~~~.#          o.",
+        "..~~~~~~~~^#     AAA y#.",
+        ".########### ||| JJJ||#.",
+        ".#BBy      + |66    7Fo.",
+        ".o     || || |Y      5o.",
+        ".#S88Yt|Q U|     43O21o.",
+        ".#|||||||||| ||+||||||#.",
+        ".#d   b  +D| |zz666666#.",
+        ".#@@    y||| |z      z#.",
+        ".#@@       + +  UUUUUU#.",
+        ".#s       h|+|      A #.",
+        ".#  TEy  II|>|gzqqqNNN#.",
+        ".####oo#####o##########.",
+        ".....................^.."
       ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "#": "t_shrub",
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "p": "t_grass",
-        ";": "t_door_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "B": "t_floor",
-        "C": "t_floor",
-        "D": "t_floor",
-        "O": "t_floor",
-        "Y": "t_floor",
-        "S": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "r": "t_floor",
-        "s": "t_sidewalk",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "p": "f_mailbox",
-        "Y": "f_rack_coat",
-        "D": "f_trashcan",
-        "O": "f_oven",
-        "S": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "r": "f_rack"
-      },
-      "toilets": { "t": {  } },
-      "items": {
-        "Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
-        "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "G": "t_concrete",
+        "K": "t_concrete",
+        "~": "t_concrete",
+        "j": "t_concrete"
       },
       "place_loot": [
-        { "group": "bed", "x": [ 2, 3 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "livingroom", "x": [ 12, 21 ], "y": [ 2, 6 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "dining", "x": [ 16, 18 ], "y": [ 8, 9 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "bedroom", "x": [ 1, 10 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 5 ] },
-        { "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "consumer_electronics", "x": [ 1, 10 ], "y": [ 17, 21 ], "chance": 20, "repeat": [ 1, 2 ] },
-        { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 5, "ammo": 90, "magazine": 100 },
-        { "group": "novels", "x": [ 12, 14 ], "y": [ 2, 2 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 14, 21 ], "y": [ 13, 15 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 14, 21 ], "y": [ 13, 15 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 2, 10 ], "y": [ 13, 15 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 4, 4 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 5, 5 ], "y": [ 13, 13 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cannedfood", "x": [ 9, 10 ], "y": [ 15, 15 ], "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "pasta", "x": [ 3, 5 ], "y": [ 15, 15 ], "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "knifeblock", "x": [ 3, 5 ], "y": [ 15, 15 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "cannedfood", "x": [ 16, 19 ], "y": [ 17, 17 ], "chance": 60, "repeat": [ 1, 3 ] },
-        { "group": "camping", "x": [ 16, 19 ], "y": [ 19, 19 ], "chance": 70, "repeat": [ 1, 4 ] },
-        { "group": "softdrugs", "x": [ 16, 19 ], "y": [ 21, 21 ], "chance": 60, "repeat": [ 1, 3 ] }
+        { "group": "guns_pistol_common", "x": 2, "y": 17, "chance": 5, "ammo": 90, "magazine": 100 },
+        { "group": "camping", "x": [ 16, 19 ], "y": 19, "chance": 70, "repeat": [ 1, 4 ] }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
-      "place_vehicles": [ { "vehicle": "rv", "x": 5, "y": 4, "chance": 10, "rotation": 270 } ]
+      "place_vehicles": [ { "vehicle": "rv", "x": 5, "y": 4, "chance": 5, "rotation": 270 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_rv_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "           |22222222223 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |....&.....3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        " |2222222225..........3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |...:................3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |..............=.....3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |------------------5-3 ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
     }
   }
 ]
diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
index 240430bb81f81..d5a63d9b5ef0b 100644
--- a/data/json/mapgen_palettes/house_general_palette.json
+++ b/data/json/mapgen_palettes/house_general_palette.json
@@ -88,8 +88,8 @@
         "t_window_no_curtains_open",
         [ "t_curtains", 5 ]
       ],
-      "<": "t_stairs_up",
-      ">": "t_stairs_down"
+      "<": "t_wood_stairs_up",
+      ">": "t_wood_stairs_down"
     },
     "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
     "items": {
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index 1ae188424d61b..aa33aebc5ea00 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -2746,5 +2746,55 @@
     "id": "s_hunting",
     "locations": [ "land" ],
     "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_hunting_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_hunting_roof_north" } ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_rv",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_rv_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_rv_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_porch",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_porch_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_porch_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_patio",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_patio_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_patio_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_modern_1",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_modern_1_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_modern_1_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_library",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_library_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_04_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
   }
 ]
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
index fde129afae937..9f482a2bdb9d3 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -801,5 +801,82 @@
     "color": "light_green",
     "see_cost": 2,
     "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_rv",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_rv_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_porch",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_porch_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_patio",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_patio_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_library",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_modern_1",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_modern_1_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
   }
 ]
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index bdd3c57a1daf3..fdc35e55c8eca 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -537,7 +537,7 @@
       "houses": {
         "house_w_1": 50,
         "house_two_story_basement": 1,
-        "house": 1000,
+        "house": 700,
         "house_prepper": 20,
         "house_base": 333,
         "duplex": 40,
@@ -566,7 +566,12 @@
         "house_toolshed": 50,
         "house_suicide": 20,
         "house_quiverfull": 30,
-        "house_inner_garden": 40,
+        "house_rv": 50,
+        "house_porch": 50,
+        "house_patio": 50,
+        "house_modern_1": 50,
+        "house_library": 50,
+        "house_inner_garden": 50,
         "emptyresidentiallot": 20,
         "apartments_con_new": 10,
         "apartments_mod_new": 10,