Fixed some of ColorCycle.  Some still left.