Clean up naming + Update xml + remove blank wallpaper