changeset 9215:0fc9c82e744e

work on collison, flood_duration
author gernotbelger
date Tue, 03 Jul 2018 17:00:48 +0200
parents 091fd9676496
children 85d6923b242d
files artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml artifacts/doc/conf/themes/default.xml artifacts/doc/conf/themes/second.xml artifacts/src/main/java/org/dive4elements/river/artifacts/common/DefaultCalculationResult.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCountProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCalcProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCountProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResults.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationProcessor.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodHeightProcessor.java
diffstat 24 files changed, 3290 insertions(+), 3540 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml	Tue Jul 03 17:00:48 2018 +0200
@@ -57,9 +57,9 @@
     <processor class="org.dive4elements.river.artifacts.sinfo.common.VelocityProcessor" axis="Velocity"/>
     <processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentProcessor" axis="flowdepthDevelopmentAxis"/>
     <processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentPerYearProcessor" axis="flowdepthDevelopmentPerYearAxis"/>
-    <processor class="org.dive4elements.river.artifacts.sinfo.common.CollisionCalcProcessor" axis="countAxis"/>
-    <processor class="org.dive4elements.river.artifacts.sinfo.common.FloodDurationProcessor" axis="durationAxis"/>
-    <processor class="org.dive4elements.river.artifacts.sinfo.common.FloodHeightProcessor" axis="W"/>
+    <processor class="org.dive4elements.river.artifacts.sinfo.collision.CollisionCalcProcessor" axis="countAxis"/>
+    <processor class="org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationProcessor" axis="durationAxis"/>
+    <processor class="org.dive4elements.river.artifacts.sinfo.flood_duration.FloodHeightProcessor" axis="W"/>
     
     <processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedChannelWidthProcessor" axis="Width"/>
     <processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedChannelDepthProcessor" axis="flowdepthAxis"/>
@@ -68,7 +68,7 @@
     <processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedDepthEvolPerYearProcessor" axis="flowdepthDevelopmentPerYearAxis"/>
     <processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedFlowDepthProcessor" axis="flowdepthAxis"/>
     <processor class="org.dive4elements.river.artifacts.sinfo.common.InfrastructureHeightProcessor" axis="W"/>
-    <processor class="org.dive4elements.river.artifacts.sinfo.common.CollisionCountProcessor" axis="countAxis"/>
+    <processor class="org.dive4elements.river.artifacts.sinfo.collision.CollisionCountProcessor" axis="countAxis"/>
 
     <chartextender class="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthChartExtender" />
 </longitudinal-defaults>
\ No newline at end of file
--- a/artifacts/doc/conf/themes/default.xml	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Tue Jul 03 17:00:48 2018 +0200
@@ -1,3113 +1,2859 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <themegroup name="default">
-    <theme name="MainValuesQ">
-        <inherits>
-            <inherit from="Lines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showlinelabel" type="boolean"
-                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="MainValuesW">
-        <inherits>
-            <inherit from="Lines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showlinelabel" type="boolean"
-                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="RelativePoint">
-        <inherits>
-            <inherit from="Points" />
-        </inherits>
-    </theme>
-
-    <theme name="Annotations">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="ManualPoints">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" hints="hidden" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="WKms">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="WKmsAnnotation">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="WQKms">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="WQKmsHorizontal">
-        <inherits>
-            <inherit from="WQKms" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-
-    <theme name="WQPoints">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Linienfarbe"
-                default="204, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="heightmarks_points">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="Area">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-
-    <!-- top level classes defining additional attributes-->
-    <theme name="LongitudinalSection">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="bandwidth" type="double" display="Bandbreite"
-                default="0"/>
-            <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe"
-                default="104, 104, 104"/>
-            <field name="transparency" type="int" default="20" display="Transparenz"/>
-            <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionPoints">
-        <inherits>
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="Differences">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-
-    <!-- Classes defining special values -->
-    <theme name="LongitudinalSectionW_HQ1">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ2">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ5">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ10">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ20">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ25">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ50">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ100">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ200">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ300">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 100" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ500">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1000">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQRZ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HSQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MHQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MNQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_NQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
+  <theme name="MainValuesQ">
+    <inherits>
+      <inherit from="Lines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Farbe" default="200, 0, 15" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionW_HQExtrem">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ2_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ5_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ10_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ20_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ25_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ50_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 153, 153" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ100_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ200_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ300_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ500_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1000_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQRZ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HSQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MHQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MNQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_NQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
+  <theme name="MainValuesW">
+    <inherits>
+      <inherit from="Lines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Farbe" default="0, 215, 0" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionW_HQExtrem_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ1">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ2">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ5">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ10">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ20">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ25">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ50">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 153" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ100">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ200">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
+  <theme name="RelativePoint">
+    <inherits>
+      <inherit from="Points" />
+    </inherits>
+  </theme>
 
-    <theme name="LongitudinalSectionQ_HQ300">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ500">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ1000">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQRZ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HSQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
+  <theme name="Annotations">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Text" />
+    </inherits>
+    <fields>
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionQ_MHQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_MNQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
+  <theme name="ManualPoints">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionQ_MQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
+  <theme name="WKms">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionQ_NQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
+  <theme name="WKmsAnnotation">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="LongitudinalSectionQ_HQExtrem">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
+  <theme name="WQKms">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
 
-    <theme name="DischargeLongitudinalSectionW">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
+  <theme name="WQKmsHorizontal">
+    <inherits>
+      <inherit from="WQKms" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+    </fields>
+  </theme>
 
 
-    <theme name="DischargeLongitudinalSectionC">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0 , 0" />
-        </fields>
-    </theme>
-
-    <theme name="DischargeLongitudinalSectionQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQInfoldCut">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 102, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQInfolding">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="51, 51, 51" />
-        </fields>
-    </theme>
-
-    <!-- MIDDLE BED HEIGHT -->
-    <theme name="MiddleBedHeightSingle">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="true" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" />
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <!-- Bed Quality -->
-    <theme name="PorosityTopPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="PorositySubPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="DensityTopPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="DensitySubPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterTopPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterSubPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedLoadDiameterPoints">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="PorosityTopLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="PorositySubLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="DensityTopLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="DensitySubLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterTopLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterSubLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedLoadDiameterLines">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterDataTop">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="2" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterDataSub">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="2" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
-        </fields>
-    </theme>
-
-    <theme name="BedloadDiameterData">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
-            <field name="pointsize" type="int" display="Punktdicke" default="2" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0" />
-        </fields>
-    </theme>
-    <!-- Bedheight differences -->
-    <theme name="BedheightDiffYear">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffMorphWidth">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffEpoch">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffAbsHeight1">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffAbsHeight2">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 100" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffHeightYear">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="MorphologicWidth">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-    <!-- Flow velocity -->
-    <theme name="FlowVelocityVMainChannel">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityVTotalChannel">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityTau">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityDischarge">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 0" />
-        </fields>
-    </theme>
-
-    <!-- Sediment load longitudinal sections, M^3/A -->
-    <theme name="SedimentLoadLSM3A">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" default="2" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ACoarse">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
+  <theme name="WQPoints">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+    </fields>
+  </theme>
 
-    <theme name="SedimentLoadLSM3AFineMid">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ASand">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ASuspSand">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ASediment">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ASuspSandBed">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ATotal">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ABed">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="200, 200, 200" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ABedSusp">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="150, 255, 150" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSM3ASusp">
-        <inherits>
-            <inherit from="SedimentLoadLSM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="85, 255, 0" />
-        </fields>
-    </theme>
-
-    <!-- Sediment load longitudinal sections, T/A -->
-    <theme name="SedimentLoadLSTACoarse">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTAFineMid">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTASand">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTASuspSand">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTASediment">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTASuspSandBed">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTATotal">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTABed">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="200, 200, 200" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTABedSusp">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="150, 255, 150" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadLSTASusp">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="85, 255, 0" />
-        </fields>
-    </theme>
-
-    <!-- Sediment load at measurement stations, T/A -->
-    <theme name="SedimentLoad">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linetype" type="Dash" default="10,5" />
-            <field name="showpoints" type="boolean" default="true" />
-            <field name="pointsize" type="int" default="3" />
-        </fields>
-    </theme>
+  <theme name="heightmarks_points">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
 
-    <theme name="SedimentLoadTACoarse">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-            <field name="pointcolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTAFineMid">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-            <field name="pointcolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTASand">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-            <field name="pointcolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTASuspSand">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 255, 0" />
-            <field name="pointcolor" type="Color" default="255, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTASediment">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 255" />
-            <field name="pointcolor" type="Color" default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTASuspSandBed">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-            <field name="pointcolor" type="Color" default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTATotal">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="pointcolor" type="Color" default="0, 100, 200" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTABed">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="200, 200, 200" />
-            <field name="pointcolor" type="Color" default="200, 200, 200" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTABedSusp">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="150, 255, 150" />
-            <field name="pointcolor" type="Color" default="150, 255, 150" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadTASusp">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="85, 255, 0" />
-            <field name="pointcolor" type="Color" default="85, 255, 0" />
-        </fields>
-    </theme>
+  <theme name="Area">
+    <inherits>
+      <inherit from="Areas" />
+    </inherits>
+    <fields>
+      <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" />
+      <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" />
+      <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" />
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
+      <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
 
-    <!-- Sediment load at measurement stations, M3/A -->
-    <theme name="SedimentLoadM3A">
-        <inherits>
-            <inherit from="SedimentLoad" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" default="2" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ACoarse">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-            <field name="pointcolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3AFineMid">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-            <field name="pointcolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ASand">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-            <field name="pointcolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ASuspSand">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 255, 0" />
-            <field name="pointcolor" type="Color" default="255, 255, 0" />
-        </fields>
-    </theme>
+  <!-- top level classes defining additional attributes -->
+  <theme name="LongitudinalSection">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="MinMaxPoints" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="SedimentLoadM3ASediment">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 255" />
-            <field name="pointcolor" type="Color" default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ASuspSandBed">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-            <field name="pointcolor" type="Color" default="0, 255, 0" />
-        </fields>
-    </theme>
+  <theme name="LongitudinalSectionW">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="bandwidth" type="double" display="Bandbreite" default="0" />
+      <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe" default="104, 104, 104" />
+      <field name="transparency" type="int" default="20" display="Transparenz" />
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="SedimentLoadM3ATotal">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="pointcolor" type="Color" default="0, 100, 200" />
-        </fields>
-    </theme>
+  <theme name="LongitudinalSectionPoints">
+    <inherits>
+      <inherit from="Points" />
+    </inherits>
+    <fields>
+    </fields>
+  </theme>
 
