Well, you can do the upgrade without doing the Factory Resource Restore. I didn't want to lose my custom styles that I had loaded into factory locations. Sooner or later, I will save them to where they are easily restored, and then update the resources. Not sure what I'm missing if anything.