If you want OEM type lights you can get them repro. They make the whole lamp assy (metal back part and socket included) and also just the lense. I've seen them in clear and orange. JC Whitney as well as many Jeep parts catalogs had them back when I had my CJ. If you want to upgrade the lights you might check out some of the LED truck lights out there. They make lots of round, orange LED lights for the trucking industry. Something is bound to fit the holes in the grille fairly closely (a surface mount light would't look too bad as long as it covered the hole) . Just make sure you get them with turn and running lights (dual function lamps) . Best of luck - John