ZKW Lenses + AL headlight and City light retrofit was my old setup.