diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/744_t_border_rock_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_border_rock.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/744_t_border_rock_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_border_rock.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_border_rock_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_border_rock_0.json
deleted file mode 100644
index 0b3365da5e..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_border_rock_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_border_rock", "fg": ["744_t_border_rock_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2978_t_door_gray_b_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_b.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2978_t_door_gray_b_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_b.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_b_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_b_0.json
deleted file mode 100644
index a74634c97a..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_b_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_gray_b", "fg": ["2978_t_door_gray_b_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2977_t_door_gray_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2977_t_door_gray_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_c_0.json
deleted file mode 100644
index 06aa1ad181..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_gray_c", "fg": ["2977_t_door_gray_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2976_t_door_gray_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2976_t_door_gray_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_o_0.json
deleted file mode 100644
index 7d4fe2d63f..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_gray_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_gray_o", "fg": ["2976_t_door_gray_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2984_t_door_green_b_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_b.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2984_t_door_green_b_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_b.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_b_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_b_0.json
deleted file mode 100644
index f3088d2e5b..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_b_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_green_b", "fg": ["2984_t_door_green_b_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2983_t_door_green_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2983_t_door_green_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_c_0.json
deleted file mode 100644
index cc98a9a71f..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_green_c", "fg": ["2983_t_door_green_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2982_t_door_green_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2982_t_door_green_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_o_0.json
deleted file mode 100644
index 4f5d74d5fc..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_green_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_green_o", "fg": ["2982_t_door_green_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2981_t_door_red_b_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_b.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2981_t_door_red_b_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_b.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_b_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_b_0.json
deleted file mode 100644
index 23dbf4807b..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_b_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_red_b", "fg": ["2981_t_door_red_b_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2980_t_door_red_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2980_t_door_red_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_c_0.json
deleted file mode 100644
index 3c5a620cb4..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_red_c", "fg": ["2980_t_door_red_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2979_t_door_red_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2979_t_door_red_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_o_0.json
deleted file mode 100644
index 4bb645ec6e..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_red_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_red_o", "fg": ["2979_t_door_red_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2987_t_door_white_b_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_b.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2987_t_door_white_b_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_b.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_b_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_b_0.json
deleted file mode 100644
index 28cecc819a..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_b_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_white_b", "fg": ["2987_t_door_white_b_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2986_t_door_white_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2986_t_door_white_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_c_0.json
deleted file mode 100644
index e6b5ba41a0..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_white_c", "fg": ["2986_t_door_white_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2985_t_door_white_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2985_t_door_white_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_o_0.json
deleted file mode 100644
index 9600935ecd..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_door_white_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_door_white_o", "fg": ["2985_t_door_white_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3001_t_floor_resin_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_floor_resin.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3001_t_floor_resin_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_floor_resin.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_floor_resin_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_floor_resin_0.json
deleted file mode 100644
index 1f7af1bd86..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_floor_resin_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_floor_resin", "fg": ["3001_t_floor_resin_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/625_t_gas_tank_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gas_tank.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/625_t_gas_tank_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_gas_tank.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gas_tank_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gas_tank_0.json
deleted file mode 100644
index b03457ba20..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gas_tank_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_gas_tank", "fg": ["625_t_gas_tank_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3053_t_gate_metal_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3053_t_gate_metal_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_c_0.json
deleted file mode 100644
index 37f0f571af..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_gate_metal_c", "fg": ["3053_t_gate_metal_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3054_t_gate_metal_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3054_t_gate_metal_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_o_0.json
deleted file mode 100644
index 226ad7bfc7..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_gate_metal_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_gate_metal_o", "fg": ["3054_t_gate_metal_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/633_t_improvised_shelter_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_improvised_shelter.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/633_t_improvised_shelter_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_improvised_shelter.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_improvised_shelter_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_improvised_shelter_0.json
deleted file mode 100644
index 096d368d1c..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_improvised_shelter_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_improvised_shelter", "fg": ["633_t_improvised_shelter_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3070_t_intercom_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_intercom.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3070_t_intercom_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_intercom.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_intercom_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_intercom_0.json
deleted file mode 100644
index 3ee9d1b0eb..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_intercom_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_intercom", "fg": ["3070_t_intercom_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/650_t_leanto_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_leanto.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/650_t_leanto_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_leanto.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_leanto_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_leanto_0.json
deleted file mode 100644
index 6011b12e53..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_leanto_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_leanto", "fg": ["650_t_leanto_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/618_t_nuclear_reactor_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_nuclear_reactor.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/618_t_nuclear_reactor_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_nuclear_reactor.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_nuclear_reactor_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_nuclear_reactor_0.json
deleted file mode 100644
index 77eec4157e..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_nuclear_reactor_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_nuclear_reactor", "fg": ["618_t_nuclear_reactor_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/617_t_plut_generator_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_plut_generator.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/617_t_plut_generator_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_plut_generator.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_plut_generator_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_plut_generator_0.json
deleted file mode 100644
index a8b750a270..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_plut_generator_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_plut_generator", "fg": ["617_t_plut_generator_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/652_t_recycler_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_recycler.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/652_t_recycler_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_recycler.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_recycler_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_recycler_0.json
deleted file mode 100644
index 65495846c3..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_recycler_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_recycler", "fg": ["652_t_recycler_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3000_t_resin_hole_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3000_t_resin_hole_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_0.json
deleted file mode 100644
index 2f9e58d17c..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_resin_hole", "fg": ["3000_t_resin_hole_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2998_t_resin_hole_c_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_c.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2998_t_resin_hole_c_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_c.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_c_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_c_0.json
deleted file mode 100644
index e458d39636..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_c_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_resin_hole_c", "fg": ["2998_t_resin_hole_c_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2999_t_resin_hole_o_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_o.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2999_t_resin_hole_o_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_o.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_o_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_o_0.json
deleted file mode 100644
index d82d6fce33..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_resin_hole_o_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_resin_hole_o", "fg": ["2999_t_resin_hole_o_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/651_t_tarptent_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tarptent.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/651_t_tarptent_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_tarptent.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tarptent_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tarptent_0.json
deleted file mode 100644
index db10c009de..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tarptent_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_tarptent", "fg": ["651_t_tarptent_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3052_t_ticket_machine_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_machine.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3052_t_ticket_machine_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_machine.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_machine_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_machine_0.json
deleted file mode 100644
index 4427aa3257..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_machine_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_ticket_machine", "fg": ["3052_t_ticket_machine_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3051_t_ticket_vendor_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_vendor.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3051_t_ticket_vendor_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_vendor.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_vendor_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_vendor_0.json
deleted file mode 100644
index 6b25fb324c..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_ticket_vendor_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_ticket_vendor", "fg": ["3051_t_ticket_vendor_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3033_t_tree_juniper_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3033_t_tree_juniper_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_0.json
deleted file mode 100644
index 089faad90b..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_tree_juniper", "fg": ["3033_t_tree_juniper_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3035_t_tree_juniper_harvested_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_harvested.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3035_t_tree_juniper_harvested_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_harvested.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_harvested_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_harvested_0.json
deleted file mode 100644
index eb33984576..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_harvested_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_tree_juniper_harvested", "fg": ["3035_t_tree_juniper_harvested_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3034_t_tree_juniper_season_winter_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_season_winter.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3034_t_tree_juniper_season_winter_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_season_winter.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_season_winter_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_season_winter_0.json
deleted file mode 100644
index 6070c9c01d..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_tree_juniper_season_winter_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_tree_juniper_season_winter", "fg": ["3034_t_tree_juniper_season_winter_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/616_t_vat_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_vat.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/616_t_vat_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_vat.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_vat_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_vat_0.json
deleted file mode 100644
index aeb0e6c8ee..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_vat_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_vat", "fg": ["616_t_vat_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin.json
index 2e2b8fcc55..875aa15451 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin.json
@@ -1,32 +1,32 @@
 {
   "id": "t_wall_resin",
-  "fg": "2992_t_wall_resin_6",
+  "fg": "t_wall_resin_6",
   "rotates": false,
   "multitile": true,
   "additional_tiles": [
     {
       "id": "center",
-      "fg": "2993_t_wall_resin_1"
+      "fg": "t_wall_resin_1"
     },
     {
       "id": "corner",
-      "fg": "2994_t_wall_resin_2"
+      "fg": "t_wall_resin_2"
     },
     {
       "id": "edge",
-      "fg": "2995_t_wall_resin_3"
+      "fg": "t_wall_resin_3"
     },
     {
       "id": "end_piece",
-      "fg": "2996_t_wall_resin_4"
+      "fg": "t_wall_resin_4"
     },
     {
       "id": "t_connection",
-      "fg": "2997_t_wall_resin_5"
+      "fg": "t_wall_resin_5"
     },
     {
       "id": "unconnected",
-      "fg": "2992_t_wall_resin_6"
+      "fg": "t_wall_resin_6"
     }
   ]
 }
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2993_t_wall_resin_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2993_t_wall_resin_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_1.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2994_t_wall_resin_2.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_2.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2994_t_wall_resin_2.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_2.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2995_t_wall_resin_3.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_3.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2995_t_wall_resin_3.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_3.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2996_t_wall_resin_4.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_4.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2996_t_wall_resin_4.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_4.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2997_t_wall_resin_5.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_5.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2997_t_wall_resin_5.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_5.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/2992_t_wall_resin_6.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_6.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/2992_t_wall_resin_6.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_6.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage.json
index 5f424572d4..08dfde5f2d 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage.json
@@ -1,32 +1,32 @@
 {
   "id": "t_wall_resin_cage",
-  "fg": "3003_t_wall_resin_cage_1",
+  "fg": "t_wall_resin_cage_1",
   "rotates": false,
   "multitile": true,
   "additional_tiles": [
     {
       "id": "center",
-      "fg": "3003_t_wall_resin_cage_1"
+      "fg": "t_wall_resin_cage_1"
     },
     {
       "id": "corner",
-      "fg": "3004_t_wall_resin_cage_2"
+      "fg": "t_wall_resin_cage_2"
     },
     {
       "id": "edge",
-      "fg": "3005_t_wall_resin_cage_3"
+      "fg": "t_wall_resin_cage_3"
     },
     {
       "id": "end_piece",
-      "fg": "3006_t_wall_resin_cage_4"
+      "fg": "t_wall_resin_cage_4"
     },
     {
       "id": "t_connection",
-      "fg": "3007_t_wall_resin_cage_5"
+      "fg": "t_wall_resin_cage_5"
     },
     {
       "id": "unconnected",
-      "fg": "3003_t_wall_resin_cage_1"
+      "fg": "t_wall_resin_cage_1"
     }
   ]
 }
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3003_t_wall_resin_cage_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3003_t_wall_resin_cage_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_1.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3004_t_wall_resin_cage_2.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_2.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3004_t_wall_resin_cage_2.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_2.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3005_t_wall_resin_cage_3.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_3.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3005_t_wall_resin_cage_3.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_3.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3006_t_wall_resin_cage_4.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_4.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3006_t_wall_resin_cage_4.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_4.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3007_t_wall_resin_cage_5.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_5.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3007_t_wall_resin_cage_5.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wall_resin_cage_5.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3042_t_wood_stairs_down_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_down.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3042_t_wood_stairs_down_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_down.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_down_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_down_0.json
deleted file mode 100644
index c9a8b1d679..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_down_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_wood_stairs_down", "fg": ["3042_t_wood_stairs_down_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3041_t_wood_stairs_up_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3041_t_wood_stairs_up_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_0.json
deleted file mode 100644
index 2add13c647..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_wood_stairs_up", "fg": ["3041_t_wood_stairs_up_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3043_t_wood_stairs_up_broken_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_broken.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3043_t_wood_stairs_up_broken_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_broken.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_broken_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_broken_0.json
deleted file mode 100644
index 1ddc853bfe..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_broken_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_wood_stairs_up_broken", "fg": ["3043_t_wood_stairs_up_broken_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/3044_t_wood_stairs_up_half_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_half.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/3044_t_wood_stairs_up_half_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_half.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_half_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_half_0.json
deleted file mode 100644
index 7dc61db6cb..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_wood_stairs_up_half_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_wood_stairs_up_half", "fg": ["3044_t_wood_stairs_up_half_0"], "rotates": false, "bg": []}
\ No newline at end of file