New backgrounds, refactor