Fixes #867.
Comming closer to WCAG 2.0 AAA.
Resolves #338. Co-Authored-By: Tim <timz99@users.noreply.github.com>