Sender Units on `85 XJ

I am going to do the Gauge Cluster Swap on my 85 Cherokee which right now has the stupid idiot lights & the big gas gauge. My question is, where are the oil pressure & coolant temperature sender units? I have searched but all I could find was info on the 87+ XJs with a 4.0. I need to know so when I do the swap I will know where the sender units are.

My Specs:
1985 Cherokee
2.5l, 4cyl
T4, 4spd
NP207

Thanks!

Bump...

On my 96, the coolant temp sending unit is on the back of the head, on the drivers side, right beside the valve cover. Be sure to get the OEM part from the stealership, as the one I originally got from autozone did not work.....Some kind of gauge/unit calibration thing.