Add color use flag support