Scooterotica

In the above diagram am I right in saying that the light switch has two power feeds in from the rectifier?
I'm replacing my current system with a wassell set up and intend to replace all the switch wiring with thinwall cable (previously the wiring had been done with whatever wire was available so a colour for colour swap is not possible).If an expert can cast his eye over the above and tell me which wires are the power feeds I would be much obliged.

Cheers

Anyone?

You have PM.

Thank you