Fixed up color stuff