Calibration enhancements

My only concern about this is that it will cause calibration to wipe out all other settings, such as screen contrast, too.