What works good for light connection is a flat 5-pin trailer light connector available everywhere. Cheap, basically waterproof when connected, and durable. My '07 DE came with the switch wired in but not mounted. When you get the Hebo light just drill a hole for the switch in the right mounting tab near the rubber strap mount. This is how the XCs and DEs have been coming in the past years when the lights were included. Seal up the wires and your good to go. Get rid of the expansion tank for more room, just connect the rads together with a short piece of fuel line between the tank and frame. You don't need it and if it gets a hole worn in it you have a problem. I'll post a few pics soon.