--- 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"/>