Add river definitions. Update water hex colours
Colours clarification
Add hills