[PATCH] Work on salix cross sections; waterlevels work now with different colors

Wald Commits scm-commit at wald.intevation.org
Fri Aug 17 17:48:05 CEST 2018


# HG changeset patch
# User gernotbelger
# Date 1534520881 -7200
# Node ID bd5f5d2220fab42e3a50b75a0830f38ce37bc87f
# Parent  15f274e6d83b0402fbc99508e9a58f808adcf08e
Work on salix cross sections; waterlevels work now with different colors
Colors and i10n for all themes.

diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/doc/conf/artifacts/uinfo.xml
--- a/artifacts/doc/conf/artifacts/uinfo.xml	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Fri Aug 17 17:48:01 2018 +0200
@@ -150,13 +150,19 @@
 
         <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
           <facets>
-            <facet name="cross_section_water_line" description="facet.cross_section_water_line"/>
+            <facet name="uinfo_facet_salix_line_cross_section_water_line" description="Saxlix Line"/>
+            <facet name="uinfo_facet_salix_scenario_cross_section_water_line" description="Salix Lines of scenarios"/>
+            <facet name="uinfo_facet_salix_waterlevel_mnw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
+            <facet name="uinfo_facet_salix_waterlevel_mw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
+            <facet name="uinfo_facet_salix_waterlevel_mhw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
+            <facet name="uinfo_facet_salix_waterlevel_hw5_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
+
             <facet name="cross_section" description="facet.cross_section"/>
             <facet name="area" description="an area"/>
             <facet name="cross_section.area" description="an area"/>
             <facet name="cross_section.manualpoints" description="points"/>
             <facet name="cross_section.manualline" description="line"/>
-            
+
             <!--
               This would automatically import some existing hyks, but we do not want this here 
               <facet name="hyk" description="hyks"/>
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/doc/conf/themes.xml	Fri Aug 17 17:48:01 2018 +0200
@@ -484,6 +484,13 @@
         <mapping from="uinfo_facet_salix_scenario" to="UInfoSalixScenario" />
         <mapping from="uinfo_facet_salix_scenario.filtered" to="UInfoSalixScenario" />
         <mapping from="uinfo_facet_salix_rank" to="UInfoSalixRank" />
+
+        <mapping from="uinfo_facet_salix_line_cross_section_water_line" to="UInfoSalixCrossSectionWaterLine" />
+        <mapping from="uinfo_facet_salix_scenario_cross_section_water_line" to="UInfoSalixScenarioCrossSectionWaterLine" />
+        <mapping from="uinfo_facet_salix_waterlevel_mnw_cross_section_water_line" to="UInfoSalixMNWCrossSectionWaterLine" />
+        <mapping from="uinfo_facet_salix_waterlevel_mw_cross_section_water_line" to="UInfoSalixMWCrossSectionWaterLine" />
+        <mapping from="uinfo_facet_salix_waterlevel_mhw_cross_section_water_line" to="UInfoSalixMHWCrossSectionWaterLine" />
+        <mapping from="uinfo_facet_salix_waterlevel_mh5_cross_section_water_line" to="UInfoSalixMH5CrossSectionWaterLine" />
         
         <mapping from="uinfo_salix_line.manualpoints" to="ManualPoints" />
     </mappings>
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Fri Aug 17 17:48:01 2018 +0200
@@ -2,36 +2,36 @@
 <themegroup name="default">
   <theme name="MainValuesQ">
     <inherits>
-      <inherit from="Lines" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
     </inherits>
   </theme>
 
   <theme name="Annotations">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Text" />
+      <inherit from="Lines"/>
+      <inherit from="Text"/>
     </inherits>
     <fields>
     </fields>
@@ -39,126 +39,126 @@
 
   <theme name="ManualPoints">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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="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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="heightmarks_points">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="Area">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
     </inherits>
     <fields>
     </fields>
@@ -166,14 +166,14 @@
 
   <theme name="Differences">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="MinMaxPoints" />
+      <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="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>
 
@@ -181,1301 +181,1301 @@
   <!-- Classes defining special values -->
   <theme name="LongitudinalSectionW_HQ1">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ2">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ5">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ10">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ20">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ25">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ50">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ100">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ200">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ300">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ500">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1000">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQRZ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HSQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MHQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MNQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_NQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQExtrem">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ2_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ5_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ10_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ20_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ25_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ50_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ100_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ200_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ300_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ500_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1000_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQRZ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HSQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MHQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MNQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_NQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQExtrem_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ1">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ2">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ5">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ10">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ20">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ25">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ50">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ100">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ200">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ300">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ500">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ1000">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQRZ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HSQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MHQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MNQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_NQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQExtrem">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="DischargeLongitudinalSectionW">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
 
   <theme name="DischargeLongitudinalSectionC">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0"/>
     </fields>
   </theme>
 
   <theme name="DischargeLongitudinalSectionQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQInfoldCut">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQInfolding">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 51, 51" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="PorositySubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="DensityTopLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/>
     </fields>
   </theme>
 
   <theme name="DensitySubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterTopLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterSubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="BedLoadDiameterLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterDataTop">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffMorphWidth">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffEpoch">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffAbsHeight1">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffAbsHeight2">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffHeightYear">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="MorphologicWidth">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityVTotalChannel">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityTau">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityDischarge">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" default="2" />
+      <field name="linesize" type="int" default="2"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ACoarse">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3AFineMid">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASand">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASuspSand">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="linecolor" type="Color" default="255, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASediment">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="linecolor" type="Color" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASuspSandBed">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="linecolor" type="Color" default="200, 200, 200"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ABedSusp">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="linecolor" type="Color" default="150, 255, 150"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASusp">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <field name="linecolor" type="Color" default="85, 255, 0"/>
     </fields>
   </theme>
 
   <!-- Sediment load longitudinal sections, T/A -->
   <theme name="SedimentLoadLSTACoarse">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTAFineMid">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASand">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASuspSand">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="linecolor" type="Color" default="255, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASediment">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="linecolor" type="Color" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASuspSandBed">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="linecolor" type="Color" default="200, 200, 200"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTABedSusp">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="linecolor" type="Color" default="150, 255, 150"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASusp">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
-      <field name="pointcolor" type="Color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
-      <field name="pointcolor" type="Color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
-      <field name="pointcolor" type="Color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
-      <field name="pointcolor" type="Color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
-      <field name="pointcolor" type="Color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
-      <field name="pointcolor" type="Color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 100, 200" />
-      <field name="pointcolor" type="Color" default="0, 100, 200" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
-      <field name="pointcolor" type="Color" default="200, 200, 200" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
-      <field name="pointcolor" type="Color" default="150, 255, 150" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
-      <field name="pointcolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" default="2" />
+      <field name="linesize" type="int" default="2"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadM3ACoarse">
     <inherits>
