Updated to include all images and plugins