fixes #1226
Merge branch 'mode-backgrounds'