shade fix remaing contrast issues. #3442