Refactor font integration