diff --git a/source/distro/doc/w4l-user-manual.odt b/source/distro/doc/w4l-user-manual.odt
index f016fb2..19f082d 100644
Binary files a/source/distro/doc/w4l-user-manual.odt and b/source/distro/doc/w4l-user-manual.odt differ
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java
index 52c5db7..15e0b8c 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/OptionsDialogBase.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-10-14)
+ *  Version 1.2 (2009-05-01)
  *
  */ 
  
@@ -50,6 +50,7 @@ import com.sun.star.util.XMacroExpander;
 
 import org.openoffice.da.comp.w2lcommon.helper.DialogBase;
 import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper;
+import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper;
 
 /** This class provides an abstract uno component which implements a filter ui
  */
@@ -205,7 +206,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
             XPropertySet xDocInfo = (XPropertySet)
                 UnoRuntime.queryInterface(XPropertySet.class, docInfo);
 
-            return getPropertyValueAsString(xDocInfo,"Template");
+            return XPropertySetHelper.getPropertyValueAsString(xDocInfo,"Template");
         }
         catch (Exception e) {
             return "";
@@ -287,7 +288,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
                     UnoRuntime.queryInterface(XPropertySet.class,view);
 	 		
                 // Get the available configurations
-                Object configurations = getPropertyValue(xProps,"Configurations");
+                Object configurations = XPropertySetHelper.getPropertyValue(xProps,"Configurations");
                 XNameAccess xConfigurations = (XNameAccess)
                     UnoRuntime.queryInterface(XNameAccess.class,configurations);
 				
@@ -296,7 +297,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
                 Object config = xConfigurations.getByName(sName);
                 XPropertySet xCfgProps = (XPropertySet)
                     UnoRuntime.queryInterface(XPropertySet.class,config);
-                sLockedOptions = getPropertyValueAsString(xCfgProps,"LockedOptions");
+                sLockedOptions = XPropertySetHelper.getPropertyValueAsString(xCfgProps,"LockedOptions");
 				
                 // Dispose the registry view
                 disposeRegistryView(view);
@@ -330,7 +331,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
         String[] sStdConfigs = getListBoxStringItemList("Config");
         int nStdConfigs = sStdConfigs.length;
 
-        Object configurations = getPropertyValue(xProps,"Configurations");
+        Object configurations = XPropertySetHelper.getPropertyValue(xProps,"Configurations");
         XNameAccess xConfigurations = (XNameAccess)
             UnoRuntime.queryInterface(XNameAccess.class,configurations);
         sConfigNames = xConfigurations.getElementNames();
@@ -346,7 +347,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
                 Object config = xConfigurations.getByName(sConfigNames[i]);
                 XPropertySet xCfgProps = (XPropertySet)
                     UnoRuntime.queryInterface(XPropertySet.class,config);
-                sAllConfigs[nStdConfigs+i] = getPropertyValueAsString(xCfgProps,"DisplayName");
+                sAllConfigs[nStdConfigs+i] = XPropertySetHelper.getPropertyValueAsString(xCfgProps,"DisplayName");
             }
             catch (Exception e) {
                 sAllConfigs[nStdConfigs+i] = "";
@@ -363,7 +364,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
 		
         // Select item based on template name
         String sTheTemplateName = getTemplateName();
-        Object templates = getPropertyValue(xProps,"Templates");
+        Object templates = XPropertySetHelper.getPropertyValue(xProps,"Templates");
         XNameAccess xTemplates = (XNameAccess)
             UnoRuntime.queryInterface(XNameAccess.class,templates);
         String[] sTemplateNames = xTemplates.getElementNames();
@@ -372,9 +373,9 @@ public abstract class OptionsDialogBase extends DialogBase implements
                 Object template = xTemplates.getByName(sTemplateNames[i]);
                 XPropertySet xTplProps = (XPropertySet)
                     UnoRuntime.queryInterface(XPropertySet.class,template);
-                String sTemplateName = getPropertyValueAsString(xTplProps,"TemplateName");
+                String sTemplateName = XPropertySetHelper.getPropertyValueAsString(xTplProps,"TemplateName");
                 if (sTemplateName.equals(sTheTemplateName)) {
-                    String sConfigName = getPropertyValueAsString(xTplProps,"ConfigName");
+                    String sConfigName = XPropertySetHelper.getPropertyValueAsString(xTplProps,"ConfigName");
                     for (short j=0; j<nRegConfigs; j++) {
                         if (sConfigNames[j].equals(sConfigName)) {
                             setListBoxSelectedItem("Config",(short) (nStdConfigs+j));
@@ -389,12 +390,12 @@ public abstract class OptionsDialogBase extends DialogBase implements
         }
 
         // Select item based on value stored in registry
-        short nConfig = getPropertyValueAsShort(xProps,"Config");
+        short nConfig = XPropertySetHelper.getPropertyValueAsShort(xProps,"Config");
         if (nConfig<nStdConfigs) {
             setListBoxSelectedItem("Config",nConfig);
         }
         else { // Registry configurations are stored by name
-            String sConfigName = getPropertyValueAsString(xProps,"ConfigName");
+            String sConfigName = XPropertySetHelper.getPropertyValueAsString(xProps,"ConfigName");
             for (short i=0; i<nRegConfigs; i++) {
                 if (sConfigNames[i].equals(sConfigName)) {
                     setListBoxSelectedItem("Config",(short) (nStdConfigs+i));
@@ -405,7 +406,7 @@ public abstract class OptionsDialogBase extends DialogBase implements
 	
     protected short saveConfig(XPropertySet xProps, PropertyHelper filterData) {
         // The Config list box is common for all dialogs
-        Object configurations = getPropertyValue(xProps,"Configurations");
+        Object configurations = XPropertySetHelper.getPropertyValue(xProps,"Configurations");
         XNameAccess xNameAccess = (XNameAccess)
             UnoRuntime.queryInterface(XNameAccess.class,configurations);
 
@@ -418,29 +419,29 @@ public abstract class OptionsDialogBase extends DialogBase implements
                 Object config = xNameAccess.getByName(sConfigNames[i]);
                 XPropertySet xCfgProps = (XPropertySet)
                     UnoRuntime.queryInterface(XPropertySet.class,config);
-                filterData.put("ConfigURL",expandMacros(getPropertyValueAsString(xCfgProps,"ConfigURL")));
-                filterData.put("TemplateURL",expandMacros(getPropertyValueAsString(xCfgProps,"TargetTemplateURL")));
-                setPropertyValue(xProps,"ConfigName",sConfigNames[i]);
+                filterData.put("ConfigURL",expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"ConfigURL")));
+                filterData.put("TemplateURL",expandMacros(XPropertySetHelper.getPropertyValueAsString(xCfgProps,"TargetTemplateURL")));
+                XPropertySetHelper.setPropertyValue(xProps,"ConfigName",sConfigNames[i]);
                 bFound = true;
             }
             catch (Exception e) {
             }
         }
-        setPropertyValue(xProps,"Config",nConfig);
-        if (!bFound) { setPropertyValue(xProps,"ConfigName",""); }
+        XPropertySetHelper.setPropertyValue(xProps,"Config",nConfig);
+        if (!bFound) { XPropertySetHelper.setPropertyValue(xProps,"ConfigName",""); }
         return nConfig;
     }
 	
     // Check box option (boolean)
     protected boolean loadCheckBoxOption(XPropertySet xProps, String sName) {
-        boolean bValue = getPropertyValueAsBoolean(xProps,sName);
+        boolean bValue = XPropertySetHelper.getPropertyValueAsBoolean(xProps,sName);
         setCheckBoxStateAsBoolean(sName, bValue);
         return bValue;
     }
 	
     protected boolean saveCheckBoxOption(XPropertySet xProps, String sName) {
         boolean bValue = getCheckBoxStateAsBoolean(sName);
-        setPropertyValue(xProps, sName, bValue);
+        XPropertySetHelper.setPropertyValue(xProps, sName, bValue);
         return bValue;
     }
 
@@ -455,14 +456,14 @@ public abstract class OptionsDialogBase extends DialogBase implements
 	
     // List box option
     protected short loadListBoxOption(XPropertySet xProps, String sName) {
-        short nValue = getPropertyValueAsShort(xProps, sName);
+        short nValue = XPropertySetHelper.getPropertyValueAsShort(xProps, sName);
         setListBoxSelectedItem(sName ,nValue);
         return nValue;
     }
 	
     protected short saveListBoxOption(XPropertySet xProps, String sName) {
         short nValue = getListBoxSelectedItem(sName);
-        setPropertyValue(xProps, sName, nValue);
+        XPropertySetHelper.setPropertyValue(xProps, sName, nValue);
         return nValue;
     }
 	
@@ -477,14 +478,14 @@ public abstract class OptionsDialogBase extends DialogBase implements
 	
     // Combo box option
     protected String loadComboBoxOption(XPropertySet xProps, String sName) {
-        String sValue = getPropertyValueAsString(xProps, sName);
+        String sValue = XPropertySetHelper.getPropertyValueAsString(xProps, sName);
         setComboBoxText(sName ,sValue);
         return sValue;
     }
 	
     protected String saveComboBoxOption(XPropertySet xProps, String sName) {
         String sValue = getComboBoxText(sName);
-        setPropertyValue(xProps, sName, sValue);
+        XPropertySetHelper.setPropertyValue(xProps, sName, sValue);
         return sValue;
     }
 	
@@ -499,14 +500,14 @@ public abstract class OptionsDialogBase extends DialogBase implements
 
     // Text Field option
     protected String loadTextFieldOption(XPropertySet xProps, String sName) {
-        String sValue = getPropertyValueAsString(xProps, sName);
+        String sValue = XPropertySetHelper.getPropertyValueAsString(xProps, sName);
         setTextFieldText(sName ,sValue);
         return sValue;
     }
 	
     protected String saveTextFieldOption(XPropertySet xProps, String sName) {
         String sValue = getTextFieldText(sName);
-        setPropertyValue(xProps, sName, sValue);
+        XPropertySetHelper.setPropertyValue(xProps, sName, sValue);
         return sValue;
     }
 	
@@ -521,14 +522,14 @@ public abstract class OptionsDialogBase extends DialogBase implements
 
     // Numeric option
     protected int loadNumericOption(XPropertySet xProps, String sName) {
-        int nValue = getPropertyValueAsInteger(xProps, sName);
+        int nValue = XPropertySetHelper.getPropertyValueAsInteger(xProps, sName);
         setNumericFieldValue(sName, nValue);
         return nValue;
     }
 	
     protected int saveNumericOption(XPropertySet xProps, String sName) {
         int nValue = getNumericFieldValue(sName);
-        setPropertyValue(xProps, sName, nValue);
+        XPropertySetHelper.setPropertyValue(xProps, sName, nValue);
         return nValue;
     }
 	
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/helper/DialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/helper/DialogBase.java
index 76a6dff..b7228db 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/helper/DialogBase.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/helper/DialogBase.java
@@ -32,11 +32,11 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XDialogEventHandler;
 import com.sun.star.awt.XDialogProvider2;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
+//import com.sun.star.beans.PropertyVetoException;
+//import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
+//import com.sun.star.lang.IllegalArgumentException;
+//import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lang.XServiceName;
@@ -436,67 +436,6 @@ msgBox.showMessage("Error",e.toString()+" "+e.getStackTrace()[0].toString());
         }
     }
 	
