Added local font files

And some code cleanup