A couple of simple shapes, and 2 water shaders (one for vertical parts with stretched foam and one for horizontal parts), but on the same rivers. The water takes the same shape as the terrain, so to speak. The river needs to be less canal like, and the rock wall needs more 'bump' and nicer strata. I will also try to warp the outcrop and strata shader, or just use stretched PF's for it, or the blue node thing that was in the forum some time ago.