More fonts
Fix merge conflict