Move the color-filter related stuff out of "color.h" into