Fixed Some Color issues