moved around some color stuff