Refactor Wallpaper authorization