Welcome to the wonderful world of CJ's, Kip. In my case one I found functioning replacement (after two tries) O.E. gauges for the speedometer cluster I added mechanical gauges to the dash and in the place of the Voltmeter and Oil pressure electrical gauges lacking increments and are short sweep, I went with Auto Meter 270* sweep mechanicals. I also added an incremented Engine Temp. gauges as well. I noticed that Auto Meter had these plasctic standoffs available, but since mine were 2" gauges I just used some black pvc cut at an approapriate angle for easier and quicker viewing.
If you find the orange wiring, this is the lead for all of the dash and gauge lights. The lights themselves ground through the steel dash itself (steel not being a great conductor of electricity) then to the steel body and then to the negative terminal of the battery IF you have a ground strap to the firewall or elsewhere. Also a great idea to ground the frame as well.