rivers: draw the new-style rivers