-    <theme name="SedimentLoadM3ABed">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="200, 200, 200" />
-            <field name="pointcolor" type="Color" default="200, 200, 200" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ABedSusp">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="150, 255, 150" />
-            <field name="pointcolor" type="Color" default="150, 255, 150" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadM3ASusp">
-        <inherits>
-            <inherit from="SedimentLoadM3A" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="85, 255, 0" />
-            <field name="pointcolor" type="Color" default="85, 255, 0" />
-        </fields>
-    </theme>
+  <theme name="Differences">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
 
 
-    <theme name="LongitudinalSectionArea">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
+  <!-- Classes defining special values -->
+  <theme name="LongitudinalSectionW_HQ1">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ2">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ5">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ10">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ20">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ25">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ50">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ100">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ200">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ300">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ500">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ1000">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQRZ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HSQ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MHQ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MNQ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MQ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_NQ">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQExtrem">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ1_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ2_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ5_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ10_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ20_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ25_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ50_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ100_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ200_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ300_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ500_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQ1000_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQRZ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HSQ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MHQ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MNQ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_MQ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_NQ_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionW_HQExtrem_Points">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ1">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ2">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ5">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ10">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ20">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ25">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ50">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ100">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ200">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ300">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ500">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQ1000">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQRZ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HSQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_MHQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_MNQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_MQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_NQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQ_HQExtrem">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="DischargeLongitudinalSectionW">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
+
+
+  <theme name="DischargeLongitudinalSectionC">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0" />
+    </fields>
+  </theme>
+
+  <theme name="DischargeLongitudinalSectionQ">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQInfoldCut">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102" />
+    </fields>
+  </theme>
+
+  <theme name="LongitudinalSectionQInfolding">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 51, 51" />
+    </fields>
+  </theme>
+
+  <!-- MIDDLE BED HEIGHT -->
+  <theme name="MiddleBedHeightSingle">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="MinMaxPoints" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="true" />
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linetype" type="Dash" display="Linienart" default="10" />
+      <field name="linecolor" type="Color" display="Linienfarbe" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <!-- Bed Quality -->
+  <theme name="PorosityTopPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="PorositySubPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="DensityTopPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" />
+    </fields>
+  </theme>
+
+  <theme name="DensitySubPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterTopPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterSubPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedLoadDiameterPoints">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="PorosityTopLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="PorositySubLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="DensityTopLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+    </fields>
+  </theme>
+
+  <theme name="DensitySubLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterTopLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterSubLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedLoadDiameterLines">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterDataTop">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+    </fields>
+  </theme>
+
+  <theme name="BedDiameterDataSub">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+    </fields>
+  </theme>
+
+  <theme name="BedloadDiameterData">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="false" />
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0" />
+    </fields>
+  </theme>
+  <!-- Bedheight differences -->
+  <theme name="BedheightDiffYear">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="BedheightDiffMorphWidth">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0" />
+    </fields>
+  </theme>
+
+  <theme name="BedheightDiffEpoch">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+    </fields>
+  </theme>
+
+  <theme name="BedheightDiffAbsHeight1">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+    </fields>
+  </theme>
+
+  <theme name="BedheightDiffAbsHeight2">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100" />
+    </fields>
+  </theme>
+
+  <theme name="BedheightDiffHeightYear">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="MorphologicWidth">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 100, 200" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+  <!-- Flow velocity -->
+  <theme name="FlowVelocityVMainChannel">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="FlowVelocityVTotalChannel">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+    </fields>
+  </theme>
+
+  <theme name="FlowVelocityTau">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="FlowVelocityDischarge">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0" />
+    </fields>
+  </theme>
+
+  <!-- Sediment load longitudinal sections, M^3/A -->
+  <theme name="SedimentLoadLSM3A">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" default="2" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ACoarse">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3AFineMid">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ASand">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ASuspSand">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ASediment">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ASuspSandBed">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ATotal">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 100, 200" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ABed">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="200, 200, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ABedSusp">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="150, 255, 150" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSM3ASusp">
+    <inherits>
+      <inherit from="SedimentLoadLSM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="85, 255, 0" />
+    </fields>
+  </theme>
+
+  <!-- Sediment load longitudinal sections, T/A -->
+  <theme name="SedimentLoadLSTACoarse">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTAFineMid">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTASand">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTASuspSand">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTASediment">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTASuspSandBed">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTATotal">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 100, 200" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTABed">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="200, 200, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTABedSusp">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="150, 255, 150" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadLSTASusp">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="85, 255, 0" />
+    </fields>
+  </theme>
+
+  <!-- Sediment load at measurement stations, T/A -->
+  <theme name="SedimentLoad">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linetype" type="Dash" default="10,5" />
+      <field name="showpoints" type="boolean" default="true" />
+      <field name="pointsize" type="int" default="3" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTACoarse">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="pointcolor" type="Color" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTAFineMid">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="pointcolor" type="Color" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTASand">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="pointcolor" type="Color" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTASuspSand">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="pointcolor" type="Color" default="255, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTASediment">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="pointcolor" type="Color" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTASuspSandBed">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="pointcolor" type="Color" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTATotal">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 100, 200" />
+      <field name="pointcolor" type="Color" default="0, 100, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTABed">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="pointcolor" type="Color" default="200, 200, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTABedSusp">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="pointcolor" type="Color" default="150, 255, 150" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadTASusp">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <field name="pointcolor" type="Color" default="85, 255, 0" />
+    </fields>
+  </theme>
+
+  <!-- Sediment load at measurement stations, M3/A -->
+  <theme name="SedimentLoadM3A">
+    <inherits>
+      <inherit from="SedimentLoad" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" default="2" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ACoarse">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="pointcolor" type="Color" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3AFineMid">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="pointcolor" type="Color" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ASand">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="pointcolor" type="Color" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ASuspSand">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="pointcolor" type="Color" default="255, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ASediment">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="pointcolor" type="Color" default="0, 255, 255" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ASuspSandBed">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="pointcolor" type="Color" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ATotal">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 100, 200" />
+      <field name="pointcolor" type="Color" default="0, 100, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ABed">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="pointcolor" type="Color" default="200, 200, 200" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ABedSusp">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="pointcolor" type="Color" default="150, 255, 150" />
+    </fields>
+  </theme>
+
+  <theme name="SedimentLoadM3ASusp">
+    <inherits>
+      <inherit from="SedimentLoadM3A" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <field name="pointcolor" type="Color" default="85, 255, 0" />
+    </fields>
+  </theme>
+
+
+  <theme name="LongitudinalSectionArea">
+    <inherits>
+      <inherit from="Areas" />
+    </inherits>
+    <fields>
+      <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" />
+      <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" />
+      <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" />
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
+      <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
 
 
 
-    <theme name="CrossSection">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="CrossSectionWaterLine">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,0,153" />
-            <field name="showwidth" type="boolean" display="Breite anzeigen"
-                default="false" />
-            <field name="showlevel" type="boolean" display="Wasserstand anzeigen"
-                default="true" />
-            <field name="showlinelabel" type="boolean" default="true"
-                display="Beschriftung anzeigen" />
-            <field name="showmiddleheight" type="boolean"
-                display="Wasserstand anzeigen" default="false" />
-        </fields>
-    </theme>
-
-    <theme name="Hyk">
-        <inherits>
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="CrossSectionArea">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-
-
-    <theme name="DischargeCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-        </fields>
-    </theme>
-
-    <theme name="ExtremeWQCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
-                default="true" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-            <field name="showlinelabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="ExtremeWQBaseCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="2" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-
-
-    <theme name="DurationCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"
-                hints="hidden"/>
-        </fields>
-    </theme>
-
-    <theme name="DurationCurveW">
-        <inherits>
-            <inherit from="DurationCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,51,204" />
-        </fields>
-    </theme>
-
-    <theme name="DurationCurveQ">
-        <inherits>
-            <inherit from="DurationCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,204,0" />
-        </fields>
-    </theme>
-
-
-
-    <theme name="FixPoints">
-        <inherits>
-            <inherit from="ColorfulPoints" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="FixLines">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-        </fields>
-    </theme>
-
-    <theme name="FixAreas">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingCalculatedPoint">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 0" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="5"/>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingWQCurve">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDerivedCurve">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" hidden="true" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ0">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 128, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ1">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 255" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ2">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 255" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ3">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingAnalysisEventsWQ">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingReferenceEvents">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 80, 160" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingOutliers">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden"/>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" />
-        </fields>
-    </theme>
+  <theme name="CrossSection">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="FixingDeltaWtAverage0">
-        <inherits>
-            <inherit from="FixingDeltaWtAverage" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 128, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage1">
-        <inherits>
-            <inherit from="FixingDeltaWtAverage" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage2">
-        <inherits>
-            <inherit from="FixingDeltaWtAverage" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage3">
-        <inherits>
-            <inherit from="FixingDeltaWtAverage" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAnalysis">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage0">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 128, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage1">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage2">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage3">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS0">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="0, 128, 0" />
-        </fields>
-    </theme>
-    <theme name="FixingSectorDeviationLS1">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="0, 0, 255" />
-
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS2">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS3">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSDeviation">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="100, 100, 100" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSAnalysis">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSReference">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 80, 160" />
-        </fields>
-    </theme>
-
-    <theme name="FixDeltaWtDeviation">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
-        </fields>
-    </theme>
+  <theme name="CrossSectionWaterLine">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,0,153" />
+      <field name="showwidth" type="boolean" display="Breite anzeigen" default="false" />
+      <field name="showlevel" type="boolean" display="Wasserstand anzeigen" default="true" />
+      <field name="showlinelabel" type="boolean" default="true" display="Beschriftung anzeigen" />
+      <field name="showmiddleheight" type="boolean" display="Wasserstand anzeigen" default="false" />
+    </fields>
+  </theme>
 
