Incorporate Bastien's suggestions

Some colors are still slightly out-of-bound. Not sure if it's my responsibility to round them. Refs #7.