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 1a527bf069..663646a4ef 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
@@ -9,116 +9,6 @@
         "fg": "magenta48",
         "bg": "red"
     },
-    {
-        "id": [
-            "horse_farm_1",
-            "horse_farm_11",
-            "horse_farm_12",
-            "horse_farm_14",
-            "horse_farm_15",
-            "horse_farm_16",
-            "horse_farm_3",
-            "horse_farm_5",
-            "horse_farm_6",
-            "horse_farm_8"
-        ],
-        "fg": "black35",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_13_roof"
-        ],
-        "fg": "black94",
-        "bg": "brown",
-        "rotates": true
-    },
-    {
-        "id": [
-            "horse_farm_13"
-        ],
-        "fg": "black94",
-        "bg": "brown",
-        "rotates": true
-    },
-    {
-        "id": [
-            "horse_farm_2"
-        ],
-        "fg": "black35",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_4"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_4_roof"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_7"
-        ],
-        "fg": "black38",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_7_hayloft"
-        ],
-        "fg": "black38",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_7_roof"
-        ],
-        "fg": "black38",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_9"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_9_roof"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_10"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_10_roof"
-        ],
-        "fg": "black111",
-        "bg": "brown"
-    },
-    {
-        "id": [
-            "horse_farm_13_2ndfloor"
-        ],
-        "fg": "black94",
-        "bg": "brown",
-        "rotates": true
-    },
     {
         "id": "cabin_isherwood",
         "fg": "black67",
@@ -325,6 +215,12 @@
         "fg": "black76",
         "bg": "green"
     },
+    {
+        "id": "dirt_road_farm_parking",
+        "fg": "brown179",
+        "bg": "black",
+        "rotates": true
+    },
     {
         "id": "sugar_house",
         "fg": "black83",
@@ -1633,6 +1529,11 @@
         "fg": "black109",
         "bg": "light_gray"
     },
+    {
+        "id": "cs_market_small_roof",
+        "fg": "black109",
+        "bg": "light_gray"
+    },
     {
         "id": "cs_sex_shop",
         "fg": "black120",
@@ -2040,18 +1941,6 @@
         "fg": "black43",
         "bg": "light_gray"
     },
-    {
-        "id": "rift",
-        "fg": "red94",
-        "bg": "black",
-        "rotates": true
-    },
-    {
-        "id": "hellmouth",
-        "fg": "light_red94",
-        "bg": "black",
-        "rotates": true
-    },
     {
         "id": "sai",
         "fg": "black48",
@@ -3222,7 +3111,10 @@
         "bg": "green"
     },
     {
-        "id": "zoo_2_0",
+        "id": [
+            "zoo_2_0",
+            "zoo_3_0"
+        ],
         "fg": "black80",
         "bg": "green"
     },
@@ -3231,21 +3123,37 @@
             "zoo_0_1",
             "zoo_1_1",
             "zoo_2_1",
+            "zoo_3_1",
             "zoo_0_2",
             "zoo_1_2",
-            "zoo_2_2"
+            "zoo_2_2",
+            "zoo_3_2",
+            "zoo_0_3",
+            "zoo_1_3",
+            "zoo_2_3",
+            "zoo_3_3"
         ],
         "fg": "black90",
         "bg": "green"
     },
     {
         "id": [
+            "zoo_0_0_roof",
+            "zoo_1_0_roof",
+            "zoo_2_0_roof",
+            "zoo_3_0_roof",
             "zoo_0_1_roof",
             "zoo_1_1_roof",
             "zoo_2_1_roof",
+            "zoo_3_1_roof",
             "zoo_0_2_roof",
             "zoo_1_2_roof",
-            "zoo_2_2_roof"
+            "zoo_2_2_roof",
+            "zoo_3_2_roof",
+            "zoo_0_3_roof",
+            "zoo_1_3_roof",
+            "zoo_2_3_roof",
+            "zoo_3_3_roof"
         ],
         "fg": "black90",
         "bg": "green"
@@ -3560,7 +3468,6 @@
             "house_03",
             "house_04",
             "house_05",
-            "house_05ab",
             "house_06",
             "house_07",
             "house_08",
@@ -3693,7 +3600,11 @@
             "urban_17_1",
             "urban_17_2",
             "urban_18_3",
-            "urban_18_4"
+            "urban_18_4",
+            "urban_22_1",
+            "urban_22_2",
+            "urban_22_1_roof",
+            "urban_22_2_roof"
         ],
         "fg": "light_green94",
         "bg": "black",
@@ -4458,12 +4369,6 @@
         "bg": "black",
         "rotates": true
     },
-    {
-        "id": "city_center",
-        "fg": "dark_gray197",
-        "bg": "black",
-        "rotates": true
-    },
     {
         "id": "bridge",
         "fg": "blue179",
@@ -4890,6 +4795,11 @@
         "bg": "black",
         "rotates": true
     },
+    {
+        "id": "afs_crashed_cargo_shuttle",
+        "fg": "black115",
+        "bg": "red"
+    },
     {
         "id": "robot_dispatch_first",
         "fg": "black82",