I have an X, and picked up a take off bumper from another Jeeper for $25, that had the holes for the factory fogs.
I bought the Pilot 4" lights, mounted them, and then wired them up. All told, about 4-5 hours on a Saturday.
It's amazing the difference at night.
Do a search for "Pilot", and you should find a very detailed thread on it.