Font refactoring