Refactor fonts, refactor