diff --git a/sd/xml/SdDocLinkTargets.xml b/sd/xml/SdDocLinkTargets.xml
index d35c63c71f90..9eef5f76a1e2 100644
--- a/sd/xml/SdDocLinkTargets.xml
+++ b/sd/xml/SdDocLinkTargets.xml
@@ -1,31 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdDocLinkTargets</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdDocLinkTargets</name>
+        <description>
     This component provides access to possible link targets inside a context
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.document.LinkTargets</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.document.LinkTargets</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdDrawPage.xml b/sd/xml/SdDrawPage.xml
index a277ef0ad176..472bb1abb758 100644
--- a/sd/xml/SdDrawPage.xml
+++ b/sd/xml/SdDrawPage.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdDrawPage</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdDrawPage</name>
+        <description>
     This component provides access to a single drawing page of a document.
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.DrawPage</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.DrawPage</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdDrawPagesAccess.xml b/sd/xml/SdDrawPagesAccess.xml
index 449b737d25e4..72dfec474017 100644
--- a/sd/xml/SdDrawPagesAccess.xml
+++ b/sd/xml/SdDrawPagesAccess.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdDrawPagesAccess</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdDrawPagesAccess</name>
+        <description>
     This component provides access to the drawing pages of a document.
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.DrawPages</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.DrawPages</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdGenericDrawPage.xml b/sd/xml/SdGenericDrawPage.xml
index c97eb3cc62b8..885f2ad624e0 100644
--- a/sd/xml/SdGenericDrawPage.xml
+++ b/sd/xml/SdGenericDrawPage.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdGenericDrawPage</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdGenericDrawPage</name>
+        <description>
     This component provides a basic implementation for both master and drawing pages.
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.GenericDrawPage</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.GenericDrawPage</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdLayer.xml b/sd/xml/SdLayer.xml
index 50d51be6377c..4b7a761dd1ff 100644
--- a/sd/xml/SdLayer.xml
+++ b/sd/xml/SdLayer.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdLayer</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdLayer</name>
+        <description>
     This component provides access to a single layer inside a document.
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.Layer</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.Layer</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdLayerManager.xml b/sd/xml/SdLayerManager.xml
index 66633f55cfcb..f03b9ba89272 100644
--- a/sd/xml/SdLayerManager.xml
+++ b/sd/xml/SdLayerManager.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdLayerManager</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdLayerManager</name>
+        <description>
     This component provides access to the layers of a document
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.LayerManager</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.LayerManager</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdMasterPage.xml b/sd/xml/SdMasterPage.xml
index 38a1dad57611..3e86fc8b714e 100644
--- a/sd/xml/SdMasterPage.xml
+++ b/sd/xml/SdMasterPage.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdMasterPage</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdMasterPage</name>
+        <description>
     This component provides access to a single master page inside a document
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.MasterPage</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.MasterPage</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdMasterPagesAccess.xml b/sd/xml/SdMasterPagesAccess.xml
index bea1cffa8863..3c12f2e95dab 100644
--- a/sd/xml/SdMasterPagesAccess.xml
+++ b/sd/xml/SdMasterPagesAccess.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdMasterPagesAccess</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdMasterPagesAccess</name>
+        <description>
     This component provides access to the master drawing pages inside a document
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.MasterPages</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.MasterPages</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdPageLinkTargets.xml b/sd/xml/SdPageLinkTargets.xml
index 06369ffac8dd..ac208fe5217a 100644
--- a/sd/xml/SdPageLinkTargets.xml
+++ b/sd/xml/SdPageLinkTargets.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdPageLinkTargets</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdPageLinkTargets</name>
+        <description>
     This component provides the container for the link targets of a drawing page
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.document.LinkTargets</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.document.LinkTargets</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdXCustomPresentation.xml b/sd/xml/SdXCustomPresentation.xml
index fc6e134a550f..7094e0064b21 100644
--- a/sd/xml/SdXCustomPresentation.xml
+++ b/sd/xml/SdXCustomPresentation.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdXCustomPresentation</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdXCustomPresentation</name>
+        <description>
     This component provides access to the draw pages in a custom presentation
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.presentation.CustomPresentation</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.presentation.CustomPresentation</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdXCustomPresentationAccess.xml b/sd/xml/SdXCustomPresentationAccess.xml
index 3c74c71dbb20..daf8eea22527 100644
--- a/sd/xml/SdXCustomPresentationAccess.xml
+++ b/sd/xml/SdXCustomPresentationAccess.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdXCustomPresentationAccess</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdXCustomPresentationAccess</name>
+        <description>
     This component provides access to custom presentations of a document
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.presentation.CustomPresentationAccess</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.presentation.CustomPresentationAccess</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdXImpressDocument.xml b/sd/xml/SdXImpressDocument.xml
index 1bb85e2e57de..4239e0b5d254 100644
--- a/sd/xml/SdXImpressDocument.xml
+++ b/sd/xml/SdXImpressDocument.xml
@@ -1,33 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdXImpressDocument</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdXImpressDocument</name>
+        <description>
     This component provides access to an presentation document.
-</Description>
-
-<ModuleName>sd</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.presentation.PresentationDocument</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.presentation.PresentationDocument</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdXPresentation.xml b/sd/xml/SdXPresentation.xml
index 4da98640f161..79f4b4aac067 100644
--- a/sd/xml/SdXPresentation.xml
+++ b/sd/xml/SdXPresentation.xml
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdXPresentation</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdXPresentation</name>
+        <description>
     This component provides access to the presentation of a impress document
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.presentation.Presentation</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.presentation.Presentation</supported-service>
+    </component-description>
+</module-description>
diff --git a/sd/xml/SdXShape.xml b/sd/xml/SdXShape.xml
index 47e8d3e62039..5e79d777592c 100644
--- a/sd/xml/SdXShape.xml
+++ b/sd/xml/SdXShape.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SdXShape</Name>
-<Description>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sd</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SdXShape</name>
+        <description>
     This component provides access to a single shape.
-</Description>
-
-<ModuleName>sd</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.Shape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.Shape</supported-service>
+    </component-description>
+</module-description>