Fixing a disastrous Heljan '00' Class 05 Diesel Shunter

Описание: My buddy bought a new DCC fitted Heljan '00' 05 back in 2018, it emitted smoke after moving no more than 600 mm. The reasons were not obvious so the blanking plug was put in and more smoke, before it could be lifted from the track.
Due to moving home he couldn't get around to looking at the problem. I suggested he gave it to me a year ago. First problem no spare motors available, indicating this was going to be a slow job.
At least I found what the problem had been. No insulation in the deeply recessed motor enclosure. The motor is partially held in rubber 'O' rings and it had shuffled slightly rearwards and shorted the motor contacts to the chassis.
Gaugemaster who only took over doing the Heljan spares last March have been constrained by the pandemic, but this March they had a motor !!
Duly delivered it wasn't quite right, rather than a cut off end it came with a long protruding shaft. Gaugemaster checked with Heljan, but this was their spare.
To make it fit the enclosure I had to slit off nearly all the rearwards shaft extension. Having to bend the motor terminals inwards to cut short enough.
The back wall where the shorting happened was covered in insulating tape, don't want a repeat of the original problem.
I decided to remove the burnt out decoder socket and just hard wire in the decoders motor and lighting leads. Motors no problem, but Heljen used their own standard of light wiring colours. This took some careful checking, So :-
Decoder Blue to models Yellow
Decoder Yellow to models Green for the rear, but Blue for the front
Decoder White to models Blue for the rear, but Green for the front
All now working correctly on function '0'

Geoff T