Made wallpaper setup more generic.