-    <theme name="FixingDeltaWtAnalysisPeriods">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
-        </fields>
-    </theme>
-
-    <theme name="FixingReferencePeriod">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
-        </fields>
-    </theme>
-
-    <theme name="QSectors">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" hints="hidden" />
-        </fields>
-    </theme>
-
-
-
-    <theme name="MapLines">
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 205" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="3" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="Floodmaps">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="Floodplains">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="Floodmarks">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="WSPLGEN">
-        <inherits>
-            <inherit from="Uesk" />
-        </inherits>
-        <fields>
-            <field name="startcolor" type="Color"
-                display="Farbverlauf Startfarbe" default="178, 201, 215" />
-            <field name="endcolor" type="Color"
-                display="Farbverlauf Endfarbe" default="2, 27, 42" />
-            <field name="numclasses" type="int" display="Anzahl Klassen"
-                default="6" />
-        </fields>
-    </theme>
-
-    <theme name="RiverAxis">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-        <fields>
-       </fields>
-    </theme>
+  <theme name="Hyk">
+    <inherits>
+      <inherit from="Text" />
+    </inherits>
+    <fields>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+    </fields>
+  </theme>
 
-    <theme name="Kms">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-
-    <theme name="Fixpoints">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Floodmarks">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-
-    <theme name="GaugeLocation">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Qps">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="Hws">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HwsPoints">
-        <inherits>
-            <inherit from="MapLines"/>
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Catchment">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="FloodmapLines">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="140, 200, 130" />
-        </fields>
-    </theme>
-
-    <theme name="Buildings">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HydrBoundariesLines">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HydrBoundariesPolys">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="Jetties">
-        <inherits>
-            <inherit from="MapLines"/>
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
+  <theme name="CrossSectionArea">
+    <inherits>
+      <inherit from="Areas" />
+    </inherits>
+    <fields>
+      <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" />
+      <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" />
+      <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" />
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
+      <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
 
 
 
-    <theme name="HistoricalDischargeCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveQ">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveQDiff">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveW">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="100, 100, 153" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveWDiff">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="250, 250, 204" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
+  <theme name="DischargeCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Label" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" />
+      <field name="linesize" type="int" display="Liniendicke" default="2" />
+    </fields>
+  </theme>
 
-    <theme name="HistoricalDischargeWQW">
-        <!-- the facet has no styling...
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 255" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="true" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>-->
-    </theme>
+  <theme name="ExtremeWQCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde" default="true" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" />
+      <field name="linesize" type="int" display="Liniendicke" default="2" />
+      <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="HistoricalDischargeWQQ">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="true" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-
-
-    <theme name="ReferenceCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="ReferenceCurveNormalized">
-        <inherits>
-            <inherit from="ReferenceCurve" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
+  <theme name="ExtremeWQBaseCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
 
 
-    <theme name="SQMeasurements">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="SQMeasurementsOverview">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-
-    <theme name="SQOutliers">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="SQCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" default="0, 0, 0" />
-            <field name="linesize" type="int" display="Liniendicke" default="2"/>
-        </fields>
-    </theme>
-
-    <theme name="SQMeasurementsA">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsB">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 255, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsC">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 255, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsD">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsE">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 255, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsF">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsG">
-        <inherits>
-            <inherit from="SQMeasurements" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SQMeasurementsOverviewA">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewB">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 255, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewC">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 255, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewD">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewE">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 255, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewF">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="255, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SQMeasurementsOverviewG">
-        <inherits>
-            <inherit from="SQMeasurementsOverview" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="4" />
-            <field name="pointcolor" type="color" default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="SQOutliersA">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="100, 100, 255" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersB">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="100, 255, 255" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersC">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="100, 255, 100" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersD">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="255, 100, 255" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersE">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="255, 255, 100" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersF">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="255, 100, 100" />
-        </fields>
-    </theme>
-    <theme name="SQOutliersG">
-        <inherits>
-            <inherit from="SQOutliers" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" default="6" />
-            <field name="pointcolor" type="color" default="100, 100, 100" />
-        </fields>
-    </theme>
-
-    <theme name="SQOutliersOverviewA">
-        <inherits>
-            <inherit from="SQOutliersA" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewB">
-        <inherits>
-            <inherit from="SQOutliersB" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewC">
-        <inherits>
-            <inherit from="SQOutliersC" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewD">
-        <inherits>
-            <inherit from="SQOutliersD" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewE">
-        <inherits>
-            <inherit from="SQOutliersE" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewF">
-        <inherits>
-            <inherit from="SQOutliersF" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
-    <theme name="SQOutliersOverviewG">
-        <inherits>
-            <inherit from="SQOutliersG" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"/>
-        </fields>
-    </theme>
+  <theme name="DurationCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="linesize" type="int" display="Liniendicke" default="2" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
 
-    <theme name="SQCurveA">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="0, 0, 175" />
-        </fields>
-    </theme>
-    <theme name="SQCurveB">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="0, 175, 175" />
-        </fields>
-    </theme>
-    <theme name="SQCurveC">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="0, 175, 0" />
-        </fields>
-    </theme>
-    <theme name="SQCurveD">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="175, 0, 175" />
-        </fields>
-    </theme>
-    <theme name="SQCurveE">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="175, 175, 0" />
-        </fields>
-    </theme>
-    <theme name="SQCurveF">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="175, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SQCurveG">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="175, 175, 175" />
-        </fields>
-    </theme>
-
-    <theme name="SQOutlierCurveA">
-        <inherits>
-            <inherit from="SQCurveA" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveB">
-        <inherits>
-            <inherit from="SQCurveB" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveC">
-        <inherits>
-            <inherit from="SQCurveC" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveD">
-        <inherits>
-            <inherit from="SQCurveD" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveE">
-        <inherits>
-            <inherit from="SQCurveE" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveF">
-        <inherits>
-            <inherit from="SQCurveF" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-    <theme name="SQOutlierCurveG">
-        <inherits>
-            <inherit from="SQCurveG" />
-        </inherits>
-        <fields>
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-        </fields>
-    </theme>
-
-    <theme name="Porosity">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="color" default="175, 175, 175" />
-        </fields>
-    </theme>
-
-    <!-- S-INFO Data-Themes -->
-    <theme name="SInfoBedHeightMin">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
-        </fields>
-    </theme>      
-    <theme name="SInfoBedHeightMax">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
-        </fields>
-    </theme>
+  <theme name="DurationCurveW">
+    <inherits>
+      <inherit from="DurationCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204" />
+    </fields>
+  </theme>
 
-    <!-- S-INFO Flow-Depth Themes -->
-    <theme name="SInfoFlowDepth">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthWithTkh">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthMin">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthMax">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthCurrent">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthHistorical">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoTkh">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
-            <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-                
-            <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden" />
-
-            <!-- Areas use 'showborder' instead of showlines (but inconsistently uses 'linecolor' and 'linesize'), so we hide 'showline' and replace it with 'showbordder' -->
-            <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden"/>
-            <field name="showborder" type="boolean" display="Linien anzeigen" default="true" />
-            <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10" />
-            <field name="linesize" type="int" display="Liniendicke" default="1"/>
-
-            <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" />
-
-            <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" />
-            <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" />            
-            <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" />            
-            <field name="areatransparency" type="int" default="20"  />
+  <theme name="DurationCurveQ">
+    <inherits>
+      <inherit from="DurationCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0" />
+    </fields>
+  </theme>
 
