Alex,I doubt that you will find the same lights that are mounted in the P36-2. Light manufacturers come and go rapidly and most lights are / were made overseas. Ocasionally a lamp on our P36-2 will be relutant to turn on. I have a can of Electronic Cleaner from Radio Shack that I squirt on the switch and connections, hit the switch a few times, and they start working again.The switch is probably a standard size and you may find it at Radio Shack. I don't know of a good electronic shop that has a good selection of switches in Annapolis but there may be one in Baltimore.After several years of hunting, I found bulbs for the lamps. They are from Sunray Lighting, Inc and are # W106IF, also listed as #145 and #194NAXL from other vendors. I cannot remember where I got the bulbs but it was probably in Annapolis but not at Fawcetts. There bulb is longer and will extend outside the fixture.