diff --git a/data/json/mapgen/house/house_garage3.json b/data/json/mapgen/house/house_garage3.json
index 932b26f7db8d8..ca940e87ba1f8 100644
--- a/data/json/mapgen/house/house_garage3.json
+++ b/data/json/mapgen/house/house_garage3.json
@@ -3,7 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "house_garage3" ],
-    "weight": 300,
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -16,21 +16,21 @@
         "..............```````.%.",
         "..[.......[...```````.%.",
         "..............```````.%.",
-        ".....[........```````.%.",
-        "..............```````.%.",
-        ".^!!!!.%..%...```````.%.",
+        ".....[..`````````````.%.",
+        "........``!!!!```````.%.",
+        ".^!!!!.%``%%%%```````.%.",
         ".######o**o#####*######.",
         ".#B  S|L  T|Y     66F7#.",
         ".oB  t|    |  hfh    Oo.",
         ".oy   |    +  hfh    5o.",
         ".#Q88 +    |A     4321#.",
-        ".######R   ||||||+||||#.",
-        ".$~~~~#R        | D  n#.",
-        ".$~~~G#k     T| +   @@#.",
-        ".$~~~K#R   llE|+|I  @@#.",
-        ".$~~~~*   HHHs|>|Ih  d#^",
-        ".&$$$$##oo#######oo####.",
-        "........................"
+        "!######R   ||||||+||||#.",
+        "!$~~~~#R        | D  s#.",
+        "`$~~~G#k     T| +   @@#.",
+        "`]~~~K#R   llE|+|I  @@#.",
+        "`$~~~~*   HHHs|>|Ih  d#^",
+        "!$$$$$##oo#######oo####.",
+        "!!!!!!!................."
       ],
       "palettes": [ "standard_domestic_palette" ],
       "terrain": {
@@ -42,7 +42,8 @@
         "K": "t_thconc_floor",
         "~": "t_thconc_floor",
         "`": "t_concrete",
-        "$": "t_fence"
+        "$": "t_screened_porch_wall",
+        "]": "t_screen_door_c"
       },
       "furniture": { "!": "f_region_flower" },
       "place_loot": [
@@ -76,10 +77,10 @@
         " |....................3 ",
         " |....................3 ",
         " |....................3 ",
-        " |..............=.....3 ",
         " |....................3 ",
         " |....................3 ",
-        " |.....~........&.....3 ",
+        " |....................3 ",
+        " |.....~..............3 ",
         " |....................3 ",
         " |....................5 ",
         " |--------------------3 ",
diff --git a/data/json/mapgen/house/house_garage4.json b/data/json/mapgen/house/house_garage4.json
index 258306f4edd58..72e5964c7d708 100644
--- a/data/json/mapgen/house/house_garage4.json
+++ b/data/json/mapgen/house/house_garage4.json
@@ -2,108 +2,88 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 300,
+    "om_terrain": [ "house_garage4" ],
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".#.P.sssss#..#sssss...#.",
-        ".#...sssss#..#sssss...#.",
-        ".#...sssss#..#sssss...#.",
-        ".#...sssss#..#sssss...#.",
-        ".#...sssss#..#sssss...#.",
-        ".#...sssss####sssss...#.",
-        ".#...ssssssssssssss...#.",
-        ".#...ssssssssssssss...#.",
-        ".#...ssssssssssssss...#.",
-        ".#...ssssssssssssss...#.",
-        ".#...ssssssssssssss...#.",
-        ".#...#####.ss.#####...#.",
-        ".|--------v;;v--------|.",
-        ".|B  S|l       Y|n   f|.",
-        ".|B  t|  nnnnn  |n   Ov.",
-        ".|    |  nnnnn  |    cv.",
-        ".|    +         +    c|.",
-        ".-----|---+------+----|.",
-        ".w..  |o      +      h|.",
-        ".w.. h|o     h|     @@|.",
-        ".w.. h|      ?|     @@|.",
-        ".w..  ;   h???|      d|.",
-        ".Iwwww--vv-------vv----.",
+        ".%.[p`````%!!%`````.[.%.",
+        ".%...`````%!!%`````...%.",
+        ".%.[.`````%!!%`````.[.%.",
+        ".%...`````%!!%`````...%.",
+        ".%.[.`````%!!%`````.[.%.",
+        ".%...`````%%%%`````...%.",
+        ".%.[.``````````````.[.%.",
+        ".%...``````````````...%.",
+        ".%.[.``````````````.[.%.",
+        ".%...``````````````...%.",
+        ".%.[.``````````````.[.%.",
+        ".%...%%%%%.``.%%%%%...%.",
+        ".#########o**o#########.",
+        ".#B  y|T       AJ  74F#.",
+        ".#B  t|  hfh   AJ    Oo.",
+        ".#    +  hfh   AJ    5o.",
+        "^#8S8Y|           6321#.",
+        ".######|||+||||||+||||#.",
+        ".$    #RRR      +    s#.",
+        "`$   G#R     T|>|s  @@#^",
+        "`]   G#y     H|||E  @@#.",
+        "`$    *   sHHH|D+    d#.",
+        ".$$$$$##oo#######oo####.",
         "........................"
       ],
