Rivers now have options in gen menu