[style] separated more stylesheet parts into includes

6 files changed, 509 insertions, 648 deletions

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3210ab2d2c..ac9a3c8296 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index fef2cb3a39..b658c9d8a1 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -9120,11 +9120,6 @@ cont {
         color: 0
         offset_x: 6
       }
-      secondary {
-        height: 9
-        color: 0
-        offset_y: 10
-      }
       priority: 15025
     }
     circle {
@@ -34957,35 +34952,35 @@ cont {
   element {
     scale: 13
     area {
-      color: 14531481
+      color: 13430459
       priority: -16303
     }
   }
   element {
     scale: 14
     area {
-      color: 14531481
+      color: 13430459
       priority: -16304
     }
   }
   element {
     scale: 15
     area {
-      color: 14531481
+      color: 13430459
       priority: -16305
     }
   }
   element {
     scale: 16
     area {
-      color: 14531481
+      color: 13430459
       priority: -16306
     }
   }
   element {
     scale: 17
     area {
-      color: 14531481
+      color: 13430459
       priority: -16307
     }
     symbol {
@@ -34996,7 +34991,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 14531481
+      color: 13430459
       priority: -16308
     }
     symbol {
@@ -35007,7 +35002,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 14531481
+      color: 13430459
       priority: -16309
     }
     symbol {
@@ -35965,35 +35960,35 @@ cont {
   element {
     scale: 13
     area {
-      color: 14531481
+      color: 13430459
       priority: -16375
     }
   }
   element {
     scale: 14
     area {
-      color: 14531481
+      color: 13430459
       priority: -16376
     }
   }
   element {
     scale: 15
     area {
-      color: 14531481
+      color: 13430459
       priority: -16377
     }
   }
   element {
     scale: 16
     area {
-      color: 14531481
+      color: 13430459
       priority: -16378
     }
   }
   element {
     scale: 17
     area {
-      color: 14531481
+      color: 13430459
       priority: -16379
     }
     symbol {
@@ -36004,7 +35999,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 14531481
+      color: 13430459
       priority: -16380
     }
     symbol {
@@ -36015,7 +36010,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 14531481
+      color: 13430459
       priority: -16381
     }
     symbol {
@@ -36107,35 +36102,35 @@ cont {
   element {
     scale: 13
     area {
-      color: 14531481
+      color: 13430459
       priority: -16391
     }
   }
   element {
     scale: 14
     area {
-      color: 14531481
+      color: 13430459
       priority: -16392
     }
   }
   element {
     scale: 15
     area {
-      color: 14531481
+      color: 13430459
       priority: -16393
     }
   }
   element {
     scale: 16
     area {
-      color: 14531481
+      color: 13430459
       priority: -16394
     }
   }
   element {
     scale: 17
     area {
-      color: 14531481
+      color: 13430459
       priority: -16395
     }
     symbol {
@@ -36146,7 +36141,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 14531481
+      color: 13430459
       priority: -16396
     }
     symbol {
@@ -36157,7 +36152,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 14531481
+      color: 13430459
       priority: -16397
     }
     symbol {
diff --git a/data/styles/include/base_publictransport.mapcss b/data/styles/include/base_publictransport.mapcss
new file mode 100644
index 0000000000..f1869672fa
--- /dev/null
+++ b/data/styles/include/base_publictransport.mapcss
@@ -0,0 +1,305 @@
+line[highway=bus_stop]
+{
+    casing-width: 0;
+}
+node[highway=bus_stop],
+node[railway=tram_stop],
+node[railway=station],
+way[highway=bus_stop],
+way[railway=tram_stop],
+way[railway=station]
+{
+  text-position: center;
+}
+area|z16[highway=bus_stop],
+node|z16[highway=bus_stop],
+area|z15[railway=tram_stop],
+node|z15[railway=tram_stop]
+{
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
+
+area|z16[highway=bus_stop]::int_name,
+node|z16[highway=bus_stop]::int_name,
+area|z15[railway=tram_stop]::int_name,
+node|z15[railway=tram_stop]::int_name
+{
+  font-size:  9;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color: #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
+}
+
+*|z17-[highway=bus_stop],
+*|z16[railway=tram_stop]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
+}
+*|z17-[highway=bus_stop]::int_name,
+*|z16[railway=tram_stop]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color: #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
+}
+
+area|z17-[amenity=bus_station]::int_name,
+node|z17-[amenity=bus_station]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color: #404040;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 1;
+}
+
+
+area|z16[highway=bus_stop],
+node|z16[highway=bus_stop]
+{
+  icon-image:   bus-mini.svg;
+  z-index: 20;
+}
+area|z16-[amenity=bus_station],
+area|z17-[highway=bus_stop],
+node|z16-[amenity=bus_station],
+node|z17-[highway=bus_stop]
+{
+  icon-image:   bus.svg;
+  z-index: 20;
+}
+area|z17-[railway=tram_stop],
+node|z17-[railway=tram_stop]
+{
+  icon-image:   tramway.svg;
+}
+area|z15-16[railway=tram_stop],
+node|z15-16[railway=tram_stop]
+{
+  icon-image:   tramway-mini.svg;
+}
+
+line|z15-[railway=tram]::d1p2
+{
+  color:    #e6b7e6;
+  width:    2;
+  z-index:  561;
+}
+
+
+area|z15-[railway=halt],
+area|z17-[railway=tram_stop],
+node|z15-[railway=halt],
+node|z17-[railway=tram_stop]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
+area|z17-[railway=tram_stop]::int_name,
+node|z17-[railway=tram_stop]::int_name
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
+
+line|z15[railway=monorail]::d1p3,
+line|z15[railway=tram]::d1p3
+{
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   7.2,10.8;
+  linecap:  butt;
+}
+
+line|z15-[railway=tram]
+{
+  color:    #4c0f4c;
+  width:    3.2;
+  z-index:  556;
+}
+
+line|z16-[railway=tram]::d1p3
+{
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   9.6,14.4;
+  linecap:  butt;
+}
+
+line|z14[railway=tram]::raildash
+{
+  color:    #590959;
+  width:    1.7;
+  z-index:  557;
+  dashes:   3.6,5.4;
+  linecap:  butt;
+}
+line|z14[railway=tram]::railfill
+{
+  color:    #e6b7e6;
+  width:    1.7;
+  z-index:  556;
+}
+line|z14[railway=tram]::railborder
+{
+  color:    #590959;
+  width:    2;
+  z-index:  555;
+}
+
+
+
+line|z12-[railway=subway]
+{
+  color:    #0f0f4c;
+  width:    2;
+  z-index:  686;
+  dashes:   9.6,14.4;
+  linecap:  butt;
+  opacity: 0.4;
+}
+
+area|z16-[railway=subway_entrance],
+node|z16-[railway=subway_entrance]
+{
+  icon-image:   subway.svg;
+}
+line|z12-[railway=subway]                                         {width:3; color: #0f0f4c; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
+node[railway=station][transport=subway]::int_name                 {text-color:  #3050d8; text-position: center;}
+line|z12-[railway=subway][colour]                                 {width:3; color: eval(tag("colour")); z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour]                   {text-color:  eval(tag("colour"));}
+node[railway=station][transport=subway][colour]::int_name         {text-color:  eval(tag("colour"));}
+line|z12-[railway=subway][colour=red]                             {width:3; color: #DD0000; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=red]               {text-color:  #DD0000;}
+node[railway=station][transport=subway][colour=red]::int_name     {text-color:  #DD0000;}
+line|z12-[railway=subway][colour=blue]                            {width:3; color: #072889; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=blue]              {text-color:  #072889;}
+node[railway=station][transport=subway][colour=blue]::int_name    {text-color:  #072889;}
+line|z12-[railway=subway][colour=purple]                          {width:3; color: #8B509C; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=purple]            {text-color:  #8B509C;}
+node[railway=station][transport=subway][colour=purple]::int_name  {text-color:  #8B509C;}
+line|z12-[railway=subway][colour=orange]                          {width:3; color: #FF7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=orange]            {text-color:  #FF7700;}
+node[railway=station][transport=subway][colour=orange]::int_name  {text-color:  #FF7700;}
+line|z12-[railway=subway][colour=green]                           {width:3; color: #006600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=green]             {text-color:  #006600;}
+node[railway=station][transport=subway][colour=green]::int_name   {text-color:  #006600;}
+line|z12-[railway=subway][colour=brown]                           {width:3; color: #BB7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=brown]             {text-color:  #BB7700;}
+node[railway=station][transport=subway][colour=brown]::int_name   {text-color:  #BB7700;}
+line|z12-[railway=subway][colour=yellow]                          {width:3; color: #F7C600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=yellow]            {text-color:  #F7C600;}
+node[railway=station][transport=subway][colour=yellow]::int_name  {text-color:  #F7C600;}
+
+node|z12[railway=station][transport=subway],
+area|z12[railway=station][transport=subway]
+{
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z12[railway=station][transport=subway]::int_name,
+area|z12[railway=station][transport=subway]::int_name
+{
+  font-size:  9;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z13-14[railway=station][transport=subway],
+area|z13-14[railway=station][transport=subway]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z13-14[railway=station][transport=subway]::int_name,
+area|z13-14[railway=station][transport=subway]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z15-[railway=station][transport=subway],
+area|z15-[railway=station][transport=subway]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z15-[railway=station][transport=subway]::int_name,
+area|z15-[railway=station][transport=subway]::int_name
+{
+  font-size:  11;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+area|z12-14[railway=station][transport=subway],
+node|z12-14[railway=station][transport=subway]
+{
+  icon-image:   subway-station-s.svg;
+}
+area|z15[railway=station][transport=subway],
+node|z15[railway=station][transport=subway]
+{
+  icon-image:   subway-station-m.svg;
+}
+area|z16-[railway=station][transport=subway],
+node|z16-[railway=station][transport=subway]
+{
+  icon-image:   subway-station-l.svg;
+}
diff --git a/data/styles/include/base_sport.mapcss b/data/styles/include/base_sport.mapcss
new file mode 100644
index 0000000000..1f64afeeac
--- /dev/null
+++ b/data/styles/include/base_sport.mapcss
@@ -0,0 +1,143 @@
+*[sport]
+{
+  text-position: center
+}
+
+area|z12-[leisure=sports_centre],
+area|z12-[leisure=stadium],
+area|z12-[leisure=track]
+{
+  fill-color:   #d0e8c4;
+}
+
+area|z17-[leisure=sports_centre],
+area|z17-[leisure=stadium],
+node|z17-[leisure=stadium],
+node|z17-[leisure=sports_centre]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  white;
+}
+
+area|z13-[leisure=dog_park][sport=tennis],
+area|z13-[leisure=pitch][sport=tennis],
+area|z13-[leisure=playground][sport=tennis],
+area|z13-[leisure=playing_fields][sport=tennis]
+{
+  fill-color:   #ddb298;
+}
+
+area|z17-[sport=gymnastics],
+area|z17-[sport=multi],
+area|z17-[sport=skiing],
+node|z17-[sport=gymnastics],
+node|z17-[sport=multi],
+node|z17-[sport=skiing]
+{
+  icon-image:   gymnastics-borderless.svg;
+}
+area|z17-[leisure=playground],
+node|z17-[leisure=playground]
+{
+  icon-image:   playground.svg;
+}
+area|z17-[sport=diving],
+area|z17-[sport=scuba_diving],
+node|z17-[sport=diving],
+node|z17-[sport=scuba_diving]
+{
+  icon-image:   diving-borderless.svg;
+}
+area|z17-[sport=cricket],
+node|z17-[sport=cricket]
+{
+  icon-image:   cricket-borderless.svg;
+}
+area|z17-[sport=equestrian],
+node|z17-[sport=equestrian]
+{
+  icon-image:   equestrian-borderless.svg;
+}
+area|z17-[sport=curling],
+node|z17-[sport=curling]
+{
+  icon-image:   curling-borderless.svg;
+}
+area|z17-[sport=american_football],
+area|z17-[sport=australian_football],
+area|z17-[sport=football],
+node|z17-[sport=american_football],
+node|z17-[sport=australian_football],
+node|z17-[sport=football]
+{
+  icon-image:   football-borderless.svg;
+}
+area|z17-[sport=swimming],
+node|z17-[sport=swimming]
+{
+  icon-image:   swimming-borderless.svg;
+}
+area|z17-[sport=tennis],
+node|z17-[sport=tennis]
+{
+  icon-image:   tennis-borderless.svg;
+}
+area|z17-[sport=soccer],
+node|z17-[sport=soccer]
+{
+  icon-image:   soccer-borderless.svg;
+}
+area|z17-[sport=shooting],
+node|z17-[sport=shooting]
+{
+  icon-image:   shooting-borderless.svg;
+}
+area|z17-[sport=handball],
+node|z17-[sport=handball]
+{
+  icon-image:   handball-borderless.svg;
+}
+area|z17-[sport=golf],
+node|z17-[sport=golf],
+area|z17-[leisure=golf_course],
+node|z17-[leisure=golf_course]
+{
+  icon-image:   golfCourse.svg;
+}
+area|z17-[sport=baseball],
+node|z17-[sport=baseball]
+{
+  icon-image:   baseball-borderless.svg;
+}
+area|z17-[sport=athletics],
+node|z17-[sport=athletics]
+{
+  icon-image:   athletics-borderless.svg;
+}
+area|z17-[sport=bowls],
+node|z17-[sport=bowls]
+{
+  icon-image:   bowls-borderless.svg;
+}
+area|z17-[sport=archery],
+node|z17-[sport=archery]
+{
+  icon-image:   archery-borderless.svg;
+}
+area|z17-[sport=basketball],
+node|z17-[sport=basketball]
+{
+  icon-image:   basketball-borderless.svg;
+}
+line|z15-[marking=sport]
+{
+    width: 0.5;
+    color: white;
+}
+line|z15-[marking=sport][colour?]
+{
+    color: eval(tag("colour"));
+}
diff --git a/data/styles/ink.mapcss b/data/styles/ink.mapcss
index 597f32961f..266d7821c2 100644
--- a/data/styles/ink.mapcss
+++ b/data/styles/ink.mapcss
@@ -50,8 +50,7 @@ area[natural=coastline]
 *[natural],
 *[place],
 *[power],
-*[landuse],
-*[sport]
+*[landuse]
 {
   text-position: center
 }
@@ -68,8 +67,8 @@ area[tourism],
 
 @import("include/base_roads.mapcss");
 @import("include/base_shop.mapcss");
+@import("include/base_sport.mapcss");
 
-line[highway=bus_stop],
 line[highway=motorway_junction]
 {
     casing-width: 0;
@@ -1238,14 +1237,10 @@ area|z16-[amenity=townhall],
 area|z17-[tourism=caravan_site],
 area|z17-[leisure=garden],
 area|z17-[leisure=park],
-area|z17-[leisure=sports_centre],
-area|z17-[leisure=stadium],
 node|z13-[highway=motorway_junction],
-node|z17-[leisure=stadium],
 node|z17-[tourism=caravan_site],
 node|z17-[tourism=zoo],
-node|z16-[amenity=townhall],
-node|z17-[leisure=sports_centre]
+node|z16-[amenity=townhall]
 {
   font-size:    12;
   text-halo-radius: 2;
@@ -1300,13 +1295,6 @@ node|z13[place=city][capital?]
   font-size:    24;
   text-color:   grey;
 }
-area|z13-[leisure=dog_park][sport=tennis],
-area|z13-[leisure=pitch][sport=tennis],
-area|z13-[leisure=playground][sport=tennis],
-area|z13-[leisure=playing_fields][sport=tennis]
-{
-  fill-color:   #ddb298;
-}
 line|z13[railway=narrow_gauge]
 {
   color:    #a0a0a0;
@@ -1626,13 +1614,6 @@ line|z14-[piste:type=downhill][piste:difficulty=expert]
   color:    #f6800a;
   width:    5;
 }
-line|z14-[railway=tram]
-{
-    color: black;
-    width: 1;
-    -x-kot-layer: top;
-}
-
 line|z14[railway=monorail]::raildash,
 {
   color:    #590959;
@@ -2185,11 +2166,6 @@ line|z15[railway=siding]::d1p2
   width:    1.4;
   z-index:  396;
 }
-area|z15-16[railway=tram_stop],
-node|z15-16[railway=tram_stop]
-{
-  icon-image:   tramway-mini.svg;
-}
 line|z15[railway=preserved]
 {
   color:    #909090;
@@ -2301,17 +2277,6 @@ node|z15-16[place=village]
   text: name;
   text-color:   #707070;
 }
-area|z15-[railway=halt],
-area|z17-[railway=tram_stop],
-node|z15-[railway=halt],
-node|z17-[railway=tram_stop]
-{
-  font-size:    12;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-}
 line|z15[boundary=administrative][admin_level=7]
 {
   color:    #f9574b;
@@ -2721,18 +2686,6 @@ line|z15[boundary=administrative][border_type=country]
   z-index:  691;
   -x-kot-layer: top;
 }
-area|z16[highway=bus_stop],
-area|z15[railway=tram_stop],
-node|z16[highway=bus_stop],
-node|z15[railway=tram_stop]
-{
-  font-size:    10;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-}
-
 area|z15-[amenity=fuel],
 node|z15-[amenity=fuel]
 {
@@ -2784,16 +2737,6 @@ line|z15[railway=funicular]::d1p3
   width:    0.5;
   z-index:  410;
 }
-*|z17-[highway=bus_stop],
-*|z16[railway=tram_stop]
-{
-  font-size:    11;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-  z-index: 20;
-}
 line|z16[communication=line]
 {
   color:    #f080f0;
@@ -3172,11 +3115,6 @@ line|z16[railway=rail]
   width:    2.4;
   z-index:  631;
 }
-area|z16-[railway=subway_entrance],
-node|z16-[railway=subway_entrance]
-{
-  icon-image:   subway.svg;
-}
 line|z16[piste:lift=rope_tow]
 {
   color:    #d8d8c4;
@@ -3845,15 +3783,6 @@ line|z17-[boundary=administrative][border_type=county]
   z-index:  973;
   dashes:   4,20;
 }
-area|z17-[sport=gymnastics],
-area|z17-[sport=multi],
-area|z17-[sport=skiing],
-node|z17-[sport=gymnastics],
-node|z17-[sport=multi],
-node|z17-[sport=skiing]
-{
-  icon-image:   gymnastics-borderless.svg;
-}
 line|z17-[communication=line]::d1p2
 {
   color:    #f080f0;
@@ -3888,13 +3817,6 @@ line|z17-[railway=narrow_gauge]
   width:    3.2;
   z-index:  569;
 }
-area|z17-[sport=diving],
-area|z17-[sport=scuba_diving],
-node|z17-[sport=diving],
-node|z17-[sport=scuba_diving]
-{
-  icon-image:   diving-borderless.svg;
-}
 line|z17-[waterway=canal]
 {
   width:    6.4;
@@ -3937,11 +3859,6 @@ line|z17-[waterway=lock]
   casing-width: 2;
   casing-color: #202020;
 }
-area|z17-[sport=cricket],
-node|z17-[sport=cricket]
-{
-  icon-image:   cricket-borderless.svg;
-}
 line|z17-[man_made=pipeline]::d1p2
 {
   color:    #a0a0a0;
@@ -4063,11 +3980,6 @@ line|z17-[communication=line]
   z-index:  930;
   opacity:  0.5;
 }
-area|z17-[sport=equestrian],
-node|z17-[sport=equestrian]
-{
-  icon-image:   equestrian-borderless.svg;
-}
 line|z17-[boundary=administrative][border_type=suburb]
 {
   color:    #f9574b;
@@ -4116,11 +4028,6 @@ line|z17-[railway=spur]::d1p2
   width:    1.36;
   z-index:  671;
 }
-area|z17-[sport=curling],
-node|z17-[sport=curling]
-{
-  icon-image:   curling-borderless.svg;
-}
 line|z17-[railway=preserved]::d1p2
 {
   color:    #e6e6e6;
@@ -4185,15 +4092,6 @@ node|z17-[tourism=picnic_site]
 {
   icon-image:   picnic.svg;
 }
-area|z17-[sport=american_football],
-area|z17-[sport=australian_football],
-area|z17-[sport=football],
-node|z17-[sport=american_football],
-node|z17-[sport=australian_football],
-node|z17-[sport=football]
-{
-  icon-image:   football-borderless.svg;
-}
 area|z17-[railway=platform],
 line|z17-[railway=platform]
 {
@@ -4236,11 +4134,6 @@ line|z17-[railway=siding]::d1p3
   dashes:   7.2,16.8;
   linecap:  butt;
 }
-area|z17-[sport=swimming],
-node|z17-[sport=swimming]
-{
-  icon-image:   swimming-borderless.svg;
-}
 area|z17-[amenity=kindergarten],
 node|z17-[amenity=kindergarten]
 {
@@ -4643,8 +4536,6 @@ line|z17-[power=minor_line]
   opacity:  0.5;
 }
 
-node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
-
 area[waterway=riverbank],
 line[waterway=river],
 line[waterway=canal]
@@ -4691,25 +4582,6 @@ node|z17-[barrier=gate]
 {
   icon-image:   gate.svg;
 }
-area|z16[highway=bus_stop],
-node|z16[highway=bus_stop]
-{
-  icon-image:   bus-mini.svg;
-  z-index: 20;
-}
-area|z16-[amenity=bus_station],
-area|z17-[highway=bus_stop],
-node|z16-[amenity=bus_station],
-node|z17-[highway=bus_stop]
-{
-  icon-image:   bus.svg;
-  z-index: 20;
-}
-area|z17-[railway=tram_stop],
-node|z17-[railway=tram_stop]
-{
-  icon-image:   tramway.svg;
-}
 area|z17-[man_made=lighthouse],
 node|z17-[man_made=lighthouse]
 {
@@ -4746,40 +4618,6 @@ node|z16-[amenity=telephone]
 {
   icon-image:   telephone.svg;
 }
-
-area|z17-[sport=handball],
-node|z17-[sport=handball]
-{
-  icon-image:   handball-borderless.svg;
-}
-area|z17-[sport=golf],
-node|z17-[sport=golf],
-area|z17-[leisure=golf_course],
-node|z17-[leisure=golf_course]
-{
-  icon-image:   golfCourse.svg;
-}
-
-area|z17-[sport=baseball],
-node|z17-[sport=baseball]
-{
-  icon-image:   baseball-borderless.svg;
-}
-area|z17-[sport=athletics],
-node|z17-[sport=athletics]
-{
-  icon-image:   athletics-borderless.svg;
-}
-area|z17-[sport=bowls],
-node|z17-[sport=bowls]
-{
-  icon-image:   bowls-borderless.svg;
-}
-area|z17-[sport=archery],
-node|z17-[sport=archery]
-{
-  icon-image:   archery-borderless.svg;
-}
 area|z17-[amenity=school],
 node|z17-[amenity=school]
 {
@@ -4787,70 +4625,18 @@ node|z17-[amenity=school]
 }
 
 area|z14-16[railway=halt],
-area|z14-15[railway=station],
-node|z14-16[railway=halt],
-node|z14-15[railway=station],
+node|z14-16[railway=halt]
 {
   icon-image:   railway-station-mini.svg;
   z-index: 150;
 }
 
 area|z17-[railway=halt],
-area|z16-[railway=station],
-node|z17-[railway=halt],
-node|z16-[railway=station]
+node|z17-[railway=halt]
 {
   icon-image:   railway-station.svg;
 }
 
-node|z12[railway=station][transport=subway],
-area|z12[railway=station][transport=subway]
-{ 
-  font-size:    10;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z13-14[railway=station][transport=subway],
-area|z13-14[railway=station][transport=subway]
-{ 
-  font-size:    11;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z15-[railway=station][transport=subway],
-area|z15-[railway=station][transport=subway]
-{ 
-  font-size:    12;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-area|z12-14[railway=station][transport=subway],
-node|z12-14[railway=station][transport=subway]
-{
-  icon-image:   subway-station-s.svg;
-}
-
-area|z15[railway=station][transport=subway],
-node|z15[railway=station][transport=subway]
-{
-  icon-image:   subway-station-m.svg;
-}
-
-area|z16-[railway=station][transport=subway],
-node|z16-[railway=station][transport=subway]
-{
-  icon-image:   subway-station-l.svg;
-}
-
 /* Eval magic */
 
 line[waterway]
@@ -4864,16 +4650,6 @@ line[railway]
   text-position: line;
 }
 
-node[highway=bus_stop],
-node[railway=tram_stop],
-node[railway=station],
-way[highway=bus_stop],
-way[railway=tram_stop],
-way[railway=station]
-{
-  text-position: center;
-}
-
 line|z15-[bridge?]::bridgewhite,
 line|z15-[tunnel?]::tunnelwhite,
 {
@@ -4922,12 +4698,6 @@ line[access][access!=yes]::*
   opacity:  0;
   casing-opacity:  0;
 }
-
-line|z15-[marking=sport]
-{
-    width: 0.5;
-    color: white;
-}
 line|z18-[lit]::lit
 {
   width: 0.3;
@@ -5052,6 +4822,8 @@ line[highway=steps]
     text-color: white;
 }
 
+@import("include/base_publictransport.mapcss");
+
 *[building]
 {
     text-halo-color: #1;
@@ -5122,10 +4894,17 @@ area[area:highway]{fill-color: white}
     width: 0;
 }
 
+node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
+
 area|z15-[area:highway=footway],
 area|z15-[area:highway=pedestrian],
 area|z15-[area:highway=path],
 area|z15-[area:highway=steps]
 {
     fill-color: #d;
+}
+
+*::int_name
+{
+  text: "";
 }
\ No newline at end of file
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index 62c75e6da8..b0b296f414 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -46,8 +46,7 @@ area[natural=coastline]
 *[natural],
 *[place],
 *[power],
-*[landuse],
-*[sport]
+*[landuse]
 {
   text-position: center
 }
@@ -63,8 +62,8 @@ area[tourism],
 
 @import("include/base_roads.mapcss");
 @import("include/base_shop.mapcss");
+@import("include/base_sport.mapcss");
 
-line[highway=bus_stop],
 line[highway=motorway_junction]
 {
     casing-width: 0;
@@ -677,9 +676,6 @@ area|z12-[landuse=grass],
 area|z12-[landuse=meadow],
 area|z12-[landuse=recreation_ground],
 area|z12-[landuse=village_green],
-area|z12-[leisure=sports_centre],
-area|z12-[leisure=stadium],
-area|z12-[leisure=track],
 area|z12-[natural=scrub]
 {
   fill-color:   #d0e8c4;
@@ -1417,14 +1413,10 @@ area|z16-[amenity=townhall],
 area|z17-[tourism=caravan_site],
 area|z17-[leisure=garden],
 area|z17-[leisure=park],
-area|z17-[leisure=sports_centre],
-area|z17-[leisure=stadium],
 node|z13-[highway=motorway_junction],
-node|z17-[leisure=stadium],
 node|z17-[tourism=caravan_site],
 node|z17-[tourism=zoo],
-node|z16-[amenity=townhall],
-node|z17-[leisure=sports_centre]
+node|z16-[amenity=townhall]
 {
   font-size:    12;
   text-halo-radius: 2;
@@ -1500,13 +1492,6 @@ node|z13[place=city][capital?]
   font-size:    24;
   text-color:   grey;
 }
-area|z13-[leisure=dog_park][sport=tennis],
-area|z13-[leisure=pitch][sport=tennis],
-area|z13-[leisure=playground][sport=tennis],
-area|z13-[leisure=playing_fields][sport=tennis]
-{
-  fill-color:   #ddb298;
-}
 line|z13[railway=narrow_gauge]
 {
   color:    #a0a0a0;
@@ -1867,8 +1852,7 @@ line|z14[waterway=stream][intermittent=yes]
   dashes:   2.4,0.8;
   linecap:  butt;
 }
-line|z14[railway=monorail]::raildash,
-line|z14[railway=tram]::raildash
+line|z14[railway=monorail]::raildash
 {
   color:    #590959;
   width:    1.7;
@@ -1876,19 +1860,22 @@ line|z14[railway=tram]::raildash
   dashes:   3.6,5.4;
   linecap:  butt;
 }
-line|z14[railway=tram]::railfill
-{
-  color:    #e6b7e6;
-  width:    1.7;
-  z-index:  556;
-}
-line|z14[railway=monorail]::railborder,
-line|z14[railway=tram]::railborder
+line|z14[railway=monorail]::railborder
 {
   color:    #590959;
   width:    2;
   z-index:  555;
 }
+area|z15-[railway=halt],
+node|z15-[railway=halt]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
 line|z14[piste:lift=platter]::d1p3
 {
   color:    #202020;
@@ -2385,15 +2372,6 @@ line|z15[boundary=administrative][border_type=county]
   z-index:  686;
   dashes:   4,20;
 }
-line|z12-[railway=subway]
-{
-  color:    #0f0f4c;
-  width:    2;
-  z-index:  686;
-  dashes:   9.6,14.4;
-  linecap:  butt;
-  opacity: 0.4;
-}
 line|z15-16[man_made=cutline]
 {
   color:    #f1eee8;
@@ -2508,11 +2486,7 @@ line|z15[railway=siding]::d1p2
   width:    1.4;
   z-index:  396;
 }
-area|z15-16[railway=tram_stop],
-node|z15-16[railway=tram_stop]
-{
-  icon-image:   tramway-mini.svg;
-}
+
 line|z15[railway=preserved]
 {
   color:    #909090;
@@ -2635,34 +2609,6 @@ node|z15-16[place=village]
   text-color:   #707070;
   text-halo-color:  #eeeedd;
 }
-line|z15-[railway=tram]::d1p2
-{
-  color:    #e6b7e6;
-  width:    2;
-  z-index:  561;
-}
-area|z15-[railway=halt],
-area|z17-[railway=tram_stop],
-node|z15-[railway=halt],
-node|z17-[railway=tram_stop]
-{
-  font-size:    12;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-}
-area|z17-[railway=tram_stop]::int_name,
-node|z17-[railway=tram_stop]::int_name
-{
-  font-size:    12;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color:   #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-}
 line|z15[boundary=administrative][admin_level=7]
 {
   color:    #f9574b;
@@ -2863,8 +2809,7 @@ line|z15[boundary=administrative][admin_level=6]
   z-index:  675;
   dashes:   4,20;
 }
-line|z15[railway=monorail]::d1p3,
-line|z15[railway=tram]::d1p3
+line|z15[railway=monorail]::d1p3
 {
   color:    #4c0f4c;
   width:    2;
@@ -2879,8 +2824,7 @@ line|z15[railway=abandoned]::d1p2
   z-index:  384;
   opacity:  0.4;
 }
-line|z15-[railway=monorail],
-line|z15-[railway=tram]
+line|z15-[railway=monorail]
 {
   color:    #4c0f4c;
   width:    3.2;
@@ -3092,31 +3036,7 @@ line|z15[boundary=administrative][border_type=country]
   z-index:  691;
   -x-kot-layer: top;
 }
-area|z16[highway=bus_stop],
-area|z15[railway=tram_stop],
-node|z16[highway=bus_stop],
-node|z15[railway=tram_stop]
-{
-  font-size:    10;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-}
-area|z16[highway=bus_stop]::int_name,
-area|z15[railway=tram_stop]::int_name,
-node|z16[highway=bus_stop]::int_name,
-node|z15[railway=tram_stop]::int_name
-{
-  font-size:  9;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-  z-index: 20;
-}
+
 area|z15-[amenity=fuel],
 node|z15-[amenity=fuel]
 {
@@ -3167,28 +3087,6 @@ line|z15[railway=funicular]::d1p3
   width:    0.5;
   z-index:  410;
 }
-*|z17-[highway=bus_stop],
-*|z16[railway=tram_stop]
-{
-  font-size:    11;
-  text-halo-radius: 2;
-  text: name;
-  text-color:   #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-  z-index: 20;
-}
-*|z17-[highway=bus_stop]::int_name,
-*|z16[railway=tram_stop]::int_name
-{
-  font-size:  10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #3050d8;
-  text-offset:  10;
-  text-halo-color:  white;
-  z-index: 20;
-}
 line|z16[communication=line]
 {
   color:    #f080f0;
@@ -3295,17 +3193,7 @@ node|z17-[tourism]
   text-halo-color:  white;
   z-index: 1;
 }
-area|z17-[amenity=bus_station]::int_name,
-node|z17-[amenity=bus_station]::int_name
-{
-  font-size:  10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #404040;
-  text-offset:  10;
-  text-halo-color:  white;
-  z-index: 1;
-}
+
 line|z16[railway=disused]
 {
   color:    grey;
@@ -3572,8 +3460,7 @@ line|z16[boundary=administrative][border_type=region]
   z-index:  940;
   dashes:   12,4,4,4;
 }
-line|z16-[railway=monorail]::d1p3,
-line|z16-[railway=tram]::d1p3
+line|z16-[railway=monorail]::d1p3
 {
   color:    #4c0f4c;
   width:    2;
@@ -3587,11 +3474,6 @@ line|z16[railway=rail]
   width:    2.4;
   z-index:  631;
 }
-area|z16-[railway=subway_entrance],
-node|z16-[railway=subway_entrance]
-{
-  icon-image:   subway.svg;
-}
 line|z16[piste:lift=rope_tow]
 {
   color:    #d8d8c4;
@@ -4320,15 +4202,6 @@ line|z17-[boundary=administrative][border_type=county]
   z-index:  973;
   dashes:   4,20;
 }
-area|z17-[sport=gymnastics],
-area|z17-[sport=multi],
-area|z17-[sport=skiing],
-node|z17-[sport=gymnastics],
-node|z17-[sport=multi],
-node|z17-[sport=skiing]
-{
-  icon-image:   gymnastics-borderless.svg;
-}
 line|z17-[communication=line]::d1p2
 {
   color:    #f080f0;
@@ -4337,11 +4210,6 @@ line|z17-[communication=line]::d1p2
   dashes:   8,4;
   linecap:  butt;
 }
-area|z17-[leisure=playground],
-node|z17-[leisure=playground]
-{
-  icon-image:   playground.svg;
-}
 line|z17-[railway=razed]::d1p3
 {
   opacity:  0.3;
@@ -4363,13 +4231,6 @@ line|z17-[railway=narrow_gauge]
   width:    3.2;
   z-index:  569;
 }
-area|z17-[sport=diving],
-area|z17-[sport=scuba_diving],
-node|z17-[sport=diving],
-node|z17-[sport=scuba_diving]
-{
-  icon-image:   diving-borderless.svg;
-}
 line|z17-[waterway=canal]
 {
   width:    6.4;
@@ -4412,11 +4273,6 @@ line|z17-[waterway=lock]
   casing-width: 2;
   casing-color: #202020;
 }
-area|z17-[sport=cricket],
-node|z17-[sport=cricket]
-{
-  icon-image:   cricket-borderless.svg;
-}
 line|z17-[man_made=pipeline]::d1p2
 {
   color:    #a0a0a0;
@@ -4553,11 +4409,6 @@ line|z17-[communication=line]
   z-index:  930;
   opacity:  0.5;
 }
-area|z17-[sport=equestrian],
-node|z17-[sport=equestrian]
-{
-  icon-image:   equestrian-borderless.svg;
-}
 line|z17-[boundary=administrative][border_type=suburb]
 {
   color:    #f9574b;
@@ -4606,11 +4457,6 @@ line|z17-[railway=spur]::d1p2
   width:    1.36;
   z-index:  671;
 }
-area|z17-[sport=curling],
-node|z17-[sport=curling]
-{
-  icon-image:   curling-borderless.svg;
-}
 line|z17-[railway=preserved]::d1p2
 {
   color:    #e6e6e6;
@@ -4689,15 +4535,6 @@ node|z17-[amenity=parking][access?]
 {
   icon-image:   parking.svg;
 }
-area|z17-[sport=american_football],
-area|z17-[sport=australian_football],
-area|z17-[sport=football],
-node|z17-[sport=american_football],
-node|z17-[sport=australian_football],
-node|z17-[sport=football]
-{
-  icon-image:   football-borderless.svg;
-}
 area|z16-[amenity=parking][fee?],
 node|z16-[amenity=parking][fee?]
 {
@@ -4745,11 +4582,6 @@ line|z17-[railway=siding]::d1p3
   dashes:   7.2,16.8;
   linecap:  butt;
 }
-area|z17-[sport=swimming],
-node|z17-[sport=swimming]
-{
-  icon-image:   swimming-borderless.svg;
-}
 area|z17-[amenity=kindergarten],
 node|z17-[amenity=kindergarten]
 {
@@ -4816,27 +4648,12 @@ node|z17-[place=suburb]::d1p3
   text-color:   #a0a0a0;
   z-index: 20;
 }
-area|z17-[sport=tennis],
-node|z17-[sport=tennis]
-{
-  icon-image:   tennis-borderless.svg;
-}
-area|z17-[sport=soccer],
-node|z17-[sport=soccer]
-{
-  icon-image:   soccer-borderless.svg;
-}
 line|z17-[man_made=pier]::d1p3
 {
   color:    #e4e4e4;
   width:    2.4;
   z-index:  916;
 }
-area|z17-[sport=shooting],
-node|z17-[sport=shooting]
-{
-  icon-image:   shooting-borderless.svg;
-}
 area|z17-[tourism=information][information=guidepost],
 node|z17-[tourism=information][information=guidepost]
 {
@@ -5202,33 +5019,7 @@ line|z17-[power=minor_line]
   z-index:  921;
   opacity:  0.5;
 }
-line|z12-[railway=subway]                                         {width:3; color: #0f0f4c; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
-node[railway=station][transport=subway]::int_name                 {text-color:  #3050d8; text-position: center;}
-line|z12-[railway=subway][colour]                                 {width:3; color: eval(tag("colour")); z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour]                   {text-color:  eval(tag("colour"));}
-node[railway=station][transport=subway][colour]::int_name         {text-color:  eval(tag("colour"));}
-line|z12-[railway=subway][colour=red]                             {width:3; color: #DD0000; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=red]               {text-color:  #DD0000;}
-node[railway=station][transport=subway][colour=red]::int_name     {text-color:  #DD0000;}
-line|z12-[railway=subway][colour=blue]                            {width:3; color: #072889; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=blue]              {text-color:  #072889;}
-node[railway=station][transport=subway][colour=blue]::int_name    {text-color:  #072889;}
-line|z12-[railway=subway][colour=purple]                          {width:3; color: #8B509C; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=purple]            {text-color:  #8B509C;}
-node[railway=station][transport=subway][colour=purple]::int_name  {text-color:  #8B509C;}
-line|z12-[railway=subway][colour=orange]                          {width:3; color: #FF7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=orange]            {text-color:  #FF7700;}
-node[railway=station][transport=subway][colour=orange]::int_name  {text-color:  #FF7700;}
-line|z12-[railway=subway][colour=green]                           {width:3; color: #006600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=green]             {text-color:  #006600;}
-node[railway=station][transport=subway][colour=green]::int_name   {text-color:  #006600;}
-line|z12-[railway=subway][colour=brown]                           {width:3; color: #BB7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=brown]             {text-color:  #BB7700;}
-node[railway=station][transport=subway][colour=brown]::int_name   {text-color:  #BB7700;}
-line|z12-[railway=subway][colour=yellow]                          {width:3; color: #F7C600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=yellow]            {text-color:  #F7C600;}
-node[railway=station][transport=subway][colour=yellow]::int_name  {text-color:  #F7C600;}
+
 area[waterway=riverbank],
 line[waterway=river],
 line[waterway=canal]
@@ -5274,25 +5065,6 @@ node|z17-[barrier=gate]
 {
   icon-image:   gate.svg;
 }
-area|z16[highway=bus_stop],
-node|z16[highway=bus_stop]
-{
-  icon-image:   bus-mini.svg;
-  z-index: 20;
-}
-area|z16-[amenity=bus_station],
-area|z17-[highway=bus_stop],
-node|z16-[amenity=bus_station],
-node|z17-[highway=bus_stop]
-{
-  icon-image:   bus.svg;
-  z-index: 20;
-}
-area|z17-[railway=tram_stop],
-node|z17-[railway=tram_stop]
-{
-  icon-image:   tramway.svg;
-}
 area|z16-[amenity=parking][parking=park_and_ride],
 node|z16-[amenity=parking][parking=park_and_ride]
 {
@@ -5332,43 +5104,6 @@ node|z16-[amenity=telephone]
 {
   icon-image:   telephone.svg;
 }
-area|z17-[sport=handball],
-node|z17-[sport=handball]
-{
-  icon-image:   handball-borderless.svg;
-}
-area|z17-[sport=golf],
-node|z17-[sport=golf],
-area|z17-[leisure=golf_course],
-node|z17-[leisure=golf_course]
-{
-  icon-image:   golfCourse.svg;
-}
-area|z17-[sport=baseball],
-node|z17-[sport=baseball]
-{
-  icon-image:   baseball-borderless.svg;
-}
-area|z17-[sport=athletics],
-node|z17-[sport=athletics]
-{
-  icon-image:   athletics-borderless.svg;
-}
-area|z17-[sport=bowls],
-node|z17-[sport=bowls]
-{
-  icon-image:   bowls-borderless.svg;
-}
-area|z17-[sport=archery],
-node|z17-[sport=archery]
-{
-  icon-image:   archery-borderless.svg;
-}
-area|z17-[sport=basketball],
-node|z17-[sport=basketball]
-{
-  icon-image:   basketball-borderless.svg;
-}
 area|z17-[amenity=school],
 node|z17-[amenity=school]
 {
@@ -5389,87 +5124,9 @@ node|z16-[railway=station]
 {
   icon-image:   railway-station.svg;
 }
-node|z12[railway=station][transport=subway],
-area|z12[railway=station][transport=subway]
-{ 
-  font-size:    10;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z12[railway=station][transport=subway]::int_name,
-area|z12[railway=station][transport=subway]::int_name
-{
-  font-size:  9;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z13-14[railway=station][transport=subway],
-area|z13-14[railway=station][transport=subway]
-{ 
-  font-size:    11;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z13-14[railway=station][transport=subway]::int_name,
-area|z13-14[railway=station][transport=subway]::int_name
-{
-  font-size:  10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z15-[railway=station][transport=subway],
-area|z15-[railway=station][transport=subway]
-{ 
-  font-size:    12;
-  text-halo-radius: 2;
-  text: name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z15-[railway=station][transport=subway]::int_name,
-area|z15-[railway=station][transport=subway]::int_name
-{
-  font-size:  11;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset:  10;
-  text-halo-color:  #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-area|z12-14[railway=station][transport=subway],
-node|z12-14[railway=station][transport=subway]
-{
-  icon-image:   subway-station-s.svg;
-}
-area|z15[railway=station][transport=subway],
-node|z15[railway=station][transport=subway]
-{
-  icon-image:   subway-station-m.svg;
-}
-area|z16-[railway=station][transport=subway],
-node|z16-[railway=station][transport=subway]
-{
-  icon-image:   subway-station-l.svg;
-}
+
+@import("include/base_publictransport.mapcss");
+
 /* Eval magic */
 
 line[waterway]
@@ -5481,15 +5138,6 @@ line[railway]
 {
   text-position: line;
 }
-node[highway=bus_stop],
-node[railway=tram_stop],
-node[railway=station],
-way[highway=bus_stop],
-way[railway=tram_stop],
-way[railway=station]
-{
-  text-position: center;
-}
 line|z15-[bridge?]::bridgewhite,
 line|z15-[tunnel?]::tunnelwhite,
 {
@@ -5525,17 +5173,8 @@ line[access][access!=yes]::*
   opacity:  0;
   casing-opacity:  0;
 }
-line|z15-[marking=sport]
-{
-    width: 0.5;
-    color: white;
-}
-line|z15-[marking=sport][colour?]
-{
-    color: eval(tag("colour"));
-}
 line|z18-[lit]::lit
 {
   width: 0.3;
   color: yellow
-}
+}
\ No newline at end of file