fixed some color issues