Added color option and ability to override per value