Part #s for Keyring Light and Cigarette lighter unit, Do I have these right/all of them needed? Options

[Espo]

Taken from ToyoDIY.com, just making sure I have things straight before I go buy these - both are missing from my car.

Ignition keyring
81870F CAP, KEY CYLINDER LAMP BULB
81870E BULB, KEY CYLINDER LAMP
81870D LAMP ASSY, KEY CYLINDER
81871 LENS, KEY ILLUMINATION
81871-20030 AT200, ST204..ST 1 $10.37

Cigarette Lighter
85500 LIGHTER ASSY, CIGARETTE
85500-28050 AT200, ST204 1 $39.52
85513 COVER, CIGARETTE LIGHTER
85513-12020 AT200, ST204 1 $6.07
85515 STAY, CIGARETTE LIGHTER BEZEL
85515-14010 AT200, ST204 1 $10.50
85520 KNOB AND ELEMENT ASSY, CIGARETTE LIGHTER
85520-28010 AT200, ST204 1 $24.36

Also, assuming I do have these correct, do I use the part numbers with dashes after them when I go to my toyota dealer? I'm assuming yes.

Edit: Sheeeit just noticed I may not have the wiring to that light, will have to check tomorrow. If I don't, does anyone have that number or will it be a diy on my end?

This post has been edited by Espo: Feb 3, 2010 - 1:19 AM