Theme 2 water level extremes

Cleaning up a bit...
@birdage FYI