r1412: Merged OK and Save buttons in the Options box. Revert shades when it would