will a hatch from an 86 XJ bolt right up to the hinges from a 96 XJ?

Doing a hatch swap tomorrow. Got a free hatch from an 86 cherokee, heated glass, wiper, etc.

I took the hatch off my 96 today but left the hinges still on the roof. Will the older hatch bolt right up to my hinges on the 96?

Also what are the changes the wiring harness plugs will be the same??

The hatch will bolt to the hinges, as least on my 95 they did, but the connectors will be different. Thats an easy fix

How do I fix the wiring connector problem?? Does anyone have a diagram on which wires do what?