Tweak water color
Add support for polygonal waterway=dam. Tweak pier night color
Tweak water color. Add outline to polygonal water.