add in colors
upstream pull, address conflicts