Poor contrast in non-default themes