Add support for rotating the wattermark.
Minor reformatting.