fixed some color issue