-fixed some color issues