changeset 6264:e8f152163a1e double-precision

merge changes from default into double-precision branch
author Tom Gottfried <tom.gottfried@intevation.de>
date Tue, 11 Jun 2013 09:40:56 +0200
parents a3fb76cf79b6 (current diff) f01dee3a39fc (diff)
children e7526a074c0d
files artifacts/doc/conf/themes/default/cross-section.xml artifacts/doc/conf/themes/default/discharge.xml artifacts/doc/conf/themes/default/duration.xml artifacts/doc/conf/themes/default/fixings.xml artifacts/doc/conf/themes/default/floodmap.xml artifacts/doc/conf/themes/default/general.xml artifacts/doc/conf/themes/default/historical-discharge.xml artifacts/doc/conf/themes/default/longitudinal-section.xml artifacts/doc/conf/themes/default/reference.xml artifacts/doc/conf/themes/default/sq-relation.xml artifacts/doc/conf/themes/second/cross-section.xml artifacts/doc/conf/themes/second/discharge.xml artifacts/doc/conf/themes/second/duration.xml artifacts/doc/conf/themes/second/fixings.xml artifacts/doc/conf/themes/second/floodmap.xml artifacts/doc/conf/themes/second/general.xml artifacts/doc/conf/themes/second/historical-discharge.xml artifacts/doc/conf/themes/second/longitudinal-section.xml artifacts/doc/conf/themes/second/reference.xml artifacts/doc/conf/themes/second/sq-relation.xml
diffstat 194 files changed, 7462 insertions(+), 5863 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 05 11:56:38 2013 +0200
+++ b/.hgtags	Tue Jun 11 09:40:56 2013 +0200
@@ -50,3 +50,5 @@
 b740f0c4179edb5238d27013b25a0b3cc52e4e7f 3.0.3
 5f34e4cb80952b94e4683d90dbaab59e9da3711a 3.0.4
 1a169e10c0f3e1f33990a91dd294512ac97d1a70 3.0.5
+b689d2b9d1675739778083b2bcba336abb33f70c 3.0.6
+5733d7f27196c5a8cf18231fbf187738f8fea560 3.0.7
--- a/artifacts/doc/conf/artifacts/minfo.xml	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -229,7 +229,6 @@
                         <facet name="bedheight_difference.year.height2" description="A facet for raw heights."/>
                         <facet name="bedheight_difference.year.height1.filtered" description="A facet for raw heights."/>
                         <facet name="bedheight_difference.year.height2.filtered" description="A facet for raw heights."/>
-                        <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
                         <facet name="fix_sector_average_ls_0" description="Datacage facet"/>
                         <facet name="fix_sector_average_ls_1" description="Datacage facet"/>
                         <facet name="fix_sector_average_ls_2" description="Datacage facet"/>
@@ -257,7 +256,6 @@
                         <facet name="bed_difference_epoch.manualpoints" />
                         <facet name="bedheight_difference.epoch.height1" description="A facet for raw heights."/>
                         <facet name="bedheight_difference.epoch.height2" description="A facet for raw heights."/>
-                        <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
                         <facet name="fix_sector_average_ls_0" description="Datacage facet"/>
                         <facet name="fix_sector_average_ls_1" description="Datacage facet"/>
                         <facet name="fix_sector_average_ls_2" description="Datacage facet"/>
@@ -279,6 +277,12 @@
                         <facet name="morph-width" description="morphologic width, not sounding width!"/>
                     </facets>
                 </outputmode>
+                <outputmode name="bedheight_difference_export" description="output.bedheight_differenceexport" mime-type="text/plain" type="export">
+                    <facets>
+                        <facet name="csv" description="facet.bedheight_difference_export.csv" />
+                        <facet name="pdf" description="facet.bedheight_difference_export.pdf" />
+                    </facets>
+                </outputmode>
             </outputmodes>
         </state>
 
@@ -391,14 +395,17 @@
             <outputmodes>
                 <outputmode name="bed_longitudinal_section" description="output.bed_longitudinal_section" mime-type="image/png" type="chart">
                     <facets>
-                    	<facet name="bed_longitudinal_section.porosity_toplayer"/>
-                    	<facet name="bed_longitudinal_section.porosity_sublayer"/>
-                    	<facet name="bed_longitudinal_section.sediment_density_toplayer"/>
-                    	<facet name="bed_longitudinal_section.sediment_density_sublayer"/>
-                    	<facet name="bed_longitudinal_section.bed_diameter_toplayer"/>
+                        <facet name="bed_longitudinal_section.porosity_toplayer"/>
+                        <facet name="bed_longitudinal_section.porosity_sublayer"/>
+                        <facet name="bed_longitudinal_section.sediment_density_toplayer"/>
+                        <facet name="bed_longitudinal_section.sediment_density_sublayer"/>
+                        <facet name="bed_longitudinal_section.bed_diameter_toplayer"/>
                         <facet name="bed_longitudinal_section.bed_diameter_sublayer"/>
+                        <facet name="bed_longitudinal_section.bed_diameter_data_top"/>
+                        <facet name="bed_longitudinal_section.bed_diameter_data_sub"/>
+                        <facet name="bed_longitudinal_section.bedload_diameter_data"/>
                         <facet name="bed_longitudinal_section.manualpoints" />
-                    	<facet name="bed_longitudinal_section.bedload_diameter"/>
+                        <facet name="bed_longitudinal_section.bedload_diameter"/>
                         <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
                     </facets>
                 </outputmode>
--- a/artifacts/doc/conf/conf.xml	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/conf.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -332,6 +332,7 @@
         <output-generator name="bed_difference_epoch_chartinfo">org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator</output-generator>
         <output-generator name="bed_difference_height_year">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator>
         <output-generator name="bed_difference_height_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator</output-generator>
+        <output-generator name="bedheight_difference_export">org.dive4elements.river.exports.minfo.BedDifferenceExporter</output-generator>
         <output-generator name="sq_relation_a">org.dive4elements.river.exports.sq.SQRelationGeneratorA</output-generator>
         <output-generator name="sq_relation_b">org.dive4elements.river.exports.sq.SQRelationGeneratorB</output-generator>
         <output-generator name="sq_relation_c">org.dive4elements.river.exports.sq.SQRelationGeneratorC</output-generator>
Binary file artifacts/doc/conf/jasper/beddifference.jasper has changed
Binary file artifacts/doc/conf/jasper/beddifference_en.jasper has changed
Binary file artifacts/doc/conf/jasper/sqrelation.jasper has changed
Binary file artifacts/doc/conf/jasper/sqrelation_en.jasper has changed
--- a/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Tue Jun 11 09:40:56 2013 +0200
@@ -30,3 +30,11 @@
         OUTLINECOLOR "#800000"
     END
 END
+CLASS
+    NAME "Ringdeich"
+    EXPRESSION ("[TYP]"="Ringdeich")
+    STYLE
+        SIZE 5
+        OUTLINECOLOR "#800000"
+    END
+END
--- a/artifacts/doc/conf/mapserver/mapfile.vm	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/mapserver/mapfile.vm	Tue Jun 11 09:40:56 2013 +0200
@@ -14,7 +14,7 @@
     END
 
     DEBUG 5
-    CONFIG "MS_ERRORFILE" "/tmp/flys-user-wms.log"
+    CONFIG "MS_ERRORFILE" "d4e-wms.log"
 
     WEB
       METADATA
--- a/artifacts/doc/conf/meta-data.xml	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -5,8 +5,12 @@
     <dc:comment>
       User specific part
       ------------------
+      This is a hack because we currently have no way to supress empty
+      folders (either in the client or in the datacage).
     </dc:comment>
-    <dc:if test="dc:contains($parameters, 'user-id') and not(dc:contains($artifact-outs, 'floodmap-hws'))">
+    <dc:if test="dc:contains($parameters, 'user-id') and
+      not(dc:contains($artifact-outs, 'floodmap-hws')) and
+      not($current-state-id = 'state.winfo.uesk.dgm')">
       <dc:call-macro name="load-user"/>
     </dc:if>
 
@@ -32,7 +36,7 @@
     </dc:macro>
 
     <dc:macro name="generate-system-content">
-      <dc:call-macro name="user-range">
+      <dc:call-macro name="artifact-range">
         <dc:call-macro name="km-filtered-wsts">
           <dc:choose>
             <dc:when test="dc:contains($parameters, 'recommended')">
@@ -186,6 +190,7 @@
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
                     <dc:call-macro name="basedata_3_officials"/>
+                    <dc:call-macro name="basedata_6_delta_w"/>
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
@@ -242,12 +247,6 @@
                   </dc:when>
                   <dc:when test="$out = 'minfo-heights'">
                     <dc:call-macro name="minfo-heights"/>
-                    <dc:macro name="minfo-heights">
-                      <bedheights>
-                        <dc:call-macro name="bed-heights-single"/>
-                        <dc:call-macro name="bed-heights-epoch"/>
-                      </bedheights>
-                    </dc:macro>
                   </dc:when>
                   <dc:when test="$out = 'minfo-heights-epoch'">
                     <bedheights>
@@ -255,7 +254,7 @@
                     </bedheights>
                   </dc:when>
                   <dc:when test="$out = 'waterlevels'">
-                    <dc:if test="current-state-id != 'state.winfo.uesk.wsp'">
+                    <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'">
                       <dc:call-macro name="basedata_0"/>
                       <dc:call-macro name="basedata_1_additionals"/>
                       <dc:call-macro name="basedata_2_fixations"/>
@@ -272,949 +271,642 @@
     </dc:macro>
 
     <dc:macro name="generate-user-content">
