diff --git a/gfx/ASCII_Overmap/pngs_ASCIITiles_10x10/json_legacy/from_data.json b/gfx/ASCII_Overmap/pngs_ASCIITiles_10x10/json_legacy/from_data.json
index 663646a4ef..373fae055e 100644
--- a/gfx/ASCII_Overmap/pngs_ASCIITiles_10x10/json_legacy/from_data.json
+++ b/gfx/ASCII_Overmap/pngs_ASCIITiles_10x10/json_legacy/from_data.json
@@ -192,7 +192,8 @@
             "godco_8_1",
             "godco_9_1",
             "godco_1_2",
-            "godco_2_2"
+            "godco_2_2",
+            "godco_1_3"
         ],
         "fg": "black43",
         "bg": "green"
@@ -247,7 +248,13 @@
             "farm_6",
             "farm_7",
             "farm_8",
-            "farm_9",
+            "farm_9"
+        ],
+        "fg": "black35",
+        "bg": "brown"
+    },
+    {
+        "id": [
             "farm_isherwood_1",
             "farm_isherwood_4",
             "farm_isherwood_5",
@@ -255,11 +262,8 @@
             "farm_isherwood_7",
             "farm_isherwood_8",
             "farm_isherwood_9",
-            "farm_lot_wire_straight_v",
-            "farm_lot_wire_straight_v_open",
-            "farm_lot_wire_turn_h",
-            "farm_lot_wire_turn_v",
             "horse_farm_isherwood_1",
+            "horse_farm_isherwood_2",
             "horse_farm_isherwood_11",
             "horse_farm_isherwood_12",
             "horse_farm_isherwood_14",
@@ -273,16 +277,6 @@
         "fg": "black35",
         "bg": "brown"
     },
-    {
-        "id": [
-            "2farm_roof_15",
-            "farm_lot_M1",
-            "farm_lot_wire_straight_h",
-            "farm_lot_wire_turn_v_open"
-        ],
-        "fg": "black35",
-        "bg": "brown"
-    },
     {
         "id": [
             "2farm_13",
@@ -306,8 +300,15 @@
     {
         "id": [
             "farm_2_roof",
+            "farm_horse_house_1_roof"
+        ],
+        "fg": "black94",
+        "bg": "brown",
+        "rotates": true
+    },
+    {
+        "id": [
             "farm_isherwood_2_roof",
-            "farm_horse_house_1_roof",
             "horse_farm_isherwood_13_roof"
         ],
         "fg": "black94",
@@ -316,7 +317,13 @@
     },
     {
         "id": [
-            "farm_3",
+            "farm_3"
+        ],
+        "fg": "black35",
+        "bg": "brown"
+    },
+    {
+        "id": [
             "farm_isherwood_3"
         ],
         "fg": "black35",
@@ -324,7 +331,13 @@
     },
     {
         "id": [
-            "farm_3_roof",
+            "farm_3_roof"
+        ],
+        "fg": "black35",
+        "bg": "brown"
+    },
+    {
+        "id": [
             "farm_isherwood_3_roof"
         ],
         "fg": "black35",
@@ -347,9 +360,7 @@
     {
         "id": [
             "farm_2",
-            "horse_farm_isherwood_13",
             "farm_horse_house_1",
-            "farm_isherwood_2",
             "2farm_11",
             "farm_stills_3",
             "farm_stills_3_2nd",
@@ -362,6 +373,15 @@
         "bg": "brown",
         "rotates": true
     },
+    {
+        "id": [
+            "horse_farm_isherwood_13",
+            "farm_isherwood_2"
+        ],
+        "fg": "black94",
+        "bg": "brown",
+        "rotates": true
+    },
     {
         "id": [
             "farm_stills_8",
@@ -399,7 +419,13 @@
     {
         "id": [
             "dairy_farm_SE_roof",
-            "dairy_farm_SW_roof",
+            "dairy_farm_SW_roof"
+        ],
+        "fg": "black119",
+        "bg": "brown"
+    },
+    {
+        "id": [
             "dairy_farm_isherwood_SE_roof",
             "dairy_farm_isherwood_SW_roof"
         ],
@@ -499,83 +525,98 @@
         "bg": "green"
     },
     {
-        "id": [
-            "horse_farm_isherwood_2"
-        ],
-        "fg": "black35",
+        "id": "farm_horse_carriage_house_1",
+        "fg": "black111",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_horse_carriage_house_1",
-            "horse_farm_isherwood_4"
-        ],
+        "id": "horse_farm_isherwood_4",
         "fg": "black111",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_horse_carriage_house_1_roof",
-            "horse_farm_isherwood_4_roof"
-        ],
+        "id": "farm_horse_carriage_house_1_roof",
         "fg": "black111",
         "bg": "brown"
     },
     {
-        "id": [
-            "horse_farm_isherwood_7",
-            "farm_horse_stable_1"
-        ],
+        "id": "horse_farm_isherwood_4_roof",
+        "fg": "black111",
+        "bg": "brown"
+    },
+    {
+        "id": "farm_horse_stable_1",
         "fg": "black38",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_horse_stable_1_hayloft",
-            "horse_farm_isherwood_7_hayloft"
-        ],
+        "id": "horse_farm_isherwood_7",
         "fg": "black38",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_horse_stable_1_roof",
-            "horse_farm_isherwood_7_roof"
-        ],
+        "id": "farm_horse_stable_1_hayloft",
+        "fg": "black38",
+        "bg": "brown"
+    },
+    {
+        "id": "horse_farm_isherwood_7_hayloft",
+        "fg": "black38",
+        "bg": "brown"
+    },
+    {
+        "id": "farm_horse_stable_1_roof",
+        "fg": "black38",
+        "bg": "brown"
+    },
+    {
+        "id": "horse_farm_isherwood_7_roof",
         "fg": "black38",
         "bg": "brown"
     },
     {
         "id": [
             "farm_1_greenhouse",
-            "horse_farm_isherwood_9",
             "farm_horse_greenhouse"
         ],
         "fg": "black111",
         "bg": "brown"
     },
+    {
+        "id": "horse_farm_isherwood_9",
+        "fg": "black111",
+        "bg": "brown"
+    },
     {
         "id": [
             "farm_1_greenhouse_roof",
-            "horse_farm_isherwood_9_roof",
             "farm_horse_greenhouse_roof"
         ],
         "fg": "black111",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_1_coop",
-            "horse_farm_isherwood_10"
-        ],
+        "id": "horse_farm_isherwood_9_roof",
         "fg": "black111",
         "bg": "brown"
     },
     {
-        "id": [
-            "farm_1_coop_roof",
-            "horse_farm_isherwood_10_roof"
-        ],
+        "id": "farm_1_coop",
+        "fg": "black111",
+        "bg": "brown"
+    },
+    {
+        "id": "horse_farm_isherwood_10",
+        "fg": "black111",
+        "bg": "brown"
+    },
+    {
+        "id": "farm_1_coop_roof",
+        "fg": "black111",
+        "bg": "brown"
+    },
+    {
+        "id": "horse_farm_isherwood_10_roof",
         "fg": "black111",
         "bg": "brown"
     },
@@ -643,7 +684,6 @@
     },
     {
         "id": [
-            "horse_farm_isherwood_13_2ndfloor",
             "farm_horse_house_1_2ndfloor",
             "farm_dairy_twd_second_floor_3",
             "farm_dairy_twd_second_floor_4"
@@ -652,6 +692,12 @@
         "bg": "brown",
         "rotates": true
     },
+    {
+        "id": "horse_farm_isherwood_13_2ndfloor",
+        "fg": "black94",
+        "bg": "brown",
+        "rotates": true
+    },
     {
         "id": [
             "farm_dairy_twd_second_floor_5",
@@ -747,7 +793,9 @@
     {
         "id": [
             "office_doctor_roof",
+            "office_doctor_access_roof",
             "office_doctor_roof_1",
+            "office_doctor_access_roof_1",
             "office_doctor_roof_2",
             "office_doctor_upper_roof_2"
         ],
@@ -807,7 +855,9 @@
             "office_tower_roof_nw",
             "office_tower_roof_ne",
             "office_tower_roof_sw",
-            "office_tower_roof_se"
+            "office_tower_roof_se",
+            "office_tower_roof_ne_roof",
+            "office_tower_roof_se_roof"
         ],
         "fg": "black116",
         "bg": "light_gray"
@@ -994,7 +1044,9 @@
     {
         "id": [
             "s_gun_roof",
+            "s_gun_upper_roof",
             "s_gun_roof_1",
+            "s_gun_upper_roof_1",
             "s_gun_roof_3",
             "s_gun_roof_4",
             "s_gunstore_roof"
@@ -1112,6 +1164,7 @@
             "s_restaurant_roof",
             "s_restaurant_roof_1",
             "s_restaurant_roof_2",
+            "s_restaurant_upper_roof_2",
             "s_restaurant_roof_3"
         ],
         "fg": "pink94",
@@ -1227,7 +1280,8 @@
     {
         "id": [
             "s_bike_shop_roof",
-            "s_bike_shop_roof_1"
+            "s_bike_shop_roof_1",
+            "s_bike_shop_roof_1_shack_roof"
         ],
         "fg": "black94",
         "bg": "cyan",
@@ -1324,7 +1378,8 @@
             "hdwr_large_0_1_1",
             "hdwr_large_1_1_1",
             "hdwr_large_0_2_1",
-            "hdwr_large_1_2_1"
+            "hdwr_large_1_2_1",
+            "hdwr_large_1_1_2"
         ],
         "fg": "light_green72",
         "bg": "brown"
@@ -1801,7 +1856,10 @@
             "evac_center_14_z1",
             "evac_center_17_z1",
             "evac_center_18_z1",
-            "evac_center_19_z1"
+            "evac_center_19_z1",
+            "evac_center_12_z2",
+            "evac_center_13_z2",
+            "evac_center_14_z2"
         ],
         "fg": "white197",
         "bg": "black",
@@ -2387,7 +2445,10 @@
         "bg": "light_red"
     },
     {
-        "id": "mi-go_camp1",
+        "id": [
+            "mi-go_camp1",
+            "mi-go_camp1-1"
+        ],
         "fg": "dark_gray60",
         "bg": "black",
         "rotates": true
@@ -2406,12 +2467,16 @@
     },
     {
         "id": [
+            "barry_mi-go_scout_tower_1",
+            "barry_mi-go_scout_tower_2",
+            "barry_mi-go_scout_tower_3",
+            "barry_mi-go_scout_tower_4",
             "mi-go_scout_tower_1",
             "mi-go_scout_tower_2",
             "mi-go_scout_tower_3",
             "mi-go_scout_tower_4"
         ],
-        "fg": "light_gray62",
+        "fg": "dark_gray60",
         "bg": "black",
         "rotates": true
     },
@@ -2424,7 +2489,9 @@
             "fema_2_3",
             "fema_3_1",
             "fema_3_2",
-            "fema_3_3"
+            "fema_3_3",
+            "fema_roof",
+            "fema_1_3_roof"
         ],
         "fg": "black70",
         "bg": "blue"
@@ -2711,6 +2778,12 @@
             "prison_alcatraz_13_2f",
             "prison_alcatraz_14_2f",
             "prison_alcatraz_15_2f",
+            "prison_alcatraz_10_3f",
+            "prison_alcatraz_9_3f",
+            "prison_alcatraz_6_3f",
+            "prison_alcatraz_15_3f",
+            "prison_alcatraz_14_3f",
+            "prison_alcatraz_11_3f",
             "prison_island_1_1",
             "prison_island_1_2",
             "prison_island_1_3",
@@ -2741,6 +2814,11 @@
             "prison_island_1_2f_13",
             "prison_island_1_2f_14",
             "prison_island_1_2f_15",
+            "prison_island_1_3f_1",
+            "prison_island_1_3f_4",
+            "prison_island_1_3f_5",
+            "prison_island_1_3f_11",
+            "prison_island_1_3f_14",
             "prison_island_1_ug_1",
             "prison_island_1_ug_2",
             "prison_island_1_ug_3",
@@ -2815,7 +2893,8 @@
             "town_hall_0_0_roof",
             "town_hall_1_0_roof",
             "town_hall_0_1_roof",
-            "town_hall_1_1_roof"
+            "town_hall_1_1_roof",
+            "town_hall_1_1_upper_roof"
         ],
         "fg": "black94",
         "bg": "light_gray",
@@ -3015,7 +3094,8 @@
             "state_park_0_0",
             "state_park_0_1",
             "state_park_1_0",
-            "state_park_1_1"
+            "state_park_1_1",
+            "state_park_1_0_1"
         ],
         "fg": "black83",
         "bg": "green"
