Add support for manual override of color