-      "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_door_locked_interior", "x": [ 6, 6 ], "y": [ 21, 21 ], "repeat": [ 0, 1 ] },
-        { "point": "terrain", "id": "t_door_c", "x": [ 11, 12 ], "y": [ 12, 12 ], "repeat": [ 0, 1 ] }
-      ],
+      "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",
-        "I": "t_column",
-        "O": "t_floor",
-        "S": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "l": "t_floor",
-        "Y": "t_floor",
-        "h": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "s": "t_sidewalk",
-        "v": "t_window_domestic",
-        "w": "t_window",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "P": "f_mailbox",
-        "Y": "f_rack_coat",
-        "l": "f_stool",
-        "O": "f_oven",
-        "S": "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": 35, "repeat": [ 1, 4 ] },
-        "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
+        "%": [ "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_column",
+        "K": "t_thconc_floor",
+        "~": "t_thconc_floor",
+        "`": "t_concrete",
+        "$": "t_screened_porch_wall",
+        "]": "t_screen_door_c"
       },
-      "place_loot": [
-        { "group": "bed", "x": [ 20, 21 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "bedroom", "x": [ 15, 21 ], "y": [ 18, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "livingroom", "x": [ 7, 13 ], "y": [ 18, 21 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "guns_pistol_common", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 },
-        { "group": "homebooks", "x": [ 7, 7 ], "y": [ 17, 18 ], "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "kitchen", "x": [ 15, 21 ], "y": [ 16, 13 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 21, 21 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "produce", "x": [ 21, 21 ], "y": [ 13, 13 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 21, 21 ], "y": [ 15, 16 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "alcohol", "x": [ 21, 21 ], "y": [ 15, 16 ], "chance": 60, "repeat": [ 1, 2 ] },
-        { "group": "oven", "x": [ 21, 21 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "softdrugs", "x": [ 2, 4 ], "y": [ 13, 16 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 2, 4 ], "y": [ 13, 16 ], "chance": 90, "repeat": [ 1, 2 ] }
-      ],
+      "furniture": { "!": "f_region_flower" },
+      "place_loot": [ { "group": "guns_pistol_common", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 } ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 11, "y": 8, "chance": 10, "rotation": 0 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_garage4_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        " |222222222222222222223 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |.................&..3 ",
+        " 5....................3 ",
+        " |.=..................3 ",
+        " |....................3 ",
+        " |....................5 ",
+        " |.............N......3 ",
+        " |....................3 ",
+        " |--------------------3 ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_garage5.json b/data/json/mapgen/house/house_garage5.json
index d5e836b7bacdd..d6b045ceb14e2 100644
--- a/data/json/mapgen/house/house_garage5.json
+++ b/data/json/mapgen/house/house_garage5.json
@@ -2,110 +2,85 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 300,
+    "om_terrain": [ "house_garage5" ],
+    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "..sssssss...............",
-        ".Psssssss--;;----------.",
-        "..sssssss|o   |      t|.",
-        "..sssssss|o   |       |.",
-        "..sssssss|o   +       v.",
-        "..sssssss|o   |S    BB|.",
-        "..sssssss|o   |     BB|.",
-        "..sssssss|Y   |-------|.",
-        "..sssssss|    +  nn  c|.",
-        "..sssssss;    |  nn  Sv.",
-        "..#######|    |      Ov.",
-        ".|-vvvvv--    |l     f|.",
-        ".|???cc       |---+---|.",
-        ".v?                  nv.",
-        ".v                   nv.",
-        ".|ooo        K     K nv.",
-        ".|k  h     ------+----|.",
-        ".|kk       |        kk|.",
-        ".|-----;---|@@     h k|.",
-        "..#####.###|@@        |.",
-        "...........|          |.",
-        "...........|         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": [ 1, 10 ], "y": [ 19, 21 ], "repeat": [ 2, 8 ] }
+        "..```````...............",
+        ".p```````##**##########.",
+        "..```````#R   |BB    t#.",
+        "..```````#R   +       #.",
+        "..```````#R   |88Sy  yo.",
+        "..```````#R   ||||||+|#.",
+        "..```````#R   +>U|vQQQ#.",
+        "`````````#Y   ||||||||#.",
+        "`!```````#    |6664321#.",
+        "`!```````*    |      5o.",
+        "`[%%%%%%%#   AJ  A   Oo.",
+        "`##ooooo##   AJ     7F#.",
+        "`#HHHsy      AJJJ  Y||#^",
+        "`oH      hfh        hro.",
+        "`oTE     hfh  ||||||||#.",
+        "`#RRR    hfh  |D     d#.",
+        "`#r  h        +  @@ hIo.",
+        "`#rr          | s@@s I#.",
+        "`######*####  ||||||||#.",
+        "`.$       G#  |Db    s#.",
+        "``]  GKG   o  +     @@#.",
+        "..$       G#Ly|TE    d#.",
+        "..$$$$$$$$$######oo####.",
+        ".............^.........."
       ],
+      "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",
-        "K": "t_floor",
-        "l": "t_floor",
-        "Y": "t_floor",
-        "O": "t_floor",
-        "S": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "s": "t_sidewalk",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "K": "f_armchair",
-        "O": "f_oven",
-        "S": "f_sink",
-        "l": "f_stool",
-        "Y": "f_rack_coat",
-        "P": "f_mailbox",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "k": "f_desk",
-        "n": "f_table",
-        "o": "f_bookcase"
-      },
-      "toilets": { "t": {  } },
-      "items": {
-        "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
-        "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
+        "%": [ "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_concrete",
+        "#": "t_adobe_brick_wall",
+        "$": "t_screened_porch_wall",
+        "]": "t_screen_door_c"
       },
-      "place_loot": [
-        { "group": "bed", "x": [ 12, 13 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "homebooks", "x": [ 5, 6 ], "y": [ 12, 12 ], "chance": 45, "repeat": [ 1, 2 ] },
-        { "group": "bedroom", "x": [ 12, 21 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "homebooks", "x": [ 2, 4 ], "y": [ 15, 15 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 1, 10 ], "y": [ 12, 17 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "office", "x": [ 2, 5 ], "y": [ 12, 17 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "dresser", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "novels", "x": [ 10, 10 ], "y": [ 2, 6 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "cleaning", "x": [ 16, 20 ], "y": [ 2, 6 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 16, 20 ], "y": [ 2, 6 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 15, 21 ], "y": [ 9, 11 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 21, 21 ], "y": [ 9, 9 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 15, 21 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 4 ] }
-      ],
+      "furniture": { "!": "f_region_flower" },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 5, "y": 5, "chance": 10, "rotation": 270 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_garage5_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "         |2222222222223 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |.....=......3 ",
+        "         |............3 ",
+        "         |............3 ",
+        "         |............3 ",
+        " |2222222|............3 ",
+        " |....................3 ",
+        " |....................5 ",
+        " |....N...............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/house/house_garage6.json b/data/json/mapgen/house/house_garage6.json
index ef433144a3ad1..eb1c688f3ac32 100644
--- a/data/json/mapgen/house/house_garage6.json
+++ b/data/json/mapgen/house/house_garage6.json
@@ -2,139 +2,77 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
-    "weight": 100,
+    "om_terrain": [ "house_garage6" ],
+    "weight": 200,
     "//": "two bedroom one bath single garage home.",
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "..........sss.ssssss....",
-        "...i####iw.s.Mssssss#...",
-        "..--vvvv--#s#-======--..",
-        "..|p((((p|Q9Q|      e|..",
-        "..|((HH((|gsg|       |..",
-        ".#v((NN((v#s#v       |#.",
-        ".#v((HH((v#s#v       ;s.",
-        "..|((((((|/s/|      c|D.",
-        "..|-<<(((|/s/|      c|..",
-        "..|f(((((v#s#v      cv#.",
-        ".g|O((<((v#s#v      cv#.",
-        ".#vS((<((|isi|L WYccc|..",
-        ".g|C(((((|#s#--+------..",
-        "..|-<<<((|V;V|o P|S|t|/.",
-        ".i|P             +(((v#.",
-        ".s;         k|-+-|BB(|/.",
-        ".i| k??  ----|   ---+|..",
-        ".#v ?    | do| h     |..",
-        ".#v ? n  +   |kk   @@v#.",
-        "..|      |h  ---   @@v#.",
-        "..|P    P|k  @@|d   o|..",
-        "..--V[[V---v-v----v---..",
-        "...ssssss.g#.#g...#.....",
-        "....ssss................"
+        "..........```.``````````",
+        "...!!%%%!p.`.M``````%!!`",
+        "..##oooo##%`%#======##!`",
+        "..#,____,#$?$#~~~~~~&#!`",
+        "..#__//__#!`!#~~~~~~~#!`",
+        ".%o__ff__o%`%o~~~~~~~#%`",
+        ".%o__//__o%`%o~~~~~~~*``",
+        ".^#______#!`!#~~~~~~q#!.",
+        "..#347__6#!`!#~~~~~~q#..",
+        "..#F_____o%`%o~~~~~~No%.",
+        ".!#O__J__o%`%o~~~~~~No%.",
+        ".%o5__J_6#!`!#q~WZqqq#..",
+        ".!#1_____#%`%#|+|||||#..",
+        "..#|JJJ__#)*)#s y|S8t#!.",
+        ".!#yAA A         +___o%.",
+        ".`*      |y>r||+||BB_#!.",
+        ".!# sHH  |||||   |||+#..",
+        ".%o H    | dR| h     #..",
+        ".%o H l  +   |II   @@o%.",
+        "..#      |h  |||T  @@o%.",
+        "..#y    y|II @@|Dd  R#..",
+        "..##)]])###o#o####o###..",
+        "...``````.!%.%!...%.^...",
+        "....````................"
       ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "#": "t_shrub",
-        "(": "t_linoleum_gray",
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "/": "t_dirt",
-        "9": "t_fencegate_c",
-        ";": "t_door_locked",
-        "<": "t_linoleum_white",
+        "%": [ "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",
+        "M": "t_region_groundcover_urban",
         "=": "t_door_metal_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "B": "t_linoleum_white",
-        "C": "t_linoleum_white",
-        "D": "t_grass",
-        "H": "t_linoleum_white",
-        "L": "t_floor",
-        "M": "t_grass",
-        "w": "t_grass",
-        "N": "t_linoleum_white",
+        "&": "t_gates_control_brick",
+        "~": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "W": "t_thconc_floor",
+        "Z": "t_thconc_floor",
+        "N": "t_thconc_floor",
+        "`": "t_concrete",
+        "?": "t_fencegate_c",
+        "$": "t_fence",
+        "_": "t_linoleum_white",
+        "J": "t_linoleum_white",
+        "/": "t_linoleum_white",
+        ",": "t_linoleum_white",
+        "1": "t_linoleum_white",
+        "3": "t_linoleum_white",
+        "4": "t_linoleum_white",
+        "5": "t_linoleum_white",
+        "6": "t_linoleum_white",
+        "7": "t_linoleum_white",
+        "8": "t_linoleum_white",
         "O": "t_linoleum_white",
-        "P": "t_floor",
-        "Q": "t_fence_h",
-        "S": "t_linoleum_white",
-        "V": "t_wall_glass",
-        "W": "t_floor",
-        "Y": "t_floor",
-        "[": "t_door_glass_c",
-        "c": "t_floor",
-        "d": "t_floor",
-        "e": "t_gates_mech_control",
         "f": "t_linoleum_white",
-        "g": "t_dirt",
-        "h": "t_floor",
-        "i": "t_dirt",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "p": "t_linoleum_white",
-        "s": "t_sidewalk",
+        "F": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
         "t": "t_linoleum_white",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "/": "f_dandelion",
-        "<": "f_counter",
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "D": "f_trashcan",
-        "H": "f_chair",
-        "L": "f_locker",
-        "M": "f_sign",
-        "N": "f_table",
-        "w": "f_mailbox",
-        "O": "f_oven",
-        "P": "f_indoor_plant",
-        "S": "f_sink",
-        "W": "f_washer",
-        "Y": "f_dryer",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "g": "f_bluebell",
-        "h": "f_chair",
-        "i": "f_dahlia",
-        "k": "f_desk",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "p": "f_indoor_plant"
-      },
-      "toilets": { "t": {  } },
-      "items": {
-        "w": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] },
-        "W": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
-        "Y": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] }
+        ")": "t_wall_glass",
+        "]": "t_door_glass_c"
       },
+      "furniture": { "!": "f_region_flower", "M": "f_sign", ",": [ "f_indoor_plant", "f_indoor_plant_y" ], "/": "f_chair" },
       "place_loot": [
-        { "group": "bedroom", "x": [ 16, 20 ], "y": [ 17, 20 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "office", "x": [ 14, 15 ], "y": [ 18, 18 ], "chance": 75, "repeat": [ 1, 3 ] },
         { "group": "child_items", "x": [ 10, 12 ], "y": [ 17, 20 ], "chance": 80, "repeat": [ 1, 3 ] },
         { "group": "school", "x": [ 10, 10 ], "y": [ 20, 20 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "bed", "x": [ 19, 20 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "bed", "x": [ 13, 14 ], "y": [ 20, 20 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 11, 11 ], "y": [ 17, 17 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "dresser", "x": [ 16, 16 ], "y": [ 20, 20 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "homebooks", "x": [ 20, 20 ], "y": [ 20, 20 ], "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "novels", "x": [ 12, 12 ], "y": [ 17, 17 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 3, 3 ], "y": [ 9, 9 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 3, 3 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cannedfood", "x": [ 3, 3 ], "y": [ 12, 12 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "pasta", "x": [ 3, 3 ], "y": [ 12, 12 ], "chance": 50, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 4, 5 ], "y": [ 8, 8 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "trash", "x": [ 22, 22 ], "y": [ 7, 7 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "dining", "x": [ 5, 6 ], "y": [ 5, 5 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "livingroom", "x": [ 14, 14 ], "y": [ 13, 13 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "waitingroom", "x": [ 4, 4 ], "y": [ 16, 16 ], "chance": 75, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 18, 18 ], "y": [ 13, 13 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 18, 20 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "tools_carpentry", "x": [ 14, 14 ], "y": [ 11, 11 ], "chance": 30, "repeat": [ 1, 2 ] },
         { "group": "home_hw", "x": [ 20, 20 ], "y": [ 7, 10 ], "chance": 70, "repeat": [ 1, 4 ] },
         { "item": "hose", "x": [ 12, 12 ], "y": [ 22, 22 ], "chance": 75 }
@@ -142,5 +80,41 @@
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 17, "y": 7, "chance": 10, "rotation": 90 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_garage6_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "  |2222223   |22222223  ",
+        "  |......3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  5......3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  |...&..3   |.......3  ",
+        "  |......3   |.......3  ",
+        "  |......3   |...X...3  ",
+        "  |......3222|.......3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |............=.....3  ",
+        "  |...N..............3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |----------------5-3  ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_garage7.json b/data/json/mapgen/house/house_garage7.json
index beb136b18f711..ac4e8ec184587 100644
--- a/data/json/mapgen/house/house_garage7.json
+++ b/data/json/mapgen/house/house_garage7.json
@@ -2,128 +2,98 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_garage7" ],
     "weight": 150,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "..ssssss.......p.sss....",
-        ".lssssssl.....T.#sss#...",
-        "..ssssss........#sss#...",
-        "..ssssss..#######sss##..",
-        "..ssssss---vvv---v;v--..",
-        "..ssssss|      Y    P|..",
-        "..ssssssv  n?        |..",
-        "..ssssssvn n?        v..",
-        "..ssssssv  n?        |..",
-        "..ssssss|           Cv..",
-        "..|--;--|    l   c  c|..",
-        "..|h         |   c  Ov..",
-        "..vn        hc   c  u|..",
-        "..vn        hc      Cv..",
-        "..|h         |      f|..",
-        "..|------+---|--~=~--|..",
-        "..|tii+      |.......q..",
-        "..vii-|      v..bbb..q..",
-        "..|SC|o      v..nnn..q..",
-        "..|--|o  @@ d|..bbb..q..",
-        "..|r ;o  @@ d|......Tq..",
-        "..|-----v----|QQQggQQQ..",
+        ".!``````!......p.```....",
+        ".!``````!.....[.%```%...",
+        ".!``````!.......%```%...",
+        ".!``````!.%%%%%%%```%%..",
+        ".!``````###ooo###o*o##..",
+        ".!``````#s      L   y#..",
+        ".!``````oH l x      >o..",
+        ".!``````oH l x     ||#..",
+        ".!``````oH l x      7#..",
+        ".!``````#y          1o..",
+        ".!###*###    |   J  2#..",
+        ".%#L         J   J  Oo..",
+        ".%o  hffh   AJ   J  3#..",
+        ".%o  hffh   AJ      5o..",
+        ".%#y         |66   4F#^.",
+        ".^#||||||+|||###)])###..",
+        "..#tBB|Ry bII#.......$..",
+        "..o___+    h o..jjj..$..",
+        "..#S8Q|R     o..///..$..",
+        "..#||||T @@ d#..jjj..$..",
+        "..#vD + s@@sy#......[$..",
+        "..######o#####$$$??$$$..",
         "........................",
         "........................"
       ],
-      "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 6, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 1, 1 ], "y": [ 2, 23 ], "repeat": [ 5, 9 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 22, 23 ], "y": [ 0, 23 ], "repeat": [ 8, 15 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 19, 20 ], "y": [ 16, 20 ], "repeat": [ 2, 4 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 14, 15 ], "y": [ 16, 21 ], "repeat": [ 2, 4 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 9, 13 ], "y": [ 0, 2 ], "repeat": [ 4, 7 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 1, 22 ], "y": [ 23, 23 ], "repeat": [ 5, 10 ] }
-      ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "p": "t_grass",
-        ";": "t_door_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "C": "t_floor",
-        "O": "t_floor",
-        "P": "t_floor",
-        "Q": "t_fence_h",
-        "S": "t_linoleum_gray",
-        "T": "t_tree",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "Y": "t_floor",
-        "h": "t_floor",
-        "i": "t_linoleum_gray",
-        "n": "t_floor",
-        "o": "t_floor",
-        "q": "t_fence_v",
-        "r": "t_floor",
-        "s": "t_sidewalk",
-        "t": "t_linoleum_gray",
-        "u": "t_floor",
-        "v": "t_window_domestic",
-        "|": "t_wall",
-        "b": "t_grass",
-        "=": "t_door_glass_c",
-        "l": "t_column",
-        "#": "t_shrub",
-        "g": "t_fencegate_c",
-        "~": "t_wall_glass"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "C": "f_cupboard",
-        "O": "f_oven",
-        "P": "f_indoor_plant",
-        "S": "f_sink",
-        "c": "f_counter",
-        "p": "f_mailbox",
-        "Y": "f_rack_coat",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "r": "f_rack",
-        "u": "f_sink",
-        "b": "f_bench",
-        "t": "f_table"
-      },
-      "toilets": { "t": {  } },
-      "items": {
-        "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
-        "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
+        "%": [ "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_region_groundcover_urban",
+        "`": "t_concrete",
+        "?": "t_fencegate_c",
+        "#": "t_rock_wall",
+        "$": "t_fence",
+        "_": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        ")": "t_wall_glass",
+        "]": "t_door_glass_c"
       },
+      "furniture": { "!": "f_region_flower", "/": "f_table" },
       "place_loot": [
-        { "group": "magazines", "x": [ 11, 11 ], "y": [ 6, 8 ], "chance": 50, "repeat": [ 1, 4 ] },
-        { "group": "homebooks", "x": [ 6, 6 ], "y": [ 18, 19 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "livingroom", "x": [ 14, 20 ], "y": [ 6, 7 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "dining", "x": [ 13, 13 ], "y": [ 12, 13 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "fridge", "x": [ 20, 20 ], "y": [ 14, 14 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 20, 20 ], "y": [ 11, 11 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 20, 20 ], "y": [ 9, 9 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 20, 20 ], "y": [ 13, 13 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 12, 12 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "drugs_rare", "x": [ 3, 3 ], "y": [ 20, 20 ], "chance": 5, "repeat": [ 1, 2 ] },
-        { "group": "harddrugs", "x": [ 3, 3 ], "y": [ 20, 20 ], "chance": 15, "repeat": [ 1, 2 ] },
-        { "group": "dining", "x": [ 17, 17 ], "y": [ 10, 12 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "groce_premade", "x": [ 16, 18 ], "y": [ 18, 18 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "bed", "x": [ 9, 10 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 4, 4 ], "y": [ 18, 18 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "bedroom", "x": [ 8, 12 ], "y": [ 16, 18 ], "chance": 80, "repeat": [ 1, 3 ] },
-        { "group": "guns_pistol_common", "x": [ 3, 3 ], "y": [ 20, 20 ], "chance": 75, "ammo": 95, "magazine": 100 },
-        { "item": "television", "x": [ 9, 9 ], "y": [ 7, 7 ], "chance": 75 }
+        { "group": "guns_pistol_common", "x": 3, "y": 20, "chance": 75, "ammo": 95, "magazine": 100 },
+        { "item": "television", "x": 13, "y": 7, "chance": 75 }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 6 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 4, "y": 4, "chance": 15, "fuel": 80, "status": 50, "rotation": 270 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_garage7_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "        |------------3  ",
+        "        |............3  ",
+        "        |............3  ",
+        "        |............3  ",
+        "        |.......X....3  ",
+        "        |............3  ",
+        "  |22222|............3  ",
+        "  |..................3  ",
+        "  |.....&........=...3  ",
+        "  |..................3  ",
+        "  |..................5  ",
+        "  5..........3-------3  ",
+        "  |......N...3          ",
+        "  |..........3          ",
+        "  |..........3          ",
+        "  |..........3          ",
+        "  |..........3          ",
+        "  |----------3          ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]
diff --git a/data/json/mapgen/house/house_garage8.json b/data/json/mapgen/house/house_garage8.json
index 123e8c13529e6..d460c190534e6 100644
--- a/data/json/mapgen/house/house_garage8.json
+++ b/data/json/mapgen/house/house_garage8.json
@@ -2,129 +2,107 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_garage8" ],
     "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "..ssssssss...s..........",
-        ".lsssssssslp.s.....T....",
-        ".|ssssssss|#.s.xXxXx....",
-        ".|sssssssr|#.s..........",
-        ".|sssssssr|#.s.XxXxX....",
-        ".|sssssssr|#.s..........",
-        ".|ssssssss|##s#|vvv|....",
-        ".|sssssccc|-v;v-???-|gq.",
-        ".|---;----|P       o|.q.",
-        ".|r+               o|.q.",
-        ".|---+--+-|C        |.q.",
-        ".|dd  |BiS|O    hnh v.q.",
-        ".|    |Bic|C    hnh v.q.",
-        ".|@@  |-iS|u    hnh v.q.",
-        ".|@@ P|tiC|f        |.q.",
-        ".|-vv---v-----~==~--|.q.",
-        ".q....................q.",
-        ".q.................T..q.",
-        ".q.|----v+v|..mmmm....q.",
-        ".q.|r      v..........q.",
-        ".q.|  h    v..mmmm....q.",
-        ".q.| kkk oo|..........q.",
-        ".QQ--vvv----QQQQQQQQQQq.",
+        "..````````...`..........",
+        ".&````````&p.`.....[....",
+        ".#~~~~~~~~#%.`.,;,;,....",
+        ".#~~~~~~~q#%.`..........",
+        ".#~~~~~~~q#%.`.,;,;,....",
+        ".#~~~~~~~q#%.`..........",
+        ".#~~~~~~~~#%%`%#ooo#....",
+        ".#~~~~~NNN##o*o#HHH##?$.",
+        ".####*#####L    ll R#.$.",
+        ".#U>+              R#.$.",
+        ".#|||+||+||2        #.$.",
+        ".#Ddb |B_S|O    hfh o.$.",
+        ".#    |B_8|1    hfh o.$.",
+        ".#@@ E|Q_S|5    hfh o.$.",
+        ".#@@ y|t_8|F34     T#^$.",
+        ".##oo###o#####)]])###.$.",
+        ".$^......``````````...$.",
+        ".$.......`.........[..$.",
+        ".$.#####o*o#..////....$.",
+        ".$.#6      o.......[..$.",
+        ".$.#  h    o..////....$.",
+        ".$.# rrr RR#..........$.",
+        ".$$##ooo####$$$$$$$$$$$.",
         "........................"
       ],
-      "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 6, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 6, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 2, 21 ], "y": [ 16, 17 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 20, 23 ], "y": [ 0, 6 ], "repeat": [ 3, 6 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 14, 15 ], "y": [ 2, 5 ], "repeat": [ 3, 6 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 12, 13 ], "y": [ 18, 21 ], "repeat": [ 3, 6 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 21, 21 ], "y": [ 8, 15 ], "repeat": [ 3, 6 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 18, 21 ], "y": [ 18, 21 ], "repeat": [ 5, 10 ] }
-      ],
+      "palettes": [ "standard_domestic_palette" ],
       "terrain": {
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        "p": "t_grass",
-        ";": "t_door_locked",
-        "?": "t_floor",
-        "@": "t_floor",
-        "B": "t_linoleum_gray",
-        "C": "t_floor",
-        "O": "t_floor",
-        "P": "t_floor",
-        "Q": "t_fence_h",
-        "m": "t_dirtmound",
-        "S": "t_linoleum_gray",
-        "T": "t_tree",
-        "c": "t_linoleum_gray",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "i": "t_linoleum_gray",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "q": "t_fence_v",
-        "r": "t_floor",
-        "s": "t_sidewalk",
-        "t": "t_linoleum_gray",
-        "u": "t_floor",
-        "v": "t_window_domestic",
-        "|": "t_wall",
-        "=": "t_door_glass_c",
-        "l": "t_column",
-        "#": "t_shrub",
-        "g": "t_fencegate_c",
-        "X": "t_shrub_blueberry",
-        "x": "t_shrub_strawberry",
-        "~": "t_wall_glass"
-      },
-      "furniture": {
-        "?": "f_sofa",
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "O": "f_oven",
-        "P": "f_indoor_plant",
-        "S": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "p": "f_mailbox",
-        "k": "f_desk",
-        "n": "f_table",
-        "o": "f_bookcase",
-        "r": "f_rack",
-        "u": "f_sink",
-        "t": "f_table"
+        "%": [ "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_concrete",
+        "?": "t_fencegate_c",
+        "#": "t_rock_wall",
+        "$": "t_fence",
+        "_": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        ")": "t_wall_glass",
+        "]": "t_door_glass_c",
+        "/": "t_dirtmound",
+        "N": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "~": "t_thconc_floor",
+        "&": "t_column",
+        ";": "t_shrub_blueberry",
+        ",": "t_shrub_strawberry"
       },
-      "toilets": { "t": {  } },
-      "items": { "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
+      "furniture": { "!": "f_region_flower" },
       "place_loot": [
-        { "group": "magazines", "x": [ 5, 7 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "homebooks", "x": [ 9, 10 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "homebooks", "x": [ 19, 19 ], "y": [ 8, 9 ], "chance": 85, "repeat": [ 1, 3 ] },
-        { "group": "livingroom", "x": [ 13, 15 ], "y": [ 9, 13 ], "chance": 40, "repeat": [ 1, 4 ] },
-        { "group": "dining", "x": [ 17, 17 ], "y": [ 11, 13 ], "chance": 70, "repeat": [ 1, 3 ] },
-        { "group": "fridge", "x": [ 11, 11 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 5 ] },
-        { "group": "oven", "x": [ 11, 11 ], "y": [ 11, 11 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "kitchen", "x": [ 11, 11 ], "y": [ 12, 12 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 11, 11 ], "y": [ 10, 10 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 2, 3 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "softdrugs", "x": [ 9, 9 ], "y": [ 14, 14 ], "chance": 80, "repeat": [ 1, 2 ] },
         { "group": "drugs_heal_simple", "x": [ 9, 9 ], "y": [ 12, 12 ], "chance": 80, "repeat": [ 1, 2 ] },
         { "group": "farming_seeds", "x": [ 4, 4 ], "y": [ 19, 19 ], "chance": 85, "repeat": [ 1, 4 ] },
         { "group": "hydro", "x": [ 14, 17 ], "y": [ 18, 18 ], "chance": 90, "repeat": [ 1, 4 ] },
         { "group": "hydro", "x": [ 14, 17 ], "y": [ 20, 20 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "tools_common", "x": [ 9, 9 ], "y": [ 3, 5 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "bed", "x": [ 2, 3 ], "y": [ 13, 14 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 2, 2 ], "y": [ 9, 9 ], "chance": 80, "repeat": [ 1, 2 ] }
+        { "group": "tools_common", "x": [ 9, 9 ], "y": [ 3, 5 ], "chance": 75, "repeat": [ 1, 3 ] }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 4, 5 ], "y": [ 12, 13 ], "chance": 6 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 4, "y": 2, "chance": 15, "fuel": 80, "status": 50, "rotation": 270 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_garage8_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        " |222222223             ",
+        " |........3             ",
+        " |........3             ",
+        " |........3             ",
+        " |........3    |2223    ",
+        " |........32222|...33   ",
+        " |..................3   ",
+        " |..................3   ",
+        " |..................3   ",
+        " |..................3   ",
+        " |..................3   ",
+        " |..................3   ",
+        " |..................5   ",
+        " |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 4457e9cb82375..16f0ba6bb403a 100644
--- a/data/json/mapgen_palettes/house_general_palette.json
+++ b/data/json/mapgen_palettes/house_general_palette.json
@@ -2,7 +2,7 @@
   {
     "type": "palette",
     "id": "standard_domestic_palette",
-    "//": "Intended as a palette for non-nested houses.  Symbols still open for use: ! $ % & _ = ~ - ? / , and some symbols that conflict with json (like brackets).",
+    "//": "Intended as a palette for non-nested houses.  Symbols still open for use: ! $ % & _ = ~ ? / , and some symbols that conflict with json (like brackets).",
     "toilets": { "t": {  } },
     "furniture": {
       "a": "f_fireplace",
@@ -119,9 +119,10 @@
       "n": { "item": "SUS_dishwasher", "chance": 100 },
       "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] },
       "q": [
-        { "item": "home_hw", "chance": 10, "repeat": [ 1, 2 ] },
+        { "item": "tools_home", "chance": 40, "repeat": [ 1, 2 ] },
         { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
-        { "item": "mechanics", "chance": 5, "repeat": [ 1, 2 ] }
+        { "item": "mechanics", "chance": 15, "repeat": [ 1, 2 ] },
+        { "item": "tools_survival", "chance": 25, "repeat": [ 1, 2 ] }
       ],
       "r": [ { "item": "office_paper", "chance": 5 }, { "item": "office", "chance": 25 } ],
       "t": { "item": "SUS_toilet", "chance": 10, "repeat": [ 1, 3 ] },
@@ -163,7 +164,7 @@
       "S": { "item": "SUS_bathroom_sink", "chance": 75 },
       "U": [
         { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] },
-        { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
+        { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] },
         { "item": "mechanics", "chance": 10, "repeat": [ 1, 2 ] }
       ],
       "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 4 ] },
diff --git a/data/json/mapgen_palettes/roof_palette.json b/data/json/mapgen_palettes/roof_palette.json
index 05e2c26837867..758ec6216452b 100644
--- a/data/json/mapgen_palettes/roof_palette.json
+++ b/data/json/mapgen_palettes/roof_palette.json
@@ -30,6 +30,7 @@
     },
     "furniture": {
       "&": "f_roof_turbine_vent",
+      "N": "f_TV_antenna",
       ":": "f_cellphone_booster",
       "X": "f_small_satelitte_dish",
       "~": "f_chimney",
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index 802c0066efa0a..32316c283b480 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -2846,5 +2846,55 @@
       { "point": [ 0, 0, 1 ], "overmap": "house_garage3_roof_north" },
       { "point": [ 0, 0, -1 ], "overmap": "basement" }
     ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_garage4",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_garage4_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_garage4_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_garage5",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_garage5_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_garage5_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_garage6",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_garage6_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_garage6_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_garage7",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_garage7_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_garage7_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "basement" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_garage8",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "house_garage8_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "house_garage8_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 0876ab0f0ed06..8ab071cdb171c 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -981,5 +981,90 @@
     "copy-from": "generic_city_building",
     "color": "light_green",
     "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage4",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage4_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage5",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage5_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage6",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage6_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage7",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage7_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage8",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_garage8_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 bf10c42c5f5b3..46aedad21a26e 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -566,6 +566,11 @@
         "house_garage": 50,
         "house_garage2": 50,
         "house_garage3": 50,
+        "house_garage4": 50,
+        "house_garage5": 50,
+        "house_garage6": 50,
+        "house_garage7": 50,
+        "house_garage8": 50,
         "house_toolshed": 50,
         "house_suicide": 20,
         "house_quiverfull": 30,