I started on replacing the electrolytic caps tonight.
I decided not to re-stuff C1 and C3. Because it was easy to add a terminal strip for C1 and C3 was just wired in directly.
C1 is a double cap that has a 100uf and a 40uf cap both at 150 volts. I used a 100uf and a 47uf both at 250 volts and 10,000 hour 105C caps. I used a terminal strip to mount these.
C3 is a single 40uf 150 volt cap. I used a 47uf 250 volt cap like the one above.
I replace a 2 position terminal strip with a 3 position terminal strip and used that to mount C6. It was a 5uf 50 volt cap and was replaced with a 5.6uf 250 volt cap . The reason I used a 250 volt cap was that the 250 volt cap is more robust and less chance of getting damaged.
I cleaned, lubed, and polished R2 the Brightness pot.