Add color variables support