diff --git a/ws/Xmlmind/Files/addon/config/unix/imagetoolkits.incl b/ws/Xmlmind/Files/addon/config/unix/imagetoolkits.incl
index 6e3885cf521ee620e41f4254170a8540b06520dd..70aac6e54b1db9649b7f083838e83af5c988a2f8 100644
--- a/ws/Xmlmind/Files/addon/config/unix/imagetoolkits.incl
+++ b/ws/Xmlmind/Files/addon/config/unix/imagetoolkits.incl
@@ -124,6 +124,23 @@ Important: requires Ghostscript 8+.</description>
     </converter>
   </imageToolkit>
 -->
+
+  <imageToolkit name="Inkscape as an external SVG toolkit">
+    <description>Converts SVG to PNG.</description>
+    <converter>
+      <input extensions="svg svgz"
+             magicStrings="&lt;?xml"
+             rootNames="svg:svg"
+             rootQNames="svg:svg" xmlns:svg="http://www.w3.org/2000/svg" />
+      <output extensions="png"/>
+
+      <shell
+        command='inkscape --export-filename="%O" "%I"' />
+    </converter>
+
+  </imageToolkit>
+
+
   <imageToolkit name="Fig">
     <description>Converts (X)FIG graphics to PNG.
 Important: requires transfig package.</description>
diff --git a/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch b/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
index e9ec419453b579ce572a703a9c8142dbb5333f7b..19b88aaaef1d08813072744522dbdad6d4dfcdbb 100644
--- a/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
+++ b/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
@@ -1,99 +1,10 @@
---- xmlmind.orig/addon/config/docbook5/rng/V5.0/docbook.sch	2018-09-06 18:50:44.850904769 +0200
-+++ xmlmind/addon/config/docbook5/rng/V5.0/docbook.sch	2018-09-09 11:35:15.308143353 +0200
-@@ -244,4 +244,42 @@
-          <s:assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of sidebar</s:assert>
-       </s:rule>
-    </s:pattern>
--</s:schema>
-\ No newline at end of file
-+<!-- Start Goik's additions -->
-+   <s:pattern name="Mandatory title in exercise">
-+      <s:rule context="db:qandaset">
-+         <s:assert test="db:title or name(preceding-sibling::*[1])='db:title'">Must be IMMEDIATELY following title or contain a title itself.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern name="Mandatory defaultlabel">
-+      <s:rule context="db:qandaset">
-+         <s:assert test="@defaultlabel">Attribute defaultlabel must be defined.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern name="Mandatory language">
-+      <s:rule context="db:programlisting">
-+         <s:assert test="@language">Attribute language must be defined.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern name="Mandatory Id definition constraint">
-+      <s:rule context="db:preface|db:chapter|db:section|db:appendix|db:figure|db:equation|db:table|db:qandaset">
-+         <s:assert test="@xml:id">Each chapter,section, subection,... must have a unique id.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern name="Mandatory coref target constraint">
-+      <s:rule context="db:coref">
-+         <s:assert test="//db:co[@xml:id=current()/@linkend]">coref target must be a co element.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+  <s:pattern name="Avoid nested slide annotations">
-+     <s:rule context="*[contains(@annotations, 'slide')]">
-+        <s:assert test="not(ancestor::*[contains(@annotations, 'slide')])">Existing »slide« annotated parent.</s:assert>
-+     </s:rule>
-+  </s:pattern>
-+
-+<!-- End Goik's additions -->
-+</s:schema>
---- xmlmind.orig/addon/config/docbook51/rng/V5.1/docbook.sch	2018-09-06 18:50:44.946903174 +0200
-+++ xmlmind/addon/config/docbook51/rng/V5.1/docbook.sch	2018-09-09 11:35:15.312143280 +0200
-@@ -196,4 +196,49 @@
-          <s:assert test="parent::*[@xlink:type='extended'] or parent::*[@xlink:type='locator'] or parent::*[@xlink:type='arc']">An XLink title type element must occur as the direct child of an XLink extended, locator, or arc type element.</s:assert>
-       </s:rule>
-    </s:pattern>
-+
-+   <!-- Start Goik's additions -->
-+   <s:pattern>
-+      <s:title>Mandatory title in exercise</s:title>
-+      <s:rule context="db:qandaset">
-+        <s:assert test="db:title or name(preceding-sibling::*[1])='db:title'">Must be IMMEDIATELY following title or contain a title itself.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+   
-+   <s:pattern>
-+      <s:title>Mandatory defaultlabel</s:title>
-+       <s:rule context="db:qandaset">
-+         <s:assert test="@defaultlabel">Attribute defaultlabel must be defined.</s:assert>
-+       </s:rule>
-+   </s:pattern>
-+      
-+   <s:pattern>
-+      <s:title>Mandatory @language</s:title>
-+      <s:rule context="db:programlisting">
-+        <s:assert test="@language">Attribute language must be defined.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern>
-+      <s:title>Mandatory Id definition constraint</s:title>
-+      <s:rule context="db:preface|db:chapter|db:section|db:appendix|db:figure|db:equation|db:table|db:qandaset">
-+         <s:assert test="@xml:id">Each chapter,section, subection,... must have a unique id.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+   <s:pattern>
-+      <s:title>Mandatory coref target constraint</s:title>
-+      <s:rule context="db:coref">
-+         <s:assert test="//db:co[@xml:id=current()/@linkend]">coref target must be a co element.</s:assert>
-+      </s:rule>
-+   </s:pattern>
-+
-+  <s:pattern>
-+      <s:title>Avoid nested slide annotations</s:title>
-+     <s:rule context="*[contains(@annotations, 'slide')]">
-+        <s:assert test="not(ancestor::*[contains(@annotations, 'slide')])">Existing »slide« annotated parent.</s:assert>
-+     </s:rule>
-+  </s:pattern>
-+  <!-- End Goik's additions -->
-+  
- </s:schema>
+--- xmlmind.orig/addon/config/docbook51/docbook51.xxe	2022-07-25 19:54:19.187325536 +0200
++++ xmlmind/addon/config/docbook51/docbook51.xxe	2022-07-25 19:55:44.083968765 +0200
+@@ -24,6 +24,7 @@
+ 
+   <relaxng location="rng/V5.1/docbook.rng" />
+   <schematron location="rng/V5.1/docbook.sch" />
++  <schematron location="rng/V5.1/goikDocbookExt.sch" />
+ 
+   <template name="Topic" location="template/V5.1/topic.xml" 
+             category="DocBook v5+/5.1" order="50" />