-      <dc:call-macro name="user-range">
-        <dc:call-macro name="km-filtered-userdata">
-          <dc:choose>
-            <dc:when test="dc:contains($parameters, 'recommended')">
-              <dc:comment>
-                Recommendations (client shall load immediately).
-              </dc:comment>
-              <dc:iterate var="out" container="artifact-outs">
-                <dc:choose>
-                  <dc:when test="$out = 'longitudinal_section'">
-                    <dc:call-macro name="officiallines_user"/>
-                  </dc:when>
-                </dc:choose>
-              </dc:iterate>
-            </dc:when>
-            <dc:otherwise>
-              <dc:comment>
-                Non Recommendations
-              </dc:comment>
-              <dc:iterate var="out" container="artifact-outs">
-                <dc:choose>
-                  <dc:when test="$out = 'longitudinal_section'">
-                    <dc:call-macro name="longitudinal"/>
-                    <dc:call-macro name="differences"/>
-                  </dc:when>
-                  <dc:when test="$out = 'discharge_longitudinal_section'">
-                    <dc:call-macro name="longitudinal"/>
-                    <dc:call-macro name="differences"/>
-                  </dc:when>
-                  <dc:when test="$out = 'w_differences'">
-                    <dc:call-macro name="longitudinal"/>
-                    <dc:call-macro name="differences"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_deltawt_curve'">
-                    <dc:call-macro name="delta-wt"/>
-                  </dc:when>
-                  <dc:when test="$out = 'reference_curve'">
-                    <dc:call-macro name="reference-curves"/>
-                  </dc:when>
-                  <dc:when test="$out = 'computed_discharge_curve'">
-                    <dc:call-macro name="computed-discharge-curve"/>
-                  </dc:when>
-                  <dc:when test="$out = 'cross_section'">
-                    <dc:call-macro name="waterlevels"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_longitudinal_section_curve'">
-                    <dc:call-macro name="longitudinal-section"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_derivate_curve'">
-                    <dc:call-macro name="fix-derivate-curve"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="fix-wq-curve"/>
-                  </dc:when>
-                  <dc:when test="$out = 'duration_curve'">
-                    <dc:call-macro name="duration-curve"/>
-                  </dc:when>
-                  <dc:when test="$out = 'waterlevels'">
-                    <dc:call-macro name="waterlevels-fix"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="waterlevels-fix"/>
-                  </dc:when>
-                  <dc:when test="$out = 'floodmap'">
-                    <dc:call-macro name="flood-map"/>
-                  </dc:when>
-                  <dc:when test="$out = 'map'">
-                    <dc:call-macro name="flood-map"/>
-                  </dc:when>
-                  <dc:when test="$out = 'bedheight_middle'">
-                    <dc:call-macro name="waterlevels-discharge"/>
-                    <dc:call-macro name="waterlevels-fix"/>
-                  </dc:when>
-                  <dc:when test="$out = 'floodmap-hws'">
-                    <dc:call-macro name="floodmap-hws-user"/>
-                  </dc:when>
-                  <dc:when test="$out = 'flow_velocity'">
-                    <dc:call-macro name="bedquality-bed"/>
-                    <dc:call-macro name="bedquality-load"/>
-                  </dc:when>
-                  <dc:when test="$out = 'bed_longitudinal_section'">
-                    <dc:call-macro name="bedquality-bed"/>
-                    <dc:call-macro name="bedquality-load"/>
-                    <dc:call-macro name="bedquality-density"/>
-                    <dc:call-macro name="bedquality-porosity"/>
-                  </dc:when>
-                  <dc:when test="$out = 'sedimentload_ls'">
-                    <dc:call-macro name="differences"/>
-                    <dc:call-macro name="bedheight-differences"/>
-                    <dc:call-macro name="flow-velocity"/>
-                    <dc:call-macro name="sediment-load"/>
-                  </dc:when>
-                  <dc:when test="$out = 'bed_difference_year'">
-                    <dc:call-macro name="waterlevels-discharge"/>
-                    <dc:call-macro name="bedheight-differences"/>
-                    <dc:call-macro name="differences"/>
-                    <dc:call-macro name="waterlevels-fix"/>
-                    <dc:call-macro name="delta-wt-ls"/>
-                  </dc:when>
-                  <dc:when test="$out = 'bed_difference_epoch'">
-                    <dc:call-macro name="waterlevels-discharge"/>
-                    <dc:call-macro name="bedheight-differences"/>
-                    <dc:call-macro name="differences"/>
-                    <dc:call-macro name="waterlevels-fix"/>
-                    <dc:call-macro name="delta-wt-ls"/>
-                  </dc:when>
-                </dc:choose>
-              </dc:iterate>
-            </dc:otherwise>
-          </dc:choose>
+      <dc:call-macro name="artifact-range">
+        <dc:call-macro name="all-user-artifacts">
+          <dc:call-macro name="km-filtered-user-artifacts">
+            <dc:choose>
+              <dc:when test="dc:contains($parameters, 'recommended')">
+                <dc:comment>
+                  Recommendations (user)
+                </dc:comment>
+                <dc:iterate var="out" container="artifact-outs">
+                  <dc:choose>
+                    <dc:when test="$out = 'longitudinal_section'">
+                      <dc:call-macro name="officiallines_user"/>
+                    </dc:when>
+                  </dc:choose>
+                </dc:iterate>
+              </dc:when>
+              <dc:otherwise>
+                <dc:comment>
+                  Non Recommendations (user)
+                </dc:comment>
+                <dc:iterate var="out" container="artifact-outs">
+                  <dc:choose>
+                    <dc:when test="$out = 'longitudinal_section'">
+                      <dc:call-macro name="longitudinal"/>
+                      <dc:call-macro name="differences"/>
+                    </dc:when>
+                    <dc:when test="$out = 'discharge_longitudinal_section'">
+                      <dc:call-macro name="longitudinal"/>
+                      <dc:call-macro name="differences"/>
+                    </dc:when>
+                    <dc:when test="$out = 'w_differences'">
+                      <dc:call-macro name="longitudinal"/>
+                      <dc:call-macro name="differences"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_deltawt_curve'">
+                      <dc:call-macro name="delta-wt"/>
+                    </dc:when>
+                    <dc:when test="$out = 'reference_curve'">
+                      <dc:call-macro name="reference-curves"/>
+                    </dc:when>
+                    <dc:when test="$out = 'computed_discharge_curve'">
+                      <dc:call-macro name="computed-discharge-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'cross_section'">
+                      <dc:call-macro name="waterlevels"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_longitudinal_section_curve'">
+                      <dc:call-macro name="longitudinal-section"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_derivate_curve'">
+                      <dc:call-macro name="fix-derivate-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_wq_curve'">
+                      <dc:call-macro name="fix-wq-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'duration_curve'">
+                      <dc:call-macro name="duration-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'waterlevels'">
+                      <dc:call-macro name="waterlevels-fix"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_wq_curve'">
+                      <dc:call-macro name="waterlevels-fix"/>
+                    </dc:when>
+                    <dc:when test="$out = 'floodmap'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
+                    <dc:when test="$out = 'map'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
+                    <dc:when test="$out = 'bedheight_middle'">
+                      <dc:call-macro name="waterlevels-discharge"/>
+                      <dc:call-macro name="waterlevels-fix"/>
+                    </dc:when>
+                    <dc:when test="$out = 'floodmap-hws'">
+                      <dc:call-macro name="floodmap-hws-user"/>
+                    </dc:when>
+                    <dc:when test="$out = 'flow_velocity'">
+                      <dc:call-macro name="bedquality-bed"/>
+                      <dc:call-macro name="bedquality-load"/>
+                    </dc:when>
+                    <dc:when test="$out = 'bed_longitudinal_section'">
+                      <dc:call-macro name="bedquality-bed"/>
+                      <dc:call-macro name="bedquality-load"/>
+                      <dc:call-macro name="bedquality-density"/>
+                      <dc:call-macro name="bedquality-porosity"/>
+                    </dc:when>
+                    <dc:when test="$out = 'sedimentload_ls'">
+                      <dc:call-macro name="differences"/>
+                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="flow-velocity"/>
+                      <dc:call-macro name="sediment-load"/>
+                    </dc:when>
+                    <dc:when test="$out = 'bed_difference_year'">
+                      <dc:call-macro name="waterlevels-discharge"/>
+                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="differences"/>
+                      <dc:call-macro name="waterlevels-fix"/>
+                      <dc:call-macro name="delta-wt-ls"/>
+                    </dc:when>
+                    <dc:when test="$out = 'bed_difference_epoch'">
+                      <dc:call-macro name="waterlevels-discharge"/>
+                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="differences"/>
+                      <dc:call-macro name="waterlevels-fix"/>
+                      <dc:call-macro name="delta-wt-ls"/>
+                    </dc:when>
+                  </dc:choose>
+                </dc:iterate>
+              </dc:otherwise>
+            </dc:choose>
+          </dc:call-macro>
         </dc:call-macro>
       </dc:call-macro>
     </dc:macro>
 
     <!-- Macros to load user data -->
 
-    <dc:macro name="select-facets">
-      <dc:context>
-        <dc:statement>
-          SELECT a.gid         AS aid,
-                 f.id          AS fid,
-                 f.name        AS facet_name,
-                 f.num         AS facet_num,
-                 f.description AS facet_description
-          FROM artifacts a
-            JOIN outs o   ON o.artifact_id = a.id
-            JOIN facets f ON f.out_id = o.id
-          WHERE a.id = ${a_id}
-            AND f.name = ${facet_type}
-        </dc:statement>
+    <dc:macro name="differences">
+      <dc:filter expr="$facet_name = 'w_differences'">
         <dc:if test="dc:has-result()">
-          <dc:macro-body/>
+          <differences>
+            <dc:for-each>
+              <w_differences
+                description="{$facet_description}"
+                factory="winfo" target_out="{$out}"
+                artifact-id="{$aid}"
+                ids="{$aid}"
+                out="w_differences"/>
+            </dc:for-each>
+          </differences>
         </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="differences">
