Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 13946)
+++ 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] {
