[WIP] Refactor typography after talk with design