Cheers, the headlamp visor was a doddle but the spotlight ones were a different kettle of fish. The nasty little clips that hold the rim on made numerous perforation in my fingers with their sharp ends and you need to bend the lug on top of the visor and bend the visor a bit to the size of the spots.
I've bled for my bike.
