Refactor the way fonts are used