#fonts refactoring