diff --git a/gfx/NonFormatted/BillBen.png b/gfx/Archive/BillBen.png
similarity index 100%
rename from gfx/NonFormatted/BillBen.png
rename to gfx/Archive/BillBen.png
diff --git a/gfx/NonFormatted/Boco.png b/gfx/Archive/Boco.png
similarity index 100%
rename from gfx/NonFormatted/Boco.png
rename to gfx/Archive/Boco.png
diff --git a/gfx/NonFormatted/Diesel.png b/gfx/Archive/Diesel.png
similarity index 100%
rename from gfx/NonFormatted/Diesel.png
rename to gfx/Archive/Diesel.png
diff --git a/gfx/Trains/Edward_James.png b/gfx/Archive/Edward_James.png
similarity index 100%
rename from gfx/Trains/Edward_James.png
rename to gfx/Archive/Edward_James.png
diff --git a/gfx/Trains/Express_Coaches.png b/gfx/Archive/Express_Coaches.png
similarity index 100%
rename from gfx/Trains/Express_Coaches.png
rename to gfx/Archive/Express_Coaches.png
diff --git a/gfx/Archive/Gordon.png b/gfx/Archive/Gordon.png
new file mode 100644
index 0000000..f022f17
Binary files /dev/null and b/gfx/Archive/Gordon.png differ
diff --git a/gfx/Archive/Henry.png b/gfx/Archive/Henry.png
new file mode 100644
index 0000000..64be706
Binary files /dev/null and b/gfx/Archive/Henry.png differ
diff --git a/gfx/Trains/Pip_Emma.png b/gfx/Archive/Pip_Emma.png
similarity index 100%
rename from gfx/Trains/Pip_Emma.png
rename to gfx/Archive/Pip_Emma.png
diff --git a/gfx/Trains/Thomas_Percy_AnnieClarabel.png b/gfx/Archive/Thomas_Percy_AnnieClarabel.png
similarity index 100%
rename from gfx/Trains/Thomas_Percy_AnnieClarabel.png
rename to gfx/Archive/Thomas_Percy_AnnieClarabel.png
diff --git a/gfx/Archive/Toby.png b/gfx/Archive/Toby.png
new file mode 100644
index 0000000..bd12181
Binary files /dev/null and b/gfx/Archive/Toby.png differ
diff --git a/gfx/class40.png b/gfx/Archive/class40.png
similarity index 100%
rename from gfx/class40.png
rename to gfx/Archive/class40.png
diff --git a/gfx/NonFormatted/parameter_show_remix.png b/gfx/Archive/parameter_show_remix.png
similarity index 100%
rename from gfx/NonFormatted/parameter_show_remix.png
rename to gfx/Archive/parameter_show_remix.png
diff --git a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514134818.png b/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514134818.png
deleted file mode 100644
index 733c20c..0000000
Binary files a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514134818.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140425.png b/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140425.png
deleted file mode 100644
index 12b763b..0000000
Binary files a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140425.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140829.png b/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140829.png
deleted file mode 100644
index 0a733e3..0000000
Binary files a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514140829.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514142216.png b/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514142216.png
deleted file mode 100644
index 363e5d7..0000000
Binary files a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240514142216.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240524092124.png b/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240524092124.png
deleted file mode 100644
index 585f49f..0000000
Binary files a/gfx/NonFormatted/Untitled111.2024.05.15-05.15_20240524092124.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled48_20240514143030.png b/gfx/NonFormatted/Untitled48_20240514143030.png
deleted file mode 100644
index c78ab7e..0000000
Binary files a/gfx/NonFormatted/Untitled48_20240514143030.png and /dev/null differ
diff --git a/gfx/NonFormatted/Untitled69_20240327082831.png b/gfx/NonFormatted/Untitled69_20240327082831.png
deleted file mode 100644
index 7aee956..0000000
Binary files a/gfx/NonFormatted/Untitled69_20240327082831.png and /dev/null differ
diff --git a/gfx/Trains/Bill_Ben.png b/gfx/Trains/Bill_Ben.png
new file mode 100644
index 0000000..28814e2
Binary files /dev/null and b/gfx/Trains/Bill_Ben.png differ
diff --git a/gfx/Trains/Gordon.png b/gfx/Trains/Gordon.png
index f022f17..4491df1 100644
Binary files a/gfx/Trains/Gordon.png and b/gfx/Trains/Gordon.png differ
diff --git a/gfx/Trains/Henry.png b/gfx/Trains/Henry.png
index 64be706..904ba2c 100644
Binary files a/gfx/Trains/Henry.png and b/gfx/Trains/Henry.png differ
diff --git a/gfx/Trains/James.png b/gfx/Trains/James.png
new file mode 100644
index 0000000..b53474e
Binary files /dev/null and b/gfx/Trains/James.png differ
diff --git a/gfx/Trains/Rolling_Stock.png b/gfx/Trains/Rolling_Stock.png
new file mode 100644
index 0000000..e2ef9ca
Binary files /dev/null and b/gfx/Trains/Rolling_Stock.png differ
diff --git a/gfx/Trains/Tenders.png b/gfx/Trains/Tenders.png
new file mode 100644
index 0000000..ac37995
Binary files /dev/null and b/gfx/Trains/Tenders.png differ
diff --git a/gfx/Trains/Toby.png b/gfx/Trains/Toby.png
index bd12181..733c20c 100644
Binary files a/gfx/Trains/Toby.png and b/gfx/Trains/Toby.png differ