Made the new effects support rich-text and different size images.