Wiring diagram

I spent a couple of hours redrawing the wiring diagram so that it should be easier to read.  All wires are shown vertically or horizontally now and each wire is labeled with its colour.  I would like to get this drawn up on computer if possible so I have it for future reference but that depends on what time is available.

I also had a look at the side panel template that I got my brother to draw up on the computer.  Two of the holes need moving a few millimeters and then the template will be perfect.