-      <dc:variable name="facet_type" value="w_differences"/>
-      <dc:call-macro name="select-facets">
-        <differences>
-          <dc:for-each>
-            <w_differences
-              description="{$facet_description}"
-              factory="winfo"
-              artifact-id="{$aid}"
-              ids="{$aid}"
-              out="w_differences"/>
-          </dc:for-each>
-        </differences>
-      </dc:call-macro>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="reference-curves">
-      <dc:variable name="facet_type" value="reference_curve"/>
-      <dc:call-macro name="select-facets">
-        <reference_curves>
-          <dc:for-each>
-            <dc:element name="${facet_name}">
-              <dc:attribute name="description" value="${facet_description}"/>
-              <dc:attribute name="factory" value="winfo"/>
-              <dc:attribute name="artifact-id" value="${aid}"/>
-              <dc:attribute name="ids" value="${aid}"/>
-              <dc:attribute name="out" value="reference_curve"/>
-            </dc:element>
-          </dc:for-each>
-        </reference_curves>
-      </dc:call-macro>
+      <dc:filter expr="$facet_name = 'reference_curve'">
+        <dc:if test="dc:has-result()">
+          <reference_curves>
+            <dc:for-each>
+              <dc:element name="${facet_name}">
+                <dc:attribute name="description" value="${facet_description}"/>
+                <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
+                <dc:attribute name="artifact-id" value="${a_id}"/>
+                <dc:attribute name="ids" value="${a_id}"/>
+                <dc:attribute name="out" value="reference_curve"/>
+              </dc:element>
+            </dc:for-each>
+          </reference_curves>
+        </dc:if>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="computed-discharge-curve">
-      <dc:variable name="facet_type" value="computed_discharge_curve.q"/>
-      <dc:call-macro name="select-facets">
-        <computed_discharge_curves>
-          <dc:for-each>
-            <dc:element name="${facet_name}">
-              <dc:attribute name="description" value="${facet_description}"/>
-              <dc:attribute name="factory" value="winfo"/>
-              <dc:attribute name="artifact-id" value="${aid}"/>
-              <dc:attribute name="ids" value="${aid}"/>
-              <dc:attribute name="out" value="computed_discharge_curve"/>
-            </dc:element>
-          </dc:for-each>
-        </computed_discharge_curves>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="flood-map">
-      <dc:variable name="facet_type" value="floodmap.wsplgen"/>
-      <dc:call-macro name="select-facets">
-        <floodmap>
-          <dc:for-each>
-            <dc:element name="${facet_name}">
-              <dc:attribute name="description" value="${facet_description}"/>
-              <dc:attribute name="factory" value="winfo"/>
-              <dc:attribute name="artifact-id" value="${aid}"/>
-              <dc:attribute name="ids" value="${aid}"/>
-              <dc:attribute name="out" value="floodmap"/>
-            </dc:element>
-          </dc:for-each>
-        </floodmap>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="waterlevels">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'cross_section'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name AS facet_name, num AS facet_num, description AS facet_description
-                    FROM facets
-                  WHERE out_id = ${out_id}
-                    ORDER BY num ASC, name DESC
-                </dc:statement>
-                <longitudinal_section_columns description="{$river} {$a_creation}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="winfo"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="cross_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </longitudinal_section_columns>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="longitudinal">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id}
-            AND name = 'longitudinal_section'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name        AS facet_name,
-                         num         AS facet_num,
-                         description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id}
-                    ORDER BY num ASC, name DESC
-                </dc:statement>
-                <longitudinal_section_columns description="{$river} {$a_creation}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="winfo"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </longitudinal_section_columns>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="longitudinal-section">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id}
-            AND name = 'fix_longitudinal_section_curve'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name        AS facet_name,
-                         num         AS facet_num,
-                         description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} AND (
-                      name LIKE 'fix_deviation_ls%'       OR
-                      name LIKE 'fix_sector_average_ls%'  OR
-                      name LIKE 'fix_analysis_events_ls%' OR
-                      name LIKE 'fix_reference_events_ls%')
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="fixanalysis"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="delta-wt">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id}
-            AND name = 'fix_deltawt_curve'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name        AS facet_name,
-                         num         AS facet_num,
-                         description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} and (
-                    name LIKE 'fix_sector_average_dwt%' OR
-                    name LIKE 'fix_deviation_dwt%'      OR
-                    name = 'fix_analysis_events_dwt'    OR
-                    name = 'fix_reference_events_dwt'   OR
-                    name = 'fix_analysis_periods_dwt')
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="fixanalysis"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="fix_deltawt_curve"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="delta-wt-ls">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'fix_deltawt_curve'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name AS facet_name, num AS facet_num, description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} and (
-                    name LIKE 'fix_sector_average_dwt%' OR
-                    name LIKE 'fix_deviation_dwt%')
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="fixanalysis"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="fix_deltawt_curve"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="fix-derivate-curve">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'fix_derivate_curve'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name AS facet_name, num AS facet_num, description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} and name = 'fix_derivate_curve'
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="fixanalysis"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="fix_derivate_curve"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="fix-wq-curve">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'fix_wq_curve'
-        </dc:statement>
-        <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name AS facet_name, num AS facet_num, description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} and (
-                    name LIKE 'fix_sector_average_wq%'  OR
-                    name = 'fix_wq_curve'               OR
-                    name LIKE 'fix_analysis_events_wq%' OR
-                    name LIKE 'fix_reference_events_wq%' )
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="fixanalysis"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="fix_wq_curve"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
-          </waterlevels>
-        </dc:if>
-      </dc:context>
-    </dc:macro>
-
-    <dc:macro name="duration-curve">
-      <dc:context>
-        <dc:statement>
-          SELECT a.gid         AS aid,
-                 f.id          AS fid,
-                 f.name        AS facet_name,
-                 f.num         AS facet_num,
-                 f.description AS facet_description
-          FROM outs AS o, facets AS f, artifacts AS a
-          WHERE
-              (f.name = 'duration_curve.q' OR f.name = 'duration_curve.w') AND
-              f.out_id = o.id         AND
-              o.artifact_id = ${a_id} AND
-              a.id = ${a_id}
-        </dc:statement>
+      <dc:filter expr="$facet_name = 'computed_discharge_curve.q'">
         <dc:if test="dc:has-result()">
           <computed_discharge_curves>
             <dc:for-each>
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory" value="winfo"/>
-                <dc:attribute name="artifact-id" value="${aid}"/>
-                <dc:attribute name="ids" value="${aid}"/>
+                <dc:attribute name="target_out" value="${out}"/>
+                <dc:attribute name="artifact-id" value="${a_id}"/>
+                <dc:attribute name="ids" value="${a_id}"/>
+                <dc:attribute name="out" value="computed_discharge_curve"/>
+              </dc:element>
+            </dc:for-each>
+          </computed_discharge_curves>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="flood-map">
+      <dc:filter expr="$facet_name = 'floodmap.wsplgen'">
+        <dc:if test="dc:has-result()">
+          <floodmap>
+            <dc:for-each>
+              <dc:variable name="combined_desc" expr="concat($facet_description, ' ', $a_creation, ' ', $collection_name)"/>
+              <dc:element name="${facet_name}">
+                <dc:attribute name="description" value="${combined_desc}"/>
+                <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
+                <dc:attribute name="artifact-id" value="${a_id}"/>
+                <dc:attribute name="ids" value="${a_id}"/>
+                <dc:attribute name="out" value="floodmap"/>
+              </dc:element>
+            </dc:for-each>
+          </floodmap>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="waterlevels">
+      <dc:filter expr="$out_name = 'cross_section'">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation)">
+              <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment>
+              <longitudinal_section_columns description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="cross_section"/>
+                  </dc:element>
+                </dc:for-each>
+              </longitudinal_section_columns>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="longitudinal">
+      <dc:filter expr="$out_name = 'longitudinal_section'">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation)">
+              <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment>
+              <longitudinal_section_columns description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
+              </longitudinal_section_columns>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="longitudinal-section">
+      <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and
+        (starts-with($facet_name, 'fix_deviation_ls') or
+        starts-with($facet_name, 'fix_sector_average_ls') or
+        starts-with($facet_name, 'fix_analysis_events_ls') or
+        starts-with($facet_name, 'fix_reference_events_ls'))">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="delta-wt">
+      <dc:filter expr="$out_name = 'fix_deltawt_curve' and
+        ($facet_name = 'fix_analysis_events_dwt' or
+        $facet_name = 'fix_analysis_periods_dwt' or
+        $facet_name = 'fix_reference_events_dwt' or
+        starts-with($facet_name, 'fix_deviation_dwt') or
+        starts-with($facet_name, 'fix_sector_average_dwt'))">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="fix_deltawt_curve"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="delta-wt-ls">
+      <dc:filter expr="$out_name = 'fix_deltawt_curve' and
+        (starts-with($facet_name, 'fix_sector_average_dwt') or
+        starts-with($facet_name, 'fix_deviation_dwt'))">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="fix_deltawt_curve"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="fix-derivate-curve">
+      <dc:filter expr="$out_name = 'fix_derivate_curve' and $facet_name = 'fix_derivate_curve'">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="fix_derivate_curve"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="fix-wq-curve">
+      <dc:filter expr="$out_name = 'fix_wq_curve' and
+        (starts-with($facet_name, 'fix_analysis_events_wq') or
+        starts-with($facet_name, 'fix_reference_events_wq') or
+        starts-with($facet_name, 'fix_sector_average_wq') or
+        $facet_name = 'fix_wq_curve')">
+        <dc:if test="dc:has-result()">
+          <waterlevels>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="fixanalysis"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="fix_wq_curve"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
+          </waterlevels>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="duration-curve">
+      <dc:filter expr="$facet_name = 'duration_curve.q' or $facet_name = 'duration_curve.w'">
+        <dc:if test="dc:has-result()">
+          <computed_discharge_curves>
+            <dc:for-each>
+              <dc:element name="${facet_name}">
+                <dc:attribute name="description" value="${facet_description}"/>
+                <dc:attribute name="factory" value="winfo"/>
+                <dc:attribute name="target_out" value="${out}"/>
+                <dc:attribute name="artifact-id" value="${a_id}"/>
+                <dc:attribute name="ids" value="${a_id}"/>
                 <dc:attribute name="out" value="duration_curve"/>
               </dc:element>
             </dc:for-each>
           </computed_discharge_curves>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
-    <dc:comment>TODO doesnt work nicely for fix/wq-diags.</dc:comment>
+    <dc:comment>TODO doesnt work nicely for fix/wq-diags. Aheinecke (27.5.2013): Why?</dc:comment>
     <dc:macro name="waterlevels-fix">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w'">
         <dc:if test="dc:has-result()">
           <waterlevels>
-            <dc:for-each>
-              <dc:context>
-                <dc:statement>
-                  SELECT name AS facet_name, num AS facet_num, description AS facet_description
-                  FROM facets
-                  WHERE out_id = ${out_id} and name = 'longitudinal_section.w'
-                  ORDER BY num ASC, name DESC
-                </dc:statement>
-                <waterlevels description="{$river} {$a_creation} {$collection_name}">
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <dc:attribute name="factory" value="winfo"/>
-                      <dc:attribute name="artifact-id" value="${a_gid}"/>
-                      <dc:attribute name="out" value="longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </waterlevels>
-              </dc:context>
-            </dc:for-each>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <waterlevels description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
+                    <dc:attribute name="out" value="longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
+              </waterlevels>
+            </dc:group>
           </waterlevels>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="floodmap-hws-user">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS out_id
-          FROM outs
-          WHERE artifact_id = ${a_id} AND name = 'floodmap'
-        </dc:statement>
-        <dc:for-each>
-          <dc:context>
-            <dc:statement>
-              SELECT name        AS facet_name,
-                     num         AS facet_num,
-                     description AS facet_description
-              FROM facets
-              WHERE out_id = ${out_id} AND name = 'floodmap.usershape'
-              ORDER BY num ASC, name DESC
-            </dc:statement>
-            <own-hws>
-              <dc:for-each>
-                <dc:element name="${facet_name}">
-                  <dc:attribute name="description" value="${facet_description}"/>
-                  <dc:attribute name="ids" value="${facet_num}"/>
-                  <dc:attribute name="factory" value="winfo"/>
-                  <dc:attribute name="artifact-id" value="${a_gid}"/>
-                  <dc:attribute name="out" value="floodmap"/>
-                </dc:element>
-              </dc:for-each>
-            </own-hws>
-          </dc:context>
-        </dc:for-each>
-      </dc:context>
+      <dc:comment>No grouping in this?</dc:comment>
+      <dc:filter expr="$out_name = 'floodmap' and $facet_name = 'floodmap.usershape'">
+        <own-hws>
+          <dc:for-each>
+            <dc:element name="${facet_name}">
+              <dc:attribute name="description" value="${facet_description}"/>
+              <dc:attribute name="ids" value="${facet_num}"/>
+              <dc:attribute name="factory" value="winfo"/>
+              <dc:attribute name="target_out" value="${out}"/>
+              <dc:attribute name="artifact-id" value="${a_gid}"/>
+              <dc:attribute name="out" value="floodmap"/>
+            </dc:element>
+          </dc:for-each>
+        </own-hws>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="bedquality-bed">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            o.name='bed_longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'bed_longitudinal_section' and
+        ($facet_name = 'bed_longitudinal_section.bed_diameter_toplayer' or
+        $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer')">
         <dc:if test="dc:has-result()">
           <bed_quality_bed>
-            <dc:for-each>
-              <quality-bed description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE
-                      (f.name = 'bed_longitudinal_section.bed_diameter_toplayer'
-                       OR f.name = 'bed_longitudinal_section.bed_diameter_sublayer') AND
-                       f.out_id = o.id         AND
-                       o.artifact_id = ${a_id} AND
-                       a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="bed_longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <quality-bed description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="bed_longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
               </quality-bed>
-            </dc:for-each>
+            </dc:group>
           </bed_quality_bed>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="bedquality-load">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            o.name='bed_longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'bed_longitudinal_section' and
+        $facet_name = 'bed_longitudinal_section.bedload_diameter'">
         <dc:if test="dc:has-result()">
           <bed_quality_load>
-            <dc:for-each>
-              <quality-load description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE
-                       f.name = 'bed_longitudinal_section.bedload_diameter' AND
-                       f.out_id = o.id         AND
-                       o.artifact_id = ${a_id} AND
-                       a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="bed_longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <quality-load description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="bed_longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
               </quality-load>
-            </dc:for-each>
+            </dc:group>
           </bed_quality_load>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="bedquality-density">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            o.name='bed_longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'bed_longitudinal_section' and
+        ($facet_name = 'bed_longitudinal_section.sediment_density_toplayer' or
+         $facet_name = 'bed_longitudinal_section.sediment_density_sublayer')">
         <dc:if test="dc:has-result()">
           <bed_quality_density>
-            <dc:for-each>
-              <density description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE
-                       (f.name = 'bed_longitudinal_section.sediment_density_toplayer' OR
-                        f.name = 'bed_longitudinal_section.sediment_density_sublayer') AND
-                       f.out_id = o.id         AND
-                       o.artifact_id = ${a_id} AND
-                       a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="bed_longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <density description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="bed_longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
               </density>
-            </dc:for-each>
+            </dc:group>
           </bed_quality_density>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="bedquality-porosity">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            o.name='bed_longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'bed_longitudinal_section' and
+        ($facet_name = 'bed_longitudinal_section.porosity_toplayer' or
+        $facet_name = 'bed_longitudinal_section.porosity_sublayer')">
         <dc:if test="dc:has-result()">
           <bed_quality_porosity>
-            <dc:for-each>
-              <porosity description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE
-                       (f.name = 'bed_longitudinal_section.porosity_toplayer' OR
-                        f.name = 'bed_longitudinal_section.porosity_sublayer') AND
-                       f.out_id = o.id         AND
-                       o.artifact_id = ${a_id} AND
-                       a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="bed_longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <porosity description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="bed_longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
               </porosity>
-            </dc:for-each>
+            </dc:group>
           </bed_quality_porosity>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="flow-velocity">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} and o.name='flow_velocity'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'flow_velocity' and
+        ($facet_name = 'flow_velocity.totalchannel' or
+         $facet_name = 'flow_velocity.mainchannel' or
+         $facet_name = 'flow_velocity.totalchannel.filtered' or
+         $facet_name = 'flow_velocity.mainchannel.filtered')">
         <dc:if test="dc:has-result()">
           <flow-velocity>
-            <dc:for-each>
-              <flow description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE
-                      (f.name = 'flow_velocity.totalchannel' OR
-                       f.name = 'flow_velocity.mainchannel' OR
-                       f.name = 'flow_velocity.totalchannel.filtered' OR
-                       f.name = 'flow_velocity.mainchannel.filtered') AND
-                       f.out_id = o.id         AND
-                       o.artifact_id = ${a_id} AND
-                       a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="flow_velocity"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <flow description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="flow_velocity"/>
+                  </dc:element>
+                </dc:for-each>
               </flow>
