Ok, this weekend it was cluster time. Steering wheel removed, all covers off that are broken, then taking the cluster out. Restoring to OEM needs to refit the original dial backgrounds. The cluster comes apart easily, and carefully taking he needles off, then replacing the dial backgrounds with an original OEM one. Cluster was cleaned all globes tested and the put back together again, with a test in the car, all lights work.
Cluster before:
Dials almost off:
And back to OEM, with all lights tested: