I've got a 2007 S40 LS650 Boulevard. My rear signal lights are in a pretty sorry state and I want to replace them. Has anyone had luck with non-OEM lights or does anyone have any good suggestions for modifying an aftermarket light (easily) to make it fit? My online searches haven't yielded anything that fits the 2007 Boulevard that isn't OEM. The rear signal only attaches via the bolt (#15) that holds it into a chrome housing.