almost fix wallpaper handling
split & fix