Fix for color and more prep work for `group` field