Fix a couple colors, run out of steam; #610