diff --git a/ws/Docbook/Extensions/Tdata/Forum/.gitignore b/ws/Docbook/Extensions/Tdata/Forum/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f3c7a7c5da68804a1bdf391127ba34aed33c3cca
--- /dev/null
+++ b/ws/Docbook/Extensions/Tdata/Forum/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/ws/Docbook/Extensions/Tdata/Forum/forum.xml b/ws/Docbook/Extensions/Tdata/Forum/forum.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a1ec52e0d58d6044d634f01760004860e66785a
--- /dev/null
+++ b/ws/Docbook/Extensions/Tdata/Forum/forum.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<book version="5.1" xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:xila="http://www.w3.org/2001/XInclude/local-attributes"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:trans="http://docbook.org/ns/transclusion"
+      xmlns:svg="http://www.w3.org/2000/svg"
+      xmlns:m="http://www.w3.org/1998/Math/MathML"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      xmlns:db="http://docbook.org/ns/docbook">
+  <info>
+    <title/>
+
+    <author>
+      <personname><firstname/><surname/></personname>
+
+      <affiliation>
+        <orgname/>
+      </affiliation>
+    </author>
+
+    <pubdate/>
+  </info>
+
+  <part xml:id="sd1">
+    <title>Software development 1</title>
+
+    <chapter annotations="slide" xml:id="sd1_chap_intro">
+      <title>Introduction</title>
+
+      <figure xml:id="sd1_fig_items">
+        <title>Some items</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>one</para>
+          </listitem>
+
+          <listitem>
+            <para>two</para>
+          </listitem>
+        </itemizedlist>
+      </figure>
+
+      <section xml:id="sd1_sect_onlyForTestNesting">
+        <title>Nesting test</title>
+
+        <qandaset defaultlabel="qanda" xml:id="sda1_qanda_yetAnotherQuestion">
+          <title>Yet another question</title>
+
+          <qandadiv>
+            <qandaentry>
+              <question>
+                <para>A different Question</para>
+              </question>
+            </qandaentry>
+          </qandadiv>
+        </qandaset>
+      </section>
+    </chapter>
+  </part>
+
+  <part xml:id="sda1">
+    <title>Software development 1</title>
+
+    <chapter xml:id="sda1_chap_intro">
+      <title>Introduction</title>
+
+      <qandaset defaultlabel="qanda" xml:id="sda1_qanda_firstQuestion">
+        <title>First question</title>
+
+        <qandadiv>
+          <qandaentry>
+            <question>
+              <para>A simple Question</para>
+            </question>
+          </qandaentry>
+        </qandadiv>
+      </qandaset>
+    </chapter>
+  </part>
+</book>
diff --git a/ws/Docbook/Id2topic/.gitignore b/ws/Docbook/Id2topic/.gitignore
index c801fe35d4022980f726678acd3f4fc2a0d81aa8..ab790706ed4cb598ce6edf77aa9b02fe5e00fe24 100644
--- a/ws/Docbook/Id2topic/.gitignore
+++ b/ws/Docbook/Id2topic/.gitignore
@@ -1,4 +1,5 @@
 dependency-reduced-pom.xml
 .idea/
 id2topic.iml
+topics.xml
 
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl b/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
index 66169a637bc5dd417d72d2c475cec838127841dc..e902d08d5c33b01e24e4f56b5d3e2a5254e0e407 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
@@ -16,10 +16,32 @@
   
   <xsl:template match="/">
       <map prefix="goiklecture">
-        <xsl:apply-templates select=".//d:qandaset"/>
+        <xsl:apply-templates select="d:book/d:part[@xml:id='sd1']//(d:qandaset|d:figure)"/>
       </map>
   </xsl:template>
   
+  <xsl:template match="d:figure">
+    
+    <entry >
+      <xsl:attribute name="id">
+        <xsl:value-of select="@xml:id"/>
+      </xsl:attribute>
+      
+      <title>
+        <xsl:text>Slide "</xsl:text>
+        <xsl:value-of select="d:title"/>
+        <xsl:text>"</xsl:text>
+      </title>
+      <content>
+        <xsl:text>Discussing [Slide "</xsl:text>
+        <xsl:value-of select="d:title"/>
+        <xsl:text>"](https://freedocs.mi.hdm-stuttgart.de/</xsl:text>
+        <xsl:call-template name="href.target.uri"/>
+        <xsl:text>)</xsl:text>
+      </content>
+      
+    </entry>
+  </xsl:template>
   <xsl:template match="d:qandaset">
     
     <entry >
@@ -42,7 +64,7 @@
         <xsl:call-template name="href.target.uri"/>
         <xsl:text>)</xsl:text>
       </content>
-       
+      
     </entry>
   </xsl:template>