Typography refactoring started