I contacted one of my favorite vendors AZNOptics - and got new city lights (194) and new festoon LEDs for the license plates.
Here are a few pics of the LEDs - error free, CAN-BUS approved :D
The festoon bulb on the left is a single CREE LED - amazingly bright for a single LED. Snaps into place into the clips.
Here's the result! amazingly bright!
Same for the city lights - check this new design out!
...and the result!
Highly recommended - very bright (not blinding) and should last years!