Merging Texture Updates

I had to resolve a handful of conflicts, I think everything should be
working correctly but I can't test until this is merged. A few tweaks
may be needed.