Fixed some color issues