Haha! It never ends!
I did the cigarette lighter socket, along with the window switches and "ashtray"(actually an ipod cubby) a few days ago, then took it for a night drive, content that all was well...NO!
I forgot the headlight switch!
Did that today using white for the icons and blue for the "dot".
Done!