Orange drops are great but expensive, also they can be hard to fit in tight spots.
AES
http://www.tubesandmore.com/ sells some nice yellow Polyester or Polypropylene caps that work great and are easy to work with. They also have Orange Drops and Electrolytics.
Justradios sells basically the same caps as AES but cheaper:
http://www.justradios.com/
For the paper caps you can use the 630 volt caps to replace anything 630 volts or less. The new 630 volt caps will be smaller than the old 200 volt caps of the same value.
For the electrolytics use only equal or slightly higher voltage replacements.