-            <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden"/>
-            
-            <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthDevelopment">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFlowDepthDevelopmentPerYear">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoWaterlevelDifference">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
-        </fields>
-    </theme>
-    <theme name="SInfoBedHeightDifference">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedChannelWidth">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0" />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedChannelDepth">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64" />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedTkh">
-        <inherits>
-            <inherit from="SInfoTkh" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 10" />
-            <field name="areabgcolor" type="Color" default="255, 240, 224" display="Füllfarbe" />            
-            <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" />            
-            <field name="areatransparency" type="int" default="20"  />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedDepthEvol">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192" />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedDepthEvolPerYear">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128" />
-        </fields>
-    </theme>
-    <theme name="SInfoPredefinedFlowDepth">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192" />
-        </fields>
-    </theme>
-    <theme name="SInfoInfrastructureHeight">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0" />
-        </fields>
-    </theme>
-    <theme name="SInfoCollisionCount">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="64, 192, 64" />
-        </fields>
-    </theme>
-    <theme name="SInfoCollisionCount2">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke" default="2" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SInfoCollisionCount3">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke" default="2" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" />
-        </fields>
-    </theme>
-    <theme name="SInfoFloodDuration">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke" default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40" />
-        </fields>
-    </theme>
-    <theme name="SInfoMainValues">
-        <inherits>
-            <inherit from="MainValuesW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" />
-        </fields>
-    </theme>
-    
-     
+
+
+  <theme name="FixPoints">
+    <inherits>
+      <inherit from="ColorfulPoints" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="FixLines">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+    </fields>
+  </theme>
+
+  <theme name="FixAreas">
+    <inherits>
+      <inherit from="Areas" />
+    </inherits>
+    <fields>
+      <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" />
+      <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" />
+      <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" />
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" />
+      <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+
+  <theme name="FixingCalculatedPoint">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="5" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+
+  <theme name="FixingWQCurve">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="227, 27, 162" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDerivedCurve">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="227, 27, 162" />
+      <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden" hidden="true" />
+      <field name="pointsize" type="int" display="Punktdicke" default="5" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorAverageWQ0">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorAverageWQ1">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorAverageWQ2">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorAverageWQ3">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingAnalysisEventsWQ">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingReferenceEvents">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingOutliers">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAverage">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAverage0">
+    <inherits>
+      <inherit from="FixingDeltaWtAverage" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAverage1">
+    <inherits>
+      <inherit from="FixingDeltaWtAverage" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAverage2">
+    <inherits>
+      <inherit from="FixingDeltaWtAverage" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAverage3">
+    <inherits>
+      <inherit from="FixingDeltaWtAverage" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAnalysis">
+    <inherits>
+      <inherit from="FixPoints" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixingLSAverage0">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 128, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixingLSAverage1">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="FixingLSAverage2">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="FixingLSAverage3">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorDeviationLS0">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0" />
+    </fields>
+  </theme>
+  <theme name="FixingSectorDeviationLS1">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255" />
+
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorDeviationLS2">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255" />
+    </fields>
+  </theme>
+
+  <theme name="FixingSectorDeviationLS3">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixLSDeviation">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100" />
+    </fields>
+  </theme>
+
+  <theme name="FixLSAnalysis">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 255, 0" />
+    </fields>
+  </theme>
+
+  <theme name="FixLSReference">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" default="0, 80, 160" />
+    </fields>
+  </theme>
+
+  <theme name="FixDeltaWtDeviation">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe" />
+    </fields>
+  </theme>
+
+  <theme name="FixingDeltaWtAnalysisPeriods">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+    </fields>
+  </theme>
+
+  <theme name="FixingReferencePeriod">
+    <inherits>
+      <inherit from="FixAreas" />
+    </inherits>
+    <fields>
+      <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+    </fields>
+  </theme>
+
+  <theme name="QSectors">
+    <inherits>
+      <inherit from="FixLines" />
+    </inherits>
+    <fields>
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" />
+    </fields>
+  </theme>
+
+
+
+  <theme name="MapLines">
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 205" />
+      <field name="linesize" type="int" display="Liniendicke" default="3" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="Floodmaps">
+    <inherits>
+      <inherit from="Map" />
+    </inherits>
+  </theme>
+
+  <theme name="Floodplains">
+    <inherits>
+      <inherit from="Map" />
+    </inherits>
+  </theme>
+
+  <theme name="Floodmarks">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+  <theme name="WSPLGEN">
+    <inherits>
+      <inherit from="Uesk" />
+    </inherits>
+    <fields>
+      <field name="startcolor" type="Color" display="Farbverlauf Startfarbe" default="178, 201, 215" />
+      <field name="endcolor" type="Color" display="Farbverlauf Endfarbe" default="2, 27, 42" />
+      <field name="numclasses" type="int" display="Anzahl Klassen" default="6" />
+    </fields>
+  </theme>
+
+  <theme name="RiverAxis">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+    <fields>
+    </fields>
+  </theme>
+
+  <theme name="Kms">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Label" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+
+  <theme name="Fixpoints">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+  <theme name="Floodmarks">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+
+  <theme name="GaugeLocation">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+  <theme name="Qps">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+  </theme>
+
+  <theme name="Hws">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+  </theme>
+
+  <theme name="HwsPoints">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Label" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+  <theme name="Catchment">
+    <inherits>
+      <inherit from="Map" />
+    </inherits>
+  </theme>
+
+  <theme name="FloodmapLines">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130" />
+    </fields>
+  </theme>
+
+  <theme name="Buildings">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+  </theme>
+
+  <theme name="HydrBoundariesLines">
+    <inherits>
+      <inherit from="MapLines" />
+    </inherits>
+  </theme>
+
+  <theme name="HydrBoundariesPolys">
+    <inherits>
+      <inherit from="Map" />
+    </inherits>
+  </theme>
+
+  <theme name="Jetties">
+    <inherits>
+      <inherit from="MapLines" />
+      <inherit from="Label" />
+      <inherit from="Symbol" />
+    </inherits>
+  </theme>
+
+
+
+  <theme name="HistoricalDischargeCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" />
+      <field name="linesize" type="int" display="Liniendicke" default="2" />
+    </fields>
+  </theme>
+
+  <theme name="HistoricalDischargeCurveQ">
+    <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="HistoricalDischargeCurveQDiff">
+    <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="HistoricalDischargeCurveW">
+    <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="100, 100, 153" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="HistoricalDischargeCurveWDiff">
+    <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="250, 250, 204" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+  <theme name="HistoricalDischargeWQW">
+    <!-- the facet has no styling...
+      <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="Label" />
+      </inherits>
+      <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe"
+      default="0, 0, 255" />
+      <field name="linesize" type="int" display="Liniendicke"
+      default="1" />
+      <field name="linetype" type="Dash" display="Linienart"
+      default="10" />
+      <field name="showlines" type="boolean" display="Linie anzeigen"
+      default="true" hints="hidden" />
+      <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+      default="false" />
+      <field name="pointsize" type="int" display="Punktdicke"
+      default="3" />
+      <field name="showlinelabel" type="boolean"
+      display="Beschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean"
+      display="Beschriftung anzeigen" default="false" hints="hidden" />
+      </fields> -->
+  </theme>
+
+  <theme name="HistoricalDischargeWQQ">
+    <inherits>
+      <inherit from="HistoricalDischargeCurve" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linetype" type="Dash" display="Linienart" default="10" />
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden" />
+      <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" />
+    </fields>
+  </theme>
+
+
+
+  <theme name="ReferenceCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+      <inherit from="MinMaxPoints" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+    </fields>
+  </theme>
+
+  <theme name="ReferenceCurveNormalized">
+    <inherits>
+      <inherit from="ReferenceCurve" />
+    </inherits>
+    <fields>
+    </fields>
+  </theme>
+
+
+
+  <theme name="SQMeasurements">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="SQMeasurementsOverview">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+
+  <theme name="SQOutliers">
+    <inherits>
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+    </fields>
+  </theme>
+
+  <theme name="SQCurve">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+      <field name="linecolor" type="Color" default="0, 0, 0" />
+      <field name="linesize" type="int" display="Liniendicke" default="2" />
+    </fields>
+  </theme>
+
+  <theme name="SQMeasurementsA">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsB">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 255, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsC">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 255, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsD">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsE">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 255, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsF">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 0, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsG">
+    <inherits>
+      <inherit from="SQMeasurements" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SQMeasurementsOverviewA">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewB">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 255, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewC">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 255, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewD">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewE">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 255, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewF">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="255, 0, 0" />
+    </fields>
+  </theme>
+  <theme name="SQMeasurementsOverviewG">
+    <inherits>
+      <inherit from="SQMeasurementsOverview" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="4" />
+      <field name="pointcolor" type="color" default="0, 0, 0" />
+    </fields>
+  </theme>
+
+  <theme name="SQOutliersA">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="100, 100, 255" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersB">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="100, 255, 255" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersC">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="100, 255, 100" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersD">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="255, 100, 255" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersE">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="255, 255, 100" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersF">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="255, 100, 100" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersG">
+    <inherits>
+      <inherit from="SQOutliers" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" default="6" />
+      <field name="pointcolor" type="color" default="100, 100, 100" />
+    </fields>
+  </theme>
+
+  <theme name="SQOutliersOverviewA">
+    <inherits>
+      <inherit from="SQOutliersA" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewB">
+    <inherits>
+      <inherit from="SQOutliersB" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewC">
+    <inherits>
+      <inherit from="SQOutliersC" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewD">
+    <inherits>
+      <inherit from="SQOutliersD" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewE">
+    <inherits>
+      <inherit from="SQOutliersE" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewF">
+    <inherits>
+      <inherit from="SQOutliersF" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SQOutliersOverviewG">
+    <inherits>
+      <inherit from="SQOutliersG" />
+    </inherits>
+    <fields>
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+    </fields>
+  </theme>
+
+  <theme name="SQCurveA">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="0, 0, 175" />
+    </fields>
+  </theme>
+  <theme name="SQCurveB">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="0, 175, 175" />
+    </fields>
+  </theme>
+  <theme name="SQCurveC">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="0, 175, 0" />
+    </fields>
+  </theme>
+  <theme name="SQCurveD">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="175, 0, 175" />
+    </fields>
+  </theme>
+  <theme name="SQCurveE">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="175, 175, 0" />
+    </fields>
+  </theme>
+  <theme name="SQCurveF">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="175, 0, 0" />
+    </fields>
+  </theme>
+  <theme name="SQCurveG">
+    <inherits>
+      <inherit from="SQCurve" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="175, 175, 175" />
+    </fields>
+  </theme>
+
+  <theme name="SQOutlierCurveA">
+    <inherits>
+      <inherit from="SQCurveA" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveB">
+    <inherits>
+      <inherit from="SQCurveB" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveC">
+    <inherits>
+      <inherit from="SQCurveC" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveD">
+    <inherits>
+      <inherit from="SQCurveD" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveE">
+    <inherits>
+      <inherit from="SQCurveE" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveF">
+    <inherits>
+      <inherit from="SQCurveF" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+  <theme name="SQOutlierCurveG">
+    <inherits>
+      <inherit from="SQCurveG" />
+    </inherits>
+    <fields>
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+    </fields>
+  </theme>
+
+  <theme name="Porosity">
+    <inherits>
+      <inherit from="LongitudinalSection" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="color" default="175, 175, 175" />
+    </fields>
+  </theme>
+
+  <!-- S-INFO Data-Themes -->
+  <theme name="SInfoBedHeightMin">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+    </fields>
+  </theme>
+  <theme name="SInfoBedHeightMax">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+    </fields>
+  </theme>
+
+  <!-- S-INFO Flow-Depth Themes -->
+  <theme name="SInfoFlowDepth">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthWithTkh">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthMin">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthMax">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthCurrent">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthHistorical">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoTkh">
+    <inherits>
+      <inherit from="Lines" />
+      <inherit from="Points" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+
+      <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden" />
+
+      <!-- Areas use 'showborder' instead of showlines (but inconsistently uses 'linecolor' and 'linesize'), so we hide 'showline' and replace it with 'showbordder' -->
+      <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden" />
+      <field name="showborder" type="boolean" display="Linien anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10" />
+      <field name="linesize" type="int" display="Liniendicke" default="1" />
+
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" />
+
+      <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" />
+      <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" />
+      <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" />
+      <field name="areatransparency" type="int" default="20" />
+
+      <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+
+      <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthDevelopment">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFlowDepthDevelopmentPerYear">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoWaterlevelDifference">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+    </fields>
+  </theme>
+  <theme name="SInfoBedHeightDifference">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedChannelWidth">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedChannelDepth">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedTkh">
+    <inherits>
+      <inherit from="SInfoTkh" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 10" />
+      <field name="areabgcolor" type="Color" default="255, 240, 224" display="Füllfarbe" />
+      <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" />
+      <field name="areatransparency" type="int" default="20" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedDepthEvol">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedDepthEvolPerYear">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128" />
+    </fields>
+  </theme>
+  <theme name="SInfoPredefinedFlowDepth">
+    <inherits>
+      <inherit from="LongitudinalSectionW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192" />
+    </fields>
+  </theme>
+  <theme name="SInfoInfrastructureHeight">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="Label" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0" />
+    </fields>
+  </theme>
+  <theme name="SInfoCollisionCount">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="64, 192, 64" />
+    </fields>
+  </theme>
+  <theme name="SInfoCollisionCount2">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+    </fields>
+  </theme>
+  <theme name="SInfoCollisionCount3">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="2" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" />
+    </fields>
+  </theme>
+  <theme name="SInfoFloodDuration">
+    <inherits>
+      <inherit from="LongitudinalSectionPoints" />
+    </inherits>
+    <fields>
+      <field name="pointsize" type="int" display="Punktdicke" default="3" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40" />
+    </fields>
+  </theme>
+  <theme name="SInfoMainValues">
+    <inherits>
+      <inherit from="MainValuesW" />
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" />
+    </fields>
+  </theme>
 </themegroup>
