Update how font is handled