More changes to the color scheme made during review meeting, see #31.