Colors changed and clean up