Fix fonts' mappings and shapes
Merge branch 'Zhaodong'