Add updates from earlier work on color kernel