special font color fix and rearrange
fix flag code for submission
Merge branch 'feature/fonts' into develop
Merge branch 'develop'