Fixed Color inconsistencies