Patch #5, passes the A11y color contrast test.
Still applies in 9.1.
looks go...