Refactoring, more texture formats