-    // Helpers for access to an XPropertySet. The helpers will fail silently if
-    // names or data is provided, but the subclass is expected to use them with
-    // correct data only...
-    protected Object getPropertyValue(XPropertySet xProps, String sName) {
-        try {
-            return xProps.getPropertyValue(sName);
-        }
-        catch (UnknownPropertyException e) {
-            return null;
-        }
-        catch (WrappedTargetException e) {
-            return null;
-        }
-    } 
-	
-    protected void setPropertyValue(XPropertySet xProps, String sName, Object value) {
-        try {
-            xProps.setPropertyValue(sName,value);
-        }
-        catch (UnknownPropertyException e) {
-        }
-        catch (PropertyVetoException e) { // unacceptable value
-        }
-        catch (IllegalArgumentException e) {
-        }
-        catch (WrappedTargetException e) {
-        }
-    }
-	
-    protected String getPropertyValueAsString(XPropertySet xProps, String sName) {
-        Object value = getPropertyValue(xProps,sName);
-        return value instanceof String ? (String) value : "";
-    }
-	
-    protected int getPropertyValueAsInteger(XPropertySet xProps, String sName) {
-        Object value = getPropertyValue(xProps,sName);
-        return value instanceof Integer ? ((Integer) value).intValue() : 0;
-    }
-	
-    protected void setPropertyValue(XPropertySet xProps, String sName, int nValue) {
-        setPropertyValue(xProps,sName,new Integer(nValue));
-    }
-
-    protected short getPropertyValueAsShort(XPropertySet xProps, String sName) {
-        Object value = getPropertyValue(xProps,sName);
-        return value instanceof Short ? ((Short) value).shortValue() : 0;
-    }
-	
-    protected void setPropertyValue(XPropertySet xProps, String sName, short nValue) {
-        setPropertyValue(xProps,sName,new Short(nValue));
-    }
-
-    protected boolean getPropertyValueAsBoolean(XPropertySet xProps, String sName) {
-        Object value = getPropertyValue(xProps,sName);
-        return value instanceof Boolean ? ((Boolean) value).booleanValue() : false;
-    }
-	
-    protected void setPropertyValue(XPropertySet xProps, String sName, boolean bValue) {
-        setPropertyValue(xProps,sName,new Boolean(bValue));
-    }
-
 }
 
 
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/helper/RegistryHelper.java b/source/java/org/openoffice/da/comp/w2lcommon/helper/RegistryHelper.java
new file mode 100644
index 0000000..e9db09f
--- /dev/null
+++ b/source/java/org/openoffice/da/comp/w2lcommon/helper/RegistryHelper.java
@@ -0,0 +1,86 @@
+/**
+ *  RegistryHelper.java
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *  Copyright: 2002-2009 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.2 (2009-05-01)
+ *
+ * 
+ */
+
+package org.openoffice.da.comp.w2lcommon.helper;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+
+/** This class defines convenience methods to access the OOo registry
+ *  using a given base path 
+ */
+public class RegistryHelper {
+	
+	private XComponentContext xContext;
+	
+	/** Construct a new RegistryHelper using a given component context
+	 * 
+	 * @param xContext the context to use to create new services
+	 */
+	public RegistryHelper(XComponentContext xContext) {
+		this.xContext = xContext;
+	}
+	
+    /** Get a registry view relative to the given path
+     * 
+     * @param sPath the base path witin the registry
+     * @param bUpdate true if we need update access
+     * @return the registry view
+     * @throws com.sun.star.uno.Exception
+     */
+    public Object getRegistryView(String sPath, boolean bUpdate) 
+        throws com.sun.star.uno.Exception {
+        //Object provider = xMSF.createInstance(
+        Object provider = xContext.getServiceManager().createInstanceWithContext(
+            "com.sun.star.configuration.ConfigurationProvider", xContext);
+        XMultiServiceFactory xProvider = (XMultiServiceFactory)
+            UnoRuntime.queryInterface(XMultiServiceFactory.class,provider);
+        PropertyValue[] args = new PropertyValue[1];
+        args[0] = new PropertyValue();
+        args[0].Name = "nodepath";
+        args[0].Value = sPath;
+        String sServiceName = bUpdate ?
+            "com.sun.star.configuration.ConfigurationUpdateAccess" :
+            "com.sun.star.configuration.ConfigurationAccess";
+        Object view = xProvider.createInstanceWithArguments(sServiceName,args);
+        return view;
+    }
+	
+    /** Dispose a previously obtained registry view
+     * 
+     * @param view the view to dispose
+     */
+    public void disposeRegistryView(Object view) {
+        XComponent xComponent = (XComponent)
+            UnoRuntime.queryInterface(XComponent.class,view);
+        xComponent.dispose();
+    }
+
+}
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/helper/XPropertySetHelper.java b/source/java/org/openoffice/da/comp/w2lcommon/helper/XPropertySetHelper.java
new file mode 100644
index 0000000..f9b619b
--- /dev/null
+++ b/source/java/org/openoffice/da/comp/w2lcommon/helper/XPropertySetHelper.java
@@ -0,0 +1,100 @@
+/************************************************************************
+ *
+ *  XPropertySetHelper.java
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *  Copyright: 2002-2008 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.0 (2008-07-21)
+ *
+ */
+package org.openoffice.da.comp.w2lcommon.helper;
+
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.beans.UnknownPropertyException;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
+
+/** Helper class providing staic convenience methods for accesing an XPropertySet
+ * The helpers will fail silently if names or data is provided, but the user is expected to
+ * apply them with correct data only...
+ */
+public class XPropertySetHelper {
+
+	public static Object getPropertyValue(XPropertySet xProps, String sName) {
+        try {
+            return xProps.getPropertyValue(sName);
+        }
+        catch (UnknownPropertyException e) {
+            return null;
+        }
+        catch (WrappedTargetException e) {
+            return null;
+        }
+    } 
+	
+    public static void setPropertyValue(XPropertySet xProps, String sName, Object value) {
+        try {
+            xProps.setPropertyValue(sName,value);
+        }
+        catch (UnknownPropertyException e) {
+        }
+        catch (PropertyVetoException e) { // unacceptable value
+        }
+        catch (IllegalArgumentException e) {
+        }
+        catch (WrappedTargetException e) {
+        }
+    }
+	
+    public static String getPropertyValueAsString(XPropertySet xProps, String sName) {
+        Object value = getPropertyValue(xProps,sName);
+        return value instanceof String ? (String) value : "";
+    }
+	
+    public static int getPropertyValueAsInteger(XPropertySet xProps, String sName) {
+        Object value = getPropertyValue(xProps,sName);
+        return value instanceof Integer ? ((Integer) value).intValue() : 0;
+    }
+	
+    public static void setPropertyValue(XPropertySet xProps, String sName, int nValue) {
+        setPropertyValue(xProps,sName,new Integer(nValue));
+    }
+
+    public static short getPropertyValueAsShort(XPropertySet xProps, String sName) {
+        Object value = getPropertyValue(xProps,sName);
+        return value instanceof Short ? ((Short) value).shortValue() : 0;
+    }
+	
+    public static void setPropertyValue(XPropertySet xProps, String sName, short nValue) {
+        setPropertyValue(xProps,sName,new Short(nValue));
+    }
+
+    public static boolean getPropertyValueAsBoolean(XPropertySet xProps, String sName) {
+        Object value = getPropertyValue(xProps,sName);
+        return value instanceof Boolean ? ((Boolean) value).booleanValue() : false;
+    }
+	
+    public static void setPropertyValue(XPropertySet xProps, String sName, boolean bValue) {
+        setPropertyValue(xProps,sName,new Boolean(bValue));
+    }
+
+
+
+}
diff --git a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java
index 342d883..2ab74bd 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-04-25)
+ *  Version 1.2 (2009-05-01)
  *
  */ 
  
