diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json
index 2e34e3caf5..1048fe8f4c 100644
--- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json
+++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json
@@ -1,553 +1,89 @@
 {
   "type": "unique",
-  "property": "quant-class",
+  "property": "ws-class",
   "values": [
     {
       "geomType": "point",
       "value": 0,
-      "minResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 0,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png",
-        "label": {
-          "template": "${name}\n - ",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(0,255,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1,
-      "minResolution": 100,
-      "maxResolution": 250,
       "vectorOptions": {
         "type": "circle",
-        "radius": 7,
+        "radius": 8,
         "fill": {
-          "color": "rgba(0,255,0,1)"
+          "color": "#EEEEEE"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 1,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(0,255,0,1)"
+          "color": "#00FF00"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(255,255,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(255,255,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(255,255,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(255,153,0,1)"
+          "color": "#FFFF00"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 3,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(255,153,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(255,153,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(255,0,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(255,0,0,1)"
+          "color": "#FF9900"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 4,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(255,0,0,1)"
+          "color": "#FF0000"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 5,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(128,0,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(128,0,0,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(128,0,0,1)"
+          "color": "#800000"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
     }
diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json
index be1ab03fa7..bc2309421c 100644
--- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json
+++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json
@@ -1,300 +1,61 @@
 {
   "type": "unique",
-  "property": "quant-class",
+  "property": "groundwater-quantile-class",
   "values": [
     {
       "geomType": "point",
       "value": 0,
-      "minResolution": 100,
       "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/nodata14.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "value": [
-        -100000,
-        0
-      ],
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png",
-        "label": {
-          "template": "${name}\n - ",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_153_102_51.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_153_102_51.png",
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+        "type": "circle",
+        "radius": 8,
+        "fill": {
+          "color": "#BEBEBE"
+        },
+        "stroke": {
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "rotation": "quant-class-radiant",
       "value": 1,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/arrow20_153_102_51.png",
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_238_215_194.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 2,
-      "minResolution": 100,
-      "maxResolution": 250,
       "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_238_215_194.png",
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+        "type": "circle",
+        "radius": 8,
+        "fill": {
+          "color": "#D48A45"
+        },
+        "stroke": {
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "rotation": "quant-class-radiant",
       "value": 2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/arrow20_238_215_194.png",
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 3,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_26_71_139.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "rotation": "quant-class-radiant",
-      "value": 3,
-      "minResolution": 100,
-      "maxResolution": 250,
       "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_26_71_139.png",
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+        "type": "circle",
+        "radius": 8,
+        "fill": {
+          "color": "#EFD7C1"
+        },
+        "stroke": {
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "rotation": "quant-class-radiant",
       "value": 3,
-      "maxResolution": 100,
       "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_26_71_139.png",
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+        "type": "circle",
+        "radius": 8,
+        "fill": {
+          "color": "#668FBC "
+        },
+        "stroke": {
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
     }
diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json
index ccc05ae52b..10455b003a 100644
--- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json
+++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json
@@ -1,553 +1,131 @@
 {
   "type": "unique",
-  "property": "quant-class",
+  "property": "temp-class",
   "values": [
     {
       "geomType": "point",
       "value": 0,
-      "minResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata14.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 0,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata16.png",
-        "label": {
-          "template": "${name}\n - ",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1,
-      "minResolution": 250,
       "vectorOptions": {
         "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(78,191,221,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
+        "radius": 8,
         "fill": {
-          "color": "rgba(78,191,221,1)"
+          "color": "#BEBEBE"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 1,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(78,191,221,1)"
+          "color": "#0069A6"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
-      "geomType": "point",
-      "value": 2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(152,212,225,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(152,212,225,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 2,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(152,212,225,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(236,173,135,1)"
+          "color": "#009FCF"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 3,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(236,173,135,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3,
-      "maxResolution": 100,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(236,173,135,1)"
+          "color": "#4EBFDD"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
       "value": 4,
-      "minResolution": 250,
       "vectorOptions": {
         "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(226,127,116,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
+        "radius": 8,
         "fill": {
-          "color": "rgba(226,127,116,1)"
+          "color": "#98D4E1"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 4,
-      "maxResolution": 100,
+      "value": 5,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(226,127,116,1)"
+          "color": "#ECAD87"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 5,
-      "minResolution": 250,
+      "value": 6,
       "vectorOptions": {
         "type": "circle",
-        "radius": 6,
+        "radius": 8,
         "fill": {
-          "color": "rgba(157,53,67,1)"
+          "color": "#E27F74"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 5,
-      "minResolution": 100,
-      "maxResolution": 250,
+      "value": 7,
       "vectorOptions": {
         "type": "circle",
-        "radius": 7,
+        "radius": 8,
         "fill": {
-          "color": "rgba(157,53,67,1)"
+          "color": "#C64E53"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 5,
-      "maxResolution": 100,
+      "value": 8,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(157,53,67,1)"
+          "color": "#9D3543"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
     }
diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json
index 3a505b4d17..e9be809177 100644
--- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json
+++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json
@@ -1,1102 +1,89 @@
 {
   "type": "unique",
-  "property": "symbol_design",
+  "property": "quant-class",
   "values": [
     {
       "geomType": "point",
-      "value": 0.1,
-      "minResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/nodata14.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 0.1,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png",
-        "label": {
-          "template": "${name}\n - ",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 0.2,
-      "minResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/nodata14.png"
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 0.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "icon",
-        "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png",
-        "label": {
-          "template": "${name}\n - ",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1.1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(153,102,51,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1.1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(153,102,51,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1.1,
-      "maxResolution": 100,
+      "value": 0,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(153,102,51,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1.2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(153,102,51,1)"
+          "color": "#BEBEBE"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 1.2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(153,102,51,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 1.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 8,
-        "fill": {
-          "color": "rgba(153,102,51,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.1,
-      "minResolution": 100,
-      "maxResolution": 250,
+      "value": 1,
       "vectorOptions": {
         "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.1,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 8,
-        "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 2.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "triangle",
         "radius": 8,
         "fill": {
-          "color": "rgba(212,138,69,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3.1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(239,215, 193,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3.1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(239,215,193,1)"
+          "color": "#996633"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 3.1,
-      "maxResolution": 100,
+      "value": 2,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(239,215,193,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3.2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(239,215, 193,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 3.2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(239,215,193,1)"
+          "color": "#D48A45"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 3.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 8,
-        "fill": {
-          "color": "rgba(239,215,193,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4.1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(102,143,188,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4.1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(102,143,188,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4.1,
-      "maxResolution": 100,
+      "value": 3,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(102,143,188,1)"
+          "color": "#EFD7C1"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 4.2,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(102,143,188,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4.2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(102,143,188,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 4.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 8,
-        "fill": {
-          "color": "rgba(102,143,188,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5.1,
-      "minResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(26,71,139,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5.1,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "circle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(26,71,139,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5.1,
-      "maxResolution": 100,
+      "value": 4,
       "vectorOptions": {
         "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(26,71,139,1)"
+          "color": "#668FBC"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
-    },
-    {
+    }, {
       "geomType": "point",
-      "value": 5.2,
-      "minResolution": 250,
+      "value": 5,
       "vectorOptions": {
-        "type": "triangle",
-        "radius": 6,
-        "fill": {
-          "color": "rgba(26,71,139,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5.2,
-      "minResolution": 100,
-      "maxResolution": 250,
-      "vectorOptions": {
-        "type": "triangle",
-        "radius": 7,
-        "fill": {
-          "color": "rgba(26,71,139,1)"
-        },
-        "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -20,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
-        }
-      }
-    },
-    {
-      "geomType": "point",
-      "value": 5.2,
-      "maxResolution": 100,
-      "vectorOptions": {
-        "type": "triangle",
+        "type": "circle",
         "radius": 8,
         "fill": {
-          "color": "rgba(26,71,139,1)"
+          "color": "#1A478B"
         },
         "stroke": {
-          "color": "rgba(14,80,114,0.9)",
-          "width": 2
-        },
-        "label": {
-          "template": "${name}\n ${quant-value}",
-          "text": {
-            "textAlign": "center",
-            "textBaseline": "middle",
-            "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif",
-            "scale": 1,
-            "offsetY": -28,
-            "padding": [
-              2,
-              2,
-              2,
-              2
-            ],
-            "stroke": {
-              "color": "rgba(14,80,114,0.9)",
-              "width": 3
-            },
-            "backgroundFill": {
-              "color": "rgba(14,80,114,0.9)"
-            },
-            "fill": {
-              "color": "white"
-            }
-          }
+          "color": "#FFFFFF",
+          "width": 1
         }
       }
     }