diff --git a/docs/Class 80X power calculations.ods b/docs/Class 80X power calculations.ods
new file mode 100644
index 00000000..8ba61d36
Binary files /dev/null and b/docs/Class 80X power calculations.ods differ
diff --git a/src/trains/_spriteset/EMU_Sprites/800.pnml b/src/trains/_spriteset/EMU_Sprites/800.pnml
index 792f5682..6b62f81e 100644
--- a/src/trains/_spriteset/EMU_Sprites/800.pnml
+++ b/src/trains/_spriteset/EMU_Sprites/800.pnml
@@ -130,7 +130,7 @@ spriteset(spriteset_BR80X_middle3_Avanti, "gfx/BR80X.png") {
 
 
 
-// Speed switch
+// 125mph service speed, 140mph design speed
 switch(FEAT_TRAINS, SELF, switch_BR800_speed, param_max_speed) {
 	0: 201;
 	1: 225;
diff --git a/src/trains/bmu/800_5car_0-2.pnml b/src/trains/bmu/800_5car_0-2.pnml
index 86daf731..891b555b 100644
--- a/src/trains/bmu/800_5car_0-2.pnml
+++ b/src/trains/bmu/800_5car_0-2.pnml
@@ -92,17 +92,25 @@ switch(FEAT_TRAINS, SELF, switch_BR800_5car_can_attach_wagon, vehicle_type_id) {
 	return string(STR_CANNOT_ATTACH);
 }
 
-// LNER trains hold fewer passengers than GWR trains
+// GWR trains hold more passengers than LNER/others
 switch(FEAT_TRAINS, SELF, switch_BR800_5car_capacity, cargo_subtype) {
-	0: return (302/5 * param_pax);
 	1: return (326/5 * param_pax);
+	3: return (326/5 * param_pax);
+	return (302/5 * param_pax);
 }
 
-switch(FEAT_TRAINS, SELF, switch_BR800_5car_power, current_railtype) {
-	ELRL: return 3200;
+// GWR trains have higher diesel power than LNER/others
+switch(FEAT_TRAINS, SELF, switch_BR800_5car_diesel_power, cargo_subtype) {
+	1: return 2700; // GWR
+	3: return 2700; // GWR Pride
 	return 2250;
 }
 
+switch(FEAT_TRAINS, SELF, switch_BR800_5car_power, current_railtype) {
+	ELRL: return 4000;
+	return switch_BR800_5car_diesel_power;
+}
+
 // Class 800/0/2 (5car)
 item(FEAT_TRAINS, item_BR800_5car, 459) {
 	property {
@@ -121,7 +129,7 @@ item(FEAT_TRAINS, item_BR800_5car, 459) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 3200 hp;
+		power: 4000 hp;
 		cargo_capacity: (302/5);
 		weight: 243 ton;
 		
diff --git a/src/trains/bmu/800_9car_0-1.pnml b/src/trains/bmu/800_9car_0-1.pnml
index b8c20ffc..877b9168 100644
--- a/src/trains/bmu/800_9car_0-1.pnml
+++ b/src/trains/bmu/800_9car_0-1.pnml
@@ -92,16 +92,23 @@ switch(FEAT_TRAINS, SELF, switch_BR800_9car_can_attach_wagon, vehicle_type_id) {
 	return string(STR_CANNOT_ATTACH);
 }
 
-// LNER trains hold fewer passengers than GWR trains
+// GWR trains hold more passengers than LNER/others
 switch(FEAT_TRAINS, SELF, switch_BR800_9car_capacity, cargo_subtype) {
-	0: return (611/9 * param_pax);
-	1: return (650/9 * param_pax);
+	1: return (650/9 * param_pax); // GWR
+	3: return (650/9 * param_pax); // GWR Pride
+	return (611/9 * param_pax); // Anything else
 }
 
-switch(FEAT_TRAINS, SELF, switch_BR800_9car_power, current_railtype) {
-	ELRL: return 5760;
-	return 3750;
+// GWR trains have higher diesel power than LNER speeds
+switch(FEAT_TRAINS, SELF, switch_BR800_9car_diesel_power, cargo_subtype) {
+	1: return 4500; // GWR
+	3: return 4500; // GWR Pride
+	return 3750; // Anything else
+}
 
+switch(FEAT_TRAINS, SELF, switch_BR800_9car_power, current_railtype) {
+	ELRL: return 5600;
+	return switch_BR800_9car_diesel_power;
 }
 
 // Class 800/1/3 (9car)
@@ -122,7 +129,7 @@ item(FEAT_TRAINS, item_BR800_9car, 460) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 5760 hp;
+		power: 5600 hp;
 		cargo_capacity: (611/9);
 		weight: 438 ton;
 		
diff --git a/src/trains/bmu/802_5car_-0-2-3.pnml b/src/trains/bmu/802_5car_-0-2-3.pnml
index 43fdda71..bf64d07c 100644
--- a/src/trains/bmu/802_5car_-0-2-3.pnml
+++ b/src/trains/bmu/802_5car_-0-2-3.pnml
@@ -102,7 +102,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_5car_capacity, cargo_subtype) {
 }
 
 switch(FEAT_TRAINS, SELF, switch_BR802_5car_power, current_railtype) {
-	ELRL: return 3200;
+	ELRL: return 4000;
 	return 2820;
 }
 
diff --git a/src/trains/bmu/802_9car_1.pnml b/src/trains/bmu/802_9car_1.pnml
index c493687a..b16e4515 100644
--- a/src/trains/bmu/802_9car_1.pnml
+++ b/src/trains/bmu/802_9car_1.pnml
@@ -73,7 +73,7 @@ switch(FEAT_TRAINS, SELF, switch_BR802_9car_can_attach_wagon, vehicle_type_id) {
 }
 
 switch(FEAT_TRAINS, SELF, switch_BR802_9car_power, current_railtype) {
-	ELRL: return 5760;
+	ELRL: return 7200;
 	return 4700;
 }
 
diff --git a/src/trains/bmu/805_5car.pnml b/src/trains/bmu/805_5car.pnml
index 0c20e15c..e741eab2 100644
--- a/src/trains/bmu/805_5car.pnml
+++ b/src/trains/bmu/805_5car.pnml
@@ -65,11 +65,10 @@ switch(FEAT_TRAINS, SELF, switch_BR805_5car_can_attach_wagon, vehicle_type_id) {
 }
 
 switch(FEAT_TRAINS, SELF, switch_BR805_5car_power, current_railtype) {
-	ELRL: return 3200;
+	ELRL: return 4000;
 	return 2820;
 }
 
-// Class 805/0/2/3 (5car)
 item(FEAT_TRAINS, item_BR805_5car, 581) {
 	property {
 		name: string(STR_BR805_5CAR);
@@ -87,7 +86,7 @@ item(FEAT_TRAINS, item_BR805_5car, 581) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 3200 hp;
+		power: 4000 hp;
 		cargo_capacity: (301/5);
 		weight: 261 ton;
 		
diff --git a/src/trains/bmu/810_5car.pnml b/src/trains/bmu/810_5car.pnml
index fe90a38d..c96d79b5 100644
--- a/src/trains/bmu/810_5car.pnml
+++ b/src/trains/bmu/810_5car.pnml
@@ -64,11 +64,10 @@ switch(FEAT_TRAINS, SELF, switch_BR810_5car_can_attach_wagon, vehicle_type_id) {
 }
 
 switch(FEAT_TRAINS, SELF, switch_BR810_5car_power, current_railtype) {
-	ELRL: return 3200;
-	return 2820;
+	ELRL: return 4000;
+	return 3944;
 }
 
-// Class 810/0/2/3 (5car)
 item(FEAT_TRAINS, item_BR810_5car, 579) {
 	property {
 		name: string(STR_BR810_5CAR);
@@ -86,7 +85,7 @@ item(FEAT_TRAINS, item_BR810_5car, 579) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 3200 hp;
+		power: 3944 hp;
 		cargo_capacity: (301/5);
 		weight: 261 ton;
 		
diff --git a/src/trains/bmu/807_7car.pnml b/src/trains/emu/807_7car.pnml
similarity index 95%
rename from src/trains/bmu/807_7car.pnml
rename to src/trains/emu/807_7car.pnml
index 5416b555..70a38bff 100644
--- a/src/trains/bmu/807_7car.pnml
+++ b/src/trains/emu/807_7car.pnml
@@ -68,12 +68,6 @@ switch(FEAT_TRAINS, SELF, switch_BR807_7car_can_attach_wagon, vehicle_type_id) {
 	return string(STR_CANNOT_ATTACH);
 }
 
-switch(FEAT_TRAINS, SELF, switch_BR807_7car_power, current_railtype) {
-	ELRL: return 5760;
-	return 4700;
-}
-
-// Class 802/1 (9car)
 item(FEAT_TRAINS, item_BR807_7car, 580) {
 	property {
 		name: string(STR_BR807_7CAR);
@@ -91,14 +85,14 @@ item(FEAT_TRAINS, item_BR807_7car, 580) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 4480 hp;
+		power: 5600 hp;
 		cargo_capacity: (453/7);
 		weight: 357 ton;
 		
 		sprite_id: SPRITE_ID_NEW_TRAIN; // required
 		misc_flags: bitmask(TRAIN_FLAG_MU); // acts as multiple-unit
 		refit_cost: 0;
-		track_type: RAIL;
+		track_type: ELRL;
 		ai_special_flag: AI_FLAG_PASSENGER; // tell ai that this is a passenger train
 		running_cost_base: RUNNING_COST_ELECTRIC;
 		dual_headed: 0; // set to 0 otherwise limited to 2 cars only
@@ -114,9 +108,7 @@ item(FEAT_TRAINS, item_BR807_7car, 580) {
 	
 	graphics {
 		default: switch_BR807_7car_spriteset;
-		purchase: spriteset_BR805_807_purchase;
-		
-		power: switch_BR807_7car_power;
+		purchase: spriteset_BR805_807_purchase;			
 		speed: switch_BR800_speed;
 
 		cargo_subtype_text: switch_BR807_7car_subtype_text;
diff --git a/src/trains/emu/BR801_5car_1.pnml b/src/trains/emu/BR801_5car_1.pnml
index 4e6a8a77..c78c5d14 100644
--- a/src/trains/emu/BR801_5car_1.pnml
+++ b/src/trains/emu/BR801_5car_1.pnml
@@ -51,7 +51,7 @@ item(FEAT_TRAINS, item_BR801_5car, 451) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 3200 hp;
+		power: 4000 hp;
 		cargo_capacity: (302/5);
 		weight: 205 ton;
 		
diff --git a/src/trains/emu/BR801_9car_2.pnml b/src/trains/emu/BR801_9car_2.pnml
index d33db3c7..067eba38 100644
--- a/src/trains/emu/BR801_9car_2.pnml
+++ b/src/trains/emu/BR801_9car_2.pnml
@@ -52,7 +52,7 @@ item(FEAT_TRAINS, item_BR801_9car, 452) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 5760 hp;
+		power: 7200 hp;
 		cargo_capacity: (611/9);
 		weight: 369 ton;
 		
diff --git a/src/trains/emu/BR803_5car_1.pnml b/src/trains/emu/BR803_5car_1.pnml
index a861983e..2603e9d4 100644
--- a/src/trains/emu/BR803_5car_1.pnml
+++ b/src/trains/emu/BR803_5car_1.pnml
@@ -32,7 +32,6 @@ switch(FEAT_TRAINS, SELF, switch_BR803_5car_can_attach_wagon, vehicle_type_id) {
 	return string(STR_CANNOT_ATTACH);
 }
 
-// Class 803/1 (5car)
 item(FEAT_TRAINS, item_BR803_5car, 547) {
 	property {
 		name: string(STR_BR803_5CAR);
@@ -50,7 +49,7 @@ item(FEAT_TRAINS, item_BR803_5car, 547) {
 		cargo_disallow_refit: [];
 		
 		speed: 125 mph;
-		power: 3200 hp;
+		power: 4000 hp;
 		cargo_capacity: (302/5);
 		weight: 205 ton;