Switch to Typotheque web fonts
Tidy up font varibles