Changes to demo files
Improved font usage