-            </dc:for-each>
+            </dc:group>
           </flow-velocity>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="sediment-load">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} and o.name='sedimentload_ls'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')">
         <dc:if test="dc:has-result()">
           <sediment-load>
-            <dc:for-each>
-              <load description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE f.name LIKE 'sedimentload%' AND
-                          f.out_id = o.id         AND
-                          o.artifact_id = ${a_id} AND
-                          a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="sedimentload_ls"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <load description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="sedimentload_ls"/>
+                  </dc:element>
+                </dc:for-each>
               </load>
-            </dc:for-each>
+            </dc:group>
           </sediment-load>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="bedheight-differences">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid,
-                 name AS o_name
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            (o.name = 'bed_difference_year' OR
-             o.name = 'bed_differnece_epoch')
-        </dc:statement>
+      <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and
+        (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
         <dc:if test="dc:has-result()">
           <bedheight-differences>
-            <dc:for-each>
-              <difference description="{$river} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE (f.name LIKE 'bedheight_difference.year%' OR
-                           f.name LIKE 'bedheight_difference.epoch%') AND
-                          f.out_id = o.id         AND
-                          o.artifact_id = ${a_id} AND
-                          a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="minfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:choose>
-                        <dc:when test="dc:contains($o_name, 'bed_difference_year')">
-                          <dc:attribute name="out" value="bed_difference_year"/>
-                        </dc:when>
-                        <dc:otherwise>
-                          <dc:attribute name="out" value="bed_difference_epoch"/>
-                        </dc:otherwise>
-                      </dc:choose>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($river, ' ', $a_creation, ' ', $collection_name)">
+              <difference description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="minfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="${out}"/>
+                  </dc:element>
+                </dc:for-each>
               </difference>
-            </dc:for-each>
+            </dc:group>
           </bedheight-differences>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
 
     <dc:macro name="waterlevels-discharge">
-      <dc:context>
-        <dc:statement>
-          SELECT id AS oid
-          FROM outs AS o
-          WHERE
-            o.artifact_id = ${a_id} AND
-            o.name = 'discharge_longitudinal_section'
-        </dc:statement>
+      <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w">
         <dc:if test="dc:has-result()">
           <waterlevels-discharge>
-            <dc:for-each>
-              <discharge description="{$oid} {$river} {$a_id} {$a_creation} {$collection_name}">
-                <dc:context>
-                  <dc:statement>
-                    SELECT a.gid         AS aid,
-                           f.id          AS fid,
-                           f.name        AS facet_name,
-                           f.num         AS facet_num,
-                           f.description AS facet_description
-                    FROM outs AS o, facets AS f, artifacts AS a
-                    WHERE f.name = 'discharge_longitudinal_section.w' AND
-                          f.out_id = o.id         AND
-                          o.artifact_id = ${a_id} AND
-                          a.id = ${a_id}
-                  </dc:statement>
-                  <dc:for-each>
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="factory" value="winfo"/>
-                      <dc:attribute name="description" value="${facet_description}"/>
-                      <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                      <dc:attribute name="artifact-id" value="${aid}"/>
-                      <dc:attribute name="out" value="longitudinal_section"/>
-                    </dc:element>
-                  </dc:for-each>
-                </dc:context>
+            <dc:group expr="concat($oid, ' ', $river, ' ', $a_id, ' ', $a_creation, ' ', $collection_name)">
+              <discharge description="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="factory" value="winfo"/>
+                    <dc:attribute name="target_out" value="${out}"/>
+                    <dc:attribute name="description" value="${facet_description}"/>
+                    <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="out" value="longitudinal_section"/>
+                  </dc:element>
+                </dc:for-each>
               </discharge>
-            </dc:for-each>
+            </dc:group>
           </waterlevels-discharge>
         </dc:if>
-      </dc:context>
+      </dc:filter>
     </dc:macro>
     <!-- Macros to load system data -->
 
     <dc:macro name="annotations">
-      <annotation factory="annotations" ids="{$river_id}"/>
+      <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="mainvalues">
-      <wmainvalue factory="mainvalue" ids="{$river_id}:w"/>
-      <qmainvalue factory="mainvalue" ids="{$river_id}:q"/>
+      <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}" />
+      <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="cross_sections">
@@ -1232,7 +924,7 @@
           <dc:for-each>
             <cross_section name="{$prot_description}"
                            ids="{$prot_id}"
-                           factory="crosssections"/>
+                           factory="crosssections" target_out="{$out}" />
           </dc:for-each>
         </dc:context>
       </cross_sections>
@@ -1251,9 +943,9 @@
               AND he.km BETWEEN ${fromkm} AND ${tokm}
           </dc:statement>
           <dc:for-each>
-            <hyk name="{$hyk_description}" 
+            <hyk name="{$hyk_description}"
                  ids="{$hyk_id}"
-                 factory="hyk"/>
+                 factory="hyk" target_out="{$out}" />
           </dc:for-each>
         </dc:context>
       </hyks>
@@ -1279,7 +971,7 @@
       <dc:call-macro name="fixings-macro">
         <column name="{$wst_column_name}"
                 ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol"
+                factory="wqinterpol" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1288,7 +980,7 @@
       <dc:call-macro name="fixings-macro">
         <column name="{$wst_column_name}"
                 ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1302,7 +994,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwqkms"
+                          factory="staticwqkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </official>
@@ -1321,7 +1013,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </heightmark>
@@ -1340,7 +1032,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1369,7 +1061,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </flood_protection>
@@ -1382,7 +1074,7 @@
     <dc:macro name="annotations_per_type">
       <annotations>
         <dc:context>
-          <all_annotations factory="annotations" ids="{$river_id}"/>
+          <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}" />
           <dc:statement>
             SELECT id   AS anno_id,
                    name AS anno_description
@@ -1390,7 +1082,7 @@
           </dc:statement>
           <dc:for-each>
             <annotation name="{$anno_description}"
-                        factory="annotations"
+                        factory="annotations" target_out="{$out}"
                         ids="{$river_id}:{$anno_description}"/>
           </dc:for-each>
         </dc:context>
@@ -1406,7 +1098,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1425,7 +1117,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1444,7 +1136,7 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms"
+                          factory="staticwkms" target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </relativepoint>
@@ -1454,6 +1146,25 @@
       </dc:filter>
     </dc:macro>
 
+    <dc:macro name="basedata_6_delta_w">
+      <dc:filter expr="$kind=6">
+        <dc:if test="dc:has-result()">
+          <delta_w>
+            <dc:group expr="$wst_description">
+              <relativepoint name="{dc:group-key()}">
+                <dc:for-each>
+                  <column name="{$wst_column_name}"
+                          ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
+                          factory="staticwkms" target_out="{$out}"
+                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                </dc:for-each>
+              </relativepoint>
+            </dc:group>
+          </delta_w>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
     <dc:macro name="discharge_table_gauge">
       <dc:context>
         <dc:statement>
@@ -1466,7 +1177,7 @@
             <discharge_table_gauge>
               <dc:for-each>
                 <gauge name="{$gauge_name}"
-                  factory="gaugedischarge"
+                  factory="gaugedischarge" target_out="{$out}"
                   from="{$g_start}"
                   to="{$g_stop}"
                   ids="{$gauge_name}"/>
@@ -1488,15 +1199,15 @@
     </dc:macro>
 
     <dc:macro name="qsectors">
-      <qsector factory="qsectors" ids="{$river_id}"/>
+      <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" />
     </dc:macro>
 
     <dc:macro name="flood-map-recommended">
       <kilometrage>
-        <riveraxis factory="riveraxis" ids="{$river_id}"/>
+        <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" />
       </kilometrage>
       <rastermap>
-        <background factory="wmsbackground" ids="{$river_id}"/>
+        <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" />
       </rastermap>
     </dc:macro>
 
@@ -1514,10 +1225,12 @@
             SELECT id          AS bedh_id,
                    year        AS bedh_year,
                    description AS bedh_descr
-            FROM bed_height_single WHERE river_id = ${river_id}
+            FROM bed_height_single
+            WHERE river_id = ${river_id}
+              AND lower(description) NOT LIKE '%epoch%'
           </dc:statement>
           <dc:for-each>
-            <height factory="bedheight"
+            <height factory="bedheight" target_out="{$out}"
                     ids="bedheight-single-{$bedh_id}-{$bedh_year}"
                     description="{$bedh_descr}"/>
           </dc:for-each>
@@ -1529,14 +1242,16 @@
       <epoch>
         <dc:context>
           <dc:statement>
-            SELECT id               AS bedh_id,
-                   time_interval_id AS bedh_interval_id,
-                   description      AS bedh_descr
-            FROM bed_height_epoch WHERE river_id = ${river_id}
+            SELECT id          AS bedh_id,
+                   year        AS bedh_year,
+                   description AS bedh_descr
+            FROM bed_height_single
+            WHERE river_id = ${river_id}
+              AND lower(description) LIKE '%epoch%'
           </dc:statement>
           <dc:for-each>
-            <height factory="bedheight"
-                    ids="bedheight-epoch-{$bedh_id}-{$bedh_interval_id}"
+            <height factory="bedheight" target_out="{$out}"
+                    ids="bedheight-single-{$bedh_id}-{$bedh_year}"
                     description="{$bedh_descr}"/>
           </dc:for-each>
         </dc:context>
@@ -1556,7 +1271,7 @@
               <dc:comment>TODO: Why has this an id and factory?</dc:comment>
               <flow_velocity_measurement name="{$fvmd}"
                                          ids="{$fvmid}"
-                                         factory="flowvelocity">
+                                         factory="flowvelocity" target_out="{$out}" >
                 <dc:context>
                   <dc:statement>
                     SELECT id, description, station, datetime, v, w, q
@@ -1567,7 +1282,7 @@
                   <dc:for-each>
                     <measurement_value name="{$description} - {$station} - {$datetime}"
                                        ids="{$id}"
-                                       factory="flowvelocity"/>
+                                       factory="flowvelocity" target_out="{$out}" />
                   </dc:for-each>
                 </dc:context>
               </flow_velocity_measurement>
@@ -1597,7 +1312,7 @@
                 <dc:for-each>
                   <morphologic-width name="{$from_station} - {$to_station}"
                                      ids="{$width_id}"
-                                     factory="morph-width"/>
+                                     factory="morph-width" target_out="{$out}" />
                 </dc:for-each>
               </dc:context>
             </dc:for-each>
@@ -1617,7 +1332,7 @@
         <dc:if test="dc:has-result()">
           <soundings_width>
             <dc:for-each>
-              <height factory="bedheight"
+              <height factory="bedheight" target_out="{$out}"
                       ids="bedheight-singlevalues-{$bedh_id}-{$bedh_year}"
                       description="{$bedh_descr}"/>
             </dc:for-each>
@@ -1646,7 +1361,7 @@
       <dc:call-macro name="basedata_0_macro">
         <column name="{$wst_column_name}"
                 ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1655,7 +1370,7 @@
       <dc:call-macro name="basedata_0_macro">
         <column name="{$wst_column_name}"
                 ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol"
+                factory="wqinterpol" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1680,7 +1395,7 @@
       <dc:call-macro name="basedata_1_additionals_macro">
         <column name="{$wst_column_name}"
                 ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms"
+                factory="staticwqkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1689,7 +1404,7 @@
       <dc:call-macro name="basedata_1_additionals_macro">
         <column name="{$wst_column_name}"
                 ids="additionalsmarks-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwkms"
+                factory="staticwkms" target_out="{$out}"
                 info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
@@ -1733,10 +1448,10 @@
          FIXME: Following two macros look identical to me.
       </dc:comment>
       <kilometrage>
-        <riveraxis factory="riveraxis" ids="{$river_id}"/>
+        <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" />
       </kilometrage>
       <rastermap>
-        <background factory="wmsbackground" ids="{$river_id}"/>
+        <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" />
       </rastermap>
     </dc:macro>
 
@@ -1750,21 +1465,22 @@
                    d.name  AS name,
                    t.start_time AS start_time,
                    t.stop_time AS stop_time,