-      <inherit from="SedimentLoadM3A" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
-      <field name="pointcolor" type="Color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
-      <field name="pointcolor" type="Color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
-      <field name="pointcolor" type="Color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
-      <field name="pointcolor" type="Color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
-      <field name="pointcolor" type="Color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
-      <field name="pointcolor" type="Color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 100, 200" />
-      <field name="pointcolor" type="Color" default="0, 100, 200" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
-      <field name="pointcolor" type="Color" default="200, 200, 200" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
-      <field name="pointcolor" type="Color" default="150, 255, 150" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
-      <field name="pointcolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <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" />
+      <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>
 
@@ -1483,53 +1483,53 @@
 
   <theme name="CrossSection">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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="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" />
+      <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" />
+      <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" />
+      <inherit from="Text"/>
     </inherits>
     <fields>
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
     </fields>
   </theme>
 
   <theme name="CrossSectionArea">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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>
 
@@ -1537,38 +1537,38 @@
 
   <theme name="DischargeCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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>
 
@@ -1576,33 +1576,33 @@
 
   <theme name="DurationCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <inherit from="DurationCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204"/>
     </fields>
   </theme>
 
   <theme name="DurationCurveQ">
     <inherits>
-      <inherit from="DurationCurve" />
+      <inherit from="DurationCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0"/>
     </fields>
   </theme>
 
@@ -1610,320 +1610,320 @@
 
   <theme name="FixPoints">
     <inherits>
-      <inherit from="ColorfulPoints" />
-      <inherit from="Label" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="227, 27, 162" />
+      <field name="linecolor" type="Color" default="227, 27, 162"/>
     </fields>
   </theme>
 
   <theme name="FixingDerivedCurve">
     <inherits>
-      <inherit from="FixLines" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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="FixingDeltaWtAverage">
     <inherits>
-      <inherit from="FixLines" />
+      <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" />
+      <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" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage1">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage2">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage3">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAnalysis">
     <inherits>
-      <inherit from="FixPoints" />
+      <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" />
+      <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" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 128, 0" />
+      <field name="linecolor" type="Color" default="0, 128, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage1">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage2">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage3">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS0">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0"/>
     </fields>
   </theme>
   <theme name="FixingSectorDeviationLS1">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255"/>
 
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS2">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS3">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixLSDeviation">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100"/>
     </fields>
   </theme>
 
   <theme name="FixLSAnalysis">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="linecolor" type="Color" default="0, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="FixLSReference">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 80, 160" />
+      <field name="linecolor" type="Color" default="0, 80, 160"/>
     </fields>
   </theme>
 
   <theme name="FixDeltaWtDeviation">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAnalysisPeriods">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="FixingReferencePeriod">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="QSectors">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden"/>
     </fields>
   </theme>
 
@@ -1931,44 +1931,44 @@
 
   <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" />
+      <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" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Floodplains">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Floodmarks">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="WSPLGEN">
     <inherits>
-      <inherit from="Uesk" />
+      <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" />
+      <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" />
+      <inherit from="MapLines"/>
     </inherits>
     <fields>
     </fields>
@@ -1976,93 +1976,93 @@
 
   <theme name="Kms">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
 
   <theme name="Fixpoints">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Floodmarks">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
 
   <theme name="GaugeLocation">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Qps">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="Hws">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HwsPoints">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Catchment">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="FloodmapLines">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130"/>
     </fields>
   </theme>
 
   <theme name="Buildings">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HydrBoundariesLines">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HydrBoundariesPolys">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Jetties">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
@@ -2070,59 +2070,59 @@
 
   <theme name="HistoricalDischargeCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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>
 
@@ -2154,18 +2154,18 @@
 
   <theme name="HistoricalDischargeWQQ">
     <inherits>
-      <inherit from="HistoricalDischargeCurve" />
-      <inherit from="Label" />
+      <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" />
+      <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>
 
@@ -2173,21 +2173,21 @@
 
   <theme name="ReferenceCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <inherit from="ReferenceCurve"/>
     </inherits>
     <fields>
     </fields>
@@ -2197,789 +2197,837 @@
 
   <theme name="SQMeasurements">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 0" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="100, 100, 255" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="100, 255, 255" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="100, 255, 100" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="255, 100, 255" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="255, 255, 100" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="255, 100, 100" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="6" />
-      <field name="pointcolor" type="color" default="100, 100, 100" />
+      <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" />
+      <inherit from="SQOutliersA"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewB">
     <inherits>
-      <inherit from="SQOutliersB" />
+      <inherit from="SQOutliersB"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewC">
     <inherits>
-      <inherit from="SQOutliersC" />
+      <inherit from="SQOutliersC"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewD">
     <inherits>
-      <inherit from="SQOutliersD" />
+      <inherit from="SQOutliersD"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewE">
     <inherits>
-      <inherit from="SQOutliersE" />
+      <inherit from="SQOutliersE"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewF">
     <inherits>
-      <inherit from="SQOutliersF" />
+      <inherit from="SQOutliersF"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewG">
     <inherits>
-      <inherit from="SQOutliersG" />
+      <inherit from="SQOutliersG"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
 
   <theme name="SQCurveA">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 0, 175" />
+      <field name="linecolor" type="color" default="0, 0, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveB">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 175, 175" />
+      <field name="linecolor" type="color" default="0, 175, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveC">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 175, 0" />
+      <field name="linecolor" type="color" default="0, 175, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveD">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 0, 175" />
+      <field name="linecolor" type="color" default="175, 0, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveE">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 0" />
+      <field name="linecolor" type="color" default="175, 175, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveF">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 0, 0" />
+      <field name="linecolor" type="color" default="175, 0, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveG">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 175" />
+      <field name="linecolor" type="color" default="175, 175, 175"/>
     </fields>
   </theme>
 
   <theme name="SQOutlierCurveA">
     <inherits>
-      <inherit from="SQCurveA" />
+      <inherit from="SQCurveA"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveB">
     <inherits>
-      <inherit from="SQCurveB" />
+      <inherit from="SQCurveB"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveC">
     <inherits>
-      <inherit from="SQCurveC" />
+      <inherit from="SQCurveC"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveD">
     <inherits>
-      <inherit from="SQCurveD" />
+      <inherit from="SQCurveD"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveE">
     <inherits>
-      <inherit from="SQCurveE" />
+      <inherit from="SQCurveE"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveF">
     <inherits>
-      <inherit from="SQCurveF" />
+      <inherit from="SQCurveF"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveG">
     <inherits>
-      <inherit from="SQCurveG" />
+      <inherit from="SQCurveG"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
 
   <theme name="Porosity">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 175" />
+      <field name="linecolor" type="color" default="175, 175, 175"/>
     </fields>
   </theme>
 
   <!-- S-INFO Data-Themes -->
   <theme name="SInfoBedHeightMin">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/>
     </fields>
   </theme>
   <theme name="SInfoBedHeightMax">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+      <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" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthWithTkh">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthMin">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthMax">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthCurrent">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthHistorical">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255" />
+      <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" />
+      <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="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" />
+      <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="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="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="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="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden"/>
 
-      <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false" />
+      <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthDevelopment">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthDevelopmentPerYear">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoWaterlevelDifference">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
   <theme name="SInfoBedHeightDifference">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedChannelWidth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedChannelDepth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedTkh">
     <inherits>
