This might help someone and I wish I visited old forums before this adventure, but will benefit anyways. I had the displeasure of rewiring my lights mainly due to fire hazard. I removed all ignition and headlight wires a year ago, immediately replaced ignition but left headlights disconnected. After getting carb straightened out(leaking issue) I focused on wiring which finally led me to lights(rear(tail/brake) and front). The worst part of the process was the light contacts(thumbtack type are a horror to replace. After visiting an old forum, Tiny referred to YNZ                                                                         ( https://www

.store.ynzyesterdaysparts.com/electrical-terminals-and-connectors/terminals/wire-end-contact-for-lamp-bulb-sockets.html) for socket type light contacts which will make life ten times easier. The wiring is temporary until I order fabric covered for the vintage look. The lights work well now but a painful process(light sockets only). Pictures are worth a thousand words.I reused the dash light wires but reconnected splice and most importantly soldered all contacts(lugs and light contacts of course.