Add fonts. Also, make a few changes according to Mathilde.