Darthintel, Welcome to the 'bolt. That looks like a nice start for a decent driver. Having the lights modified like they are might make
a few people scratch their heads and wonder what is going on with them.
Before you rip out the existing wiring (assuming it is safe), please visit the electrical bay and research some of the methods
to the madness of replacing the wire harnesses.
Please scroll through the various forums.
Make sure to check out the rules of the page as well.
Questions pertaining to your problem are welcome and will usually get answered quickly.
There are many "how I done it's" here as well that can be found using the search feature.