Make colors less awful

And by that I mean the crappy 'red' and 'green' values I had been
using before. Now we have nice pastels that are lovely and stuff.