@@ -268,7 +268,7 @@ public final class ConfigurationDialog
     		externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s");
     		externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s");
     		externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s");
-    		externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s");
+    		externalApps.setApplication(ExternalApps.MK4HT, "mk4ht", "oolatex %s");
     		externalApps.setApplication(ExternalApps.DVIVIEWER, "yap", "--single-instance %s");
     		// And assume gsview for pdf and ps
     		// gsview32 may not be in the path, but at least this helps a bit
@@ -282,7 +282,7 @@ public final class ConfigurationDialog
     		configureApp(ExternalApps.DVIPS, "dvips", "%s");
     		configureApp(ExternalApps.BIBTEX, "bibtex", "%s");
     		configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s");
-    		configureApp(ExternalApps.OOLATEX, "oolatex", "%s");    		
+    		configureApp(ExternalApps.MK4HT, "mk4ht", "oolatex %s");    		
     		// We have several possible viewers
     		String[] sDviViewers = {"evince", "okular", "xdvi"};
     		configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s");
@@ -305,7 +305,7 @@ public final class ConfigurationDialog
             case 3: return ExternalApps.DVIPS;
             case 4: return ExternalApps.BIBTEX;
             case 5: return ExternalApps.MAKEINDEX;
-            case 6: return ExternalApps.OOLATEX;
+            case 6: return ExternalApps.MK4HT;
             case 7: return ExternalApps.DVIVIEWER;
             case 8: return ExternalApps.PDFVIEWER;
             case 9: return ExternalApps.POSTSCRIPTVIEWER;
