diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic.json
new file mode 100644
index 0000000000..06a9a32e64
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic.json
@@ -0,0 +1,12 @@
+{
+  "id": "t_window_domestic",
+  "fg": "t_window_domestic_0",
+  "rotates": true,
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "t_connection",
+      "fg": "t_window_domestic_1"
+    }
+  ]
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_0.json
deleted file mode 100644
index 6c67b20ca4..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_window_domestic", "fg": ["477_t_window_domestic_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "t_connection", "fg": ["478_t_window_domestic_1"], "bg": []}], "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/477_t_window_domestic_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/477_t_window_domestic_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_0.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/478_t_window_domestic_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/478_t_window_domestic_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_domestic_1.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains.json
new file mode 100644
index 0000000000..8660e22aee
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains.json
@@ -0,0 +1,12 @@
+{
+  "id": "t_window_no_curtains",
+  "fg": "t_window_no_curtains_0",
+  "rotates": true,
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "t_connection",
+      "fg": "t_window_no_curtains_1"
+    }
+  ]
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_0.json
deleted file mode 100644
index cae4d5f113..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_window_no_curtains", "fg": ["483_t_window_no_curtains_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "t_connection", "fg": ["484_t_window_no_curtains_1"], "bg": []}], "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/483_t_window_no_curtains_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/483_t_window_no_curtains_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_0.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/484_t_window_no_curtains_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/484_t_window_no_curtains_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_1.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open.json
new file mode 100644
index 0000000000..0dc6a9e6a8
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open.json
@@ -0,0 +1,12 @@
+{
+  "id": "t_window_no_curtains_open",
+  "fg": "t_window_no_curtains_open_0",
+  "rotates": true,
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "t_connection",
+      "fg": "t_window_no_curtains_open_1"
+    }
+  ]
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_0.json
deleted file mode 100644
index 65ecee5bb9..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_window_no_curtains_open", "fg": ["485_t_window_no_curtains_open_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "t_connection", "fg": ["486_t_window_no_curtains_open_1"], "bg": []}], "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/485_t_window_no_curtains_open_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/485_t_window_no_curtains_open_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_0.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/486_t_window_no_curtains_open_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/486_t_window_no_curtains_open_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_no_curtains_open_1.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open.json
new file mode 100644
index 0000000000..eb910f1d33
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open.json
@@ -0,0 +1,12 @@
+{
+  "id": "t_window_open",
+  "fg": "t_window_open_0",
+  "rotates": true,
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "t_connection",
+      "fg": "t_window_open_1"
+    }
+  ]
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_0.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_0.json
deleted file mode 100644
index 299454afd8..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "t_window_open", "fg": ["479_t_window_open_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "t_connection", "fg": ["480_t_window_open_1"], "bg": []}], "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/479_t_window_open_0.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/479_t_window_open_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_0.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/480_t_window_open_1.png b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_1.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/terrain/480_t_window_open_1.png
rename to gfx/NeoDays/pngs_tiles_10x10/terrain/t_window_open_1.png