\ No newline at end of file
--- a/artifacts/doc/conf/themes/second.xml	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Tue Jul 03 17:00:48 2018 +0200
@@ -3088,7 +3088,7 @@
             <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40" />
         </fields>
     </theme>
-    <theme name="SInfoMainValues1">
+    <theme name="SInfoMainValues">
         <inherits>
             <inherit from="MainValuesW" />
         </inherits>
@@ -3096,20 +3096,4 @@
             <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" />
         </fields>
     </theme>
-    <theme name="SInfoMainValues2">
-        <inherits>
-            <inherit from="MainValuesW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SInfoMainValues3">
-        <inherits>
-            <inherit from="MainValuesW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe" default="96, 128, 0" />
-        </fields>
-    </theme>
 </themegroup>
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/DefaultCalculationResult.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/DefaultCalculationResult.java	Tue Jul 03 17:00:48 2018 +0200
@@ -23,5 +23,4 @@
         // this class only serves as instantiable version of AbstractCalculationResult
         // not intended for pdf/csv-export
     }
-
-}
+}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java	Tue Jul 03 17:00:48 2018 +0200
@@ -24,7 +24,6 @@
 import org.dive4elements.river.artifacts.AbstractStaticStateArtifact;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.sinfo.common.CollisionCountProcessor;
 import org.dive4elements.river.artifacts.states.StaticState;
 import org.w3c.dom.Document;
 
@@ -90,21 +89,24 @@
         else
             seriesName = "name?";
 
+        // if different facet wanted, e.g. for each year use different facetIndex
+        // if multiple Result treated, get each Result from data
         createFacets(callMeta, code, seriesName, getDataAsString("year"));
 
         super.setup(identifier, factory, context, callMeta, data, loadFacets);
     }
 
-    private void createFacets(final CallMeta callMeta, final String code, final String seriesName, final String year) {
+    private void createFacets(final CallMeta callMeta, final String code, final String seriesName, final String yearForName) {
         if (code == null)
             return;
+
         final String[] parts = code.split("-");
         if (parts.length < 2) {
             log.error("Invalid datacage ID '" + code + "'");
             return;
         }
         final ArrayList<Facet> facets = new ArrayList<>(1);
-        facets.add(CollisionCountProcessor.createFacet(callMeta, year));
+        facets.add(CollisionCountProcessor.createFacet(0, callMeta, yearForName));
         // facets.add(CollisionGaugeWProcessor.createFacet(callMeta, seriesName)); //REMARK gauge_w is the cm above gauge datum,
         // therefore only useful with transformation to NHN
         addFacets(STATIC_STATE_NAME, facets);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -11,11 +11,7 @@
 package org.dive4elements.river.artifacts.sinfo.collision;
 
 import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.Artifact;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.DataFacet;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultFacet;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 /**
@@ -23,32 +19,25 @@
  *
  * @author Matthias Schäfer
  */
-// FIXME: remove
-public class CollisionCalcFacet extends DataFacet {
+public class CollisionCalcFacet extends SInfoResultFacet {
 
     private static final long serialVersionUID = 1;
+    private int year;
 
-    public CollisionCalcFacet() {
+    private CollisionCalcFacet() {
+        super();
         // required for clone operation deepCopy()
     }
 
-    public CollisionCalcFacet(final int idx, final String name, final String description, final String yAxisLabelKey, final ComputeType type,
-            final String stateId, final String hash) {
-        super(idx, name, description, type, hash, stateId);
-        this.metaData.put("X", "sinfo.chart.km.xaxis.label");
-        this.metaData.put("Y", yAxisLabelKey);
+    public CollisionCalcFacet(final int facetIndex, final int resultIndex, final int year, final String name, final String description,
+            final String yAxisLabelKey, final ComputeType type, final String hash, final String stateId) {
+        super(facetIndex, resultIndex, name, description, yAxisLabelKey, type, stateId, hash);
+
+        this.year = year;
     }
 
-    @Override
-    public Object getData(final Artifact artifact, final CallContext context) {
-
-        final D4EArtifact flys = (D4EArtifact) artifact;
-
-        final CalculationResult res = (CalculationResult) flys.compute(context, this.hash, this.stateId, this.type, false);
-
-        final CollisionCalculationResults data = (CollisionCalculationResults) res.getData();
-
-        return data.getResults().get(0); // first result is always the one and only CollisionCalcOverviewResult
+    public int getYear() {
+        return this.year;
     }
 
     /** Copy deeply. */
@@ -61,6 +50,7 @@
         copy.type = this.type;
         copy.hash = this.hash;
         copy.stateId = this.stateId;
+        copy.year = this.year;
         return copy;
     }
 }
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java	Tue Jul 03 17:00:48 2018 +0200
@@ -0,0 +1,89 @@
+/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ *  Björnsen Beratende Ingenieure GmbH
+ *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.artifacts.sinfo.collision;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
+
+/**
+ * Processor to generate the facet and data series of calculated bed collision counts
+ *
+ * @author Matthias Schäfer
+ *
+ */
+public final class CollisionCalcProcessor extends AbstractSInfoProcessor {
+
+    public static final String FACET_COLLISION_CALC_COUNT = "sinfo_facet_collision_calc_count";
+
+    public static final String FACET_COLLISION_CALC_COUNT_2 = "sinfo_facet_collision_calc_count.2";
+
+    public static final String FACET_COLLISION_CALC_COUNT_3 = "sinfo_facet_collision_calc_count.3";
+
+    private static final String[] COLLISION_FACETS = new String[] { FACET_COLLISION_CALC_COUNT, FACET_COLLISION_CALC_COUNT_2, FACET_COLLISION_CALC_COUNT_3 };
+
+    private static final String I18N_AXIS_LABEL = "chart.collision_count.section.yaxis.label";
+
+    private static final String I18N_SERIES_NAME_PATTERN = "collision.count.title";
+
+    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
+
+    static {
+        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT);
+        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT_2);
+        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT_3);
+    }
+
+    public CollisionCalcProcessor() {
+        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
+    }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+
+        final CollisionCalcFacet facet = (CollisionCalcFacet) bundle.getFacet();
+        final int year = facet.getYear();
+
+        final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) getResult(generator, bundle);
+
+        final double[][] points = result.getStationPointsByYear(SInfoResultType.collisionCount, year);
+
+        return buildSeriesForType(points, generator, bundle, theme, visible, null);
+    }
+
+    public static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
+            final int resultIndex, final int year, final int themeCount) {
+
+        // REMARK: we are using themeCount as facet index, because we get several lines (with the same facet name) for the same
+        // result index; however name and index are used on client side as unique id.
+
+        final CollisionCalcOverviewResult ccoResult = (CollisionCalcOverviewResult) result;
+        if (ccoResult.getSingleYears() == null) {
+            final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, result.getLabel());
+            return new CollisionCalcFacet(themeCount, resultIndex, -1, FACET_COLLISION_CALC_COUNT, facetDescription, I18N_AXIS_LABEL, ComputeType.ADVANCE, hash,
+                    id);
+        } else {
+            final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, Integer.toString(year));
+            return new CollisionCalcFacet(themeCount, resultIndex, year, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL,
+                    ComputeType.ADVANCE, hash, id);
+        }
+    }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCountProcessor.java	Tue Jul 03 17:00:48 2018 +0200
@@ -0,0 +1,59 @@
+/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ *  Björnsen Beratende Ingenieure GmbH
+ *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.artifacts.sinfo.collision;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.artifacts.CallMeta;
+import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
+
+/**
+ * Processor to generate a data series for bed collision count data loaded from the database
+ *
+ * @author Matthias Schäfer
+ *
+ */
+public class CollisionCountProcessor extends AbstractSInfoProcessor {
+
+    public static final String FACET_COLLISION_COUNT = "sinfo_facet_collision_count";
+
+    private static final String I18N_AXIS_LABEL = "chart.collision_count.section.yaxis.label";
+
+    private static final String I18N_SERIES_NAME_PATTERN = "collision.count.title";
+
+    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
+
+    static {
+        HANDLED_FACET_TYPES.add(FACET_COLLISION_COUNT);
+    }
+
+    public CollisionCountProcessor() {
+        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
+    }
+
+    public static Facet createFacet(final int facetIndex, final CallMeta callMeta, final String year) {
+        return new CollisionFacet(facetIndex, FACET_COLLISION_COUNT, Resources.getMsg(callMeta, I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, year),
+                I18N_AXIS_LABEL);
+    }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+
+        return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.collisionCount, null);
+    }
+}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionFacet.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -21,7 +21,6 @@
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.model.BlackboardDataFacet;
-import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.model.sinfo.Collision;
 import org.dive4elements.river.model.sinfo.CollisionAggregateValue;