diff --git a/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java b/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java
index a92d57c..1033ecf 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/ExternalApps.java
@@ -54,13 +54,13 @@ public class ExternalApps {
     public final static String XELATEX = "XeLaTeX";
     public final static String BIBTEX = "BibTeX";
     public final static String MAKEINDEX = "Makeindex";
-    public final static String OOLATEX = "Oolatex";
+    public final static String MK4HT = "Mk4ht";
     public final static String DVIPS = "Dvips";
     public final static String DVIVIEWER = "DVIViewer";
     public final static String POSTSCRIPTVIEWER = "PostscriptViewer";
     public final static String PDFVIEWER = "PdfViewer";
 	
-    private final static String[] sApps = { LATEX, PDFLATEX, XELATEX, BIBTEX, MAKEINDEX, OOLATEX, DVIPS, DVIVIEWER, POSTSCRIPTVIEWER, PDFVIEWER };
+    private final static String[] sApps = { LATEX, PDFLATEX, XELATEX, BIBTEX, MAKEINDEX, MK4HT, DVIPS, DVIVIEWER, POSTSCRIPTVIEWER, PDFVIEWER };
 	
     private XComponentContext xContext;
 
diff --git a/source/java/org/openoffice/da/comp/writer4latex/LaTeXImporter.java b/source/java/org/openoffice/da/comp/writer4latex/LaTeXImporter.java
new file mode 100644
index 0000000..c3c601a
--- /dev/null
+++ b/source/java/org/openoffice/da/comp/writer4latex/LaTeXImporter.java
@@ -0,0 +1,118 @@
+/************************************************************************
+ *
+ *  LaTeXImporter.java
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *  Copyright: 2002-2009 by Henrik Just
+ *
+ *  All Rights Reserved.
+ * 
+ *  Version 1.2 (2009-05-01)
+ *
+ */ 
+
+package org.openoffice.da.comp.writer4latex;
+
+import java.io.File;
+import java.net.URI;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+public class LaTeXImporter {
+	
+	private XComponentContext xContext;
+	
+	private ExternalApps externalApps;
+	
+    public LaTeXImporter(XComponentContext xContext) {
+        this.xContext = xContext;
+        externalApps = new ExternalApps(xContext);
+        externalApps.load();
+    }
+    
+    public void importLaTeX(String sURL) {
+    	// Get the LaTeX file
+    	File file = null;
+    	try {
+    		file = new File(new URI(sURL));
+    	}
+    	catch (java.net.URISyntaxException e) {
+    		// Could not use the URL provided
+    		return;
+    	}
+    	
+    	// Protect the ODT file if it already exists
+    	String sBaseName = file.getName();
+    	if (sBaseName.endsWith(".tex")) { sBaseName = sBaseName.substring(0, sBaseName.length()-4); }
+    	File odtFile = new File(file.getParentFile(),sBaseName+".odt");
+    	File tempFile = null;
+    	if (odtFile.exists()) {
+    		try {
+    			tempFile = File.createTempFile("w4l", ".tmp", file.getParentFile());
+    		}
+    		catch (java.io.IOException e) {
+    			// Failed to protect the ODT file, give up
+    			return;
+    		}
+    		odtFile.renameTo(tempFile);
+    	}
+
+		externalApps.execute(ExternalApps.MK4HT, file.getName(), file.getParentFile(), true);
+
+		// Assemble the URL of the ODT file
+    	String sODTURL = sURL;
+    	if (sODTURL.endsWith(".tex")) { sODTURL = sODTURL.substring(0, sODTURL.length()-4); }
+    	sODTURL += ".odt";
+    	
+    	// Get the component loader
+    	Object desktop;
+    	try {
+    		desktop = xContext.getServiceManager().createInstanceWithContext(
+    				"com.sun.star.frame.Desktop", xContext);
+
+    		XComponentLoader xComponentLoader = (XComponentLoader)UnoRuntime.queryInterface(
+    				XComponentLoader.class, desktop);
+
+    		// Load the file
+    		PropertyValue[] props = new PropertyValue[1];
+    		props[0] = new PropertyValue();
+    		props[0].Name = "AsTemplate";
+    		props[0].Value = new Boolean(true); 
+
+    		xComponentLoader.loadComponentFromURL(sODTURL, "_blank", 0, props);
+    	}
+    	catch (com.sun.star.lang.IllegalArgumentException e) {
+    		System.out.println("Fejler med illegalargumentexception");
+    	}
+    	catch (com.sun.star.io.IOException e) {
+    		System.out.println("Fejler med ioexception");
+    	}
+    	catch (com.sun.star.uno.Exception e) {
+    		System.out.println("Failed to get desktop");
+    	}
+    	finally {
+			odtFile.delete();
+			// Restore origninal ODT file, if any
+    		if (tempFile!=null) {
+    			tempFile.renameTo(odtFile);
+    		}
+    	}
+    }
+
+}
diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
index b36c638..fa33321 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-03-30)
+ *  Version 1.2 (2009-05-01)
  *
  */ 
  