-                   'Projektion: ' || d.projection || '$' ||
-                   'Rasterweite: '   || d.resolution || 'm$' ||
-                   'Format: '  || d.format || '$' ||
+                   'Projektion: ' || d.projection || '&lt;BR&gt;' ||
+                   'Rasterweite: '   || d.resolution || 'm&lt;BR&gt;' ||
+                   'Format: '  || d.format || '&lt;BR&gt;' ||
                    'Zeitraum: '
                    AS info
             FROM dem d
               JOIN ranges r ON d.range_id = r.id
               LEFT JOIN time_intervals t ON d.time_interval_id = t.id
-            WHERE d.river_id = ${river_id}
-          </dc:statement>
-          <dc:for-each>
-            <dem factory="demfactory" 
+              WHERE d.river_id = ${river_id}
+              AND NOT((${tokm} &lt; r.a) or (${fromkm} &gt; r.b))
+            </dc:statement>
+            <dc:for-each>
+            <dem factory="demfactory" target_out="{$out}"
               ids="{$dem_id}"
               name="{$name}"
-              info="{dc:replace($info, '$', '&lt;BR&gt;')}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/>
+              info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/>
           </dc:for-each>
         </dc:context>
       </dems>
@@ -1774,7 +1490,7 @@
       <dc:macro name="durchlass_damm_graben">
         <dc:macro name="ddg_factory">
           <dc:for-each>
-            <hws factory="hwsfactory" name="{$hws_name}"/>
+            <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}" />
           </dc:for-each>
         </dc:macro>
 
@@ -1861,7 +1577,7 @@
               AND kind = 2
           </dc:statement>
           <dc:for-each>
-            <line factory="wmshydrboundariesfactory" 
+            <line factory="wmshydrboundariesfactory" target_out="{$out}"
                   ids="{$river_id};{$name};2"
                   name="{$name}"/>
           </dc:for-each>
@@ -1875,7 +1591,7 @@
               AND kind = 2
           </dc:statement>
           <dc:for-each>
-            <line factory="wmshydrboundariespolyfactory"
+            <line factory="wmshydrboundariespolyfactory" target_out="{$out}"
                   ids="{$river_id};{$name};2"
                   name="{$name}"/>
           </dc:for-each>
@@ -1896,7 +1612,7 @@
         <dc:if test="dc:has-result()">
           <lines>
             <dc:for-each>
-              <line factory="wmshydrboundariesfactory"
+              <line factory="wmshydrboundariesfactory" target_out="{$out}"
                     ids="{$river_id};{$name};1"
                     name="{$name}"/>
             </dc:for-each>
@@ -1921,7 +1637,7 @@
             <sobek_areas>
               <dc:for-each>
                 <boundary name="{$sectie}"
-                          factory="wmshydrboundariespolyfactory"
+                          factory="wmshydrboundariespolyfactory" target_out="{$out}"
                           ids="{$river_id};{$sectie};1;{$sectie_id};-1"/>
               </dc:for-each>
             </sobek_areas>
@@ -1941,7 +1657,7 @@
             <sobek_flooded>
               <dc:for-each>
                 <boundary name="{$sobek}"
-                          factory="wmshydrboundariespolyfactory"
+                          factory="wmshydrboundariespolyfactory" target_out="{$out}"
                           ids="{$river_id};{$sobek};1;-1;{$sobek_id}"/>
               </dc:for-each>
             </sobek_flooded>
@@ -1959,7 +1675,7 @@
           </dc:statement>
           <dc:for-each>
             <boundary name="{$name}"
-                      factory="wmshydrboundariespolyfactory"
+                      factory="wmshydrboundariespolyfactory" target_out="{$out}"
                       ids="{$river_id};{$name}"/>
           </dc:for-each>
         </dc:context>
@@ -1990,7 +1706,7 @@
                     <dc:if test="dc:has-result()">
                       <bfg>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -2006,7 +1722,7 @@
                     <dc:if test="dc:has-result()">
                       <federal>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -2032,7 +1748,7 @@
                     <dc:if test="dc:has-result()">
                       <bfg>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -2049,7 +1765,7 @@
                     <dc:if test="dc:has-result()">
                       <federal>
                         <dc:for-each>
-                          <floodmaps factory="wmsfloodmapsfactory"
+                          <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                             ids="{$river_id};{$name}"
                             name="{$name}"/>
                         </dc:for-each>
@@ -2080,7 +1796,7 @@
                         ${source}
                       </dc:statement>
                       <dc:for-each>
-                        <floodmaps factory="wmsfloodmapsfactory"
+                        <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}"
                           ids="{$river_id};{$name}"
                           name="{$name}"/>
                       </dc:for-each>
@@ -2110,19 +1826,21 @@
           <floodplain>
             <dc:filter expr="$kind_id=1">
               <dc:for-each>
-                <floody factory="wmsfloodplainfactory"
+                <floody factory="wmsfloodplainfactory" target_out="{$out}"
                         description="{$kind_name}"
                         ids="{$river_id};{$kind_name};{$kind_id}"/>
               </dc:for-each>
             </dc:filter>
-            <dc:filter expr="kind_id!=1">
-              <other>
-                <dc:for-each>
-                  <floody factory="wmsfloodplainfactory"
-                          description="{$layer_name}"
-                          ids="{$river_id};{$layer_name};{$kind_id}"/>
-                </dc:for-each>
-              </other>
+            <dc:filter expr="$kind_id != 1">
+              <dc:if test="dc:has-result()">
+                <other>
+                  <dc:for-each>
+                    <floody factory="wmsfloodplainfactory" target_out="{$out}"
+                            description="{$layer_name}"
+                            ids="{$river_id};{$layer_name};{$kind_id}"/>
+                  </dc:for-each>
+                </other>
+              </dc:if>
             </dc:filter>
           </floodplain>
         </dc:if>
@@ -2137,7 +1855,7 @@
 
       <dc:macro name="hwspoints_by_kind_factory">
         <dc:for-each>
-          <hws factory="wmshwspointsfactory"
+          <hws factory="wmshwspointsfactory" target_out="{$out}"
                ids="{$river_id};{$hws_name}"
                name="{$hws_name}"/>
         </dc:for-each>
@@ -2268,7 +1986,7 @@
 
       <dc:macro name="hwslines_by_kind_factory">
         <dc:for-each>
-          <hws factory="wmshwslinesfactory"
+          <hws factory="wmshwslinesfactory" target_out="{$out}"
                ids="{$river_id};{$hws_name}"
                name="{$hws_name}"/>
         </dc:for-each>
@@ -2403,7 +2121,7 @@
           <floodmarks>
             <dc:for-each>
               <floodmark name="{$year}"
-                factory="wmsfloodmarkfactory"
+                factory="wmsfloodmarkfactory" target_out="{$out}"
                 ids="{$river_id};{$year};{$year}"/>
             </dc:for-each>
           </floodmarks>
@@ -2413,7 +2131,7 @@
 
     <dc:macro name="catchments">
       <catchments>
-        <catchment_wms factory="externalwmsfactory"
+        <catchment_wms factory="externalwmsfactory" target_out="{$out}"
                        ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiete (WMS)" />
         <dc:call-macro name="flood-map-gaugelocations"/>
       </catchments>
@@ -2421,10 +2139,10 @@
 
     <dc:macro name="flood-map-gaugelocations">
       <gaugelocations>
-        <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)"/>
-        <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)"/>
-        <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)"/>
-        <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)"/>
+        <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}" />
+        <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}" />
+        <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}" />
+        <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}" />
       </gaugelocations>
     </dc:macro>
 
@@ -2445,7 +2163,7 @@
               <dc:for-each>
                 <actual description="{$kind_name}"
                         ids="{$river_id};{$kind_name};{$kind_id}"
-                        factory="riveraxis"/>
+                        factory="riveraxis" target_out="{$out}" />
               </dc:for-each>
             </dc:filter>
             <dc:filter expr="$kind_id!=1">
@@ -2453,7 +2171,7 @@
                 <dc:for-each>
                   <misc-axis description="{$layer_name}"
                              ids="{$river_id};{$layer_name};{$kind_id}"
-                             factory="riveraxis"/>
+                             factory="riveraxis" target_out="{$out}" />
                 </dc:for-each>
               </other>
             </dc:filter>
@@ -2468,7 +2186,7 @@
           SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id}
         </dc:statement>
          <dc:for-each>
-            <kilometrage factory="wmskmfactory" ids="{$river_id}"/>
+            <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}" />
         </dc:for-each>
       </dc:context>
     </dc:macro>
@@ -2482,7 +2200,7 @@
             GROUP BY name
         </dc:statement>
         <dc:for-each>
-          <fixpoints factory="wmsfixpointsfactory"
+          <fixpoints factory="wmsfixpointsfactory" target_out="{$out}"
             ids="{$river_id};{$name}"/>
         </dc:for-each>
       </dc:context>
@@ -2504,18 +2222,20 @@
             <dc:filter expr="$kind_id=1">
               <dc:for-each>
                 <actual description="{$kind_name}"
-                        factory="wmsqpsfactory"
+                        factory="wmsqpsfactory" target_out="{$out}"
                         ids="{$river_id};{$kind_name};{$kind_id}"/>
               </dc:for-each>
             </dc:filter>
-            <dc:filter expr="kind_id=0">
-              <other>
-                <dc:for-each>
-                  <misc-qps description="{$layer_name}"
-                            factory="wmsqpsfactory"
-                            ids="{$river_id};{$layer_name};{$kind_id}"/>
-                </dc:for-each>
-              </other>
+            <dc:filter expr="$kind_id = 0">
+              <dc:if test="dc:has-result()">
+                <other>
+                  <dc:for-each>
+                    <misc-qps description="{$layer_name}"
+                              factory="wmsqpsfactory" target_out="{$out}"
+                              ids="{$river_id};{$layer_name};{$kind_id}"/>
+                  </dc:for-each>
+                </other>
+              </dc:if>
             </dc:filter>
           </qps>
         </dc:if>
@@ -2538,7 +2258,7 @@
             <dc:filter expr="$building_kind_id!=0">
               <dc:for-each>
                 <buildings description="{$building_kind}"
-                           factory="wmsbuildingsfactory"
+                           factory="wmsbuildingsfactory" target_out="{$out}"
                            ids="{$river_id};{$building_kind};{$building_kind_id}"/>
               </dc:for-each>
             </dc:filter>
@@ -2546,7 +2266,7 @@
               <other>
                 <dc:for-each>
                   <buildings description="{$building_name}"
-                             factory="wmsbuildingsfactory"
+                             factory="wmsbuildingsfactory" target_out="{$out}"
                              ids="{$river_id};{$building_name}"/>
                 </dc:for-each>
               </other>
@@ -2566,7 +2286,7 @@
             <jetties>
               <dc:for-each>
                 <jetty description="{$jetty_kind}"
-                       factory="wmsjettiesfactory"
+                       factory="wmsjettiesfactory" target_out="{$out}"
                        ids="{$river_id};{$jetty_kind};{$jetty_kind_id}"/>
               </dc:for-each>
             </jetties>
@@ -2619,6 +2339,7 @@
                     <dc:attribute name="name" value="${olname}"/>
                     <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}"/>
                     <dc:attribute name="factory" value="staticwkms"/>
+                    <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="out" value="${out}"/>
                   </dc:element>
                 </dc:for-each>
@@ -2640,7 +2361,7 @@
                  wc.position    AS wst_column_position,
                  wc.description AS info,
                  w.description  AS wst_description,
-                 wc.name        AS wst_column_name,
+                 COALESCE(wc.name, '')        AS wst_column_name,
                  wr.a           AS deffrom,
                  wr.b           AS defto
           FROM wst_columns wc
@@ -2653,7 +2374,7 @@
       </dc:context>
     </dc:macro>
 
-    <dc:macro name="km-filtered-userdata">
+    <dc:macro name="all-user-artifacts">
         <dc:context connection="user">
         <dc:comment>Select collections and masterartifacts.</dc:comment>
         <dc:statement>
@@ -2665,10 +2386,18 @@
                  COALESCE(ma.ld_mode, '')      AS ld_m,
                  COALESCE(ma.ld_locations, '') AS ld_l,
                  COALESCE(ma.ld_from, '')      AS ld_f,
