I'm adding a second front interior light, and am looking for both the
light and the metal bracket which gets pop-riveted to the headliner.

Email me off list if you've got these for a reasonable price.