Fixed the font names
Further font fixes