diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
index 4a1d123d..e73a5e41 100644
Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ
diff --git a/src/trains/diesel_mu/BR_A_MK3T_253.pnml b/src/trains/diesel_mu/BR_A_MK3T_253.pnml
deleted file mode 100644
index 6119cd26..00000000
--- a/src/trains/diesel_mu/BR_A_MK3T_253.pnml
+++ /dev/null
@@ -1,233 +0,0 @@
-item (FEAT_TRAINS, item_253_BRMk3TF, 13) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TF);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		power:							0;
-		speed:							125 mph;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					48;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				250;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TF;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TF_purchase;
-	speed:								200;
-	cargo_capacity: return(48 * param_pax);
-}
-}
-
-item (FEAT_TRAINS, item_253_BRMk3TS, 14) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TS);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		power:							0;
-		speed:							125 mph;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					72;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				185;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TS;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TS_purchase;
-	speed:								200;
-	cargo_capacity: return(72 * param_pax);
-}
-}
-
-item (FEAT_TRAINS, item_253_BRMk3TGS, 15) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TGS);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		power:							0;
-		speed:							125 mph;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					59;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				185;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TGS;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TGS_purchase;
-	speed:								200;
-	cargo_capacity: return(59 * param_pax);
-}
-}
-
-item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TRSB);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		speed:							125 mph;
-		power:							0;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					34;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				185;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TRSB;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TRSB_purchase;
-	speed:								200;
-	cargo_capacity: return(34 * param_pax);
-}
-}
-
-item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TRUB);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		speed:							125 mph;
-		power:							0;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					34;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				185;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TRUB;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TRUB_purchase;
-	speed:								200;
-	cargo_capacity: return(34 * param_pax);
-}
-}
-
-item (FEAT_TRAINS, item_253_BRMk3TRUK, 18) {
-	property {
-		variant_group:					header_BRMk3;
-		name: 							string(STR_NAME_BRMk3TRUK);
-		climates_available: 			ALL_CLIMATES;
-		refittable_cargo_classes:		CC_PASSENGERS;
-		cargo_allow_refit:				[PASS, TOUR];
-		loading_speed:					14;
-		cost_factor:					52;
-		running_cost_factor:			0;
-		sprite_id:						SPRITE_ID_NEW_TRAIN;
-		refit_cost:						0;
-		track_type:						RAIL;
-		speed:							125 mph;
-		power:							0;
-		running_cost_base:				RUNNING_COST_STEAM;
-		dual_headed:					0;
-		default_cargo_type:				PASS;
-		cargo_capacity:					34;
-		weight:							0;
-		tractive_effort_coefficient:	0;
-		air_drag_coefficient:			0;
-		length:							8;
-		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
-		extra_weight_per_wagon:			0;
-		bitmask_vehicle_info:			0;
-		cargo_age_period:				185;
-	}
-	graphics {
-	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
- 	default: 							sw_253_BRMk3TRUK;
-	colour_mapping: 					return PALETTE_CC_FIRST;
-	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
-	purchase:							spriteset_BRMk3TRUK_purchase;
-	speed:								200;
-	cargo_capacity: return(34 * param_pax);
-}
-}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml
new file mode 100644
index 00000000..241b2d39
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk33_TGS.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TGS, 15) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TGS);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		power:							0;
+		speed:							125 mph;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					59;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				185;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TGS;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TGS_purchase;
+	speed:								200;
+	cargo_capacity: return(59 * param_pax);
+}
+}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml
new file mode 100644
index 00000000..9290d346
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TF.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TF, 13) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TF);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		power:							0;
+		speed:							125 mph;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					48;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				250;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TF;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TF_purchase;
+	speed:								200;
+	cargo_capacity: return(48 * param_pax);
+}
+}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml
new file mode 100644
index 00000000..7598dcef
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUB.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TRUB);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		speed:							125 mph;
+		power:							0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					34;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				185;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TRUB;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TRUB_purchase;
+	speed:								200;
+	cargo_capacity: return(34 * param_pax);
+}
+}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml
new file mode 100644
index 00000000..070a8839
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TRUK.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TRUK, 18) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TRUK);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		speed:							125 mph;
+		power:							0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					34;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				185;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TRUK;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TRUK_purchase;
+	speed:								200;
+	cargo_capacity: return(34 * param_pax);
+}
+}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml
new file mode 100644
index 00000000..2a0492f2
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TS.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TS, 14) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TS);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		power:							0;
+		speed:							125 mph;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					72;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				185;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TS;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TS_purchase;
+	speed:								200;
+	cargo_capacity: return(72 * param_pax);
+}
+}
\ No newline at end of file
diff --git a/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml b/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml
new file mode 100644
index 00000000..698b40c1
--- /dev/null
+++ b/src/trains/rolling_stock/BR/Mk3/BRMk3_TSRB.pnml
@@ -0,0 +1,38 @@
+item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) {
+	property {
+		variant_group:					header_BRMk3;
+		name: 							string(STR_NAME_BRMk3TRSB);
+		climates_available: 			ALL_CLIMATES;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					14;
+		cost_factor:					52;
+		running_cost_factor:			0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		track_type:						RAIL;
+		speed:							125 mph;
+		power:							0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				PASS;
+		cargo_capacity:					34;
+		weight:							0;
+		tractive_effort_coefficient:	0;
+		air_drag_coefficient:			0;
+		length:							8;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_NONE;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+		cargo_age_period:				185;
+	}
+	graphics {
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+ 	default: 							sw_253_BRMk3TRSB;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BR253_cargo_subtype_text;
+	purchase:							spriteset_BRMk3TRSB_purchase;
+	speed:								200;
+	cargo_capacity: return(34 * param_pax);
+}
+}
\ No newline at end of file