Finished refactoring typography components