diff --git a/data/json/mapgen/antique_store.json b/data/json/mapgen/antique_store.json
index 05e960e88291..061f6978a697 100644
--- a/data/json/mapgen/antique_store.json
+++ b/data/json/mapgen/antique_store.json
@@ -3,7 +3,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_antique" ],
-    "weight": 500,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -14,7 +13,7 @@
         "____,____,____,____,____",
         "FFFFFFFFFFFFFFFFFFFFFFFF",
         "FFFFFFFFFFFFFFFFFFFFFFFF",
-        "|--OOOOOO--++--OOOOOO--|",
+        "|||OOOOOO||++||OOOOOO|||",
         "|l                    l|",
         "|l                    l|",
         "|l  llllll    llllll  l|",
@@ -25,8 +24,8 @@
         "|l                    l|",
         "|      ##TTTTTT##      |",
         "|              L#      |",
-        "|----------M-----------|",
-        ".4..UUU...._________<...",
+        "|||||||||||M||||||||||||",
+        ".4..UUU....FFFFFFFFF<...",
         "........................",
         "........................",
         "........................",
@@ -36,9 +35,8 @@
         " ": "t_floor",
         "+": "t_door_glass_c",
         ",": "t_pavement_y",
-        "-": "t_wall_w",
-        ".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
-        "U": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
+        ".": "t_region_groundcover_urban",
+        "U": "t_region_groundcover_urban",
         "'": "t_pavement",
         "F": "t_sidewalk",
         "O": "t_window",
@@ -60,7 +58,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_antique_roof" ],
-    "weight": 500,
     "object": {
       "fill_ter": "t_tar_flat_roof",
       "rows": [
@@ -71,35 +68,26 @@
         "                        ",
         "                        ",
         "                        ",
-        "|......................3",
-        "|.c....................3",
-        "|......................3",
-        "|......................3",
-        "|......................3",
-        "|......................3",
-        "|......................3",
-        "|......................3",
-        "|......................3",
-        "|.........&............3",
-        "|......................3",
-        "|5---------------------3",
+        "-......................-",
+        "-.:....................-",
+        "-......................-",
+        "-......................-",
+        "-......................-",
+        "-......................-",
+        "-......................-",
+        "-......................-",
+        "-......................-",
+        "-.........&............-",
+        "-......................-",
+        "-5----------------------",
         "                   #>## ",
         "                        ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "terrain": {
-        ".": "t_tar_flat_roof",
-        " ": "t_open_air",
-        "|": "t_gutter_west",
-        "-": "t_gutter_south",
-        "3": "t_gutter_east",
-        "#": "t_grate",
-        ">": "t_ladder_down",
-        "5": "t_gutter_drop"
-      },
-      "furniture": { "&": "f_roof_turbine_vent", "c": "f_cellphone_booster" },
+      "palettes": [ "roof_palette" ],
+      "terrain": { ">": "t_ladder_down", ".": "t_tar_flat_roof" },
       "place_items": [ { "item": "roof_trash", "x": [ 4, 16 ], "y": [ 8, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ],
       "place_nested": [
         { "chunks": [ [ "roof_2x2_golf", 5 ], [ "null", 85 ], [ "roof_3x3_wine", 10 ] ], "x": [ 13, 20 ], "y": 15 },