-      <inherit from="SInfoTkh" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedDepthEvolPerYear">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedFlowDepth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
-      <inherit from="Label" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeightLeft">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeightRight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoCollisionCount">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoCollisionCount3">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFloodDurationLeft">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/>
     </fields>
   </theme>
   <theme name="SInfoFloodDurationRight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoMainValues">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <inherit from="Lines"/>
+      <inherit from="Points"/>
+      <inherit from="Label"/>
+      <inherit from="MinMaxPoints"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" />
-      <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="Farbe" default="0, 96, 192"/>
+      <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="SInfoMainValuesQ">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="SInfoMainValuesW">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureWLeft">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureWRight">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureQLeft">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureQRight">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="UInfoSalixLine">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64"/>
     </fields>
   </theme>
   <theme name="UInfoSalixMnwMw">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255"/>
     </fields>
   </theme>
   <theme name="UInfoSalixScenario">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
   <theme name="UInfoSalixRank">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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="UInfoSalixCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="38,138,62"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixScenarioCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMNWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 192, 0"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMHWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="247, 150, 70"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMH5CrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 </themegroup>
\ No newline at end of file
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Fri Aug 17 17:48:01 2018 +0200
@@ -2,36 +2,36 @@
 <themegroup name="second">
   <theme name="MainValuesQ">
     <inherits>
-      <inherit from="Lines" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
     </inherits>
   </theme>
 
   <theme name="Annotations">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Text" />
+      <inherit from="Lines"/>
+      <inherit from="Text"/>
     </inherits>
     <fields>
     </fields>
@@ -39,126 +39,126 @@
 
   <theme name="ManualPoints">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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="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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="heightmarks_points">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="Area">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
     </inherits>
     <fields>
     </fields>
@@ -166,14 +166,14 @@
 
   <theme name="Differences">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="MinMaxPoints" />
+      <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="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>
 
@@ -181,1301 +181,1301 @@
   <!-- Classes defining special values -->
   <theme name="LongitudinalSectionW_HQ1">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ2">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ5">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ10">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ20">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ25">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ50">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ100">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ200">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ300">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ500">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1000">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQRZ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HSQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MHQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MNQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_NQ">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQExtrem">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ2_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ5_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ10_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ20_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ25_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ50_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ100_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ200_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ300_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ500_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQ1000_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQRZ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HSQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MHQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MNQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_MQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_NQ_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionW_HQExtrem_Points">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" />
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ1">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ2">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ5">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ10">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ20">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ25">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ50">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ100">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ200">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ300">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ500">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQ1000">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQRZ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HSQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MHQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MNQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_MQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_NQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQ_HQExtrem">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="DischargeLongitudinalSectionW">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
 
   <theme name="DischargeLongitudinalSectionC">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0"/>
     </fields>
   </theme>
 
   <theme name="DischargeLongitudinalSectionQ">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQInfoldCut">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102"/>
     </fields>
   </theme>
 
   <theme name="LongitudinalSectionQInfolding">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 51, 51" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="PorositySubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="DensityTopLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/>
     </fields>
   </theme>
 
   <theme name="DensitySubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterTopLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterSubLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="BedLoadDiameterLines">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="BedDiameterDataTop">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffMorphWidth">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffEpoch">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffAbsHeight1">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffAbsHeight2">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100"/>
     </fields>
   </theme>
 
   <theme name="BedheightDiffHeightYear">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="MorphologicWidth">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityVTotalChannel">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityTau">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/>
     </fields>
   </theme>
 
   <theme name="FlowVelocityDischarge">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" default="2" />
+      <field name="linesize" type="int" default="2"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ACoarse">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3AFineMid">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASand">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASuspSand">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="linecolor" type="Color" default="255, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASediment">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="linecolor" type="Color" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASuspSandBed">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="linecolor" type="Color" default="200, 200, 200"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ABedSusp">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="linecolor" type="Color" default="150, 255, 150"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSM3ASusp">
     <inherits>
-      <inherit from="SedimentLoadLSM3A" />
+      <inherit from="SedimentLoadLSM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <field name="linecolor" type="Color" default="85, 255, 0"/>
     </fields>
   </theme>
 
   <!-- Sediment load longitudinal sections, T/A -->
   <theme name="SedimentLoadLSTACoarse">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTAFineMid">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASand">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASuspSand">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
+      <field name="linecolor" type="Color" default="255, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASediment">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
+      <field name="linecolor" type="Color" default="0, 255, 255"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASuspSandBed">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
+      <field name="linecolor" type="Color" default="200, 200, 200"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTABedSusp">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
+      <field name="linecolor" type="Color" default="150, 255, 150"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadLSTASusp">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
-      <field name="pointcolor" type="Color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
-      <field name="pointcolor" type="Color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
-      <field name="pointcolor" type="Color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
-      <field name="pointcolor" type="Color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
-      <field name="pointcolor" type="Color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
-      <field name="pointcolor" type="Color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 100, 200" />
-      <field name="pointcolor" type="Color" default="0, 100, 200" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
-      <field name="pointcolor" type="Color" default="200, 200, 200" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
-      <field name="pointcolor" type="Color" default="150, 255, 150" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
-      <field name="pointcolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoad"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" default="2" />
+      <field name="linesize" type="int" default="2"/>
     </fields>
   </theme>
 
   <theme name="SedimentLoadM3ACoarse">
     <inherits>
-      <inherit from="SedimentLoadM3A" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
-      <field name="pointcolor" type="Color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
-      <field name="pointcolor" type="Color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
-      <field name="pointcolor" type="Color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 255, 0" />
-      <field name="pointcolor" type="Color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 255" />
-      <field name="pointcolor" type="Color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
-      <field name="pointcolor" type="Color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 100, 200" />
-      <field name="pointcolor" type="Color" default="0, 100, 200" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="200, 200, 200" />
-      <field name="pointcolor" type="Color" default="200, 200, 200" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="150, 255, 150" />
-      <field name="pointcolor" type="Color" default="150, 255, 150" />
+      <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" />
+      <inherit from="SedimentLoadM3A"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="85, 255, 0" />
-      <field name="pointcolor" type="Color" default="85, 255, 0" />
+      <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" />
+      <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" />
+      <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>
 
@@ -1483,53 +1483,53 @@
 
   <theme name="CrossSection">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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="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" />
+      <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" />
+      <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" />
+      <inherit from="Text"/>
     </inherits>
     <fields>
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
     </fields>
   </theme>
 
   <theme name="CrossSectionArea">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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>
 
@@ -1537,38 +1537,38 @@
 
   <theme name="DischargeCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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>
 
@@ -1576,33 +1576,33 @@
 
   <theme name="DurationCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <inherit from="DurationCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204"/>
     </fields>
   </theme>
 
   <theme name="DurationCurveQ">
     <inherits>
-      <inherit from="DurationCurve" />
+      <inherit from="DurationCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0"/>
     </fields>
   </theme>
 
@@ -1610,320 +1610,320 @@
 
   <theme name="FixPoints">
     <inherits>
