I'm getting a CEL number 41. 'Primary o2 heater malfunction". I'm pretty possitive that i screwed my wiring up somewhere. I'm using a Rywire obd-0 to obd-1 conversion harness. Can someone please match these wires up correctly?

FROM HARNESS:
YELLOW-12v switch
BROWN-02 heater control
GREY-o2 ground
BLACK-o2 signal

FROM 4-WIRE o2 SENSOR:
2 WHITE-heater
BLACK-signal
GREY-ground

ALSO the original signal wire from my old 1-wire o2 sensor. (do I use this anymore??)

If someone can match those up please that would be good.
-Adam.