Changing some key mappings and background color.
Merge remote-tracking branch 'origin/master'