Moved fonts to the right places
Updated font names, loading
Merging