Any way to generate realistic rivers?

[DeepSoul]

The most annoying thing about map generation is how rivers are generated(and has kept me from starting a game so far). Usually they start in one end of a continent and runs to the other side, totally ignoring hills and mountain ranges, and the result looks ridiculous, and is immersion breaking. The game needs more river sources and rivers should be shorter, usually taking the shortest route to the sea. Is there any way to achieve this?

I am using Detailed Worlds atm, and it fixes everything except rivers. I wish there was a mod like GEM for CIV 6, or at least an ingame generator.