Add new typography styles, move code