Adapted the styles for more info
Added waterways correctly