--- a/flys-artifacts/doc/conf/themes/default/discharge.xml	Mon Dec 17 17:54:26 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/discharge.xml	Mon Dec 17 17:56:56 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
@@ -22,13 +23,18 @@
         <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" hints="hidden" />
+                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>
 
@@ -68,24 +74,39 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
         </fields>
     </theme>
 
     <theme name="ExtremeWQCurve">
         <inherits>
-            <inherit from="DischargeCurve" />
+            <inherit from="Lines" />
+            <inherit from="MinMaxPoints" />
         </inherits>
-        <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
-            default="true" hidden="true" />
+        <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" />
-            <inherit from="Label" />
         </inherits>
-        <field name="pointsize" type="int" display="Punktdicke"
-            default="2" hidden="true" />
+        <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-->