Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 13971)
+++ trunk/data/validator/combinations.mapcss	(revision 13972)
@@ -35,5 +35,4 @@
 way[tracks                     ][!railway][route!=railway],
 way[traffic_mode               ][!railway][route!=railway],
-way[usage                      ][!railway][route!=railway][man_made!=pipeline],
 way[workrules                  ][!railway][route!=railway],
 way[stream                     ][!waterway],
@@ -110,5 +109,6 @@
 *[bridge:movable               ][bridge!=movable][man_made!=bridge],
 *[substation                   ][power!=substation][pipeline!=substation],
-*[reservoir_type               ][landuse!=reservoir][water!=reservoir] {
+*[reservoir_type               ][landuse!=reservoir][water!=reservoir],
+way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
   group: tr("missing tag");
@@ -179,4 +179,11 @@
 }
 
+/* {0.tag} without {1.tag} */
+way[usage=penstock][man_made!=pipeline],
+way[usage=penstock][waterway!=pressurised] {
+  throwWarning: tr("{0} without {1}", "{0.tag}", "{1.tag}");
+  group: tr("missing tag");
+}
+
 /* {0.tag} without {1.tag} or {2.tag} */
 *[amenity=recycling][recycling_type!=container][recycling_type!=centre] {
@@ -211,4 +218,6 @@
 *[amenity=vending_machine][shop],
 *[noname?][name],
+way[man_made=pipeline][tunnel=flooded]
+way[waterway=canal][tunnel=yes]
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
 way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
@@ -375,6 +384,7 @@
 }
 
-/* #10140 */
-*[building:levels][!building][!building:part] {
+/* {0.key} without {1.key} or {2.key} see #10140 */
+*[building:levels][!building][!building:part],
+way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
   group: tr("missing tag");
@@ -463,5 +473,5 @@
 }
 
-/* #13138, 14468 */
+/* {1.key} without {2.tag} see #13138, 14468 */
 area:closed[water][natural!~/water|bay|strait/][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 13971)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 13972)
@@ -1448,5 +1448,5 @@
     repeat-image: "presets/misc/embankment-pattern-centered.png";
 }
-way[man_made=pipeline] {
+way[man_made=pipeline][!waterway] {
     width: 2;
     color: pipeline#660000;
@@ -4313,4 +4313,5 @@
     color: riverbank#0000cf;
 }
+way[waterway=pressurised],
 way[waterway=canal] {
     width: 2;
@@ -4322,4 +4323,12 @@
     casing-color: lock#303030;
     casing-dashes: 5,20;
+}
+way[waterway=pressurised][tunnel] {
+    casing-width: 1;
+    casing-color: tunnel#964B00;
+}
+way[waterway=pressurised][man_made=pipeline] {
+    casing-width: 1;
+    casing-color: pipeline#660000;
 }
 way[waterway=stream] {