More colour tweaks according to IRC discussion.