diff --git a/data/json/mapgen/musicstore.json b/data/json/mapgen/musicstore.json
index 2162422c7346..9a3bb23fa71a 100644
--- a/data/json/mapgen/musicstore.json
+++ b/data/json/mapgen/musicstore.json
@@ -60,8 +60,8 @@
         "_8c..rrrrrr..|gg|gg|gg8_",
         "_|...........|Kh|Kh|Kh|_",
         "_|D---D|D-55----------|_",
-        "_|.S|S.|sssssss12_z_____",
-        "_|T#|#T|<_______________",
+        "_|.S|S.|sssssss12_z___<_",
+        "_|T#|#T|________________",
         "_-H---H-________________",
         "________________________"
       ],
@@ -131,7 +131,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_music_roof" ],
-    "weight": 180,
     "object": {
       "fill_ter": "t_flat_roof",
       "rows": [
@@ -142,40 +141,31 @@
         "                        ",
         "                        ",
         "                        ",
-        " wnnnnnnnnnnnnnnnnnnnne ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w....................e ",
-        " w.&..................e ",
-        " w.....esssssssssssssse ",
-        " w.....e                ",
-        " w.....d                ",
-        " wssssse                ",
+        " ---------------------- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -....................- ",
+        " -.&..................- ",
+        " -.....---------------5 ",
+        " -.....-                ",
+        " -.....-                ",
+        " -------                ",
         "                        "
       ],
-      "terrain": {
-        " ": "t_open_air",
-        ".": "t_flat_roof",
-        "n": "t_gutter_north",
-        "e": "t_gutter_east",
-        "s": "t_gutter_south",
-        "w": "t_gutter_west",
-        "d": "t_gutter_drop"
-      },
-      "furniture": { "&": "f_roof_turbine_vent" },
+      "palettes": [ "roof_palette" ],
       "place_items": [ { "item": "roof_trash", "x": [ 2, 21 ], "y": [ 9, 18 ], "chance": 50, "repeat": [ 1, 3 ] } ],
       "place_nested": [
         {
           "chunks": [ [ "null", 5 ], [ "roof_2x2_utilities_d", 30 ], [ "roof_2x2_utilities", 50 ], [ "roof_6x6_survivor", 5 ] ],
-          "x": [ 3, 20 ],
-          "y": [ 10, 17 ]
+          "x": [ 3, 15 ],
+          "y": [ 9, 12 ]
         }
       ]
     }