--- a/flys-artifacts/doc/conf/themes.xml	Wed Mar 06 14:14:15 2013 +0100
+++ b/flys-artifacts/doc/conf/themes.xml	Fri Mar 22 11:25:54 2013 +0100
@@ -173,6 +173,8 @@
         <mapping from="longitudinal_section.q" pattern="(NQ)(\D.*)*"
             to="LongitudinalSectionQ_NQ" />
         <mapping from="longitudinal_section.q" to="LongitudinalSection" />
+        <mapping from="discharge_longitudinal_section.q.infolding" to="LongitudinalSectionQInfolding" />
+        <mapping from="discharge_longitudinal_section.q.cutting" to="LongitudinalSectionQInfoldCut" />
 
         <mapping from="discharge_curve.curve" to="DischargeCurve" />
         <mapping from="historical_discharge.historicalq" to="HistoricalDischargeCurveQ" />
@@ -201,7 +203,8 @@
         <mapping from="floodmap.riveraxis" to="RiverAxis" />
         <mapping from="floodmap.kms" to="Kms" />
         <mapping from="floodmap.qps" to="Qps" />
-        <mapping from="floodmap.hws" to="Hws" />
+        <mapping from="floodmap.hws_lines" to="Hws" />
+        <mapping from="floodmap.hws_points" to="HwsPoints" />
         <mapping from="floodmap.hydr_boundaries" to="HydrBoundariesLines" />
         <mapping from="floodmap.hydr_boundaries_poly" to="HydrBoundariesPolys" />
         <mapping from="floodmap.catchment" to="Catchment" />
@@ -219,9 +222,9 @@
         <mapping from="other.wqkms.q" to="WQKms" />
         <mapping from="heightmarks_points" to="heightmarks_points" />
         <mapping from="area" to="Area" />
-        <mapping from="cross_section.area" to="Area" />
+        <mapping from="cross_section.area" to="CrossSectionArea" />
         <mapping from="hyk" to="Hyk" />
-        <mapping from="longitudinal_section.area" to="Area" />
+        <mapping from="longitudinal_section.area" to="LongitudinalSectionArea" />
         <mapping from="longitudinal_section.manualpoints" to="ManualPoints" />
         <mapping from="cross_section.manualpoints" to="ManualPoints" />
         <mapping from="cross_section.manualline" to="CrossSectionWaterLine" />