-      <inherit from="ColorfulPoints" />
-      <inherit from="Label" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="227, 27, 162" />
+      <field name="linecolor" type="Color" default="227, 27, 162"/>
     </fields>
   </theme>
 
   <theme name="FixingDerivedCurve">
     <inherits>
-      <inherit from="FixLines" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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="FixingDeltaWtAverage">
     <inherits>
-      <inherit from="FixLines" />
+      <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" />
+      <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" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage1">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage2">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAverage3">
     <inherits>
-      <inherit from="FixingDeltaWtAverage" />
+      <inherit from="FixingDeltaWtAverage"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAnalysis">
     <inherits>
-      <inherit from="FixPoints" />
+      <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" />
+      <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" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 128, 0" />
+      <field name="linecolor" type="Color" default="0, 128, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage1">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 0, 255" />
+      <field name="linecolor" type="Color" default="0, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage2">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 255" />
+      <field name="linecolor" type="Color" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingLSAverage3">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="255, 0, 0" />
+      <field name="linecolor" type="Color" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS0">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0"/>
     </fields>
   </theme>
   <theme name="FixingSectorDeviationLS1">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255"/>
 
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS2">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255"/>
     </fields>
   </theme>
 
   <theme name="FixingSectorDeviationLS3">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="FixLSDeviation">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100" />
+      <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100"/>
     </fields>
   </theme>
 
   <theme name="FixLSAnalysis">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 255, 0" />
+      <field name="linecolor" type="Color" default="0, 255, 0"/>
     </fields>
   </theme>
 
   <theme name="FixLSReference">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" default="0, 80, 160" />
+      <field name="linecolor" type="Color" default="0, 80, 160"/>
     </fields>
   </theme>
 
   <theme name="FixDeltaWtDeviation">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="FixingDeltaWtAnalysisPeriods">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="FixingReferencePeriod">
     <inherits>
-      <inherit from="FixAreas" />
+      <inherit from="FixAreas"/>
     </inherits>
     <fields>
-      <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+      <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe"/>
     </fields>
   </theme>
 
   <theme name="QSectors">
     <inherits>
-      <inherit from="FixLines" />
+      <inherit from="FixLines"/>
     </inherits>
     <fields>
-      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden"/>
     </fields>
   </theme>
 
@@ -1931,44 +1931,44 @@
 
   <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" />
+      <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" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Floodplains">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Floodmarks">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="WSPLGEN">
     <inherits>
-      <inherit from="Uesk" />
+      <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" />
+      <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" />
+      <inherit from="MapLines"/>
     </inherits>
     <fields>
     </fields>
@@ -1976,93 +1976,93 @@
 
   <theme name="Kms">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
 
   <theme name="Fixpoints">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Floodmarks">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
 
   <theme name="GaugeLocation">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Qps">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="Hws">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HwsPoints">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
   <theme name="Catchment">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="FloodmapLines">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130"/>
     </fields>
   </theme>
 
   <theme name="Buildings">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HydrBoundariesLines">
     <inherits>
-      <inherit from="MapLines" />
+      <inherit from="MapLines"/>
     </inherits>
   </theme>
 
   <theme name="HydrBoundariesPolys">
     <inherits>
-      <inherit from="Map" />
+      <inherit from="Map"/>
     </inherits>
   </theme>
 
   <theme name="Jetties">
     <inherits>
-      <inherit from="MapLines" />
-      <inherit from="Label" />
-      <inherit from="Symbol" />
+      <inherit from="MapLines"/>
+      <inherit from="Label"/>
+      <inherit from="Symbol"/>
     </inherits>
   </theme>
 
@@ -2070,59 +2070,59 @@
 
   <theme name="HistoricalDischargeCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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>
 
@@ -2154,18 +2154,18 @@
 
   <theme name="HistoricalDischargeWQQ">
     <inherits>
-      <inherit from="HistoricalDischargeCurve" />
-      <inherit from="Label" />
+      <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" />
+      <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>
 
@@ -2173,21 +2173,21 @@
 
   <theme name="ReferenceCurve">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <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" />
+      <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" />
+      <inherit from="ReferenceCurve"/>
     </inherits>
     <fields>
     </fields>
@@ -2197,777 +2197,825 @@
 
   <theme name="SQMeasurements">
     <inherits>
-      <inherit from="Points" />
-      <inherit from="Label" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" default="0, 153, 255" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+      <field name="pointcolor" type="Color" default="0, 153, 255"/>
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="Points"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="Color" default="204, 0, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" />
+      <field name="pointcolor" type="Color" default="204, 0, 0"/>
+      <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" />
+      <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" />
+      <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" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="0, 0, 255" />
+      <field name="pointcolor" type="color" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsB">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="0, 255, 255" />
+      <field name="pointcolor" type="color" default="0, 255, 255"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsC">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="0, 255, 0" />
+      <field name="pointcolor" type="color" default="0, 255, 0"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsD">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 0, 255" />
+      <field name="pointcolor" type="color" default="255, 0, 255"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsE">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 255, 0" />
+      <field name="pointcolor" type="color" default="255, 255, 0"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsF">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 0, 0" />
+      <field name="pointcolor" type="color" default="255, 0, 0"/>
     </fields>
   </theme>
   <theme name="SQMeasurementsG">
     <inherits>
-      <inherit from="SQMeasurements" />
+      <inherit from="SQMeasurements"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="0, 0, 0" />
+      <field name="pointcolor" type="color" default="0, 0, 0"/>
     </fields>
   </theme>
 
   <theme name="SQMeasurementsOverviewA">
     <inherits>
-      <inherit from="SQMeasurementsOverview" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 255" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 255, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="255, 0, 0" />
+      <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" />
+      <inherit from="SQMeasurementsOverview"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" default="4" />
-      <field name="pointcolor" type="color" default="0, 0, 0" />
+      <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" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="100, 100, 255" />
+      <field name="pointcolor" type="color" default="100, 100, 255"/>
     </fields>
   </theme>
   <theme name="SQOutliersB">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="100, 255, 255" />
+      <field name="pointcolor" type="color" default="100, 255, 255"/>
     </fields>
   </theme>
   <theme name="SQOutliersC">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="100, 255, 100" />
+      <field name="pointcolor" type="color" default="100, 255, 100"/>
     </fields>
   </theme>
   <theme name="SQOutliersD">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 100, 255" />
+      <field name="pointcolor" type="color" default="255, 100, 255"/>
     </fields>
   </theme>
   <theme name="SQOutliersE">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 255, 100" />
+      <field name="pointcolor" type="color" default="255, 255, 100"/>
     </fields>
   </theme>
   <theme name="SQOutliersF">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="255, 100, 100" />
+      <field name="pointcolor" type="color" default="255, 100, 100"/>
     </fields>
   </theme>
   <theme name="SQOutliersG">
     <inherits>
-      <inherit from="SQOutliers" />
+      <inherit from="SQOutliers"/>
     </inherits>
     <fields>
-      <field name="pointcolor" type="color" default="100, 100, 100" />
+      <field name="pointcolor" type="color" default="100, 100, 100"/>
     </fields>
   </theme>
 
   <theme name="SQOutliersOverviewA">
     <inherits>
