Make sure highlight remains an optional component.
Convert Gradient creation to new notation.