Add texture swap
Fix window compile issue
Clean up
Merge branch 'texture' into development
Clean up