Non-square font support and less indirection with images.
Formatting