Fixed a few defines
Character fixes
Merge branch 'master' of https://github.com/ArcPro/ArcPro