(Backport)
Also, fixed the text-coloration issue