Starting to fix the fonts mess