Add two font classes and refactor