@@ -33,20 +33,26 @@ import java.net.URISyntaxException;
 
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertyAccess;
+import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XComponent;
 import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.task.XStatusIndicator;
 import com.sun.star.task.XStatusIndicatorFactory;
 import com.sun.star.ui.dialogs.ExecutableDialogResults;
 import com.sun.star.ui.dialogs.XExecutableDialog;
+import com.sun.star.ui.dialogs.XFilePicker;
+import com.sun.star.ui.dialogs.XFilterManager;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
 import org.openoffice.da.comp.w2lcommon.helper.MessageBox;
 import org.openoffice.da.comp.w2lcommon.helper.PropertyHelper;
+import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper;
+import org.openoffice.da.comp.w2lcommon.helper.XPropertySetHelper;
        
 /** This class implements the ui (dispatch) commands provided by Writer4LaTeX.
  *  The actual processing is done by the three core classes <code>TeXify</code>,
@@ -67,6 +73,7 @@ public final class Writer4LaTeX extends WeakBase
 	
     // Global data
     private TeXify texify = null;
+    private LaTeXImporter latexImporter = null;
     private PropertyValue[] mediaProps = null;
     private String sBasePath = null;
     private String sBaseFileName = null;
@@ -166,9 +173,8 @@ public final class Writer4LaTeX extends WeakBase
             }
             else if ( aURL.Path.compareTo("ProcessDirectly") == 0 ) {
                 if (updateLocation()) {
-                    if (mediaProps!=null || updateMediaProperties()) {
-                        process();
-                    }
+                	updateMediaPropertiesSilent();
+                    process();
                 }
                 else {
                     warnNotSaved();
@@ -190,8 +196,7 @@ public final class Writer4LaTeX extends WeakBase
                 return;
             }
             else if ( aURL.Path.compareTo("ImportLaTeX") == 0 ) {
-                org.openoffice.da.comp.w2lcommon.helper.MessageBox msgBox = new org.openoffice.da.comp.w2lcommon.helper.MessageBox(m_xContext);
-                msgBox.showMessage("Writer4LaTeX", "This feature has not been implemented yet");
+                importLaTeX();
                 return;
             }
         }
@@ -289,10 +294,61 @@ public final class Writer4LaTeX extends WeakBase
         }
 
     }
+    
+    private void importLaTeX() {
+    	// Display the file dialog
+    	String sURL = browseForLaTeXFile();
+    	if (sURL!=null) {
+    		if (latexImporter==null) {
+    			latexImporter = new LaTeXImporter(m_xContext);
+    		}
+    		latexImporter.importLaTeX(sURL);
+    	}
+    }
 
     // Some utility methods
+    
+    private String browseForLaTeXFile() {
+    	String sPath = null;
+        XComponent xComponent = null;
+        try {
+            // Create FilePicker
+            Object filePicker = m_xContext.getServiceManager()
+                .createInstanceWithContext("com.sun.star.ui.dialogs.FilePicker", m_xContext);
+            XFilePicker xFilePicker = (XFilePicker)
+                UnoRuntime.queryInterface(XFilePicker.class, filePicker);
+            xComponent = (XComponent)
+                UnoRuntime.queryInterface(XComponent.class, xFilePicker);
+            
+            XFilterManager xFilterManager = (XFilterManager) UnoRuntime.queryInterface(XFilterManager.class, xFilePicker);
+            xFilterManager.appendFilter("LaTeX","*.tex"); 
+
+
+            // Display the FilePicker
+            XExecutableDialog xExecutable = (XExecutableDialog)
+                UnoRuntime.queryInterface(XExecutableDialog.class, xFilePicker);
+
+            // Get the path
+            if (xExecutable.execute() == ExecutableDialogResults.OK) {
+                String[] sPathList = xFilePicker.getFiles();
+                if (sPathList.length > 0) {
+                	sPath = sPathList[0];
+                }     
+            }
+        }
+        catch (com.sun.star.uno.Exception e) {
+        }
+        finally{
+            // Always dispose the FilePicker component
+            if (xComponent!=null) {
+                xComponent.dispose();
+            }
+        } 
+        return sPath;
+    }
+
 	
-    private boolean updateMediaProperties() {
+    private void prepareMediaProperties() {
         // Create inital media properties
         mediaProps = new PropertyValue[2];
         mediaProps[0] = new PropertyValue();
@@ -300,8 +356,12 @@ public final class Writer4LaTeX extends WeakBase
         mediaProps[0].Value = "org.openoffice.da.writer2latex";
         mediaProps[1] = new PropertyValue();
         mediaProps[1].Name = "Overwrite";
-        mediaProps[1].Value = "true";
-
+        mediaProps[1].Value = "true";    	
+    }
+    
+    private boolean updateMediaProperties() {
+    	prepareMediaProperties();
+    	
         try {
             // Display options dialog
             Object dialog = m_xContext.getServiceManager()
@@ -341,6 +401,161 @@ public final class Writer4LaTeX extends WeakBase
             return false;
         }
     }
+    
+    private String getOptionAsString(XPropertySet xProps, String sName) {
+    	Object value = XPropertySetHelper.getPropertyValue(xProps, sName);
+        // Try to convert the value to a string
+        if (value instanceof String) return (String) value;
+        else if (value instanceof Boolean) return ((Boolean) value).toString();
+        else if (value instanceof Integer) return ((Integer) value).toString();
+        else if (value instanceof Short) return ((Short) value).toString();
+        else return null;
+    }
+    
+    private void loadOption(XPropertySet xProps, PropertyHelper filterData, String sRegName, String sOptionName) {
+        String sValue = getOptionAsString(xProps,sRegName);
+        if (sValue!=null) {
+        	// Set the filter data
+        	filterData.put(sOptionName, sValue);
+        }
+    }
+    
+    // Read the configuration directly from the registry rather than using the dialog
+    // TODO: Should probably do some refactoring in the Options dialogs to avoid this solution
+    private void updateMediaPropertiesSilent() {
+    	prepareMediaProperties();
+
+    	RegistryHelper registry = new RegistryHelper(m_xContext);
+    	
+    	// Read the stored settings from the registry rather than displaying a dialog
+    	try {
+    		// Prepare registry view
+    		Object view = registry.getRegistryView("/org.openoffice.da.Writer2LaTeX.Options/LaTeXOptions",true);
+    		XPropertySet xProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,view);
+    		
+            PropertyHelper filterData = new PropertyHelper();
+            
+            // Read the configuration file
+            short nConfig = XPropertySetHelper.getPropertyValueAsShort(xProps, "Config");
+            switch (nConfig) {
+            case 0: filterData.put("ConfigURL","*ultraclean.xml"); break;
+            case 1: filterData.put("ConfigURL","*clean.xml"); break;
+            case 2: filterData.put("ConfigURL","*default.xml"); break;
+            case 3: filterData.put("ConfigURL","*pdfprint.xml"); break;
+            case 4: filterData.put("ConfigURL","*pdfscreen.xml"); break;
+            case 5: filterData.put("ConfigURL","$(user)/writer2latex.xml");
+            		filterData.put("AutoCreate","true"); break;
+            default:
+            	loadOption(xProps,filterData,"ConfigName","ConfigURL");
+            }
+            
+    		// Read the options
+    		// General
+    		short nBackend = XPropertySetHelper.getPropertyValueAsShort(xProps,"Backend");
+    		switch (nBackend) {
+    		case 0: filterData.put("backend","generic"); break;
+    		case 1: filterData.put("backend","pdftex"); break; 
+    		case 2: filterData.put("backend","dvips"); break; 
+    		case 3: filterData.put("backend","xetex"); break; 
+    		case 4: filterData.put("backend","unspecified"); 
+    		}
+    		short nInputencoding = XPropertySetHelper.getPropertyValueAsShort(xProps,"Inputencoding");
+    		switch (nInputencoding) {
+    		case 0: filterData.put("inputencoding", "ascii"); break;
+    		case 1: filterData.put("inputencoding", "latin1"); break;
+    		case 2: filterData.put("inputencoding", "latin2"); break;
+    		case 3: filterData.put("inputencoding", "iso-8859-7"); break;
+    		case 4: filterData.put("inputencoding", "cp1250"); break;
+    		case 5: filterData.put("inputencoding", "cp1251"); break;
+    		case 6: filterData.put("inputencoding", "koi8-r"); break;
+    		case 7: filterData.put("inputencoding", "utf8");
+    		}
+    		loadOption(xProps,filterData,"Multilingual","multilingual");
+    		loadOption(xProps,filterData,"GreekMath","greek_math");
+    		loadOption(xProps,filterData,"AdditionalSymbols","use_pifont");
+    		loadOption(xProps,filterData,"AdditionalSymbols","use_ifsym");
+    		loadOption(xProps,filterData,"AdditionalSymbols","use_wasysym");
+    		loadOption(xProps,filterData,"AdditionalSymbols","use_eurosym");
+    		loadOption(xProps,filterData,"AdditionalSymbols","use_tipa");
+
+    		// Bibliography
+    		loadOption(xProps,filterData,"UseBibtex","use_bibtex");
+    		loadOption(xProps,filterData,"BibtexStyle","bibtex_style");
+
+    		// Files
+    		boolean bWrapLines = XPropertySetHelper.getPropertyValueAsBoolean(xProps,"WrapLines");
+    		if (bWrapLines) {
+    			loadOption(xProps,filterData,"WrapLinesAfter","wrap_lines_after");
+    		}
+    		else {
+    			filterData.put("wrap_lines_after", "0");
+    		}
+    		loadOption(xProps,filterData,"SplitLinkedSections","split_linked_sections");
+    		loadOption(xProps,filterData,"SplitToplevelSections","split_toplevel_sections");
+    		loadOption(xProps,filterData,"SaveImagesInSubdir","save_images_in_subdir");
+
+    		// Special content
+    		short nNotes = XPropertySetHelper.getPropertyValueAsShort(xProps, "Notes");
+    		switch (nNotes) {
+    		case 0: filterData.put("notes","ignore"); break;
+    		case 1: filterData.put("notes","comment"); break;
+    		case 2: filterData.put("notes","pdfannotation"); break;
+    		case 3: filterData.put("notes","marginpar");
+    		}
+    		loadOption(xProps,filterData,"Metadata","metadata");
+
+    		// Figures and tables
+    		loadOption(xProps,filterData,"OriginalImageSize","original_image_size");
+    		boolean bOptimizeSimpleTables = XPropertySetHelper.getPropertyValueAsBoolean(xProps,"OptimizeSimpleTables");
+    		if (bOptimizeSimpleTables) {
+        		loadOption(xProps,filterData,"SimpleTableLimit","simple_table_limit");    			
+    		}
+    		else {
+    			filterData.put("simple_table_limit", "0");
+    		}
+    		loadOption(xProps,filterData,"FloatTables","float_tables");
+    		loadOption(xProps,filterData,"FloatFigures","float_figures");
+    		loadOption(xProps,filterData,"FloatOptions","float_options");
+    	    short nFloatOptions = XPropertySetHelper.getPropertyValueAsShort(xProps, "FloatOptions");
+    	    switch (nFloatOptions) {
+    	    case 0: filterData.put("float_options", ""); break;
+    	    case 1: filterData.put("float_options", "tp"); break;
+    	    case 2: filterData.put("float_options", "bp"); break;
+    	    case 3: filterData.put("float_options", "htp"); break;
+    	    case 4: filterData.put("float_options", "hbp");
+    	    }
+
+    		// AutoCorrect
+    		loadOption(xProps,filterData,"IgnoreHardPageBreaks","ignore_hard_page_breaks");
+    		loadOption(xProps,filterData,"IgnoreHardLineBreaks","ignore_hard_line_breaks");
+    		loadOption(xProps,filterData,"IgnoreEmptyParagraphs","ignore_empty_paragraphs");
+    		loadOption(xProps,filterData,"IgnoreDoubleSpaces","ignore_empty_spaces");
+    		
+    		registry.disposeRegistryView(view);
+    		
+    		// Write out the filter data
+    		/*PropertyValue[] props = filterData.toArray();
+    		for (int i=0; i<props.length; i++) {
+    			String sName = props[i].Name;
+    			Object value = props[i].Value;
+    			if (value instanceof String) {
+    				System.out.println(sName+"="+(String)value);
+    			}
+    			else {
+    				System.out.println(sName+"= ???");
+    			}
+    		}*/
+    		
+            // Update the media properties with the FilterData
+            PropertyHelper helper = new PropertyHelper(mediaProps);
+            helper.put("FilterData",filterData.toArray());
+            mediaProps = helper.toArray();
+
+    	}
+    	catch (com.sun.star.uno.Exception e) {
+    		// Failed to get registry view, ignore
+    	}
+    }
 	
     private boolean updateLocation() {
         String sDocumentUrl = xModel.getURL();
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index d8fa5e4..0d04c7d 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.1";
-    private static final String DATE = "2008-04-30";
+    private static final String DATE = "2008-05-01";
 	
     /** Return version information
      *  @return the Writer2LaTeX version in the form
diff --git a/source/oxt/writer4latex/Addons.xcu b/source/oxt/writer4latex/Addons.xcu
index 1b4a6a0..a4efaae 100644
--- a/source/oxt/writer4latex/Addons.xcu
+++ b/source/oxt/writer4latex/Addons.xcu
@@ -8,7 +8,7 @@
                 <value>com.sun.star.text.TextDocument</value>
             </prop>
             <prop oor:name="Title" oor:type="xs:string">
-                <value>Writer4LaTeX</value>
+                <value>LaTe~X</value>
             </prop>
             <prop oor:name="Target" oor:type="xs:string">
                 <value>_self</value>
@@ -35,7 +35,6 @@
                         <value/>
                     </prop>
                 </node>
-                <!-- maybe later
                 <node oor:name="menu2" oor:op="replace">
                     <prop oor:name="Context" oor:type="xs:string">
                         <value>com.sun.star.text.TextDocument</value>
@@ -54,7 +53,6 @@
                         <value/>
                     </prop>
                 </node>
-                -->
                 <node oor:name="menu3" oor:op="replace">
                     <prop oor:name="Context" oor:type="xs:string">
                         <value>com.sun.star.text.TextDocument</value>
diff --git a/source/oxt/writer4latex/Options.xcs b/source/oxt/writer4latex/Options.xcs
index a1a5012..4947124 100644
--- a/source/oxt/writer4latex/Options.xcs
+++ b/source/oxt/writer4latex/Options.xcs
@@ -18,7 +18,7 @@
             <node-ref oor:name="XeLaTeX" oor:node-type="Application" />
             <node-ref oor:name="BibTeX" oor:node-type="Application" />
             <node-ref oor:name="Makeindex" oor:node-type="Application" />
-            <node-ref oor:name="Oolatex" oor:node-type="Application" />
+            <node-ref oor:name="Mk4ht" oor:node-type="Application" />
             <node-ref oor:name="Dvips" oor:node-type="Application" />
             <node-ref oor:name="DVIViewer" oor:node-type="Application" />
             <node-ref oor:name="PostscriptViewer" oor:node-type="Application" />
diff --git a/source/oxt/writer4latex/Options.xcu b/source/oxt/writer4latex/Options.xcu
index 8ccfcbf..b36c7a4 100644
--- a/source/oxt/writer4latex/Options.xcu
+++ b/source/oxt/writer4latex/Options.xcu
@@ -45,12 +45,12 @@
                 <value>%s</value>
             </prop>
         </node>
-        <node oor:name="Oolatex" oor:type="xs:string">
+        <node oor:name="Mk4ht" oor:type="xs:string">
             <prop oor:name="Executable">
-                <value>oolatex</value>
+                <value>mk4ht</value>
             </prop>
             <prop oor:name="Options">
-                <value>%s</value>
+                <value>oolatex %s</value>
             </prop>
         </node>
         <node oor:name="Dvips" oor:type="xs:string">
diff --git a/source/oxt/writer4latex/W4LDialogs/Configuration.xdl b/source/oxt/writer4latex/W4LDialogs/Configuration.xdl
index 92675de..9891929 100644
--- a/source/oxt/writer4latex/W4LDialogs/Configuration.xdl
+++ b/source/oxt/writer4latex/W4LDialogs/Configuration.xdl
@@ -16,7 +16,7 @@
     <dlg:menuitem dlg:value="Dvips"/>
     <dlg:menuitem dlg:value="BibTeX"/>
     <dlg:menuitem dlg:value="MakeIndex"/>
-    <dlg:menuitem dlg:value="TeX4ht (oolatex)"/>
+    <dlg:menuitem dlg:value="Mk4ht (TeX4ht)"/>
     <dlg:menuitem dlg:value="DVI Viewer"/>
     <dlg:menuitem dlg:value="PDF Viewer"/>
     <dlg:menuitem dlg:value="PostScript Viewer"/>