Improved wallpaper code