       lineWidth: 0
 
     sublayers.push
-      sql: "select * from #{args.table} where continent = '#{tileConfig.regionName}'"
-      cartocss: @_addSelectedStyle args
+      sql: "SELECT * FROM #{args.table} WHERE continent = '#{tileConfig.regionName}'"
+      cartocss: @_generateCartocss(args)
+    sublayers
+
+  addWdpaTiles: (tileConfig, sublayers) ->
+    cartocss = [
+      @_generateCartocss(
+        table: ['wdpa_poly', 'wdpa_point']
+        lineColor: '40541b'
+        polygonFill: '83ad35'
+      )
+    ]
+
+    if tileConfig.wdpaId?
+      cartocss.push @_generateCartocss(
+        table: ['wdpa_poly', 'wdpa_point']
+        attrName: 'wdpaid'
+        attrVal: tileConfig.wdpaId
+      )
+
+    sublayers.push
+      sql: "SELECT the_geom FROM wdpa_point UNION ALL SELECT the_geom FROM wdpa_poly"
+      cartocss: cartocss.join("\n")
     sublayers
 
   addCartodbTiles: (tileConfig) ->
-    # Always show the wdpa layer:
-    cartocss = """
-      #wdpa_point, #wdpa_poly {
-        line-color:#40541b;
-        line-width:0.05;
-        polygon-fill:#83ad35;
-        polygon-opacity:0.7;}
-    """
+    sublayers = []
 
-    sublayers = [
-      sql: """
-        SELECT the_geom FROM wdpa_point
-          UNION ALL
-        SELECT the_geom FROM wdpa_poly
-      """
-      cartocss: cartocss
-    ]
-    if tileConfig.wdpaId?
-      sublayers = @addSelectedWdpaTiles tileConfig, sublayers, 0
+    @addWdpaTiles(tileConfig, sublayers)
+
     if tileConfig.iso3?
       sublayers = @addCountryTiles tileConfig, sublayers
     if tileConfig.regionName?
       sublayers = @addRegionTiles tileConfig, sublayers
+
     carto_tiles = new cartodb.Tiles(
       sublayers: sublayers
       user_name: "carbon-tool"
     )
+
     carto_tiles.getTiles( (o) =>
       L.tileLayer(o.tiles[0]).addTo @map
     )

    x1 = bounds[0][1]
    x2 = bounds[1][1]
    if x1 < 0 and x2 >= 0
      return Math.abs(bounds[0][1]) + Math.abs(bounds[1][1])
    else
      max = Math.max(Math.abs(x1), Math.abs(x2))
      min = Math.min(Math.abs(x1), Math.abs(x2))

      lineWidth: 0

    sublayers.push
      sql: "SELECT * FROM #{args.table} WHERE iso_3 = '#{tileConfig.iso3}'"
      cartocss: @_generateCartocss(args)
    sublayers

  addRegionTiles: (tileConfig, sublayers) ->
    args =
      table: 'continents'
      attrName: 'continent'
      attrVal: "'#{tileConfig.regionName}'"