-      <inherit from="SQOutliersA" />
+      <inherit from="SQOutliersA"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewB">
     <inherits>
-      <inherit from="SQOutliersB" />
+      <inherit from="SQOutliersB"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewC">
     <inherits>
-      <inherit from="SQOutliersC" />
+      <inherit from="SQOutliersC"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewD">
     <inherits>
-      <inherit from="SQOutliersD" />
+      <inherit from="SQOutliersD"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewE">
     <inherits>
-      <inherit from="SQOutliersE" />
+      <inherit from="SQOutliersE"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewF">
     <inherits>
-      <inherit from="SQOutliersF" />
+      <inherit from="SQOutliersF"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SQOutliersOverviewG">
     <inherits>
-      <inherit from="SQOutliersG" />
+      <inherit from="SQOutliersG"/>
     </inherits>
     <fields>
-      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" />
+      <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/>
     </fields>
   </theme>
 
   <theme name="SQCurveA">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 0, 175" />
+      <field name="linecolor" type="color" default="0, 0, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveB">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 175, 175" />
+      <field name="linecolor" type="color" default="0, 175, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveC">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="0, 175, 0" />
+      <field name="linecolor" type="color" default="0, 175, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveD">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 0, 175" />
+      <field name="linecolor" type="color" default="175, 0, 175"/>
     </fields>
   </theme>
   <theme name="SQCurveE">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 0" />
+      <field name="linecolor" type="color" default="175, 175, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveF">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 0, 0" />
+      <field name="linecolor" type="color" default="175, 0, 0"/>
     </fields>
   </theme>
   <theme name="SQCurveG">
     <inherits>
-      <inherit from="SQCurve" />
+      <inherit from="SQCurve"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 175" />
+      <field name="linecolor" type="color" default="175, 175, 175"/>
     </fields>
   </theme>
 
   <theme name="SQOutlierCurveA">
     <inherits>
-      <inherit from="SQCurveA" />
+      <inherit from="SQCurveA"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveB">
     <inherits>
-      <inherit from="SQCurveB" />
+      <inherit from="SQCurveB"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveC">
     <inherits>
-      <inherit from="SQCurveC" />
+      <inherit from="SQCurveC"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveD">
     <inherits>
-      <inherit from="SQCurveD" />
+      <inherit from="SQCurveD"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveE">
     <inherits>
-      <inherit from="SQCurveE" />
+      <inherit from="SQCurveE"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveF">
     <inherits>
-      <inherit from="SQCurveF" />
+      <inherit from="SQCurveF"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
   <theme name="SQOutlierCurveG">
     <inherits>
-      <inherit from="SQCurveG" />
+      <inherit from="SQCurveG"/>
     </inherits>
     <fields>
-      <field name="linesize" type="int" display="Liniendicke" default="1" />
+      <field name="linesize" type="int" display="Liniendicke" default="1"/>
     </fields>
   </theme>
 
   <theme name="Porosity">
     <inherits>
-      <inherit from="LongitudinalSection" />
+      <inherit from="LongitudinalSection"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="color" default="175, 175, 175" />
+      <field name="linecolor" type="color" default="175, 175, 175"/>
     </fields>
   </theme>
 
   <!-- S-INFO Data-Themes -->
   <theme name="SInfoBedHeightMin">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/>
     </fields>
   </theme>
   <theme name="SInfoBedHeightMax">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" />
+      <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" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthWithTkh">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthMin">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthMax">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthCurrent">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthHistorical">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255" />
+      <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" />
+      <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="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" />
+      <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="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="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="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="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden"/>
 
-      <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false" />
+      <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthDevelopment">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFlowDepthDevelopmentPerYear">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
     </fields>
   </theme>
   <theme name="SInfoWaterlevelDifference">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/>
     </fields>
   </theme>
   <theme name="SInfoBedHeightDifference">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedChannelWidth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedChannelDepth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedTkh">
     <inherits>
-      <inherit from="SInfoTkh" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedDepthEvolPerYear">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128"/>
     </fields>
   </theme>
   <theme name="SInfoPredefinedFlowDepth">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
-      <inherit from="Label" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeightLeft">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/>
     </fields>
   </theme>
   <theme name="SInfoInfrastructureHeightRight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoCollisionCount">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <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" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoCollisionCount3">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255"/>
     </fields>
   </theme>
   <theme name="SInfoFloodDurationLeft">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <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" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/>
     </fields>
   </theme>
   <theme name="SInfoFloodDurationRight">
     <inherits>
-      <inherit from="LongitudinalSectionPoints" />
+      <inherit from="LongitudinalSectionPoints"/>
     </inherits>
     <fields>
-      <field name="pointsize" type="int" display="Punktdicke" default="3" />
-      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" />
+      <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+      <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/>
     </fields>
   </theme>
   <theme name="SInfoMainValues">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Points" />
-      <inherit from="Label" />
-      <inherit from="MinMaxPoints" />
+      <inherit from="Lines"/>
+      <inherit from="Points"/>
+      <inherit from="Label"/>
+      <inherit from="MinMaxPoints"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" />
-      <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="Farbe" default="0, 96, 192"/>
+      <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="SInfoMainValuesQ">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="SInfoMainValuesW">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureWLeft">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureWRight">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureQLeft">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="InfrastructureQRight">
     <inherits>
-      <inherit from="Lines" />
-      <inherit from="Label" />
+      <inherit from="Lines"/>
+      <inherit from="Label"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" />
-      <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
+      <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/>
+      <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/>
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/>
     </fields>
   </theme>
   <theme name="UInfoSalixLine">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64"/>
     </fields>
   </theme>
   <theme name="UInfoSalixMnwMw">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255"/>
     </fields>
   </theme>
   <theme name="UInfoSalixScenario">
     <inherits>
-      <inherit from="LongitudinalSectionW" />
+      <inherit from="LongitudinalSectionW"/>
     </inherits>
     <fields>
-      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" />
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
     </fields>
   </theme>
   <theme name="UInfoSalixRank">
     <inherits>
-      <inherit from="Areas" />
+      <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" />
+      <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="UInfoSalixCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="38,138,62"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixScenarioCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMNWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 192, 0"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMHWCrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="247, 150, 70"/>
+    </fields>
+  </theme>
+  <theme name="UInfoSalixMH5CrossSectionWaterLine">
+    <inherits>
+      <inherit from="CrossSectionWaterLine"/>
+    </inherits>
+    <fields>
+      <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
     </fields>
   </theme>
 </themegroup>
\ No newline at end of file
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionWaterLineFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionWaterLineFacet.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionWaterLineFacet.java	Fri Aug 17 17:48:01 2018 +0200
@@ -36,10 +36,9 @@
 
     private final Serializable waterLineIndex;
 
