diff --git a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
index c1d694c087f7a3dc09a4ab58f3b67a9a98015b9c..cc6fabaa4802f7e77f21dc0f44bc459af5f7b9e8 100644
--- a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
@@ -40,7 +40,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="../Ref/Fig/class.svg"/>
+          <imagedata fileref="Ref/Fig/class.svg"/>
         </imageobject>
       </mediaobject>
     </section>
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
index dcec7fbb3ca3a55bbb134d8f4ea758e912f16570..96372eb899ad54db85359f75286c47b273d8e940 100644
--- a/ws/Docbook/Extensions/Tdata/Components/intro.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -132,7 +132,7 @@
 
   <db:mediaobject>
     <db:imageobject>
-      <db:imagedata fileref="../Ref/Fig/carSlope.fig"/>
+      <db:imagedata fileref="Ref/Fig/carSlope.fig"/>
     </db:imageobject>
   </db:mediaobject>
 
@@ -141,7 +141,7 @@
 
   <db:mediaobject>
     <db:imageobject>
-      <db:imagedata fileref="../Ref/Fig/freedocs.svg"/>
+      <db:imagedata fileref="Ref/Fig/freedocs.svg"/>
     </db:imageobject>
   </db:mediaobject>
 
@@ -149,7 +149,7 @@
 
   <db:mediaobject>
     <db:imageobject>
-      <db:imagedata fileref="../../../../../Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp"/>
+      <db:imagedata fileref="Ref/Fig/codingbatSleepExample.bmp"/>
     </db:imageobject>
   </db:mediaobject>
 
@@ -160,7 +160,7 @@
 
     <db:mediaobject>
       <db:imageobject>
-        <db:imagedata fileref="../../../../../Doc/Sd1/Ref/Fig/hashing.svg"/>
+        <db:imagedata fileref="Ref/Fig/hashing.svg"/>
       </db:imageobject>
     </db:mediaobject>
   </db:figure>
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index e3efe7b5d006df23c6e0fb93da7b8d9d05d2a82b..1c50d204db868f5186da2bfb85a5285e6692781f 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -11,7 +11,7 @@ BUILDROOT_WEBHELP=${BUILDROOT}/webhelp
 BUILDROOT_EPUB=${BUILDROOT}/epub
 
 DBOOK=/usr/share/hdm-docbook-xsl
-DBOOK_XSL=${DBOOK}/docbook-xsl-1.79.2
+DBOOK_XSL=${DBOOK}/docbook-xsl
 DBOOK_XSL_CUSTOM=${DBOOK}/CustomLayer
 DBOOK_XSL_PREPROCESS=${DBOOK}/Preprocess
 
@@ -53,7 +53,7 @@ webhelp.base.dir=target/webhelp
 DIR := ${CURDIR}
 numCores=$(shell nproc --all)
 
-SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl-1.79.2/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xslthl-2.1.3.jar" \
+SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xslthl-2.1.3.jar" \
 -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
     -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
     -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \