Player Color CSS updates
Resolve merge conflicts