Use new color() helper when possible