i somehow don't like that the way most pictures are added is not explained anymore without the picture template providing a substitute for it. (the picture in the same box with the subtitle). i tried to do this with picture2 template but i am not quite convinced about it yet... please take a look at it.
I'd go with a separate "frame" parameter to decide whether to frame the image, and which would use the align parameter to decide which side to put it.
I'll make some adjustments to show what I mean!