[csvencer]

I second redoing all the wiring, its only a matter of time one of the other wires loses connection. Grab some duplex wire (two wires, one sheath) and pull it through with the old one. Then you might want to redo the switch with a Double Pole Double Throw, simplest way to wire nav/anchor with one switch.

-Svence