Gfx: More changes for TextFormat