"Use mozilla colors" fixup

*continued from #867*

As requested, I fixed some details about my already merged pull reqest #867. I propose leaving this open for a while so we can see if we find more issues and than merge all of them in one step rather than creating lots of tiny pull requests.