fix #1049
Improve player color readability fix #1101
Merge pull request #1120 from Soul1355/master

fix player side inconsistency and improve player colors