diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 1570e89f7..9336f72b8 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -269,7 +269,7 @@ area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 {fill-opacity: 1;}
 area|z15-[natural=water][tunnel],
-{fill-opacity: 0.15;}
+{fill-opacity: 0.2;}
 
 area|z11-[natural=wetland],
 area|z13-[leisure=swimming_pool],
@@ -281,7 +281,7 @@ line|z13-[waterway=stream],
 line|z13-[waterway=canal],
 line|z13-[waterway=fish_pass],
 line|z13-[natural=strait],
-{opacity: 0.95; color: @water;}
+{opacity: 1; color: @water;}
 
 /* 6.1 Area water(lake,pond etc.) */
 
@@ -328,56 +328,80 @@ area|z11-[natural=wetland][wetland=mangrove],
 /* 6.2 Line water(river,canal etc.) */
 
 line|z10[waterway=river],
-{width: 1.4;}
+{width: 1.5;}
 
 line|z11-12[waterway=river],
-{width: 2;}
+{width: 2.1;}
 
 line|z13[waterway=river],
 line|z13[natural=strait],
-{width: 2.7;}
+{width: 2.8;}
 line|z13[waterway=stream],
 line|z13[waterway=canal],
 line|z13[waterway=fish_pass],
-{width: 1.3;}
+{width: 1.6;}
 line|z13[waterway=stream][intermittent=yes]
-{width: 1;dashes: 2.7,2.7;}
+{dashes: 3,1;}
 
 line|z14[waterway=river],
 line|z14[natural=strait],
-{width: 3.5;}
+{width: 3.6;}
 line|z14[waterway=stream],
 line|z14[waterway=canal],
 line|z14[waterway=fish_pass],
-{width: 1.5;}
-line|z14[waterway=stream][intermittent=yes]
-{width: 1.2;dashes: 2.7,2.7;}
-
-line|z15-[waterway=river],
-line|z15-[natural=strait],
-{width: 4.6;}
-line|z15-[waterway=stream],
-line|z15-[waterway=canal],
-line|z15-[waterway=fish_pass],
 {width: 1.8;}
-line|z15-[waterway=stream][intermittent=yes]
-{width: 1.6;dashes: 4.95,4.95;}
+line|z14[waterway=stream][intermittent=yes]
+{dashes: 6,2;}
+
+line|z15[waterway=river],
+line|z15[natural=strait],
+{width: 4.7;}
+line|z15[waterway=stream],
+line|z15[waterway=canal],
+line|z15[waterway=fish_pass],
+{width: 2.1;}
+line|z15[waterway=stream][intermittent=yes]
+{dashes: 9,3;}
+
+line|z16-[waterway=river],
+line|z16-[natural=strait],
+{width: 5.7;}
+line|z16[waterway=stream],
+line|z16[waterway=canal],
+line|z16[waterway=fish_pass],
+{width: 2.5;}
+line|z16[waterway=stream][intermittent=yes]
+{dashes: 12,4;}
+
+line|z17[waterway=stream],
+line|z17[waterway=canal],
+line|z17[waterway=fish_pass],
+{width: 3.0;}
+line|z17[waterway=stream][intermittent=yes]
+{dashes: 15,5;}
+
+line|z18-[waterway=stream],
+line|z18-[waterway=canal],
+line|z18-[waterway=fish_pass],
+{width: 3.5;}
+line|z18-[waterway=stream][intermittent=yes]
+{dashes: 18,6;}
 
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
 line|z13-[waterway=ditch],
 line|z13-[waterway=drain],
-{opacity: 0.8; color: @water_bad; width: 1.5; dashes: 5.4,2.7;}
+{opacity: 1; color: @water_bad; width: 1.5; dashes: 1.5,1;}
 line|z14[waterway=ditch],
 line|z14[waterway=drain],
-{opacity: 0.9;}
-line|z15-[waterway=ditch],
-line|z15-[waterway=drain],
-{opacity: 0.95;}
+{width: 1.7; dashes: 3,2;}
+line|z15[waterway=ditch],
+line|z15[waterway=drain],
+{width: 2.0; dashes: 4.5,3;}
 line|z16-[waterway=ditch],
 line|z16-[waterway=drain],
-{width: 2;}
+{width: 2.4; dashes: 6,4;}
 
 /* Do not draw tunnel waterways */
 line[waterway][tunnel]
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index f7501e50f..f524a5fc1 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -39,10 +39,10 @@
 /* 3.1 Main natural */
 
 @glacier: #FFFFFF;
-@water: #9EE4F2;
-@water_bad: #9CD7DE;
-@wetland_tidal: #BBE5E8;
-@wetland_tidal_saltmarsh: #A6E0D6;
+@water: #89CDDC;
+@water_bad: #8FCDD3;
+@wetland_tidal: #9FD2DB;
+@wetland_tidal_saltmarsh: #A0DAD1;
 @wetland_saltmarsh: #AADEC4;
 @wetland_marsh: #ABDDC2;
 @wetland_fen: #B6DEC5;
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index c7d4d3443..50d1a903b 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -9,9 +9,11 @@ line|z11-[natural=strait],
 line|z12-[waterway=canal],
 line|z12-[waterway=stream],
 line|z13-[waterway=fish_pass],
+{opacity: 1; color: @water;}
+
 line|z15-[waterway=ditch],
 line|z15-[waterway=drain],
-{opacity: 1; color: @water;}
+{opacity: 1; color: @water_bad;}
 
 /* 6.2 Line water(river,canal etc.) */
 
@@ -19,54 +21,16 @@ line|z10-[waterway=river],
 line|z11-[natural=strait],
 line|z12-[waterway=stream],
 line|z12-[waterway=canal],
-line|z13-[waterway=fish_pass],
 {text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;}
 
-line|z10[waterway=river],
-{width: 1.4;}
-
-line|z11-12[waterway=river],
 line|z11-12[natural=strait],
-{width: 2;}
+{width: 2.1;}
+
 line|z12[waterway=stream],
 line|z12[waterway=canal],
-{width: 1;}
-
-line|z13[waterway=river],
-line|z13[natural=strait],
-{width: 2.7;}
-line|z13[waterway=stream],
-line|z13[waterway=canal],
-line|z13[waterway=fish_pass],
-{width: 1.3;}
+{width: 1.5;}
 line|z11-12[waterway=stream][intermittent],
 {width: 0; text: none;}
-line|z13[waterway=stream][intermittent],
-{width: 1; dashes: 2.7,2.7;}
-
-line|z14[waterway=river],
-line|z14[natural=strait],
-{width: 3.5;}
-line|z14[waterway=stream],
-line|z14[waterway=canal],
-line|z14[waterway=fish_pass],
-{width: 1.8;}
-line|z14[waterway=stream][intermittent],
-{width: 1.4; dashes: 3.5,3.5;}
-
-line|z15-[waterway=river],
-line|z15-[natural=strait],
-{width: 4.6;}
-line|z15-[waterway=stream],
-line|z15-[waterway=canal],
-line|z15-[waterway=fish_pass],
-{width: 2.4;}
-line|z15-[waterway=stream][intermittent],
-{width: 2; dashes: 5,5;}
-
-line|z13-[waterway=ditch],
-line|z13-[waterway=drain],
-{opacity: 1; color: @water_bad;}
 
 /* Do not draw tunnel waterways */
 line[waterway][tunnel]