[fireguy_ed]

Yes, OEM kit. Oh, I forgot, you need a wrench or socket to secure the lights themselves.

Biggest problem with the new switch-stalk was lining up electrical plug, and that wasn't a problem really. Pretty idiot-proof. (You can't screw it up, just won't "click" until everything is right.

I got mine from a local Nissan dealer who beat courtesy just by telling him I could do better on-line. Might be worth a phone call....