fix bg color
Merge branch 'master' into test