Use jpg instead of png
Merge branch 'modern'