Add support for un/ordered lists and image captions