Merge "Cleanup, added properties for the FontRenderer."