Jinxed myself with that last commit; more color fixes