The old harness:

 
Switches:  

The new harness will be built by one of our shops. They have a wire marker and can do a much better job than I can. 

Old style circuit breakers:

No, I probably won’t do this, but it would be interesting and one off.