Fixed Fonts from merge