Some color issue changed