Some color improvements