--- a/artifacts/doc/conf/artifacts/sinfo.xml	Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Wed Mar 07 17:36:04 2018 +0100
@@ -59,10 +59,10 @@
         <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart">
           <facets>
             <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
-            <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
-            <facet name="sinfo_flow_depth.tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/>
+            <facet name="sinfo_facet_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
+            <facet name="sinfo_facet_flow_depth_with_tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/>
 
-            <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/>
+            <facet name="sinfo_facet_tkh" description="Facet for tkh"/>
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
           </facets>
@@ -124,11 +124,15 @@
           <facets>
             <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
             <!-- FIXME: should be filtered according to spec -->
-            <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/>
+            <facet name="sinfo_facet_tkh" description="Facet for tkh"/>
+
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
 
-            <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
-            <!--  FIXME: more themes -->
+            <!-- FIXME: should not be filtered according to spec... -->
+            <facet name="sinfo_facet_flow_depth.filtered" description="mean flow depth"/>
+            <facet name="sinfo_facet_velocity.filtered" description="Velocity"/>
+            <facet name="sinfo_facet_d50.filtered" description="D50"/>
+            <facet name="sinfo_facet_tau.filtered" description="Tau"/>
           </facets>
         </outputmode>
       
@@ -144,13 +148,7 @@
             <facet name="report" description="facet.sinfo_tkh_report"/>
           </facets>
         </outputmode>      
-      
-        <!-- <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart"> <facets> <facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/> <facet name="sinfo_flow_depth.tkh.filtered" description="Facet for mean flow depth including tkh, filtered by current zoom state"/> <facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/> <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/> 
-          </facets> </outputmode> <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export"> <facets> <facet name="csv" description="facet.sinfo_flowdepth_export.csv"/> <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf"/> </facets> </outputmode> <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report"> <facets> <facet name="report" description="facet.sinfo_flowdepth_report"/> 
-          </facets> </outputmode> -->
       </outputmodes>
     </state>
-
   </states>
-
 </artifact>
\ No newline at end of file