I left the ceramic doorknob type caps for the horizontal alone, but restuffed the vertical with new ASC high voltage caps.
A few of the resistors in the high voltage divider change were out of tolerance and replaced.
I went with NOS for now, but have some modern high voltage resistors ready if they don't work out.