another attempt to make fonts work
Merge branch 'develop' into staging