Made some color changes