-                 COALESCE(ma.ld_to, '')        AS ld_t
+                 COALESCE(ma.ld_to, '')        AS ld_t,
+                 o.name                        AS out_name,
+                 o.id                          AS out_id,
+                 f.name                        AS facet_name,
+                 f.num                         AS facet_num,
+                 f.description                 AS facet_description,
+                 f.id                          AS fid
           FROM users u
             JOIN collections c             ON c.user_id = u.id
             JOIN master_artifacts_range ma ON ma.collection_id = c.id
+            JOIN outs o                    ON o.artifact_id = ma.id
+            JOIN facets f                  ON f.out_id = o.id
           WHERE  u.gid = CAST(${user-id} AS UUID)
             AND ma.gid &lt;&gt; CAST(${artifact-id} AS uuid)
             AND EXISTS (
@@ -2678,41 +2407,24 @@
                 AND k = 'river'
                 AND v = ${river})
         </dc:statement>
-          <dc:for-each>
-            <dc:variable name="from" type="number" expr="dc:fromValue($ld_m, $ld_l, $ld_f)"/>
-            <dc:variable name="to" type="number" expr="dc:toValue($ld_m, $ld_l, $ld_t)"/>
-            <dc:if test="not (($tokm &lt; $from) or $fromkm &gt; $tokm)">
-              <dc:macro-body/>
-            </dc:if>
-          </dc:for-each>
+        <dc:virtual-column name="deffrom" type="number" expr="dc:fromValue($ld_m, $ld_l, $ld_f)">
+          <dc:virtual-column name="defto" type="number" expr="dc:toValue($ld_m, $ld_l, $ld_t)">
+            <dc:macro-body/>
+          </dc:virtual-column>
+        </dc:virtual-column>
       </dc:context>
     </dc:macro>
 
-    <dc:macro name="user-range">
-      <dc:choose>
-        <dc:when test="dc:contains($parameters, 'user-id')">
-          <dc:context connection="user">
-            <dc:statement>
-              SELECT COALESCE(ld_mode, '')      AS ldm,
-                     COALESCE(ld_locations, '') AS ldl,
-                     COALESCE(ld_from, '')      AS ldf,
-                     COALESCE(ld_to, '')        AS ldt
-              FROM master_artifacts_range
-              WHERE gid = CAST(${artifact-id} AS uuid)
-            </dc:statement>
-            <dc:for-each>
-              <dc:variable name="fromkm" type="number" expr="dc:fromValue($ldm, $ldl, $ldf)"/>
-              <dc:variable name="tokm" type="number" expr="dc:toValue($ldm, $ldl, $ldt)"/>
-              <dc:macro-body/>
-            </dc:for-each>
-          </dc:context>
-        </dc:when>
-        <dc:otherwise>
-          <dc:variable name="fromkm" type="number" expr="dc:fromValue('', '', '')"/>
-          <dc:variable name="tokm" type="number" expr="dc:toValue('', '', '')"/>
-          <dc:macro-body/>
-        </dc:otherwise>
-      </dc:choose>
+    <dc:macro name="km-filtered-user-artifacts">
+      <dc:filter expr="not($deffrom &gt; $tokm or $defto &lt; $fromkm)">
+        <dc:macro-body/>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="artifact-range">
+      <dc:variable name="fromkm" type="number" expr="dc:fromValue(dc:get('ld_mode'), dc:get('ld_locations'), dc:get('ld_from'))"/>
+      <dc:variable name="tokm" type="number" expr="dc:toValue(dc:get('ld_mode'), dc:get('ld_locations'), dc:get('ld_to'))"/>
+      <dc:macro-body/>
     </dc:macro>
 
   </datacage>
--- a/artifacts/doc/conf/themes.xml	Wed Jun 05 11:56:38 2013 +0200
+++ b/artifacts/doc/conf/themes.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -1,55 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE themes [
     <!ENTITY virtual-themes SYSTEM "conf/themes/virtual.xml">
-    <!ENTITY general SYSTEM "conf/themes/default/general.xml">
-    <!ENTITY longitudinal-section SYSTEM "conf/themes/default/longitudinal-section.xml">
-    <!ENTITY cross-section SYSTEM "conf/themes/default/cross-section.xml">
-    <!ENTITY discharge SYSTEM "conf/themes/default/discharge.xml">
-    <!ENTITY duration SYSTEM "conf/themes/default/duration.xml">
-    <!ENTITY fixings SYSTEM "conf/themes/default/fixings.xml">
-    <!ENTITY floodmap SYSTEM "conf/themes/default/floodmap.xml">
-    <!ENTITY historical-discharge SYSTEM "conf/themes/default/historical-discharge.xml">
-    <!ENTITY reference SYSTEM "conf/themes/default/reference.xml">
-    <!ENTITY sq-relation SYSTEM "conf/themes/default/sq-relation.xml">
-
-    <!ENTITY general_sec SYSTEM "conf/themes/second/general.xml">
-    <!ENTITY longitudinal-section_sec SYSTEM "conf/themes/second/longitudinal-section.xml">
-    <!ENTITY cross-section_sec SYSTEM "conf/themes/second/cross-section.xml">
-    <!ENTITY discharge_sec SYSTEM "conf/themes/second/discharge.xml">
-    <!ENTITY duration_sec SYSTEM "conf/themes/second/duration.xml">
-    <!ENTITY fixings_sec SYSTEM "conf/themes/second/fixings.xml">
-    <!ENTITY floodmap_sec SYSTEM "conf/themes/second/floodmap.xml">
-    <!ENTITY historical-discharge_sec SYSTEM "conf/themes/second/historical-discharge.xml">
-    <!ENTITY reference_sec SYSTEM "conf/themes/second/reference.xml">
-    <!ENTITY sq-relation_sec SYSTEM "conf/themes/second/sq-relation.xml">
+    <!ENTITY default-themes SYSTEM "conf/themes/default.xml">
+    <!ENTITY second-themes  SYSTEM "conf/themes/second.xml">
 ]>
 <themes>
     &virtual-themes;
-
-    <themegroup name="default">
-      &longitudinal-section;
-      &cross-section;
-      &discharge;
-      &duration;
-      &fixings;
-      &floodmap;
-      &historical-discharge;
-      &reference;
-      &sq-relation;
-      &general;
-    </themegroup>
-    <themegroup name="second">
-      &longitudinal-section_sec;
-      &cross-section_sec;
-      &discharge_sec;
-      &duration_sec;
-      &fixings_sec;
-      &floodmap_sec;
-      &historical-discharge_sec;
-      &reference_sec;
-      &sq-relation_sec;
-      &general_sec;
-    </themegroup>
+    &default-themes;
+    &second-themes;
 
     <!-- Mappings are following now. A mapping maps between a name of a facet 
         and a theme. Always the first matching mapping is taken, so consider putting 
@@ -74,7 +32,7 @@
         <mapping from="longitudinal_section.w" masterAttr="ld_mode==location"
             pattern=".*(HQ200)(\D.*)*" to="LongitudinalSectionW_HQ200_Points" />
         <mapping from="longitudinal_section.w" masterAttr="ld_mode==location"
-            pattern=".*(HQ300)(\D.*)*" to="LongitudinalSectiLEVEL >= DEBUGonW_HQ300_Points" />
+            pattern=".*(HQ300)(\D.*)*" to="LongitudinalSectionW_HQ300_Points" />
         <mapping from="longitudinal_section.w" masterAttr="ld_mode==location"
             pattern=".*(HQ500)(\D.*)*" to="LongitudinalSectionW_HQ500_Points" />
         <mapping from="longitudinal_section.w" masterAttr="ld_mode==location"
@@ -258,6 +216,9 @@
         <mapping from="bed_longitudinal_section.bed_diameter_toplayer" to="BedDiameterTopLayer" />
         <mapping from="bed_longitudinal_section.bed_diameter_sublayer" to="BedDiameterSubLayer" />
         <mapping from="bed_longitudinal_section.bedload_diameter" to="BedLoadDiameter" />
+        <mapping from="bed_longitudinal_section.bed_diameter_data_top" to="BedDiameterDataTop"/>
+        <mapping from="bed_longitudinal_section.bed_diameter_data_sub" to="BedDiameterDataSub"/>
+        <mapping from="bed_longitudinal_section.bedload_diameter_data" to="BedloadDiameterData"/>
         <mapping from="bedheight_difference.year" to="BedheightDiffYear"/>
         <mapping from="bedheight_difference.year.filtered" to="BedheightDiffYear"/>
         <mapping from="bedheight_difference.morph_width" to="BedheightDiffMorphWidth"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/themes/default.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -0,0 +1,2097 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<themegroup name="default">
