I currently am still riding my '07 WR and am in the process of freshening it up with new plastics, graphics ect... I've also been thinking about lacing up some new black rims to the stock hubs to replace the battered oem excels. I actually like the stock odo, so my plan is to keep the stock hubs rather than going aftermarket. With that said, I would like to get another year or two out of this bike and upgrade to a 2016+ model. Does anyone know if this new generation still uses the same wheels/hubs? It would be nice to be able to swap them over when the time comes (If they're not to beat up by then) If they will interchange I may just look into finding another set of stock hubs so I can have a complete xtra set instead rebuilding my original set and then I could sell it with the stockers.