sfs
Merge remote-tracking branch 'origin/master'
slight refactor to background scale, some font color changes