Changed some color issues