Yes, Yes there is.
A few weeks ago i watched the
CRANK & CHROME SHOP on TNN do just that to an early 80's CJ.
They bought a sweet kit which contained EVERYTHING !!! it had the correct connectors which pluged right into the switches and heater and ign and all.
The kit goes for about $400. It also contains a new style fuse block.
http://www.painlesswiring.com/
I believe this is where the kit came from.
CRANK & CHROME did all the underhood wiring & lighting circuits as well
And...they got it all done before the 30 minute show was over!
EAZY!!!