+    <theme name="MainValuesQ">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="MainValuesQVerticalText">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="false" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="MainValuesW">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="RelativePoint">
+        <inherits>
+            <inherit from="Points" />
+        </inherits>
+    </theme>
+
+    <theme name="Annotations">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="ManualPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="hidden" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="WKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WKmsAnnotation">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="WQKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WQPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="204, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="heightmarks_points">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="Area">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <!-- top level classes defining additional attributes-->
+    <theme name="LongitudinalSection">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="bandwidth" type="double" display="Bandbreite"
+                default="0"/>
+            <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe"
+                default="104, 104, 104"/>
+            <field name="transparency" type="int" default="20" display="Transparenz"/>
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionPoints">
+        <inherits>
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="Differences">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+
+    <!-- Classes defining special values -->
+    <theme name="LongitudinalSectionW_HQ1">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ2">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ5">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ10">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ20">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ25">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ50">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ100">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ200">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ300">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ500">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1000">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQRZ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HSQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MHQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MNQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_NQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQExtrem">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ2_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ5_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ10_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ20_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ25_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ50_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 153, 153" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ100_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ200_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ300_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ500_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1000_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQRZ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HSQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MHQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MNQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_NQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQExtrem_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ1">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ2">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ5">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ10">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ20">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ25">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ50">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 153, 153" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ100">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ200">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ300">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ500">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ1000">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQRZ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HSQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MHQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MNQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_NQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQExtrem">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="DischargeLongitudinalSectionW">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+
+    <theme name="DischargeLongitudinalSectionC">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0 , 0" />
+        </fields>
+    </theme>
+
+    <theme name="DischargeLongitudinalSectionQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQInfoldCut">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 102, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQInfolding">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="51, 51, 51" />
+        </fields>
+    </theme>
+
+    <!-- MIDDLE BED HEIGHT -->
+    <theme name="MiddleBedHeightSingle">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="MiddleBedHeightEpoch">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <!-- Bed Quality -->
+    <theme name="PorosityTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="PorositySubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="DensityTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 99, 102" />
+        </fields>
+    </theme>
+
+    <theme name="DensitySubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 99, 102" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterSubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedLoadDiameter">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterDataTop">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterDataSub">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedloadDiameterData">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0" />
+        </fields>
+    </theme>
+    <!-- Bedheight differences -->
+    <theme name="BedheightDiffYear">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffMorphWidth">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffEpoch">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffAbsHeight1">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffAbsHeight2">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffHeightYear">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="MorphologicWidth">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <!-- Flow velocity -->
+    <theme name="FlowVelocityVMainChannel">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityVTotalChannel">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityTau">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityDischarge">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 0" />
+        </fields>
+    </theme>
+
+    <!-- Sediment load -->
+    <theme name="SedimentLoadCoarse">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadFineMid">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+    <theme name="SedimentLoadSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadSuspSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 255, 0" />
+        </fields>
+    </theme>
+
+     <theme name="SedimentLoadSediment">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 255" />
+        </fields>
+    </theme>
+     <theme name="SedimentLoadSuspSandBed">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+     <theme name="SedimentLoadFineTotalLoad">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 100, 100" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <theme name="SedimentLoadTotal">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionArea">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="CrossSection">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="CrossSectionWaterLine">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,0,153" />
+            <field name="showwidth" type="boolean" display="Breite anzeigen"
+                default="false" />
+            <field name="showlevel" type="boolean" display="Wasserstand anzeigen"
+                default="true" />
+            <field name="showlinelabel" type="boolean" default="true"
+                display="Beschriftung anzeigen" />
+            <field name="showmiddleheight" type="boolean"
+                display="Wasserstand anzeigen" default="false" />
+        </fields>
+    </theme>
+
+    <theme name="Hyk">
+        <inherits>
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="CrossSectionArea">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="DischargeCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <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="linesize" type="int" display="Liniendicke"
+                default="2" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <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="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurveQ">
+        <inherits>
+            <inherit from="ComputedDischargeCurve" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textcolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurveW">
+        <inherits>
+            <inherit from="ComputedDischargeCurve" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textcolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="GaugeDischargeCurve">
+        <inherits>
+            <inherit from="DischargeCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+        </fields>
+    </theme>
+
+    <theme name="ExtremeWQCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
+                default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />           
+        </fields>
+    </theme>
+
+    <theme name="ExtremeWQBaseCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="DurationCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"
+                hints="hidden"/>
+        </fields>
+    </theme>
+
+    <theme name="DurationCurveW">
+        <inherits>
+            <inherit from="DurationCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,51,204" />
+        </fields>
+    </theme>
+
+    <theme name="DurationCurveQ">
+        <inherits>
+            <inherit from="DurationCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,204,0" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="FixPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+        </fields>
+    </theme>
+
+    <theme name="FixLines">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+        </fields>
+    </theme>
+
+    <theme name="FixAreas">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="FixingWQCurve">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="227, 27, 162" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDerivedCurve">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="227, 27, 162" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" hidden="true" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="5" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ0">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 128, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ1">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ2">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ3">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingAnalysisEventsWQ">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingReferenceEvents">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 80, 160" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingOutliers">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage0">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 128, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage1">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage2">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage3">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAnalysis">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage0">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 128, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage1">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage2">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage3">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS0">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="0, 128, 0" />
+        </fields>
+    </theme>
+    <theme name="FixingSectorDeviationLS1">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="0, 0, 255" />
+
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS2">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS3">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSDeviation">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="100, 100, 100" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSAnalysis">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSReference">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 80, 160" />
+        </fields>
+    </theme>
+
+    <theme name="FixDeltaWtDeviation">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAnalysisPeriods">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+        </fields>
+    </theme>
+
+    <theme name="FixingReferencePeriod">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+        </fields>
+    </theme>
+
+    <theme name="QSectors">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="true" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="MapLines">
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 205" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="3" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="Floodmaps">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodplains">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="WSPLGEN">
+        <inherits>
+            <inherit from="Uesk" />
+        </inherits>
+        <fields>
+            <field name="startcolor" type="Color"
+                display="Farbverlauf Startfarbe" default="178, 201, 215" />
+            <field name="endcolor" type="Color"
+                display="Farbverlauf Endfarbe" default="2, 27, 42" />
+            <field name="numclasses" type="int" display="Anzahl Klassen"
+                default="6" />
+        </fields>
+    </theme>
+
+    <theme name="RiverAxis">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+        <fields>
+       </fields>
+    </theme>
+
+    <theme name="Kms">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Label" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+
+    <theme name="Fixpoints">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+
+    <theme name="GaugeLocation">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="Qps">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+    </theme>
+
+    <theme name="Hws">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+    </theme>
+
+    <theme name="HwsPoints">
+        <inherits>
+            <inherit from="MapLines"/>
+            <inherit from="Label" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="Catchment">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="FloodmapLines">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="140, 200, 130" />
+        </fields>
+    </theme>
+
+    <theme name="Buildings">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+    </theme>
+
+    <theme name="HydrBoundariesLines">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+    </theme>
+
+    <theme name="HydrBoundariesPolys">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="Jetties">
+        <inherits>
+            <inherit from="MapLines"/>
+            <inherit from="Label" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+
+
+    <theme name="HistoricalDischargeCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeCurveQ">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeCurveQDiff">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeCurveW">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="100, 100, 153" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeCurveWDiff">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="250, 250, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeWQCurve">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 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="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+        </fields>
+    </theme>
+
+    <theme name="HistoricalDischargeWQW">
+        <!-- the facet has no styling...
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 255" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="true" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>-->
+    </theme>
+
+    <theme name="HistoricalDischargeWQQ">
+        <inherits>
+            <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="true" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="ReferenceCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="ReferenceCurveNormalized">
+        <inherits>
+            <inherit from="ReferenceCurve" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+
+
+    <theme name="SQMeasurements">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" default="0, 153, 255" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="false" hints="hidden" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hints="hidden" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SQOutliers">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" default="204, 0, 0" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="false" hints="hidden" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hints="hidden" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SQCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" default="0, 0, 0" />
+        </fields>
+    </theme>
+</themegroup>
--- a/artifacts/doc/conf/themes/default/cross-section.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="CrossSection">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="CrossSectionWaterLine">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,0,153" />
-            <field name="showwidth" type="boolean" display="Breite anzeigen"
-                default="false" />
-            <field name="showlevel" type="boolean" display="Wasserstand anzeigen"
-                default="true" />
-            <field name="showlinelabel" type="boolean" default="true"
-                display="Beschriftung anzeigen" />
-            <field name="showmiddleheight" type="boolean"
-                display="Wasserstand anzeigen" default="false" />
-        </fields>
-    </theme>
-
-    <theme name="Hyk">
-        <inherits>
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="CrossSectionArea">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/discharge.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="DischargeCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
-            <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="linesize" type="int" display="Liniendicke"
-                default="2" />
-        </fields>
-    </theme>
-
-    <theme name="ComputedDischargeCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <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="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="ComputedDischargeCurveQ">
-        <inherits>
-            <inherit from="ComputedDischargeCurve" />
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-        </fields>
-    </theme>
-
-    <theme name="ComputedDischargeCurveW">
-        <inherits>
-            <inherit from="ComputedDischargeCurve" />
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="GaugeDischargeCurve">
-        <inherits>
-            <inherit from="DischargeCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-        </fields>
-    </theme>
-
-    <theme name="ExtremeWQCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
-                default="true" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-            <field name="showlinelabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />           
-        </fields>
-    </theme>
-
-    <theme name="ExtremeWQBaseCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="2" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/duration.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-
-    <theme name="DurationCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false"
-                hints="hidden"/>
-        </fields>
-    </theme>
-
-    <theme name="DurationCurveW">
-        <inherits>
-            <inherit from="DurationCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,51,204" />
-        </fields>
-    </theme>
-
-    <theme name="DurationCurveQ">
-        <inherits>
-            <inherit from="DurationCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,204,0" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/fixings.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="FixPoints">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-        </fields>
-    </theme>
-
-    <theme name="FixLines">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-        </fields>
-    </theme>
-
-    <theme name="FixAreas">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="FixingWQCurve">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDerivedCurve">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="h" hidden="true" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ0">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 128, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ1">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 255" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ2">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 255" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorAverageWQ3">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingAnalysisEventsWQ">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 0" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingReferenceEvents">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 80, 160" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingOutliers">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage0">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 128, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage1">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage2">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAverage3">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAnalysis">
-        <inherits>
-            <inherit from="FixPoints" />
-        </inherits>
-        <fields>
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="true"/>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage0">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 128, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage1">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage2">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingLSAverage3">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS0">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="0, 128, 0" />
-        </fields>
-    </theme>
-    <theme name="FixingSectorDeviationLS1">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="0, 0, 255" />
-
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS2">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="FixingSectorDeviationLS3">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSDeviation">
-        <inherits>
-            <inherit from="FixAreas" />
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" display="Fuellfarbe"
-                default="100, 100, 100" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSAnalysis">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <theme name="FixLSReference">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 80, 160" />
-        </fields>
-    </theme>
-
-    <theme name="FixDeltaWtDeviation">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
-        </fields>
-    </theme>
-
-    <theme name="FixingDeltaWtAnalysisPeriods">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
-        </fields>
-    </theme>
-
-    <theme name="FixingReferencePeriod">
-        <inherits>
-            <inherit from="FixAreas"/>
-        </inherits>
-        <fields>
-            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
-        </fields>
-    </theme>
-
-    <theme name="QSectors">
-        <inherits>
-            <inherit from="FixLines" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" hints="h" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/floodmap.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <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="h" />
-        </fields>
-    </theme>
-
-    <theme name="Floodmaps">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="Floodplains">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="WSPLGEN">
-        <inherits>
-            <inherit from="Uesk" />
-        </inherits>
-        <fields>
-            <field name="startcolor" type="Color"
-                display="Farbverlauf Startfarbe" default="178, 201, 215" />
-            <field name="endcolor" type="Color"
-                display="Farbverlauf Endfarbe" default="2, 27, 42" />
-            <field name="numclasses" type="int" display="Anzahl Klassen"
-                default="6" />
-        </fields>
-    </theme>
-
-    <theme name="RiverAxis">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-        <fields>
-       </fields>
-    </theme>
-
-    <theme name="Kms">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-
-    <theme name="Fixpoints">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Floodmarks">
-        <inherits>
-            <inherit from="MapLines" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Qps">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="Hws">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HwsPoints">
-        <inherits>
-            <inherit from="MapLines"/>
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-
-    <theme name="Catchment">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="FloodmapLines">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="140, 200, 130" />
-        </fields>
-    </theme>
-
-    <theme name="Buildings">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HydrBoundariesLines">
-        <inherits>
-            <inherit from="MapLines" />
-        </inherits>
-    </theme>
-
-    <theme name="HydrBoundariesPolys">
-        <inherits>
-            <inherit from="Map" />
-        </inherits>
-    </theme>
-
-    <theme name="Jetties">
-        <inherits>
-            <inherit from="MapLines"/>
-            <inherit from="Label" />
-            <inherit from="Symbol" />
-        </inherits>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/general.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="MainValuesQ">
-        <inherits>
-            <inherit from="Lines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showlinelabel" type="boolean"
-                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="MainValuesQVerticalText">
-        <inherits>
-            <inherit from="Lines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="false" />
-            <field name="showlinelabel" type="boolean"
-                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="MainValuesW">
-        <inherits>
-            <inherit from="Lines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-            <field name="showlinelabel" type="boolean"
-                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="RelativePoint">
-        <inherits>
-            <inherit from="Points" />
-        </inherits>
-    </theme>
-
-    <theme name="Annotations">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Text" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="ManualPoints">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" hints="hidden" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
-        </fields>
-    </theme>
-
-    <theme name="WKms">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="WKmsAnnotation">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" hints="h" />
-        </fields>
-    </theme>
-
-    <theme name="WQKms">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="WQPoints">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Linienfarbe"
-                default="204, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="heightmarks_points">
-        <inherits>
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="Area">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/historical-discharge.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="HistoricalDischargeCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="2" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveQ">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveQDiff">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveW">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="100, 100, 153" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeCurveWDiff">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="250, 250, 204" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeWQCurve">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 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="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-        </fields>
-    </theme>
-
-    <theme name="HistoricalDischargeWQW">
-        <!-- the facet has no styling...
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 255" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="true" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>-->
-    </theme>
-
-    <theme name="HistoricalDischargeWQQ">
-        <inherits>
-            <inherit from="HistoricalDischargeCurve" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="true" hints="hidden" />
-            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" />
-            <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/longitudinal-section.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,975 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <!-- top level classes defining additional attributes-->
-    <theme name="LongitudinalSection">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="bandwidth" type="double" display="Bandbreite"
-                default="0"/>
-            <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe"
-                default="104, 104, 104"/>
-            <field name="transparency" type="int" default="20" display="Transparenz"/>
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionPoints">
-        <inherits>
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-
-    <theme name="Differences">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-
-    <!-- Classes defining special values -->
-    <theme name="LongitudinalSectionW_HQ1">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ2">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ5">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ10">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ20">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ25">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ50">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ100">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ200">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ300">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 100" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ500">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1000">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQRZ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HSQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MHQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MNQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_NQ">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQExtrem">
-        <inherits>
-            <inherit from="LongitudinalSectionW" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ2_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ5_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ10_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ20_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ25_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ50_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 153, 153" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ100_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ200_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ300_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ500_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQ1000_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQRZ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HSQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MHQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MNQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_MQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_NQ_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionW_HQExtrem_Points">
-        <inherits>
-            <inherit from="LongitudinalSectionPoints" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ1">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ2">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ5">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ10">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ20">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ25">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ50">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 153" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ100">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 51" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ200">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ300">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ500">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQ1000">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQRZ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HSQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_MHQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_MNQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_MQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_NQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQ_HQExtrem">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="DischargeLongitudinalSectionW">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-
-    <theme name="DischargeLongitudinalSectionC">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0 , 0" />
-        </fields>
-    </theme>
-
-    <theme name="DischargeLongitudinalSectionQ">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQInfoldCut">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 102, 102" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionQInfolding">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="51, 51, 51" />
-        </fields>
-    </theme>
-
-    <!-- MIDDLE BED HEIGHT -->
-    <theme name="MiddleBedHeightSingle">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="MiddleBedHeightEpoch">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <!-- Bed Quality -->
-    <theme name="PorosityTopLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="PorositySubLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="DensityTopLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="DensitySubLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 99, 102" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterTopLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedDiameterSubLayer">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedLoadDiameter">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 0" />
-        </fields>
-    </theme>
-
-    <!-- Bedheight differences -->
-    <theme name="BedheightDiffYear">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffMorphWidth">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 0" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffEpoch">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffAbsHeight1">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 204" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffAbsHeight2">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 100, 100" />
-        </fields>
-    </theme>
-
-    <theme name="BedheightDiffHeightYear">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 0" />
-        </fields>
-    </theme>
-
-    <theme name="MorphologicWidth">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-        </fields>
-    </theme>
-    <!-- Flow velocity -->
-    <theme name="FlowVelocityVMainChannel">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityVTotalChannel">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityTau">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="FlowVelocityDischarge">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 0" />
-        </fields>
-    </theme>
-
-    <!-- Sediment load -->
-    <theme name="SedimentLoadCoarse">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadFineMid">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-    <theme name="SedimentLoadSand">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
-        </fields>
-    </theme>
-
-    <theme name="SedimentLoadSuspSand">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 255, 0" />
-        </fields>
-    </theme>
-
-     <theme name="SedimentLoadSediment">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 255" />
-        </fields>
-    </theme>
-     <theme name="SedimentLoadSuspSandBed">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-        </fields>
-    </theme>
-     <theme name="SedimentLoadFineTotalLoad">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 100, 100" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-        </fields>
-    </theme>
-    <theme name="SedimentLoadTotal">
-        <inherits>
-            <inherit from="LongitudinalSection" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="0, 100, 200" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="h" />
-        </fields>
-    </theme>
-
-    <theme name="LongitudinalSectionArea">
-        <inherits>
-            <inherit from="Areas" />
-        </inherits>
-        <fields>
-            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
-                default="true" hints="hidden" />
-            <field name="areashowborder" type="boolean" display="Begrenzung"
-                default="false" hints="hidden" />
-            <field name="areabordercolor" type="Color" default="0, 0, 0"
-                display="Begrenzungslinienfarbe" hints="hidden" />
-            <field name="showarea" type="boolean" display="Flaeche anzeigen"
-              default="true" hints="hidden" />
-            <field name="showarealabel" type="boolean"
-                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-<!--/themegroup>-->
--- a/artifacts/doc/conf/themes/default/reference.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="ReferenceCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-            <inherit from="MinMaxPoints" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
-        </fields>
-    </theme>
-
-    <theme name="ReferenceCurveNormalized">
-        <inherits>
-            <inherit from="ReferenceCurve" />
-        </inherits>
-        <fields>
-        </fields>
-    </theme>
-<!--/themegroup-->
--- a/artifacts/doc/conf/themes/default/sq-relation.xml	Wed Jun 05 11:56:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--themegroup name="default"-->
-    <theme name="SQMeasurements">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" default="0, 153, 255" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SQOutliers">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-        </inherits>
-        <fields>
-            <field name="pointcolor" type="Color" default="204, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
-        </fields>
-    </theme>
-
-    <theme name="SQCurve">
-        <inherits>
-            <inherit from="Lines" />
-            <inherit from="Points" />
-            <inherit from="Label" />
-        </inherits>
-        <fields>
-            <field name="showpoints" type="boolean" display="Punkte anzeigen"
-                default="false" />
-            <field name="showpointlabel" type="boolean"
-                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
-            <field name="linecolor" type="Color" default="0, 0, 0" />
-        </fields>
-    </theme>
-<!--/themegroup-->
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/themes/second.xml	Tue Jun 11 09:40:56 2013 +0200
@@ -0,0 +1,2097 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<themegroup name="second">
+    <theme name="MainValuesQ">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="MainValuesW">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="MainValuesQVerticalText">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="false" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="RelativePoint">
+        <inherits>
+            <inherit from="Points" />
+        </inherits>
+    </theme>
+
+    <theme name="Annotations">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="ManualPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="hidden" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="WKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WKmsAnnotation">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="WQKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WQPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="204, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="heightmarks_points">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="Area">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <!-- top level classes defining additional attributes-->
+    <theme name="LongitudinalSection">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="bandwidth" type="double" display="Bandbreite"
+                default="0"/>
+            <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe"
+                default="104, 104, 104"/>
+            <field name="transparency" type="int" default="20" display="Transparenz"/>
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionPoints">
+        <inherits>
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="Differences">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+
+    <!-- Classes defining special values -->
+    <theme name="LongitudinalSectionW_HQ1">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ2">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ5">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ10">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ20">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ25">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ50">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ100">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ200">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ300">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ500">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1000">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQRZ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HSQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MHQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MNQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_NQ">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQExtrem">
+        <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ2_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ5_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ10_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ20_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ25_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ50_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 153, 153" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ100_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ200_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ300_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ500_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQ1000_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQRZ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HSQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MHQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MNQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_MQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_NQ_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionW_HQExtrem_Points">
+        <inherits>
+            <inherit from="LongitudinalSectionPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ1">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ2">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ5">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 153, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ10">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ20">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ25">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 51, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ50">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 153, 153" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ100">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 51" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ200">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ300">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ500">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQ1000">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQRZ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HSQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="253, 153, 0" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MHQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 255, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MNQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_MQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 51, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_NQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 204, 255" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQ_HQExtrem">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="DischargeLongitudinalSectionW">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+
+    <theme name="DischargeLongitudinalSectionC">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0 , 0" />
+        </fields>
+    </theme>
+
+    <theme name="DischargeLongitudinalSectionQ">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQInfoldCut">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 102, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQInfolding">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="51, 51, 51" />
+        </fields>
+    </theme>
+
+    <!-- MIDDLE BED HEIGHT -->
+    <theme name="MiddleBedHeightSingle">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="MiddleBedHeightEpoch">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <!-- Bed Quality -->
+    <theme name="PorosityTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="PorositySubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="DensityTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 99, 102" />
+        </fields>
+    </theme>
+
+    <theme name="DensitySubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="153, 99, 102" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterTopLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterSubLayer">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedLoadDiameter">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterDataTop">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedDiameterDataSub">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedloadDiameterData">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/>
+            <field name="pointsize" type="int" display="Punktdicke" default="2" />
+            <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0" />
+        </fields>
+    </theme>
+    <!-- Bedheight differences -->
+    <theme name="BedheightDiffYear">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffMorphWidth">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 0" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffEpoch">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffAbsHeight1">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 204" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffAbsHeight2">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 100, 100" />
+        </fields>
+    </theme>
+
+    <theme name="BedheightDiffHeightYear">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="MorphologicWidth">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <!-- Flow velocity -->
+    <theme name="FlowVelocityVMainChannel">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityVTotalChannel">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 102" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityTau">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="FlowVelocityDischarge">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 204, 0" />
+        </fields>
+    </theme>
+
+    <!-- Sediment load -->
+    <theme name="SedimentLoadCoarse">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadFineMid">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+    <theme name="SedimentLoadSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadSuspSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 255, 0" />
+        </fields>
+    </theme>
+
+     <theme name="SedimentLoadSediment">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 255" />
+        </fields>
+    </theme>
+     <theme name="SedimentLoadSuspSandBed">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+     <theme name="SedimentLoadFineTotalLoad">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 100, 100" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+    <theme name="SedimentLoadTotal">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionArea">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="CrossSection">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="CrossSectionWaterLine">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,0,153" />
+            <field name="showwidth" type="boolean" display="Breite anzeigen"
+                default="false" />
+            <field name="showlevel" type="boolean" display="Wasserstand anzeigen"
+                default="true" />
+            <field name="showlinelabel" type="boolean" default="true"
+                display="Beschriftung anzeigen" />
+            <field name="showmiddleheight" type="boolean"
+                display="Wasserstand anzeigen" default="false" />
+        </fields>
+    </theme>
+
+    <theme name="Hyk">
+        <inherits>
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="CrossSectionArea">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="DischargeCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <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="linesize" type="int" display="Liniendicke"
+                default="2" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <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="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurveQ">
+        <inherits>
+            <inherit from="ComputedDischargeCurve" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textcolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+        </fields>
+    </theme>
+
+    <theme name="ComputedDischargeCurveW">
+        <inherits>
+            <inherit from="ComputedDischargeCurve" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textcolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="GaugeDischargeCurve">
+        <inherits>
+            <inherit from="DischargeCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+        </fields>
+    </theme>
+
+    <theme name="ExtremeWQCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
+                default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />           
+        </fields>
+    </theme>
+
+    <theme name="ExtremeWQBaseCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="DurationCurve">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"
+                hints="hidden"/>
+        </fields>
+    </theme>
+
+    <theme name="DurationCurveW">
+        <inherits>
+            <inherit from="DurationCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,51,204" />
+        </fields>
+    </theme>
+
+    <theme name="DurationCurveQ">
+        <inherits>
+            <inherit from="DurationCurve" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0,204,0" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="FixPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+        </fields>
+    </theme>
+
+    <theme name="FixLines">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
+        </fields>
+    </theme>
+
+    <theme name="FixAreas">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="FixingWQCurve">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="227, 27, 162" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDerivedCurve">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="227, 27, 162" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" hidden="true" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="5" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ0">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 128, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ1">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 0, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ2">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorAverageWQ3">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="255, 0, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingAnalysisEventsWQ">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 0" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingReferenceEvents">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 80, 160" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingOutliers">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage0">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 128, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage1">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage2">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAverage3">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAnalysis">
+        <inherits>
+            <inherit from="FixPoints" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
+            <field name="pointcolor" type="Color" display="Punktfarbe"
+                default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage0">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 128, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage1">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage2">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingLSAverage3">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS0">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="0, 128, 0" />
+        </fields>
+    </theme>
+    <theme name="FixingSectorDeviationLS1">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="0, 0, 255" />
+
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS2">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="FixingSectorDeviationLS3">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSDeviation">
+        <inherits>
+            <inherit from="FixAreas" />
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
+                default="100, 100, 100" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSAnalysis">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="FixLSReference">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 80, 160" />
+        </fields>
+    </theme>
+
+    <theme name="FixDeltaWtDeviation">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
+        </fields>
+    </theme>
+
+    <theme name="FixingDeltaWtAnalysisPeriods">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+        </fields>
+    </theme>
+
+    <theme name="FixingReferencePeriod">
+        <inherits>
+            <inherit from="FixAreas"/>
+        </inherits>
+        <fields>
+            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+        </fields>
+    </theme>
+
+    <theme name="QSectors">
+        <inherits>
+            <inherit from="FixLines" />
+        </inherits>
+        <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="true" hints="hidden" />
+        </fields>
+    </theme>
+
+
+
+    <theme name="MapLines">
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 205" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="3" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="Floodmaps">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodplains">
+        <inherits>
+            <inherit from="Map" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="WSPLGEN">
+        <inherits>
+            <inherit from="Uesk" />
+        </inherits>
+        <fields>
+            <field name="startcolor" type="Color"
+                display="Farbverlauf Startfarbe" default="178, 201, 215" />
+            <field name="endcolor" type="Color"
+                display="Farbverlauf Endfarbe" default="2, 27, 42" />
+            <field name="numclasses" type="int" display="Anzahl Klassen"
+                default="6" />
+        </fields>
+    </theme>
+
+    <theme name="RiverAxis">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+        <fields>
+       </fields>
+    </theme>
+
+    <theme name="Kms">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Label" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+
+    <theme name="Fixpoints">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+
+    <theme name="GaugeLocation">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
+    <theme name="Qps">
+        <inherits>
+            <inherit from="MapLines" />
+        </inherits>
+    </theme>
+
+    <theme name="Hws"><