diff --git a/project.mml b/project.mml
index d62b1066f6..fdf2b57d9c 100644
--- a/project.mml
+++ b/project.mml
@@ -1438,7 +1438,7 @@
         "dbname": "gis"
       },
       "id": "stations",
-      "class": "",
+      "class": "stations",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
@@ -1460,7 +1460,7 @@
         "dbname": "gis"
       },
       "id": "stations-poly",
-      "class": "",
+      "class": "stations",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
diff --git a/stations.mss b/stations.mss
index 71374ba18c..77ba465992 100644
--- a/stations.mss
+++ b/stations.mss
@@ -1,70 +1,60 @@
-/*
-<Style name="stations">
-    <Rule>
-      &maxscale_zoom18;
-      <Filter>[railway]='subway_entrance'</Filter>
-      <PointSymbolizer file="&symbols;/walking.n.12.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom12;
-      &minscale_zoom12;
-      <Filter>[railway]='station' and not [disused]='yes'</Filter>
-      <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom13;
-      &minscale_zoom14;
-      <Filter>[railway]='station' and not [disused]='yes'</Filter>
-      <PointSymbolizer file="&symbols;/station_small.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom13;
-      <Filter>[railway]='station' and [disused]='yes'</Filter>
-      <PointSymbolizer file="&symbols;/station_disused.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[railway]='station' and not [disused]='yes'</Filter>
-      <PointSymbolizer file="&symbols;/station.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom13;
-      &minscale_zoom14;
-      <Filter>[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'</Filter>
-      <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'</Filter>
-      <PointSymbolizer file="&symbols;/station_small.png" placement="interior"/>
-    </Rule>
-    <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom14;
-      <Filter>[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'</Filter>
-      <TextSymbolizer size="8" fill="#66f" dy="-8" fontset-name="book-fonts" halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[railway] ='halt' or [railway]='tram_stop' or [aerialway]='station'</Filter>
-      <TextSymbolizer size="10" fill="#66f" dy="-10" fontset-name="book-fonts" halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom14;
-      &minscale_zoom14;
-      <Filter>[railway]='station' and not [disused]='yes'</Filter>
-      <TextSymbolizer size="9" fill="#66f" dy="-8" fontset-name="bold-fonts" halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[railway]='station' and not [disused]='yes'</Filter>
-      <TextSymbolizer size="11" fill="#66f" dy="-10" fontset-name="bold-fonts" halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
-    </Rule>
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[railway]='station' and [disused]='yes'</Filter>
-      <TextSymbolizer size="9" fill="grey" dy="-9" fontset-name="bold-fonts" halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
-    </Rule>
-</Style>
+.stations {
+  [railway = 'subway_entrance'][zoom >= 18] {
+    point-file: url('symbols/walking.n.12.png');
+    point-placement: interior;
+  }
 
-*/
\ No newline at end of file
+  [railway = 'station'][zoom >= 12] {
+    point-file: url('symbols/halt.png');
+    point-placement: interior;
+    [zoom >= 13] {
+      point-file: url('symbols/station_small.png');
+    }
+    [zoom >= 14] {
+      text-name: "[name]";
+      text-face-name: @bold-fonts;
+      text-size: 9;
+      text-fill: #66f;
+      text-dy: -8;
+      text-halo-radius: 1;
+      text-wrap-width: 0;
+      text-placement: interior;
+    }
+    [zoom >= 15] {
+      point-file: url('symbols/station.png');
+      text-size: 11;
+      text-dy: -10;
+    }
+    /*
+    [disused = 'yes'] {
+      point-file: url('symbols/station_disused.png'); // 14 and above
+      text-fill: grey; // 15 and above, small version only
+    }
+    */
+  }
+
+  [railway = 'halt'],
+  [railway = 'tram_stop'],
+  [aerialway = 'station']::aerialway {
+    [zoom >= 13] {
+      point-file: url('symbols/halt.png');
+    }
+    [zoom >= 15] {
+      point-file: url('symbols/station_small.png');
+    }
+    [zoom >= 14] {
+      text-name: "[name]";
+      text-face-name: @book-fonts;
+      text-size: 8;
+      text-fill: #66f;
+      text-dy: -8;
+      text-halo-radius: 1;
+      text-wrap-width: 0;
+      text-placement: interior;
+      [zoom >= 15] {
+        text-size: 10;
+        text-dy: -10;
+      }
+    }
+  }
+}