fix webfont
updates and refactor