diff --git a/build.xml b/build.xml
index 9e05d8c..4243d97 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
   ############################################################################
   # This is the Ant build file for writer2latex
   # Original: Sep 2004 (mgn)
-  # version 1.2 (2010-03-04)
+  # version 1.2 (2010-03-14)
   ############################################################################
 -->
 <project name="w2l" default="help" basedir=".">
@@ -35,7 +35,7 @@
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
     <property name="basename" value="writer2latex11"/>
-    <property name="distrofile" value="${basename}1.zip" />
+    <property name="distrofile" value="${basename}2.zip" />
     <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />
diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 225c18d..b8f024f 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -1,7 +1,13 @@
 Changelog for Writer2LaTeX version 1.0 -> 1.2
 
+---------- version 1.1.2 ----------
+
+[w2x] Added user interface to edit custom configuration
+
 ---------- version 1.1.1 ----------
 
+[w2l] Added user interface to edit custom configuration
+
 [w2x] Added two attribute style maps: "underline" and "overstrike"
 
 [w2l] Style maps now (again) works in tables
diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt
index 5b6dc9d..1f3c38e 100644
Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index bfc8d96..b90411d 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-02-26)
+ *  Version 1.2 (2010-03-12)
  *
  */
  
@@ -32,8 +32,8 @@ package writer2latex.api;
 public class ConverterFactory {
 
     // Version information
-    private static final String VERSION = "1.1.1";
-    private static final String DATE = "2010-02-26";
+    private static final String VERSION = "1.1.2";
+    private static final String DATE = "2010-03-14";
 	
     /** Return version information
      *  @return the Writer2LaTeX version in the form
diff --git a/source/oxt/writer2latex/W2LDialogs2/ConfigurationRoot.xdl b/source/oxt/writer2latex/W2LDialogs2/ConfigurationRoot.xdl
index d747f25..527d4fc 100644
--- a/source/oxt/writer2latex/W2LDialogs2/ConfigurationRoot.xdl
+++ b/source/oxt/writer2latex/W2LDialogs2/ConfigurationRoot.xdl
@@ -9,7 +9,7 @@
   <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="32" dlg:width="248" dlg:height="2"/>
   <dlg:img dlg:style-id="0" dlg:id="ImageControl1" dlg:tab-index="1" dlg:left="8" dlg:top="6" dlg:width="21" dlg:height="21" dlg:scale-image="false" dlg:src="../images/w2licon.png"/>
   <dlg:text dlg:style-id="1" dlg:id="Label1" dlg:tab-index="2" dlg:left="34" dlg:top="10" dlg:width="193" dlg:height="16" dlg:value="Writer2LaTeX Custom Configuration"/>
-  <dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="34" dlg:top="43" dlg:width="194" dlg:height="78" dlg:value="This is where you create a custom configuration for the Writer2LaTeX export filter. You can define how to convert text, tables, figures etc. to LaTeX code. Creating a custom configuration requires some knowledge of LaTeX.&#x0a;You can export your configuration as an extension, that can be deployed to another OpenOffice.org installation." dlg:multiline="true"/>
-  <dlg:button dlg:id="ExportButton" dlg:tab-index="4" dlg:left="34" dlg:top="140" dlg:width="190" dlg:height="12" dlg:value="Export as extension..." dlg:disabled="true" />
+  <dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="34" dlg:top="43" dlg:width="194" dlg:height="78" dlg:value="This is where you create a custom configuration for the Writer2LaTeX export filter. You can define how to convert text, tables, figures etc. to LaTeX code. Creating a custom configuration requires some knowledge of LaTeX." dlg:multiline="true"/>
+  
  </dlg:bulletinboard>
 </dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml
index aab27bf..3c7206b 100644
--- a/source/oxt/writer2latex/description.xml
+++ b/source/oxt/writer2latex/description.xml
@@ -5,7 +5,7 @@
 
   <identifier value="org.openoffice.da.writer2latex.oxt"/>
 
-  <version value="1.1.1" />
+  <version value="1.1.2" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
diff --git a/source/oxt/writer2xhtml/META-INF/manifest.xml b/source/oxt/writer2xhtml/META-INF/manifest.xml
index dc4955b..15c6790 100644
--- a/source/oxt/writer2xhtml/META-INF/manifest.xml
+++ b/source/oxt/writer2xhtml/META-INF/manifest.xml
@@ -21,10 +21,18 @@
      manifest:full-path="Options.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
 
+    <manifest:file-entry
+     manifest:full-path="OptionPages.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+
     <manifest:file-entry
      manifest:full-path="W2XDialogs/"
      manifest:media-type="application/vnd.sun.star.basic-library"/>
 	 
+    <manifest:file-entry
+     manifest:full-path="W2XDialogs2/"
+     manifest:media-type="application/vnd.sun.star.basic-library"/>
+	 
     <manifest:file-entry
      manifest:full-path="writer2xhtml.rdb"
      manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
diff --git a/source/oxt/writer2xhtml/OptionPages.xcu b/source/oxt/writer2xhtml/OptionPages.xcu
new file mode 100644
index 0000000..537308b
--- /dev/null
+++ b/source/oxt/writer2xhtml/OptionPages.xcu
@@ -0,0 +1,134 @@
+<?xml version='1.0' encoding='UTF-8'?>
+ 
+<oor:component-data oor:name="OptionsDialog" oor:package="org.openoffice.Office" 
+  xmlns:oor="http://openoffice.org/2001/registry" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ 
+  <node oor:name="Modules">
+    <!-- This node should appear in the Writer module -->
+    <node oor:name="com.sun.star.text.TextDocument" oor:op="fuse">
+      <node oor:name="Nodes">
+        <node oor:name="org.openoffice.da.writer2xhtml.configuration" 
+          oor:op="fuse">
+        </node>
+      </node>
+    </node>
+  </node>
+  
+  <node oor:name="Nodes">
+
+	<!-- We define a single root node -->
+    <node oor:name="org.openoffice.da.writer2xhtml.configuration" 
+      oor:op="fuse"> 
+      <prop oor:name="Id">
+        <value>org.openoffice.da.writer2xhtml.configuration</value>
+      </prop>
+      <prop oor:name="Label">
+        <value xml:lang="en-US">Writer2xhtml</value>
+      </prop>
+      <prop oor:name="OptionsPage">
+        <value>%origin%/W2XDialogs2/ConfigurationRoot.xdl</value>
+      </prop>
+      <prop oor:name="EventHandlerService">
+        <value></value>
+      </prop>
+
+      <node oor:name="Leaves">
+      	<!-- and the root node has several leaves -->
+
+        <node oor:name="org.openoffice.da.writer2xhtml.configuration.general" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2xhtml.configuration.general</value>
+          </prop>
+          <prop oor:name="GroupId">
+            <value>org.openoffice.da.writer2xhtml.configuration</value>
+          </prop>
+          <prop oor:name="GroupIndex">
+            <value>0</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">General</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2XDialogs2/General.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value></value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2xhtml.configuration.template" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2xhtml.configuration.template</value>
+          </prop>
+          <prop oor:name="GroupId">
+            <value>org.openoffice.da.writer2xhtml.configuration</value>
+          </prop>
+          <prop oor:name="GroupIndex">
+            <value>1</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Template</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2XDialogs2/Template.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value></value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2xhtml.configuration.formatting" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2xhtml.configuration.formatting</value>
+          </prop>
+          <prop oor:name="GroupId">
+            <value>org.openoffice.da.writer2xhtml.configuration</value>
+          </prop>
+          <prop oor:name="GroupIndex">
+            <value>2</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Formatting</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2XDialogs2/Formatting.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value></value>
+          </prop>
+        </node>
+
+        <node oor:name="org.openoffice.da.writer2xhtml.configuration.styles1" 
+          oor:op="fuse">
+          <prop oor:name="Id">
+            <value>org.openoffice.da.writer2xhtml.configuration.styles1</value>
+          </prop>
+          <prop oor:name="GroupId">
+            <value>org.openoffice.da.writer2xhtml.configuration</value>
+          </prop>
+          <prop oor:name="GroupIndex">
+            <value>3</value>
+          </prop>
+          <prop oor:name="Label">
+            <value xml:lang="en-US">Styles part I</value>
+          </prop>
+          <prop oor:name="OptionsPage">
+            <value>%origin%/W2XDialogs2/StylesPartI.xdl</value>
+          </prop>
+          <prop oor:name="EventHandlerService">
+             <value></value>
+          </prop>
+        </node>
+
+       
+
+	  </node>
+    </node>
+  </node>
+  
+</oor:component-data>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl b/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl
new file mode 100644
index 0000000..ce21cc8
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/ConfigurationRoot.xdl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Configuration1" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="ConfigurationRoot" dlg:withtitlebar="false">
+ <dlg:styles>
+  <dlg:style dlg:style-id="0" dlg:border="none"/>
+  <dlg:style dlg:style-id="1" dlg:font-height="14"/>
+ </dlg:styles>
+ <dlg:bulletinboard>
+  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="32" dlg:width="248" dlg:height="2"/>
+  <dlg:img dlg:style-id="0" dlg:id="ImageControl1" dlg:tab-index="1" dlg:left="8" dlg:top="6" dlg:width="21" dlg:height="21" dlg:scale-image="false"/>
+  <dlg:text dlg:style-id="1" dlg:id="Label1" dlg:tab-index="2" dlg:left="34" dlg:top="10" dlg:width="193" dlg:height="16" dlg:value="Writer2xhtml Custom Configuration"/>
+  <dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="34" dlg:top="43" dlg:width="194" dlg:height="78" dlg:value="This is where you create a custom configuration for the Writer2xhtml export filter. You can define technical details of the generated XHTML documents and you can define how to map formatting to CSS. Creating a custom configuration requires some knowledge of XHTML and CSS." dlg:multiline="true"/>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl
new file mode 100644
index 0000000..bb12a96
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Formatting" dlg:left="139" dlg:top="84" dlg:width="258" dlg:height="172" dlg:closeable="true" dlg:moveable="true" dlg:title="Formatting" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="FormattingLabel" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="110" dlg:height="12" dlg:value="Formatting"/>
+  <dlg:menulist dlg:id="Formatting" dlg:tab-index="1" dlg:left="130" dlg:top="6" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Convert all"/>
+    <dlg:menuitem dlg:value="Ignore styles"/>
+    <dlg:menuitem dlg:value="Ignore hard formatting"/>
+    <dlg:menuitem dlg:value="Ignore all"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:text dlg:id="FrameFormattingLabel" dlg:tab-index="2" dlg:left="10" dlg:top="22" dlg:width="110" dlg:height="12" dlg:value="Frame formatting"/>
+  <dlg:menulist dlg:id="FrameFormatting" dlg:tab-index="3" dlg:left="130" dlg:top="20" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Convert all"/>
+    <dlg:menuitem dlg:value="Ignore styles"/>
+    <dlg:menuitem dlg:value="Ignore hard formatting"/>
+    <dlg:menuitem dlg:value="Ignore all"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:checkbox dlg:id="SectionFormatting" dlg:tab-index="4" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Convert section formatting" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="TableFormatting" dlg:tab-index="5" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Convert table formatting" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="IgnoreTableDimensions" dlg:tab-index="6" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Ignore table dimensions" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="UseListHack" dlg:tab-index="7" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Use non-standard continued lists" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="ConvertToPx" dlg:tab-index="8" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Convert units to px (pixels)" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="SeparateStylesheet" dlg:tab-index="9" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:value="Create separate styles sheet on file split" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/General.xdl b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl
new file mode 100644
index 0000000..fd76384
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/General.xdl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="General" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="General" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:checkbox dlg:id="NoDoctype" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="240" dlg:height="12" dlg:value="Do not include DOCTYPE" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="AddBOM" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Add Byte Order Mark (BOM)" dlg:checked="false"/>
+  <dlg:text dlg:id="EncodingLabel" dlg:tab-index="2" dlg:left="10" dlg:top="36" dlg:width="110" dlg:height="12" dlg:value="Encoding"/>
+  <dlg:menulist dlg:id="Encoding" dlg:tab-index="3" dlg:left="130" dlg:top="34" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="UTF-8"/>
+    <dlg:menuitem dlg:value="UTF-16"/>
+    <dlg:menuitem dlg:value="ISO-8859-1"/>
+    <dlg:menuitem dlg:value="US-ASCII"/>
+   </dlg:menupopup>
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EncodingChange" script:language="UNO"/>
+  </dlg:menulist>
+  <dlg:text dlg:id="HexadecimalEntitiesLabel" dlg:tab-index="4" dlg:left="10" dlg:top="50" dlg:width="110" dlg:height="12" dlg:value="Numeric character entities"/>
+  <dlg:menulist dlg:id="HexadecimalEntities" dlg:tab-index="5" dlg:left="130" dlg:top="48" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="2">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Hexadecimal"/>
+    <dlg:menuitem dlg:value="Decimal"/>
+   </dlg:menupopup>
+  </dlg:menulist>
+  <dlg:checkbox dlg:id="UseNamedEntities" dlg:tab-index="6" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Use named character entities" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="Multilingual" dlg:tab-index="7" dlg:left="10" dlg:top="78" dlg:width="240" dlg:height="12" dlg:value="Include detailed language information" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="PrettyPrinting" dlg:tab-index="8" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Use &quot;pretty printing&quot;" dlg:checked="false"/>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Module1.xba b/source/oxt/writer2xhtml/W2XDialogs2/Module1.xba
new file mode 100644
index 0000000..9c46f60
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/Module1.xba
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">REM  *****  BASIC  *****
+
+Sub Main
+
+End Sub
+
+
+</script:module>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/StylesPartI.xdl b/source/oxt/writer2xhtml/W2XDialogs2/StylesPartI.xdl
new file mode 100644
index 0000000..61bd276
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/StylesPartI.xdl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="StylesPartI" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Styles part I" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:text dlg:id="StyleSheetLabel" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="245" dlg:height="12" dlg:value="Style sheet"/>
+  <dlg:checkbox dlg:id="UseCustomStylesheet" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Use custom style sheet" dlg:checked="false">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:UseCustomStylesheetChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:text dlg:id="CustomStylesheetLabel" dlg:tab-index="2" dlg:left="19" dlg:top="36" dlg:width="55" dlg:height="12" dlg:value="URL"/>
+  <dlg:textfield dlg:id="CustomStylesheet" dlg:tab-index="3" dlg:left="80" dlg:top="34" dlg:width="170" dlg:height="12"/>
+  <dlg:text dlg:id="StyleMappingsLabel" dlg:tab-index="4" dlg:left="5" dlg:top="50" dlg:width="245" dlg:height="12" dlg:value="Style mappings"/>
+  <dlg:text dlg:id="StyleFamilyLabel" dlg:tab-index="5" dlg:left="10" dlg:top="64" dlg:width="60" dlg:height="12" dlg:value="Style family"/>
+  <dlg:menulist dlg:id="ListBox1" dlg:tab-index="6" dlg:left="80" dlg:top="62" dlg:width="170" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="Character"/>
+    <dlg:menuitem dlg:value="Paragraph"/>
+    <dlg:menuitem dlg:value="List"/>
+    <dlg:menuitem dlg:value="Frame"/>
+   </dlg:menupopup>
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:StyleFamilyChange" script:language="UNO"/>
+  </dlg:menulist>
+  <dlg:text dlg:id="StyleNameLabel" dlg:tab-index="7" dlg:left="10" dlg:top="84" dlg:width="60" dlg:height="12" dlg:value="Style name"/>
+  <dlg:menulist dlg:id="StyleName" dlg:tab-index="8" dlg:left="80" dlg:top="82" dlg:width="80" dlg:height="12" dlg:spin="true">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:StyleNameChange" script:language="UNO"/>
+  </dlg:menulist>
+  <dlg:button dlg:id="NewStyleButton" dlg:tab-index="9" dlg:left="165" dlg:top="82" dlg:width="40" dlg:height="12" dlg:value="New...">
+   <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:NewStyleClick" script:language="UNO"/>
+  </dlg:button>
+  <dlg:button dlg:id="DeleteStyleButton" dlg:tab-index="10" dlg:left="210" dlg:top="82" dlg:width="40" dlg:height="12" dlg:value="Delete...">
+   <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:DeleteStyleClick" script:language="UNO"/>
+  </dlg:button>
+  <dlg:text dlg:id="XhtmlLabel" dlg:tab-index="11" dlg:left="10" dlg:top="98" dlg:width="60" dlg:height="12" dlg:value="XHTML element"/>
+  <dlg:combobox dlg:id="Xhtml" dlg:tab-index="12" dlg:left="80" dlg:top="96" dlg:width="170" dlg:height="12" dlg:spin="true"/>
+  <dlg:text dlg:id="CssLabel" dlg:tab-index="13" dlg:left="10" dlg:top="112" dlg:width="60" dlg:height="12" dlg:value="CSS class"/>
+  <dlg:textfield dlg:id="Css" dlg:tab-index="14" dlg:left="80" dlg:top="110" dlg:width="170" dlg:height="12"/>
+  <dlg:text dlg:id="BlockXhtmlLabel" dlg:tab-index="15" dlg:left="10" dlg:top="126" dlg:width="60" dlg:height="12" dlg:value="Block XHTML element"/>
+  <dlg:combobox dlg:id="BlockXhtml" dlg:tab-index="16" dlg:left="80" dlg:top="124" dlg:width="170" dlg:height="12" dlg:spin="true"/>
+  <dlg:text dlg:id="BlockCssLabel" dlg:tab-index="17" dlg:left="10" dlg:top="140" dlg:width="60" dlg:height="12" dlg:value="Block CSS class"/>
+  <dlg:textfield dlg:id="BlockCss" dlg:tab-index="18" dlg:left="80" dlg:top="138" dlg:width="170" dlg:height="12"/>
+  <dlg:button dlg:id="LoadDefaults" dlg:tab-index="19" dlg:left="10" dlg:top="160" dlg:width="120" dlg:height="12" dlg:value="Load default mappings...">
+   <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:LoadDefaultsClick" script:language="UNO"/>
+  </dlg:button>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl
new file mode 100644
index 0000000..f3a0113
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/Template.xdl
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Template" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="Template" dlg:withtitlebar="false">
+ <dlg:bulletinboard>
+  <dlg:checkbox dlg:id="CustomTemplate" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="240" dlg:height="12" dlg:value="Use custom XHTML template" dlg:checked="false">
+   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:CustomTemplateChange" script:language="UNO"/>
+  </dlg:checkbox>
+  <dlg:textfield dlg:id="Template" dlg:tab-index="1" dlg:left="18" dlg:top="22" dlg:width="232" dlg:height="96" dlg:hscroll="true" dlg:vscroll="true" dlg:multiline="true"/>
+  <dlg:button dlg:id="Load" dlg:tab-index="2" dlg:left="18" dlg:top="120" dlg:width="60" dlg:height="12" dlg:value="Load..."/>
+  <dlg:button dlg:id="Test" dlg:tab-index="3" dlg:left="190" dlg:top="120" dlg:width="60" dlg:height="12" dlg:value="Test"/>
+  <dlg:text dlg:id="ContentIdLabel" dlg:tab-index="4" dlg:left="18" dlg:top="140" dlg:width="50" dlg:height="12" dlg:value="Content id"/>
+  <dlg:combobox dlg:id="ContentId" dlg:tab-index="5" dlg:left="72" dlg:top="138" dlg:width="50" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="content"/>
+   </dlg:menupopup>
+  </dlg:combobox>
+  <dlg:text dlg:id="PanelIdLabel" dlg:tab-index="6" dlg:left="18" dlg:top="154" dlg:width="50" dlg:height="12" dlg:value="Panel id"/>
+  <dlg:combobox dlg:id="PanelId" dlg:tab-index="7" dlg:left="72" dlg:top="152" dlg:width="50" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="panel"/>
+   </dlg:menupopup>
+  </dlg:combobox>
+  <dlg:text dlg:id="HeaderIdLabel" dlg:tab-index="8" dlg:left="146" dlg:top="140" dlg:width="50" dlg:height="12" dlg:value="Header id"/>
+  <dlg:combobox dlg:id="HeaderId" dlg:tab-index="9" dlg:left="200" dlg:top="138" dlg:width="50" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="header"/>
+   </dlg:menupopup>
+  </dlg:combobox>
+  <dlg:text dlg:id="FooterIdLabel" dlg:tab-index="10" dlg:left="146" dlg:top="154" dlg:width="50" dlg:height="12" dlg:value="Footer id"/>
+  <dlg:combobox dlg:id="FooterId" dlg:tab-index="11" dlg:left="200" dlg:top="152" dlg:width="50" dlg:height="12" dlg:spin="true">
+   <dlg:menupopup>
+    <dlg:menuitem dlg:value="footer"/>
+   </dlg:menupopup>
+  </dlg:combobox>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb b/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb
new file mode 100644
index 0000000..b013697
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/dialog.xlb
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="W2XDialogs2" library:readonly="false" library:passwordprotected="false">
+ <library:element library:name="ConfigurationRoot"/>
+ <library:element library:name="General"/>
+ <library:element library:name="Template"/>
+ <library:element library:name="Formatting"/>
+ <library:element library:name="StylesPartI"/>
+</library:library>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/W2XDialogs2/script.xlb b/source/oxt/writer2xhtml/W2XDialogs2/script.xlb
new file mode 100644
index 0000000..0c0ef79
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs2/script.xlb
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="W2XDialogs2" library:readonly="false" library:passwordprotected="false">
+ <library:element library:name="Module1"/>
+</library:library>
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml
index 6377560..62ac9e9 100644
--- a/source/oxt/writer2xhtml/description.xml
+++ b/source/oxt/writer2xhtml/description.xml
@@ -5,7 +5,7 @@
 			 
   <identifier value="org.openoffice.da.writer2xhtml.oxt" />
   
-  <version value="1.1.1" />
+  <version value="1.1.2" />
   
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml
index f8cfab1..5740feb 100644
--- a/source/oxt/writer4latex/description.xml
+++ b/source/oxt/writer4latex/description.xml
@@ -4,7 +4,7 @@
              xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <identifier value="org.openoffice.da.writer4latex.oxt" />
-  <version value="1.1.1" />
+  <version value="1.1.2" />
   <dependencies>
     <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
   </dependencies>
diff --git a/source/oxt/xhtml-config-sample/description.xml b/source/oxt/xhtml-config-sample/description.xml
index 1a01d80..8a90a62 100644
--- a/source/oxt/xhtml-config-sample/description.xml
+++ b/source/oxt/xhtml-config-sample/description.xml
@@ -2,5 +2,5 @@
 <description xmlns="http://openoffice.org/extensions/description/2006"
              xmlns:d="http://openoffice.org/extensions/description/2006">
   <identifier value="org.openoffice.da.writer2latex.xhtml-config-sample.oxt" />
-  <version value="1.1.1" />
+  <version value="1.1.2" />
 </description>