Screenshot

Will now include a screen shot of the current app.
(The commit before this also included minor redesigns for the
definition)