@@ -3102,6 +3182,11 @@
         "fg": "black84",
         "bg": "green"
     },
+    {
+        "id": "TreeFarm_1a_roof",
+        "fg": "black84",
+        "bg": "green"
+    },
     {
         "id": [
             "zoo_0_0",
@@ -3280,9 +3365,11 @@
             "movietheater_roof_0_0",
             "movietheater_roof_1_0",
             "movietheater_roof_2_0",
+            "movietheater_2_2_0",
             "movietheater_roof_0_1",
             "movietheater_roof_1_1",
             "movietheater_roof_2_1",
+            "movietheater_2_2_1",
             "movietheater_roof_0_2",
             "movietheater_roof_1_2",
             "movietheater_roof_2_2"
@@ -3510,6 +3597,9 @@
             "house_40",
             "house_41",
             "house_42",
+            "house_43",
+            "house_43_first_floor",
+            "house_43_second_floor",
             "house_crack1",
             "house_crack2",
             "house_crack3",
@@ -3813,6 +3903,7 @@
             "house_40_roof",
             "house_41_roof",
             "house_42_roof",
+            "house_43_roof",
             "house_crack1_roof",
             "house_crack3_roof",
             "house_detatched10_roof",
@@ -3888,11 +3979,6 @@
         "fg": "black46",
         "bg": "brown"
     },
-    {
-        "id": "bunker_shop_g",
-        "fg": "black88",
-        "bg": "brown"
-    },
     {
         "id": "prefab",
         "fg": "light_green94",
@@ -4357,7 +4443,8 @@
     {
         "id": [
             "speedway_6_7_1",
-            "speedway_6_7_2"
+            "speedway_6_7_2",
+            "speedway_6_7_3"
         ],
         "fg": "light_gray196",
         "bg": "black",
@@ -4433,7 +4520,8 @@
             "control_tower_2",
             "s_air_atc",
             "s_air_atc_2",
-            "s_air_atc_3"
+            "s_air_atc_3",
+            "s_air_atc_4"
         ],
         "fg": "black88",
         "bg": "light_gray"
@@ -4494,31 +4582,31 @@
             "trailer_road_1parkway",
             "trailer_road_2parkway"
         ],
-        "fg": "light_gray179",
+        "fg": "dark_gray179",
         "bg": "black",
         "rotates": true
     },
     {
         "id": "trailer_hub_11",
-        "fg": "light_gray196",
+        "fg": "dark_gray196",
         "bg": "black",
         "rotates": true
     },
     {
         "id": "trailer_road_turn",
-        "fg": "light_gray191",
+        "fg": "dark_gray191",
         "bg": "black",
         "rotates": true
     },
     {
         "id": "trailer_road_3way",
-        "fg": "light_gray194",
+        "fg": "dark_gray194",
         "bg": "black",
         "rotates": true
     },
     {
         "id": "trailer_hub_01",
-        "fg": "light_gray197",
+        "fg": "dark_gray197",
         "bg": "black",
         "rotates": true
     },
