Fix color bug and remove ugly gray