diff --git a/data/json/mapgen/s_bookstore.json b/data/json/mapgen/s_bookstore.json
index 1553c7f116b9..9b76fdbb643d 100644
--- a/data/json/mapgen/s_bookstore.json
+++ b/data/json/mapgen/s_bookstore.json
@@ -3,42 +3,39 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_bookstore" ],
-    "weight": 500,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
         "~~~~~~~~~~~~~~~~~~~~~~~'",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "*|----OOO-::--OO--OO--|*",
-        "*|s.l#.Thf..#ccccccccc|*",
-        "*|e..%................|*",
-        "*|#..#.hT...##%#%#%#--|*",
-        "*|...%..............:.:*",
-        "*|.###.Th...........:.:*",
-        "*|..................--|*",
-        "*|.h..h...TT.TT..]]..]|*",
-        "*|.T..T..........]]..]|*",
-        "*|.h..h...TT.TT..]]..]|*",
-        "*|f..............]]..]|*",
-        "*|...............]]..]|*",
-        "*|]..]]..]]..]]].....]|*",
-        "*|]..]]..]]........|--|*",
-        "*|]..]]..]]........+..|*",
-        "*|]..........]]]]]]|st|*",
-        "*|------+----------|--|*",
-        "***4|C.......f|bb.L|****",
-        "^***|CC.......+...L|*^**",
-        "****|CCC...CC<|-----****",
-        "**^*|----O----|*****^***",
-        "************************"
+        " |||||OOO|::||OO||OO||| ",
+        " |s.l#.Thf..#ccccccccc| ",
+        " |e..%................| ",
+        " |#..#.hT...##%#%#%#||| ",
+        " |...%..............:.: ",
+        " |.###.Th...........:.: ",
+        " |..................||| ",
+        " |.h..h...TT.TT..]]..]| ",
+        " |.T..T..........]]..]| ",
+        " |.h..h...TT.TT..]]..]| ",
+        " |f..............]]..]| ",
+        " |...............]]..]| ",
+        " |]..]]..]]..]]].....]| ",
+        " |]..]]..]]........|||| ",
+        " |]..]]..]]........+..| ",
+        " |]..........]]]]]]|st| ",
+        " |||||||+|||||||||||||| ",
+        "   4|C.......f|bb.L|    ",
+        "^   |CC.......+...L| ^  ",
+        "    |CCC...CC<||||||    ",
+        "  ^ |||||O|||||     ^   ",
+        "                        "
       ],
       "terrain": {
-        "#": "t_floor",
         "%": "t_console_broken",
-        "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ],
-        "^": [ "t_tree_walnut", "t_tree_chestnut", "t_tree_beech", "t_tree", "t_tree_hazelnut" ],
+        " ": "t_region_groundcover_urban",
+        "^": "t_region_tree_nut",
         "+": "t_door_c",
-        "-": "t_wall_w",
         ".": "t_floor",
         ":": "t_door_glass_c",
         "O": "t_window",
@@ -99,7 +96,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": "s_bookstore_roof",
-    "weight": 200,
     "object": {
       "fill_ter": "t_flat_roof",
       "rows": [
@@ -224,47 +220,44 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_bookstore_1" ],
-    "weight": 500,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
         "~~~~~~~~~~~~~~~~~~~~~~~'",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "**|========::-OO--OO-|**",
-        "**|hTh.hTh...#.......|**",
-        "**|.h...h....#%##%##.|**",
-        "*qO..................Oq*",
-        "**|###%#.h...........|**",
-        "**|e...#.T...[[[[[..]|**",
-        "**|s..c#....>|-|....]|**",
-        "**|c..c#....||s|....]|**",
-        "**|...a#.h..|t.|TT..]|**",
-        "**|.##%#.T..|-+|TT..]|**",
-        "*qO.................]|**",
-        "**|hTh.hTh..........]|**",
-        "*qO.................]|**",
-        "**|[[[[[[[..[[[[[[..]|**",
-        "**|[[[[[[[..[[[[[[..]|**",
-        "**|..................|**",
-        "*qO..................Oq*",
-        "**|]]]]]]]]]]]]]]]]]]|**",
-        "**|------------------|**",
-        "************************",
-        "************************"
+        "  |========::|OO||OO||  ",
+        "  |hTh.hTh...#.......|  ",
+        "  |.h...h....#%##%##.|  ",
+        " qO..................Oq ",
+        "  |###%#.h...........|  ",
+        "  |e...#.T...[[[[[..]|  ",
+        "  |s..c#....>|||....]|  ",
+        "  |c..c#....||s|....]|  ",
+        "  |...a#.h..|t.|TT..]|  ",
+        "  |.##%#.T..||+|TT..]|  ",
+        " qO.................]|  ",
+        "  |hTh.hTh..........]|  ",
+        " qO.................]|  ",
+        "  |[[[[[[[..[[[[[[..]|  ",
+        "  |[[[[[[[..[[[[[[..]|  ",
+        "  |..................|  ",
+        " qO..................Oq ",
+        "  |]]]]]]]]]]]]]]]]]]|  ",
+        "  ||||||||||||||||||||  ",
+        "                        ",
+        "                        "
       ],
       "terrain": {
-        "#": "t_floor",
         "%": "t_console_broken",
-        "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ],
+        " ": "t_region_groundcover_urban",
         "+": "t_door_c",
-        "-": "t_wall_w",
         ".": "t_floor",
         ":": "t_door_glass_c",
         "=": "t_wall_glass",
         ">": "t_stairs_up",
         "O": "t_window",
-        "q": "t_grass",
+        "q": "t_region_groundcover_urban",
         "|": "t_wall_w",
         "~": "t_sidewalk",
         "'": "t_sidewalk"
@@ -279,7 +272,7 @@
         "c": "f_cupboard",
         "e": "f_fridge",
         "h": "f_chair",
-        "q": "f_bluebell",
+        "q": "f_region_flower",
         "s": "f_sink"
       },
       "toilets": { "t": {  } },
@@ -308,7 +301,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": "s_bookstore_roof_1",
-    "weight": 200,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -433,46 +425,42 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_bookstore_2" ],
-    "weight": 3000,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
         "~~~~~~~~~~~~~~~~~~~~~~~'",
-        "~~~qSq~~~~~~~~~~qqq~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
-        "***********~************",
-        "***********~**|-----|***",
-        "*******^***~**|]]]]]|***",
-        "***********~**|]...]|***",
-        "***^*******~**|].].]|***",
-        "***********~**|].].]|***",
-        "***********~**|].].]|***",
-        "****|------+-O|....]|***",
-        "****|]]]]]..#a...T.]|***",
-        "****|]......#%#..T.]|***",
-        "****|].]]].........]|***",
-        "****|].]]].TT..TT..]|***",
-        "****|].............]|***",
-        "****|]]]]]]]]]]]]..]|***",
-        "****|------------.--||**",
-        "***********4|LbL|.|ts|**",
-        "*o**********+...+.+..|**",
-        "*******o****---------|**",
-        "**************o*********",
-        "************************"
+        "~~~~~~~~~~~~~~~~~~~~~~~~",
+        "           ~            ",
+        "           ~  |||||||   ",
+        "       ^   ~  |]]]]]|   ",
+        "           ~  |]...]|   ",
+        "   ^       ~  |].].]|   ",
+        "           ~  |].].]|   ",
+        "           ~  |].].]|   ",
+        "    |||||||+|O|....]|   ",
+        "    |]]]]]..#a...T.]|   ",
+        "    |]......#%#..T.]|   ",
+        "    |].]]].........]|   ",
+        "    |].]]].TT..TT..]|   ",
+        "    |].............]|   ",
+        "    |]]]]]]]]]]]]..]|   ",
+        "    |||||||||||||.||||  ",
+        "           4|LbL|.|ts|  ",
+        "            +...+.+..|  ",
+        "            ||||||||||  ",
+        "     ^                  ",
+        "                        "
       ],
       "terrain": {
         "%": "t_console_broken",
-        "*": [ [ "t_grass", 5 ], [ "t_dirt", 2 ], [ "t_grass_long", 4 ] ],
+        " ": "t_region_groundcover_urban",
         "+": [ "t_door_c", "t_door_locked" ],
-        "-": "t_wall_w",
         ".": "t_floor",
         "O": "t_window",
         "S": "t_sidewalk",
-        "^": [ "t_tree_walnut", "t_tree_chestnut", "t_tree_beech", "t_tree", "t_tree_hazelnut" ],
-        "o": "t_dirt",
-        "q": "t_dirt",
+        "^": "t_region_tree_nut",
         "|": "t_wall_w",
         "4": "t_gutter_downspout",
         "~": "t_sidewalk",
@@ -481,10 +469,8 @@
       "furniture": {
         "'": "f_street_light",
         "#": "f_counter",
-        "S": "f_statue",
         "T": "f_table",
         "]": "f_bookcase",
-        "q": "f_dahlia",
         "a": "f_stool",
         "L": "f_locker",
         "b": "f_bench",
@@ -549,7 +535,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": "s_bookstore_roof_2",
-    "weight": 200,
     "object": {
       "fill_ter": "t_flat_roof",
       "rows": [