Added support for custom fonts
Merge branch 'template'