Fixed contrast issues in #1959