Changed some more colors to be readable