Background lighter and default background color
Merge remote-tracking branch 'origin/master'