Oh and leave the headlight wiring alone. It looks fine. If the original bulb proves to be too dim, I have successfully installed screw-base 1 watt LEDs in my Soubitez bottle dynamo set up. Like these: http://www.superbrightleds.com/cgi-b...lashlights.htm. You want the E10-WHP. It will also greatly improve your tailight brightness as well.