Extension of the watermark configuration

Extension of the watermark configuration to include integrated use of the image frame for text labeling of an exported photo.
Currently, the frame and text must be configured manually so that the appearance matches the screenshot.
It would be desirable to specify a dynamic placeholder, e.g., the file name, and other useful parameters.
It would also be desirable to extend the watermark configuration so that the image and text can be specified and displayed in parallel.