Accessibility contrasts fixes, part 2.