@@ -4571,7 +4659,9 @@
             "junkyard_1b",
             "junkyard_roof_1b",
             "junkyard_2a",
-            "junkyard_2b"
+            "junkyard_roof_2a",
+            "junkyard_2b",
+            "junkyard_roof_2b"
         ],
         "fg": "black74",
         "bg": "brown"
@@ -4582,6 +4672,7 @@
             "ws_regional_dump_1_0",
             "ws_regional_dump_2_0",
             "ws_regional_dump_3_0",
+            "ws_regional_dump_3_0_roof",
             "ws_regional_dump_0_1",
             "ws_regional_dump_1_1",
             "ws_regional_dump_2_1",
@@ -4598,6 +4689,7 @@
             "ws_biker_dump_1_0",
             "ws_biker_dump_2_0",
             "ws_biker_dump_3_0",
+            "ws_biker_dump_3_0_roof",
             "ws_biker_dump_0_1",
             "ws_biker_dump_1_1",
             "ws_biker_dump_2_1",
@@ -4618,6 +4710,7 @@
     {
         "id": [
             "cs_open_sewer",
+            "cs_open_sewer_roof",
             "cs_open_sewer_undergound"
         ],
         "fg": "black115",
@@ -5410,6 +5503,11 @@
         "fg": "black67",
         "bg": "light_red"
     },
+    {
+        "id": "blotted_sun",
+        "fg": "black37",
+        "bg": "blue"
+    },
     {
         "id": [
             "npc_male",