Fixes #64 and #67

Let's make this straight `@grey` while we're at it, for accessible contrast.