As for the sunroof, did some of the models with sunroofs have lights with the sunroof switch, cause mine just has the switch and the map lights really aren't that bright. Got any of the switches with lights and is it possible to upgrade to that from just the switch itself?