Changed remaining image types to use Texture internally