Redoing typography
Redoing typography - merged with master
Typography refactor