-    /** Trivial constructor, set (maybe localized) description. */
-    public CrossSectionWaterLineFacet(final int idx, final String description, final ComputeType type, final String hash, final String stateId,
+    public CrossSectionWaterLineFacet(final int facetIndex, final String description, final ComputeType type, final String hash, final String stateId,
             final Serializable waterLineIndex) {
-        this(idx, CROSS_SECTION_WATER_LINE, description, type, hash, stateId, waterLineIndex);
+        this(facetIndex, CROSS_SECTION_WATER_LINE, description, type, hash, stateId, waterLineIndex);
     }
 
     /**
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Fri Aug 17 17:48:01 2018 +0200
@@ -30,11 +30,11 @@
 
     private static final long serialVersionUID = 1L;
 
-    private SInfoResultType(final String unit, final String csvHeader) {
+    protected SInfoResultType(final String unit, final String csvHeader) {
         super(unit, csvHeader, csvHeader);
     }
 
-    private SInfoResultType(final String unit, final String csvHeader, final String pdfHeader) {
+    protected SInfoResultType(final String unit, final String csvHeader, final String pdfHeader) {
         super(unit, csvHeader, pdfHeader);
     }
 
@@ -104,55 +104,6 @@
         }
     };
 
-    public static final SInfoResultType waterlevel1 = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.1.w",
-            "sinfo.flood_duration.header.pdf.mainvalue.1.w") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getFlowDepth(context);
-        }
-    };
-
-    public static final SInfoResultType waterlevel2 = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.2.w",
-            "sinfo.flood_duration.header.pdf.mainvalue.2.w") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getFlowDepth(context);
-        }
-    };
-
-    // public static final SInfoResultType waterlevel3 = new SInfoResultType(null,
-    // "sinfo.flood_duration.header.mainvalue.3.w",
-    // "sinfo.flood_duration.header.pdf.mainvalue.3.w") {
-    // private static final long serialVersionUID = 1L;
-    //
-    // @Override
-    // public String exportValue(final CallContext context, final Object value) {
-    // final double doubleValue = asDouble(value);
-    // return exportDoubleValue(context, doubleValue);
-    // }
-    //
-    // @Override
-    // protected NumberFormat createFormatter(final CallContext context) {
-    // return Formatter.getFlowDepth(context);
-    // }
-    // };
-
     public static final SInfoResultType infrastructuretype = new SInfoResultType(I18NStrings.UNIT_NONE,
             "sinfo.export.flood_duration.csv.header.infrastructure_type", "sinfo.export.flood_duration.pdf.header.infrastructure_type") {
         private static final long serialVersionUID = 1L;
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/common/UInfoResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/common/UInfoResultType.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/common/UInfoResultType.java	Fri Aug 17 17:48:01 2018 +0200
@@ -23,21 +23,8 @@
 
     private static final long serialVersionUID = 1L;
 
-    public UInfoResultType(final String unit, final String csvHeader) {
+    protected UInfoResultType(final String unit, final String csvHeader) {
         super(unit, csvHeader, csvHeader);
-
-    }
-
-    @Override
-    public String exportValue(final CallContext context, final Object value) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    protected NumberFormat createFormatter(final CallContext context) {
-        // TODO Auto-generated method stub
-        return null;
     }
 
     public static final UInfoResultType customMultiRowColSalixScenarios = new UInfoResultType(null, "uinfo.export.salix_line.csv.header.scenario") {
@@ -148,4 +135,57 @@
             return Formatter.getUeberflutungsdauer(context);
         }
     };
-}
+
+    public static final UInfoResultType waterlevelMNW = new UInfoResultType(null, null) {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            throw new UnsupportedOperationException();
+        }
+    };
+    public static final UInfoResultType waterlevelMW = new UInfoResultType(null, null) {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            throw new UnsupportedOperationException();
+        }
+    };
+    public static final UInfoResultType waterlevelMHW = new UInfoResultType(null, null) {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            throw new UnsupportedOperationException();
+        }
+    };
+    public static final UInfoResultType waterlevelMH5 = new UInfoResultType(null, null) {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            throw new UnsupportedOperationException();
+        }
+    };
+}
\ No newline at end of file
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java	Fri Aug 17 17:48:01 2018 +0200
@@ -24,6 +24,7 @@
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType;
+import org.dive4elements.river.artifacts.uinfo.salix.SalixLineCrossSectionIndexData.SalixWaterlevel;
 
 import gnu.trove.TDoubleArrayList;
 
@@ -186,7 +187,7 @@
         if (row == null)
             return Double.NaN;
 
-        // FIXME: hier wird die geodätische Höhe der SalixLinie benötigt; ggf schon in die Ergebnistzeilen einbauen
+        // FIXME: hier wird die geodätische Höhe der SalixLinie benötigt; am besten auch schon in die Ergebnistzeilen einbauen
         return 84.0;
         // return row.getDoubleValue(UInfoResultType.salixline);
     }
@@ -202,13 +203,28 @@
             return Double.NaN;
 
         // FIXME: hier wird die geodätische Höhe der SalixLinie benötigt; ggf schon als weiteres Feld an SalixScenario dranbauen
-        return 85;
+        return 89;
         // return salixScenario.getSalixValue();
     }
 
-    public final double getWaterlevelValue(final double currentKm, final double nextKm, final double prevKm, final String waterlevelName) {
+    public final double getWaterlevelValue(final double currentKm, final double nextKm, final double prevKm, final SalixWaterlevel waterlevel) {
+
         final ResultRow row = getRowForStation(currentKm, STATION_TOLERANCE);
-        // TODO implement
-        return Double.NaN;
+        if (row == null)
+            return Double.NaN;
+
+        switch (waterlevel) {
+        case mnw:
+            return row.getDoubleValue(UInfoResultType.waterlevelMNW);
+        case mw:
+            return row.getDoubleValue(UInfoResultType.waterlevelMW);
+        case mhw:
+            return row.getDoubleValue(UInfoResultType.waterlevelMHW);
+        case mh5:
+            return row.getDoubleValue(UInfoResultType.waterlevelMH5);
+
+        default:
+            throw new UnsupportedOperationException();
+        }
     }
 }
\ No newline at end of file
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java	Fri Aug 17 17:48:01 2018 +0200
@@ -28,7 +28,6 @@
 import org.dive4elements.river.artifacts.model.WstValueTable.QPosition;
 import org.dive4elements.river.artifacts.model.WstValueTableFactory;
 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
-import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper;
 import org.dive4elements.river.artifacts.uinfo.UINFOArtifact;
 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType;
@@ -151,9 +150,12 @@
         final double mnw = interpolateW(station, this.refGaugeMnwPos);
         final double mw = interpolateW(station, this.refGaugeMwPos);
         final double mhw = interpolateW(station, this.refGaugeMhwPos);
-        row.putValue(SInfoResultType.waterlevel, mnw);
-        row.putValue(SInfoResultType.waterlevel1, mw);
-        row.putValue(SInfoResultType.waterlevel2, mhw);
+        row.putValue(UInfoResultType.waterlevelMNW, mnw);
+        row.putValue(UInfoResultType.waterlevelMW, mw);
+        row.putValue(UInfoResultType.waterlevelMHW, mhw);
+        // TODO: hier noch den W(HQ5)
+        row.putValue(UInfoResultType.waterlevelMH5, Double.NaN);
+
         // Calc salix-line and mw-mnw
         row.putValue(UInfoResultType.salixline, calcSalix(mhw, mw));
         row.putValue(UInfoResultType.salix_mw_mnw, calcMwmnw(mw, mnw));
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCrossSectionIndexData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCrossSectionIndexData.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCrossSectionIndexData.java	Fri Aug 17 17:48:01 2018 +0200
@@ -19,6 +19,14 @@
  * @author Gernot Belger
  */
 public final class SalixLineCrossSectionIndexData implements Serializable {
+
+    /**
+     * Known waterlevels of the salix computation
+     */
+    public enum SalixWaterlevel {
+        mnw, mw, mhw, mh5
+    }
+
     private static final long serialVersionUID = 1L;
 
     private static final SalixLineCrossSectionIndexData SALIX_LINE = new SalixLineCrossSectionIndexData(null, null);
@@ -28,7 +36,7 @@
 
     private final Integer scenarioIndex;
 
-    private final String waterlevelName;
+    private final SalixWaterlevel waterlevel;
 
     /**
      * Creates an instance of this class that represants the salix line.
@@ -50,18 +58,18 @@
     // FIXME: gemeint sind die einzublendenden 'MNW, MW, MHW, HW5' mir nicht klar wo diese Daten herkommen, ggf. aus der
     // Rechnung?
     // FIXME: statt 'name' vielleicht eine enum oder irgend etwas anderes was diese dinger eindeutig referenzieet?
-    public static final SalixLineCrossSectionIndexData waterlevel(final String name) {
+    public static final SalixLineCrossSectionIndexData waterlevel(final SalixWaterlevel name) {
         assert name != null;
         return new SalixLineCrossSectionIndexData(null, name);
     }
 
-    private SalixLineCrossSectionIndexData(final Integer scenarioIndex, final String waterlevelName) {
+    private SalixLineCrossSectionIndexData(final Integer scenarioIndex, final SalixWaterlevel waterlevel) {
         this.scenarioIndex = scenarioIndex;
-        this.waterlevelName = waterlevelName;
+        this.waterlevel = waterlevel;
     }
 
-    public double getCrossSectionLine(final SalixLineCalculationResults results, final double currentKm, final double nextKm,
-            final double prevKm, final CallContext context) {
+    public double getCrossSectionLine(final SalixLineCalculationResults results, final double currentKm, final double nextKm, final double prevKm,
+            final CallContext context) {
 
         final SalixLineCalculationResult result = results.getResults().get(this.resultIndex);
 
@@ -70,9 +78,9 @@
             return result.getSalixScenarioValue(currentKm, nextKm, prevKm, this.scenarioIndex);
         }
 
-        if (this.waterlevelName != null) {
+        if (this.waterlevel != null) {
             // fetch waterlevel result data = salix line value at km
-            return result.getWaterlevelValue(currentKm, nextKm, prevKm, this.waterlevelName);
+            return result.getWaterlevelValue(currentKm, nextKm, prevKm, this.waterlevel);
         }
 
         // fetch normal result data = salix line value at km
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java	Fri Aug 17 17:48:01 2018 +0200
@@ -19,8 +19,12 @@
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.access.RangeAccess;
 import org.dive4elements.river.artifacts.common.AbstractProcessor;
+import org.dive4elements.river.artifacts.model.CrossSectionWaterLineFacet;
+import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType;
+import org.dive4elements.river.artifacts.uinfo.salix.SalixLineCrossSectionIndexData.SalixWaterlevel;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.themes.ThemeDocument;
 
@@ -60,6 +64,15 @@
 
     private static final String FACET_SALIX_RANK_DESCRIPTION = "uinfo_facet_salix_rank.description";
 
+    // REMARK: must end with FacetTypes.CROSS_SECTION_WATER_LINE so its correctly recognized as such a theme
+    private static final String FACET_SALIX_CROSS_SECTION_WATER_LINE = "uinfo_facet_salix_line_" + FacetTypes.CROSS_SECTION_WATER_LINE;
+
+    private static final String FACET_SALIX_CROSS_SECTION_WATER_LINE_DESCRIPTION = FACET_SALIX_CROSS_SECTION_WATER_LINE + "_description";
+
+    private static final String FACET_SALIX_SCENARIO_CROSS_SECTION_WATER_LINE = "uinfo_facet_salix_scenario_" + FacetTypes.CROSS_SECTION_WATER_LINE;
+
+    private static final String FACET_SALIX_WATERLEVEL_CROSS_SECTION_WATER_LINE_PREFIX = "uinfo_facet_salix_waterlevel_";
+
     private static final String I18N_AXIS_LABEL = "uinfo.chart.salix_line.section.yaxis.label";
 
     private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>();
@@ -107,8 +120,8 @@
     public static Facet createSalixScenarioFilteredFacet(final CallContext context, final String hash, final String id, final int dataIndex,
             final int resultIndex, final int facetIndex, final String subLabel) {
 
-        final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION,
-                FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION, subLabel);
+        final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION, FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION,
+                subLabel);
         return new SalixScenarioResultFacet(facetIndex, resultIndex, dataIndex, FACET_SALIX_SCENARIO_FILTERED, description, I18N_AXIS_LABEL, hash, id);
     }
 
@@ -125,6 +138,33 @@
         return new SalixRankResultFacet(facetIndex, resultIndex, FACET_SALIX_RANK, description, I18N_AXIS_LABEL, id, hash);
     }
 
+    public static Facet createSalixCrossSectionFacet(final CallContext context, final ComputeType type, final String hash, final String stateId,
+            final int facetIndex) {
+        final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_CROSS_SECTION_WATER_LINE_DESCRIPTION);
+        return new CrossSectionWaterLineFacet(facetIndex, FACET_SALIX_CROSS_SECTION_WATER_LINE, description, type, hash, stateId,
+                SalixLineCrossSectionIndexData.salixLine());
+    }
+
+    public static Facet createSalixScenarioCrossSectionFacet(final CallContext context, final ComputeType type, final String hash, final String stateId,
+            final int scenarioIndex, final int facetIndex, final String subLabel) {
+
+        final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION, FACET_SALIX_SCENARIO_FILTERED_DESCRIPTION,
+                subLabel);
+
+        return new CrossSectionWaterLineFacet(facetIndex, FACET_SALIX_SCENARIO_CROSS_SECTION_WATER_LINE, description, type, hash, stateId,
+                SalixLineCrossSectionIndexData.scenario(scenarioIndex));
+    }
+
+    public static Facet createSalixWaterlevelCrossSectionFacet(final CallContext context, final ComputeType type, final String hash, final String stateId,
+            final SalixWaterlevel knownWaterlevel, final int facetIndex) {
+        final String facetName = FACET_SALIX_WATERLEVEL_CROSS_SECTION_WATER_LINE_PREFIX + knownWaterlevel.name() + "_" + FacetTypes.CROSS_SECTION_WATER_LINE;
+        final String facetI10n = facetName + "_description";
+        final String facetDescirption = Resources.getMsg(context.getMeta(), facetI10n);
+
+        return new CrossSectionWaterLineFacet(facetIndex, facetName, facetDescirption, type, hash, stateId,
+                SalixLineCrossSectionIndexData.waterlevel(knownWaterlevel));
+    }
+
     @Override
     protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
 
@@ -139,7 +179,6 @@
         }
 
         if (bundle.getFacetName().equals(FACET_SALIX_RANK)) {
-            final CallContext context = generator.getContext();
             final RangeAccess kmRange = new RangeAccess((D4EArtifact) bundle.getArtifact());
             // TODO get all rank data (5 ranks) from database
             final double[][] points = new double[2][2];
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Fri Aug 17 17:48:01 2018 +0200
@@ -17,7 +17,6 @@
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.artifacts.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.CrossSectionWaterLineFacet;
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.model.EmptyFacet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
@@ -25,6 +24,7 @@
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.states.DefaultState;
 import org.dive4elements.river.artifacts.uinfo.UINFOArtifact;
+import org.dive4elements.river.artifacts.uinfo.salix.SalixLineCrossSectionIndexData.SalixWaterlevel;
 
 /**
  * @author Domenico Nardi Tironi
@@ -90,23 +90,24 @@
             facets.add(SalixLineProcessor.createSalixMnwMwRawFacet(context, hash, stateId, facetIndex++, 0));
             facets.add(SalixLineProcessor.createSalixRankFacet(context, hash, stateId, facetIndex++, 0));
 
-            facets.add(new CrossSectionWaterLineFacet(facetIndex++, "Salix Linie (!I10N!)", type, hash, stateId, SalixLineCrossSectionIndexData.salixLine()));
+            facets.add(SalixLineProcessor.createSalixCrossSectionFacet(context, type, hash, stateId, facetIndex++));
 
             final SalixLineCalculationResult result = resultList.get(0);
 
             for (int i = 0; i <= result.getScenarioCount() - 1; i++) {
-                final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw",
-                        result.getScenarioLabel(i));
+                final String scenarioLabel = result.getScenarioLabel(i);
+
+                final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw", scenarioLabel);
                 // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just
                 // increment
                 facets.add(SalixLineProcessor.createSalixScenarioFilteredFacet(context, hash, stateId, i, 0, facetIndex++, sublabel));
                 facets.add(SalixLineProcessor.createSalixScenarioRawFacet(context, hash, stateId, i, 0, facetIndex++, sublabel));
 
-                facets.add(new CrossSectionWaterLineFacet(facetIndex++, "Salix Linie Scenario (!I10N! )" + i, type, hash, stateId,
-                        SalixLineCrossSectionIndexData.scenario(i)));
+                facets.add(SalixLineProcessor.createSalixScenarioCrossSectionFacet(context, type, hash, stateId, i, facetIndex++, sublabel));
             }
 
-            // FIXME: add cross section wst lines (MW, MMHW, ...)
+            for (final SalixWaterlevel knownWaterlevel : SalixLineCrossSectionIndexData.SalixWaterlevel.values())
+                facets.add(SalixLineProcessor.createSalixWaterlevelCrossSectionFacet(context, type, hash, stateId, knownWaterlevel, facetIndex++));
 
             final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, stateId);
             final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, stateId);
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/java/org/dive4elements/river/exports/CrossSectionGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/CrossSectionGenerator.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/CrossSectionGenerator.java	Fri Aug 17 17:48:01 2018 +0200
@@ -288,7 +288,7 @@
                     attr,
                     visible);
         }
-        else if (name.equals(CROSS_SECTION_WATER_LINE)) {
+        else if (name.endsWith(CROSS_SECTION_WATER_LINE)) {
             doCrossSectionWaterLineOut(
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Fri Aug 17 17:48:01 2018 +0200
@@ -1184,7 +1184,12 @@
 uinfo_salix_calc.warning.missing_mq = MQ (MW) missing at reference gauge, no calculation possible
 uinfo_salix_calc.warning.missing_mhq = MHQ (MHW) missing at reference gauge, no salix calculation possible 
 uinfo_salix_calc.warning.missing_mnq = MNQ (MNW) missing at reference gauge, no (MW-MNW) calculation possible
-uinfo_salix_calc.warning.missing_bedheights = missing bed height values in the scenario range 
+uinfo_salix_calc.warning.missing_bedheights = missing bed height values in the scenario range
+uinfo_facet_salix_line_cross_section_water_line_description = Iota
+uinfo_facet_salix_waterlevel_mnw_cross_section_water_line_description = W(MNQ)
+uinfo_facet_salix_waterlevel_mw_cross_section_water_line_description = W(MQ)
+uinfo_facet_salix_waterlevel_mhw_cross_section_water_line_description = W(MHQ)
+uinfo_facet_salix_waterlevel_mh5_cross_section_water_line_description = W(HQ5)
 
 predefineddepthevol.total.title = Gesamt: {0}
 predefineddepthevol.peryear.title = J\u00e4hrlich: {0}
diff -r 15f274e6d83b -r bd5f5d2220fa artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Fri Aug 17 17:40:59 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Fri Aug 17 17:48:01 2018 +0200
@@ -1184,7 +1184,12 @@
 uinfo_salix_calc.warning.missing_mq = MQ (MW) fehlt am Bezugspegel, Berechnung nicht m\u00f6glich
 uinfo_salix_calc.warning.missing_mhq = MHQ (MHW) fehlt am Bezugspegel, Berechnung des Iota nicht m\u00f6glich
 uinfo_salix_calc.warning.missing_mnq = MNQ (MNW) fehlt am Bezugspegel, Berechnung von (MW-MNW) nicht m\u00f6glich
-uinfo_salix_calc.warning.missing_bedheights = Im Teilabschnitt fehlen Sohlh\u00f6hen 
+uinfo_salix_calc.warning.missing_bedheights = Im Teilabschnitt fehlen Sohlh\u00f6hen
+uinfo_facet_salix_line_cross_section_water_line_description = Iota
+uinfo_facet_salix_waterlevel_mnw_cross_section_water_line_description = W(MNQ)
+uinfo_facet_salix_waterlevel_mw_cross_section_water_line_description = W(MQ)
+uinfo_facet_salix_waterlevel_mhw_cross_section_water_line_description = W(MHQ)
+uinfo_facet_salix_waterlevel_mh5_cross_section_water_line_description = W(HQ5)
 
 predefineddepthevol.total.title = Gesamt: {0}
 predefineddepthevol.peryear.title = J\u00e4hrlich: {0}
diff -r 15f274e6d83b -r bd5f5d2220fa gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java	Fri Aug 17 17:40:59 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java	Fri Aug 17 17:48:01 2018 +0200
@@ -619,7 +619,7 @@
     @Override
     protected boolean canArea(Theme a) {
         return a.getFacet().equals("cross_section")
-            || a.getFacet().equals("cross_section_water_line")
+            || a.getFacet().endsWith("cross_section_water_line")
             || a.getFacet().endsWith("line");
     }
 


More information about the Dive4Elements-commits mailing list