fonts refactoring