diff --git a/docs/New Template Calculations.ods b/docs/New Template Calculations.ods
index 9e0f0521..379971f3 100644
Binary files a/docs/New Template Calculations.ods and b/docs/New Template Calculations.ods differ
diff --git a/gfx/diesel/BR20.png b/gfx/Diesel tmp/BR20.png
similarity index 100%
rename from gfx/diesel/BR20.png
rename to gfx/Diesel tmp/BR20.png
diff --git a/gfx/diesel/Kestrel.png b/gfx/Diesel tmp/Kestrel.png
similarity index 100%
rename from gfx/diesel/Kestrel.png
rename to gfx/Diesel tmp/Kestrel.png
diff --git a/gfx/electric/BR8X.png b/gfx/Electric tmp/BR8X.png
similarity index 100%
rename from gfx/electric/BR8X.png
rename to gfx/Electric tmp/BR8X.png
diff --git a/gfx/freight/BRHHA.png b/gfx/Freight tmp/BRHHA.png
similarity index 100%
rename from gfx/freight/BRHHA.png
rename to gfx/Freight tmp/BRHHA.png
diff --git a/gfx/freight/BRTTA.png b/gfx/Freight tmp/BRTTA.png
similarity index 100%
rename from gfx/freight/BRTTA.png
rename to gfx/Freight tmp/BRTTA.png
diff --git a/gfx/freight/Containers.png b/gfx/Freight tmp/Containers.png
similarity index 100%
rename from gfx/freight/Containers.png
rename to gfx/Freight tmp/Containers.png
diff --git a/gfx/freight/lumber_wagon_small.png b/gfx/Freight tmp/Lumber_Wagon_Small.png
similarity index 100%
rename from gfx/freight/lumber_wagon_small.png
rename to gfx/Freight tmp/Lumber_Wagon_Small.png
diff --git a/gfx/freight/Ore_Dumper_Wagon_Medium.png b/gfx/Freight tmp/Ore_Dumper_Wagon_Medium.png
similarity index 100%
rename from gfx/freight/Ore_Dumper_Wagon_Medium.png
rename to gfx/Freight tmp/Ore_Dumper_Wagon_Medium.png
diff --git a/gfx/freight/RM_TPO.png b/gfx/Freight tmp/RM_TPO.png
similarity index 100%
rename from gfx/freight/RM_TPO.png
rename to gfx/Freight tmp/RM_TPO.png
diff --git a/gfx/freight/RS_SWB_Hopper.png b/gfx/Freight tmp/RS_SWB_Hopper.png
similarity index 100%
rename from gfx/freight/RS_SWB_Hopper.png
rename to gfx/Freight tmp/RS_SWB_Hopper.png
diff --git a/gfx/freight/RS_SWB_Open_Vans.png b/gfx/Freight tmp/RS_SWB_Open_Vans.png
similarity index 100%
rename from gfx/freight/RS_SWB_Open_Vans.png
rename to gfx/Freight tmp/RS_SWB_Open_Vans.png
diff --git a/gfx/freight/bulk_hopper.png b/gfx/Freight tmp/bulk_hopper.png
similarity index 100%
rename from gfx/freight/bulk_hopper.png
rename to gfx/Freight tmp/bulk_hopper.png
diff --git a/gfx/freight/bulk_hopper_large.png b/gfx/Freight tmp/bulk_hopper_large.png
similarity index 100%
rename from gfx/freight/bulk_hopper_large.png
rename to gfx/Freight tmp/bulk_hopper_large.png
diff --git a/gfx/freight/goods_van.png b/gfx/Freight tmp/goods_van.png
similarity index 100%
rename from gfx/freight/goods_van.png
rename to gfx/Freight tmp/goods_van.png
diff --git a/gfx/freight/mail_van.png b/gfx/Freight tmp/mail_van.png
similarity index 100%
rename from gfx/freight/mail_van.png
rename to gfx/Freight tmp/mail_van.png
diff --git a/gfx/Rolling Stock/BRMk1BlueGrey.png b/gfx/Rolling Stock tmp/BRMk1BlueGrey.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1BlueGrey.png
rename to gfx/Rolling Stock tmp/BRMk1BlueGrey.png
diff --git a/gfx/Rolling Stock/BRMk1CarmCream.png b/gfx/Rolling Stock tmp/BRMk1CarmCream.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1CarmCream.png
rename to gfx/Rolling Stock tmp/BRMk1CarmCream.png
diff --git a/gfx/Rolling Stock/BRMk1ChocCream.png b/gfx/Rolling Stock tmp/BRMk1ChocCream.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1ChocCream.png
rename to gfx/Rolling Stock tmp/BRMk1ChocCream.png
diff --git a/gfx/Rolling Stock/BRMk1Intercity.png b/gfx/Rolling Stock tmp/BRMk1Intercity.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1Intercity.png
rename to gfx/Rolling Stock tmp/BRMk1Intercity.png
diff --git a/gfx/Rolling Stock/BRMk1Malachite.png b/gfx/Rolling Stock tmp/BRMk1Malachite.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1Malachite.png
rename to gfx/Rolling Stock tmp/BRMk1Malachite.png
diff --git a/gfx/Rolling Stock/BRMk1Maroon.png b/gfx/Rolling Stock tmp/BRMk1Maroon.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1Maroon.png
rename to gfx/Rolling Stock tmp/BRMk1Maroon.png
diff --git a/gfx/Rolling Stock/BRMk1Purchase.png b/gfx/Rolling Stock tmp/BRMk1Purchase.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk1Purchase.png
rename to gfx/Rolling Stock tmp/BRMk1Purchase.png
diff --git a/gfx/Rolling Stock/BRMk2A-C.png b/gfx/Rolling Stock tmp/BRMk2A-C.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk2A-C.png
rename to gfx/Rolling Stock tmp/BRMk2A-C.png
diff --git a/gfx/rolling stock/BRMk2Coach.png b/gfx/Rolling Stock tmp/BRMk2Coach.png
similarity index 100%
rename from gfx/rolling stock/BRMk2Coach.png
rename to gfx/Rolling Stock tmp/BRMk2Coach.png
diff --git a/gfx/Rolling Stock/BRMk2D-F.png b/gfx/Rolling Stock tmp/BRMk2D-F.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk2D-F.png
rename to gfx/Rolling Stock tmp/BRMk2D-F.png
diff --git a/gfx/Rolling Stock/BRMk2Purchase.png b/gfx/Rolling Stock tmp/BRMk2Purchase.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk2Purchase.png
rename to gfx/Rolling Stock tmp/BRMk2Purchase.png
diff --git a/gfx/Rolling Stock/BRMk3DMB.png b/gfx/Rolling Stock tmp/BRMk3DMB.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3DMB.png
rename to gfx/Rolling Stock tmp/BRMk3DMB.png
diff --git a/gfx/Rolling Stock/BRMk3DVT.png b/gfx/Rolling Stock tmp/BRMk3DVT.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3DVT.png
rename to gfx/Rolling Stock tmp/BRMk3DVT.png
diff --git a/gfx/Rolling Stock/BRMk3TF.png b/gfx/Rolling Stock tmp/BRMk3TF.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TF.png
rename to gfx/Rolling Stock tmp/BRMk3TF.png
diff --git a/gfx/Rolling Stock/BRMk3TGS.png b/gfx/Rolling Stock tmp/BRMk3TGS.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TGS.png
rename to gfx/Rolling Stock tmp/BRMk3TGS.png
diff --git a/gfx/Rolling Stock/BRMk3TRSB.png b/gfx/Rolling Stock tmp/BRMk3TRSB.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TRSB.png
rename to gfx/Rolling Stock tmp/BRMk3TRSB.png
diff --git a/gfx/Rolling Stock/BRMk3TRUB.png b/gfx/Rolling Stock tmp/BRMk3TRUB.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TRUB.png
rename to gfx/Rolling Stock tmp/BRMk3TRUB.png
diff --git a/gfx/Rolling Stock/BRMk3TRUK.png b/gfx/Rolling Stock tmp/BRMk3TRUK.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TRUK.png
rename to gfx/Rolling Stock tmp/BRMk3TRUK.png
diff --git a/gfx/Rolling Stock/BRMk3TS.png b/gfx/Rolling Stock tmp/BRMk3TS.png
similarity index 100%
rename from gfx/Rolling Stock/BRMk3TS.png
rename to gfx/Rolling Stock tmp/BRMk3TS.png
diff --git a/gfx/Rolling Stock/BRSleeper.png b/gfx/Rolling Stock tmp/BRSleeper.png
similarity index 100%
rename from gfx/Rolling Stock/BRSleeper.png
rename to gfx/Rolling Stock tmp/BRSleeper.png
diff --git a/gfx/Rolling Stock/LNERBRCarmCream.png b/gfx/Rolling Stock tmp/LNERBRCarmCream.png
similarity index 100%
rename from gfx/Rolling Stock/LNERBRCarmCream.png
rename to gfx/Rolling Stock tmp/LNERBRCarmCream.png
diff --git a/gfx/Rolling Stock/LNERBRMaroon.png b/gfx/Rolling Stock tmp/LNERBRMaroon.png
similarity index 100%
rename from gfx/Rolling Stock/LNERBRMaroon.png
rename to gfx/Rolling Stock tmp/LNERBRMaroon.png
diff --git a/gfx/Rolling Stock/LNERTeakBCK.png b/gfx/Rolling Stock tmp/LNERTeakBCK.png
similarity index 100%
rename from gfx/Rolling Stock/LNERTeakBCK.png
rename to gfx/Rolling Stock tmp/LNERTeakBCK.png
diff --git a/gfx/Rolling Stock/LNERTeakBG.png b/gfx/Rolling Stock tmp/LNERTeakBG.png
similarity index 100%
rename from gfx/Rolling Stock/LNERTeakBG.png
rename to gfx/Rolling Stock tmp/LNERTeakBG.png
diff --git a/gfx/Rolling Stock/LNERTeakPV.png b/gfx/Rolling Stock tmp/LNERTeakPV.png
similarity index 100%
rename from gfx/Rolling Stock/LNERTeakPV.png
rename to gfx/Rolling Stock tmp/LNERTeakPV.png
diff --git a/gfx/Rolling Stock/LNERTeakTK.png b/gfx/Rolling Stock tmp/LNERTeakTK.png
similarity index 100%
rename from gfx/Rolling Stock/LNERTeakTK.png
rename to gfx/Rolling Stock tmp/LNERTeakTK.png