Fixes #64 and #67

Wow even `@gray` only passes one contrast test according to http://webaim.org/resources/contrastchecker/