Add support for color variables
Fix warning about weak variable being accessed multiple times in a method