Working on contrast and accessibility a bit