@@ -31,12 +30,12 @@
  *
  * @author Matthias Schäfer
  */
-public class CollisionFacet extends BlackboardDataFacet implements FacetTypes {
+public class CollisionFacet extends BlackboardDataFacet {
 
     private static final long serialVersionUID = 1;
 
-    public CollisionFacet(final String name, final String description, final String yAxisLabel) {
-        super(0, name, description);
+    public CollisionFacet(final int facetIndex, final String name, final String description, final String yAxisLabel) {
+        super(facetIndex, name, description);
 
         this.metaData.put("X", "chart.longitudinal.section.xaxis.label");
         this.metaData.put("Y", yAxisLabel);
@@ -61,8 +60,15 @@
         final List<CollisionAggregateValue> values = CollisionAggregateValue.getValuesByKm(series, access.getFrom(true), access.getTo(true));
         final Collection<ResultRow> rows = new ArrayList<>();
         for (final CollisionAggregateValue value : values) {
-            rows.add(ResultRow.create().putValue(GeneralResultType.station, value.getStation()) //
-                    .putValue(SInfoResultType.collisionCount, value.getCount()).putValue(SInfoResultType.collisionGaugeW, value.getGaugeW()));
+
+            final ResultRow row = ResultRow.create();
+
+            row.putValue(GeneralResultType.station, value.getStation());
+            // Not needed: row.putValue(SInfoResultType.years, series.getYear());
+            row.putValue(SInfoResultType.collisionCount, value.getCount());
+            row.putValue(SInfoResultType.collisionGaugeW, value.getGaugeW());
+
+            rows.add(row);
         }
         return new DefaultCalculationResult(series.getFilename(), rows);
     }
@@ -74,7 +80,7 @@
      */
     @Override
     public CollisionFacet deepCopy() {
-        final CollisionFacet copy = new CollisionFacet(this.name, this.description, this.metaData.get("Y"));
+        final CollisionFacet copy = new CollisionFacet(this.index, this.name, this.description, this.metaData.get("Y"));
         copy.set(this);
         return copy;
     }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Tue Jul 03 17:00:48 2018 +0200
@@ -22,7 +22,6 @@
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.ReportFacet;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
-import org.dive4elements.river.artifacts.sinfo.common.CollisionCalcProcessor;
 import org.dive4elements.river.artifacts.states.DefaultState;
 
 /**
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java	Tue Jul 03 17:00:48 2018 +0200
@@ -81,10 +81,6 @@
         return data;
     }
 
-    protected static final int getDataIndex(final ArtifactAndFacet bundle) {
-        return ((SInfoResultFacet) bundle.getFacet()).getDataIndex();
-    }
-
     /**
      * @return The axis label
      */
@@ -246,12 +242,7 @@
 
     protected static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int resultIndex, final String axisLabel, final String facetId, final String description) {
-        return createFacet(context, hash, id, result, resultIndex, -1, axisLabel, facetId, description);
-    }
-
-    protected static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int resultIndex, final int dataIndex, final String axisLabel, final String facetId, final String description) {
         final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), description, description, result.getLabel());
-        return new SInfoResultFacet(resultIndex, dataIndex, facetId, facetFlowDepthFilteredDescription, axisLabel, ComputeType.ADVANCE, id, hash);
+        return new SInfoResultFacet(resultIndex, facetId, facetFlowDepthFilteredDescription, axisLabel, ComputeType.ADVANCE, id, hash);
     }
 }
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCalcProcessor.java	Tue Jul 03 14:26:56 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
- * Software engineering by
- *  Björnsen Beratende Ingenieure GmbH
- *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.artifacts.sinfo.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
-import org.dive4elements.river.artifacts.resources.Resources;
-import org.dive4elements.river.artifacts.sinfo.collision.CollisionCalcOverviewResult;
-import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.themes.ThemeDocument;
-
-/**
- * Processor to generate the facet and data series of calculated bed collision counts
- *
- * @author Matthias Schäfer
- *
- */
-public final class CollisionCalcProcessor extends AbstractSInfoProcessor {
-
-    public static final String FACET_COLLISION_CALC_COUNT = "sinfo_facet_collision_calc_count";
-
-    public static final String FACET_COLLISION_CALC_COUNT_2 = "sinfo_facet_collision_calc_count.2";
-
-    public static final String FACET_COLLISION_CALC_COUNT_3 = "sinfo_facet_collision_calc_count.3";
-
-    private static final String[] COLLISION_FACETS = new String[] { FACET_COLLISION_CALC_COUNT, FACET_COLLISION_CALC_COUNT_2, FACET_COLLISION_CALC_COUNT_3 };
-
-    private static final String I18N_AXIS_LABEL = "chart.collision_count.section.yaxis.label";
-
-    private static final String I18N_SERIES_NAME_PATTERN = "collision.count.title";
-
-    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
-
-    static {
-        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT);
-        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT_2);
-        HANDLED_FACET_TYPES.add(FACET_COLLISION_CALC_COUNT_3);
-    }
-
-    public CollisionCalcProcessor() {
-        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
-    }
-
-    @Override
-    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
-
-        final int year = getDataIndex(bundle);
-
-        final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) getResult(generator, bundle);
-
-        final double[][] points = result.getStationPointsByYear(SInfoResultType.collisionCount, year);
-
-        return buildSeriesForType(points, generator, bundle, theme, visible, null);
-    }
-
-    public static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int resultIndex, final int year, final int themeCount) {
-
-        // REMARK: we are using themeCount as facet index, because we get several lines (with the same facet name) for the same
-        // result index; however name and index are used on client side as unique id.
-
-        final CollisionCalcOverviewResult ccoResult = (CollisionCalcOverviewResult) result;
-        if (ccoResult.getSingleYears() == null) {
-            final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, result.getLabel());
-            return new SInfoResultFacet(themeCount, resultIndex, -1, FACET_COLLISION_CALC_COUNT, facetDescription, I18N_AXIS_LABEL, ComputeType.ADVANCE, id,
-                    hash);
-        } else {
-            final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, Integer.toString(year));
-            return new SInfoResultFacet(themeCount, resultIndex, year, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL, ComputeType.ADVANCE,
-                    id, hash);
-        }
-    }
-}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCountProcessor.java	Tue Jul 03 14:26:56 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
- * Software engineering by
- *  Björnsen Beratende Ingenieure GmbH
- *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.artifacts.sinfo.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.CallMeta;
-import org.dive4elements.river.artifacts.resources.Resources;
-import org.dive4elements.river.artifacts.sinfo.collision.CollisionFacet;
-import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.themes.ThemeDocument;
-
-/**
- * Processor to generate a data series for bed collision count data loaded from the database
- *
- * @author Matthias Schäfer
- *
- */
-public class CollisionCountProcessor extends AbstractSInfoProcessor {
-
-    // private final static Logger log = Logger.getLogger(CollisionCountProcessor.class);
-
-    public static final String FACET_COLLISION_COUNT = "sinfo_facet_collision_count";
-
-    private static final String I18N_AXIS_LABEL = "chart.collision_count.section.yaxis.label";
-
-    private static final String I18N_SERIES_NAME_PATTERN = "collision.count.title";
-
-    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
-
-    static {
-        HANDLED_FACET_TYPES.add(FACET_COLLISION_COUNT);
-    }
-
-    public CollisionCountProcessor() {
-        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
-    }
-
-    public static Facet createFacet(final CallMeta callMeta, final String seriesName) {
-        return new CollisionFacet(FACET_COLLISION_COUNT, Resources.getMsg(callMeta, I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, seriesName),
-                I18N_AXIS_LABEL);
-    }
-
-    @Override
-    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
-
-        return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.collisionCount, null);
-    }
-
-}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java	Tue Jul 03 14:26:56 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
- * Software engineering by
- *  Björnsen Beratende Ingenieure GmbH
- *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.artifacts.sinfo.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
-import org.dive4elements.river.artifacts.resources.Resources;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.DurationWaterlevel;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.ValueGetter;
-import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.themes.ThemeDocument;
-
-/**
- * Processor to generate the facet and data series of infrastructure flood durations
- *
- * @author Matthias Schäfer
- *
- */
-public final class FloodDurationProcessor extends AbstractSInfoProcessor {
-
-    private static final String FACET_FLOOD_DURATION = "sinfo_facet_flood_duration";
-
-    private static final String FACET_FLOOD_DURATION_DESCRIPTION = "sinfo_facet_flood_duration.description";
-
-    private static final String FACET_MAIN_VALUE_DURATION = "mainvalue.duration";
-
-    private static final String FACET_MAIN_VALUE_DURATION_DESCRIPTION = "mainvalue.duration.description";
-
-    private static final String I18N_AXIS_LABEL = "sinfo.chart.flood_duration.section.yaxis.label";
-
-    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
-
-    static {
-        HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_DURATION);
-
-    }
-
-    public FloodDurationProcessor() {
-        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
-    }
-
-    public static Facet createFloodDurationFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int resultIndex) {
-
-        return AbstractSInfoProcessor.createFacet(context, hash, id, result, resultIndex, -1, I18N_AXIS_LABEL, FACET_FLOOD_DURATION,
-                FACET_FLOOD_DURATION_DESCRIPTION);
-    }
-
-    public static Facet createMainValueDurationFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
-            final int facetIndex, final int resultIndex, final int dataIndex) {
-
-        final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_DURATION_DESCRIPTION, FACET_MAIN_VALUE_DURATION_DESCRIPTION,
-                result.getMainValueLabel(dataIndex));
-
-        return new SInfoResultFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_DURATION, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
-    }
-
-    @Override
-    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
-        final String facetName = bundle.getFacetName();
-
-        if (FACET_FLOOD_DURATION.contentEquals(facetName))
-            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.floodDuration, null);
-
-        if (FACET_MAIN_VALUE_DURATION.contentEquals(facetName)) {
-
-            final AbstractCalculationResult data = getResult(generator, bundle);
-
-            if (data instanceof FloodDurationCalculationResult) {
-                final int index = getDataIndex(bundle);
-                final FloodDurationCalculationResult.ValueGetter valuegetter = new ValueGetter() {
-                    @Override
-                    public double getValue(final DurationWaterlevel waterlevel) {
-                        return waterlevel.getFloodDurDaysPerYear();
-                    }
-                };
-                final double[][] points = ((FloodDurationCalculationResult) data).getMainValueDurationPoints(generator, bundle, valuegetter, index);
-                return buildSeriesForType(points, generator, bundle, theme, visible, null);
-            }
-
-        }
-
-        final String error = String.format("Unknown facet name: %s", facetName);
-        throw new UnsupportedOperationException(error);
-    }
-
-}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java	Tue Jul 03 14:26:56 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
- * Software engineering by
- *  Björnsen Beratende Ingenieure GmbH
- *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.artifacts.sinfo.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
-import org.dive4elements.river.artifacts.resources.Resources;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.DurationWaterlevel;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.ValueGetter;
-import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
-import org.dive4elements.river.themes.ThemeDocument;
-
-/**
- * Processor to generate the facet and data series of infrastructure flood heights
- *
- * @author Matthias Schäfer
- *
- */
-public final class FloodHeightProcessor extends AbstractSInfoProcessor {
-
-    private static final String FACET_FLOOD_HEIGHT = "sinfo_facet_flood_height";
-
-    private static final String FACET_FLOOD_HEIGHT_DESCRIPTION = "sinfo_facet_flood_height.description";
-
-    private static final String FACET_MAIN_VALUE_HEIGHT = "mainvalue.w";
-
-    private static final String FACET_MAIN_VALUE_HEIGHT_DESCRIPTION = "mainvalue.w.description";
-
-    private static final String I18N_AXIS_LABEL = LongitudinalSectionGenerator.I18N_YAXIS_LABEL;
-
-    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
-
-    static {
-        HANDLED_FACET_TYPES.add(FACET_FLOOD_HEIGHT);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_HEIGHT);
-    }
-
-    public FloodHeightProcessor() {
-        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
-    }
-
-    public static Facet createFloodHeightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int index) {
-        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, -1, I18N_AXIS_LABEL, FACET_FLOOD_HEIGHT, FACET_FLOOD_HEIGHT_DESCRIPTION);
-    }
-
-    public static Facet createMainValueHeightFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
-            final int facetIndex, final int resultIndex, final int dataIndex) {
-        final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_HEIGHT_DESCRIPTION, FACET_MAIN_VALUE_HEIGHT_DESCRIPTION,
-                result.getMainValueLabel(dataIndex));
-
-        return new SInfoResultFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_HEIGHT, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
-    }
-
-    @Override
-    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
-
-        final String facetName = bundle.getFacetName();
-
-        if (FACET_FLOOD_HEIGHT.contentEquals(facetName))
-            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.infrastructureHeight, null);
-
-        if (FACET_MAIN_VALUE_HEIGHT.contentEquals(facetName)) {
-
-            final AbstractCalculationResult data = getResult(generator, bundle);
-
-            if (data instanceof FloodDurationCalculationResult) {
-                final int index = getDataIndex(bundle);
-                final FloodDurationCalculationResult.ValueGetter valuegetter = new ValueGetter() {
-                    @Override
-                    public double getValue(final DurationWaterlevel waterlevel) {
-                        return waterlevel.getWaterlevel();
-                    }
-                };
-                final double[][] points = ((FloodDurationCalculationResult) data).getMainValueDurationPoints(generator, bundle, valuegetter, index);
-                return buildSeriesForType(points, generator, bundle, theme, visible, null);
-            }
-
-        }
-
-        final String error = String.format("Unknown facet name: %s", facetName);
-        throw new UnsupportedOperationException(error);
-    }
-}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultFacet.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -22,14 +22,12 @@
 /**
  * Facet of one of the S-Info curves.
  */
