Hopefully the new lighting kit comes with those. If so, as you said, easy peezy.
I assume it'll have the extra parts as before but info on the new light kit is very scarce. I still don't even have a firm release date that I have been able to find, which means moneywise I gotta walk on eggshells to make sure I can afford the kit when it finally drops, since its like 50 or more bucks than the model itself was.