Change sample content to a better variety of effects.
Add preliminary support for marginal captions in one-column mode.