-public final class SInfoResultFacet extends DataFacet {
+public class SInfoResultFacet extends DataFacet {
 
     private static final long serialVersionUID = 1L;
 
     private static Logger log = Logger.getLogger(SInfoResultFacet.class);
 
-    private int dataIndex;
-
     private int resultIndex;
 
     public SInfoResultFacet() {
@@ -38,35 +36,24 @@
 
     public SInfoResultFacet(final int resultIndex, final String name, final String description, final String yAxisLabelKey, final ComputeType type,
             final String stateId, final String hash) {
-        // REMARK:
-        this(resultIndex, resultIndex, -1, name, description, yAxisLabelKey, type, stateId, hash);
+        this(resultIndex, resultIndex, name, description, yAxisLabelKey, type, stateId, hash);
     }
 
-    public SInfoResultFacet(final int resultIndex, final int dataIndex, final String name, final String description, final String yAxisLabelKey,
+    public SInfoResultFacet(final int facetIndex, final int resultIndex, final String name, final String description, final String yAxisLabelKey,
             final ComputeType type, final String stateId, final String hash) {
-        // REMARK: in some cases, we have several
-        this(resultIndex, resultIndex, dataIndex, name, description, yAxisLabelKey, type, stateId, hash);
-    }
-
-    public SInfoResultFacet(final int facetIndex, final int resultIndex, final int dataIndex, final String name, final String description,
-            // REMARK: in some cases, we have several data-lines for the same result (which normally determines the facet index) and
-            // facet name. But index and name are used by the client side as unique keys for the chart themes...
-            // So we might have different facet index and result index.
-            final String yAxisLabelKey, final ComputeType type, final String stateId, final String hash) {
+        // REMARK: in some cases, we have several data-lines for the same result (which normally determines the facet index) and
+        // facet name. But index and name are used by the client side as unique keys for the chart themes...
+        // So we might have different facet index and result index.
         super(facetIndex, name, description, type, hash, stateId);
         this.resultIndex = resultIndex;
-        this.dataIndex = dataIndex;
+
         this.metaData.put("X", "sinfo.chart.km.xaxis.label");
         this.metaData.put("Y", yAxisLabelKey);
     }
 
-    public int getDataIndex() {
-        return this.dataIndex;
-    }
-
     @Override
-    public Object getData(final Artifact artifact, final CallContext context) {
-        log.debug("Get data for result at index: " + this.index);
+    public final Object getData(final Artifact artifact, final CallContext context) {
+        log.debug("Get data for result at index: " + this.resultIndex);
 
         final D4EArtifact flys = (D4EArtifact) artifact;
 
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Tue Jul 03 17:00:48 2018 +0200
@@ -58,14 +58,8 @@
         // Calculate the selected main values, if any
         /* misuse winfo-artifact to calculate waterlevels in the same way */
         final WINFOArtifact winfo = new WinfoArtifactWrapper(sinfo);
-        // FIXME: check! wenn mainValueCount nicht mehr benutzt --> weg!
-        int mainValueCount = 0;
-        if (winfo.isW())
-            mainValueCount = winfo.getWs().length;
-        else if (winfo.isQ())
-            mainValueCount = winfo.getQs().length;
 
-        final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange, mainValueCount);
+        final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange);
 
         final FloodDurationCalculationResult result = calculateResult(infrasType, riverside, calcRange, infoProvider,
                 RiversideChoiceKey.fromKey(access.getRiverside()), problems, winfo);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Tue Jul 03 17:00:48 2018 +0200
@@ -15,7 +15,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.common.AbstractExportContext;
 import org.dive4elements.river.artifacts.common.ExportContextCSV;
@@ -47,7 +46,7 @@
     private final int maxWaterlevelPdf = 3;
 
     public interface ValueGetter {
-        abstract double getValue(DurationWaterlevel waterlevel);
+        double getValue(DurationWaterlevel waterlevel);
     }
 
     private enum ExportMode {
@@ -56,7 +55,7 @@
 
     public FloodDurationCalculationResult(final String label, final String[] mainvalueLabels, final Collection<ResultRow> rows) {
         super(label, rows);
-        this.mainvalueLabels = mainvalueLabels; // TODO: löschen (?)
+        this.mainvalueLabels = mainvalueLabels;
         this.waterlevelCount = mainvalueLabels.length;
     }
 
@@ -279,9 +278,7 @@
         return "";
     }
 
-    public final double[][] getMainValueDurationPoints(final DiagramGenerator generator, final ArtifactAndFacet bundle,
-            // final Function<DurationWaterlevel, Double> valueGetter
-            final ValueGetter valuegetter, final int dataIndex) {
+    public final double[][] getMainValueDurationPoints(final DiagramGenerator generator, final ValueGetter valuegetter, final int dataIndex) {
 
         final TDoubleArrayList xPoints = new TDoubleArrayList(this.rows.size());
         final TDoubleArrayList yPoints = new TDoubleArrayList(this.rows.size());
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResults.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResults.java	Tue Jul 03 17:00:48 2018 +0200
@@ -20,15 +20,7 @@
 
     private static final long serialVersionUID = 1L;
 
-    private final int mainValueCount;
-
-    public FloodDurationCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange,
-            final int mainValueCount) {
+    public FloodDurationCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange) {
         super(calcModeLabel, user, river, calcRange);
-        this.mainValueCount = mainValueCount;
-    }
-
-    public int getMainValueCount() {
-        return this.mainValueCount;
     }
 }
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java	Tue Jul 03 17:00:48 2018 +0200
@@ -82,6 +82,7 @@
         // Merge all stations (range/step, borders of gauge ranges, infrastructures)
         final Map<Double, InfrastructureValue> allStations = new HashMap<>();
         final Map<Double, InfrastructureValue> secondBank = new HashMap<>(); // any second infrastructure in case of both-banks-option
+        // FIXME: check, do we really need all stations? compare with tkh...
         addRangeStations(allStations, winfo);
         addGaugeLimits(allStations, durFinders.keySet(), calcRange.getMinimumDouble(), calcRange.getMaximumDouble());
         addInfrastructures(allStations, secondBank, infras);
@@ -197,9 +198,17 @@
 
         final String[] mainValueLabels = new String[wqkmsArray.length];
         if (wqkmsArray.length >= 1) {
+
+            // FIXME
+            // WaterlevelDescriptionBuilder builder = new WaterlevelDescriptionBuilder(artifact, context);
+
             // Labels like Q=123 or W=123
-            for (int i = 0; i <= wqkmsArray.length - 1; i++)
+            for (int i = 0; i <= wqkmsArray.length - 1; i++) {
+                // FIXME
+                // String label = builder.getDesc(wqkmsArray[i]);
+
                 mainValueLabels[i] = wqkmsArray[i].getName();
+            }
             // Replace labels for named main Q values
             final GaugeMainValueFinder zoneFinder = GaugeMainValueFinder.loadValues(MainValueTypeKey.Q, gauge, problems);
             if ((zoneFinder != null) && (qs != null)) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -0,0 +1,53 @@
+/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ *  Björnsen Beratende Ingenieure GmbH
+ *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+package org.dive4elements.river.artifacts.sinfo.flood_duration;
+
+import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultFacet;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+
+/**
+ * @author Domenico Nardi Tironi
+ */
+final class FloodDurationFacet extends SInfoResultFacet {
+
+    private static final long serialVersionUID = 1L;
+
+    protected int waterlevelIndex = -1; // for custom result
+
+    private FloodDurationFacet() {
+        // required for clone operation deepCopy()
+    }
+
+    public FloodDurationFacet(final int facetIndex, final int resultIndex, final int waterlevelIndex, final String name, final String description,
+            final ComputeType type, final String yAxisLabelKey, final String hash, final String stateId) {
+        super(facetIndex, resultIndex, name, description, yAxisLabelKey, type, stateId, hash);
+
+        this.waterlevelIndex = waterlevelIndex;
+    }
+
+    public int getWaterlevelIndex() {
+        return this.waterlevelIndex;
+    }
+
+    /** Copy deeply. */
+    @Override
+    public Facet deepCopy() {
+        // FIXME: why not simply use the full constructor instead?
+        final FloodDurationFacet copy = new FloodDurationFacet();
+        // FIXME: why does DataFacet does not override set? Bad access to variables of parent!
+        copy.set(this);
+        copy.type = this.type;
+        copy.hash = this.hash;
+        copy.stateId = this.stateId;
+        copy.waterlevelIndex = this.waterlevelIndex;
+        return copy;
+    }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationProcessor.java	Tue Jul 03 17:00:48 2018 +0200
@@ -0,0 +1,104 @@
+/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ *  Björnsen Beratende Ingenieure GmbH
+ *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.artifacts.sinfo.flood_duration;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
+import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.ValueGetter;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
+
+/**
+ * Processor to generate the facet and data series of infrastructure flood durations
+ *
+ * @author Matthias Schäfer
+ *
+ */
+public final class FloodDurationProcessor extends AbstractSInfoProcessor {
+
+    private static final String FACET_FLOOD_DURATION = "sinfo_facet_flood_duration";
+
+    private static final String FACET_FLOOD_DURATION_DESCRIPTION = "sinfo_facet_flood_duration.description";
+
+    private static final String FACET_MAIN_VALUE_DURATION = "mainvalue.duration";
+
+    private static final String FACET_MAIN_VALUE_DURATION_DESCRIPTION = "mainvalue.duration.description";
+
+    private static final String I18N_AXIS_LABEL = "sinfo.chart.flood_duration.section.yaxis.label";
+
+    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
+
+    static {
+        HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION);
+        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_DURATION);
+
+    }
+
+    public FloodDurationProcessor() {
+        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
+    }
+
+    public static Facet createFloodDurationFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
+            final int resultIndex) {
+
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, resultIndex, I18N_AXIS_LABEL, FACET_FLOOD_DURATION,
+                FACET_FLOOD_DURATION_DESCRIPTION);
+    }
+
+    public static Facet createMainValueDurationFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
+            final int facetIndex, final int resultIndex, final int dataIndex) {
+
+        final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_DURATION_DESCRIPTION, FACET_MAIN_VALUE_DURATION_DESCRIPTION,
+                result.getMainValueLabel(dataIndex));
+
+        return new FloodDurationFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_DURATION, description, ComputeType.ADVANCE, I18N_AXIS_LABEL, hash,
+                id);
+    }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+        final String facetName = bundle.getFacetName();
+
+        if (FACET_FLOOD_DURATION.contentEquals(facetName))
+            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.floodDuration, null);
+
+        if (FACET_MAIN_VALUE_DURATION.contentEquals(facetName)) {
+
+            final AbstractCalculationResult data = getResult(generator, bundle);
+
+            final FloodDurationFacet facet = (FloodDurationFacet) bundle.getFacet();
+            final int index = facet.getWaterlevelIndex();
+
+            if (data instanceof FloodDurationCalculationResult) {
+                final FloodDurationCalculationResult.ValueGetter valuegetter = new ValueGetter() {
+                    @Override
+                    public double getValue(final DurationWaterlevel waterlevel) {
+                        return waterlevel.getFloodDurDaysPerYear();
+                    }
+                };
+                final double[][] points = ((FloodDurationCalculationResult) data).getMainValueDurationPoints(generator, valuegetter, index);
+                return buildSeriesForType(points, generator, bundle, theme, visible, null);
+            }
+        }
+
+        final String error = String.format("Unknown facet name: %s", facetName);
+        throw new UnsupportedOperationException(error);
+    }
+}
\ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java	Tue Jul 03 17:00:48 2018 +0200
@@ -21,8 +21,6 @@
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.ReportFacet;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
-import org.dive4elements.river.artifacts.sinfo.common.FloodDurationProcessor;
-import org.dive4elements.river.artifacts.sinfo.common.FloodHeightProcessor;
 import org.dive4elements.river.artifacts.states.DefaultState;
 
 /**
@@ -91,6 +89,7 @@
                 final String waterlevelLabel = result.getMainValueLabel(j);
                 // FIXME: use label as label for theme
 
+                // final int facetIndex, final int resultIndex, final int dataIndex
                 facets.add(FloodDurationProcessor.createMainValueDurationFacet(context, hash, this.id, result, themeCount, resultIndex, j));
                 facets.add(FloodHeightProcessor.createMainValueHeightFacet(context, hash, this.id, result, themeCount, resultIndex, j));
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodHeightProcessor.java	Tue Jul 03 17:00:48 2018 +0200
@@ -0,0 +1,101 @@
+/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ *  Björnsen Beratende Ingenieure GmbH
+ *  Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.artifacts.sinfo.flood_duration;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
+import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.ValueGetter;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
+
+/**
+ * Processor to generate the facet and data series of infrastructure flood heights
+ *
+ * @author Matthias Schäfer
+ *
+ */
+public final class FloodHeightProcessor extends AbstractSInfoProcessor {
+
+    private static final String FACET_FLOOD_HEIGHT = "sinfo_facet_flood_height";
+
+    private static final String FACET_FLOOD_HEIGHT_DESCRIPTION = "sinfo_facet_flood_height.description";
+
+    private static final String FACET_MAIN_VALUE_HEIGHT = "mainvalue.w";
+
+    private static final String FACET_MAIN_VALUE_HEIGHT_DESCRIPTION = "mainvalue.w.description";
+
+    private static final String I18N_AXIS_LABEL = LongitudinalSectionGenerator.I18N_YAXIS_LABEL;
+
+    private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
+
+    static {
+        HANDLED_FACET_TYPES.add(FACET_FLOOD_HEIGHT);
+        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_HEIGHT);
+    }
+
+    public FloodHeightProcessor() {
+        super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
+    }
+
+    public static Facet createFloodHeightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
+            final int index) {
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, I18N_AXIS_LABEL, FACET_FLOOD_HEIGHT, FACET_FLOOD_HEIGHT_DESCRIPTION);
+    }
+
+    public static Facet createMainValueHeightFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
+            final int facetIndex, final int resultIndex, final int dataIndex) {
+        final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_HEIGHT_DESCRIPTION, FACET_MAIN_VALUE_HEIGHT_DESCRIPTION,
+                result.getMainValueLabel(dataIndex));
+
+        return new FloodDurationFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_HEIGHT, description, ComputeType.ADVANCE, I18N_AXIS_LABEL, hash, id);
+    }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+
+        final String facetName = bundle.getFacetName();
+
+        if (FACET_FLOOD_HEIGHT.contentEquals(facetName))
+            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.infrastructureHeight, null);
+
+        if (FACET_MAIN_VALUE_HEIGHT.contentEquals(facetName)) {
+
+            final AbstractCalculationResult data = getResult(generator, bundle);
+
+            final FloodDurationFacet facet = (FloodDurationFacet) bundle.getFacet();
+            final int index = facet.getWaterlevelIndex();
+
+            if (data instanceof FloodDurationCalculationResult) {
+                final FloodDurationCalculationResult.ValueGetter valuegetter = new ValueGetter() {
+                    @Override
+                    public double getValue(final DurationWaterlevel waterlevel) {
+                        return waterlevel.getWaterlevel();
+                    }
+                };
+                final double[][] points = ((FloodDurationCalculationResult) data).getMainValueDurationPoints(generator, valuegetter, index);
+                return buildSeriesForType(points, generator, bundle, theme, visible, null);
+            }
+        }
+
+        final String error = String.format("Unknown facet name: %s", facetName);
+        throw new UnsupportedOperationException(error);
+    }
+}
\ No newline at end of file

http://dive4elements.wald.intevation.org