Fixed up some colour issues

Some colour combinations looked quite odd and unreadable, this commit is
to fix some of those up.