Finish ScoreScreen windows, color tweaks
Merge branch 'master' of https://github.com/nancydo/Match