Scooterotica

I'm a bit of an electrical numpty so some advice would be welcome...

I'm planning the wiring for the Pathfinders on my S Type and I'm using the Allstyles diagram as a reference point:



My issue is that I want one switch for each light. Where would I add the extra switch? Would I need an additional relay?

I'm also planning a cig lighter / usb socket but I think I'm OK with that

Thanks

basicaly wire up as above but fit one light ,then repeat from battery with another relay for the second

I always thought 85 to earth was the convention on wiring a relay...
not that it should probably matter for the intended use.

Thanks: looks like I need to track down another relay...