diff --git a/source/oxt/writer4latex/Addons.xcu b/source/oxt/writer2latex/Addons.xcu
similarity index 91%
rename from source/oxt/writer4latex/Addons.xcu
rename to source/oxt/writer2latex/Addons.xcu
index 56daf13..32ac902 100644
--- a/source/oxt/writer4latex/Addons.xcu
+++ b/source/oxt/writer2latex/Addons.xcu
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-<!-- Defines the menus and toolbars provided by Writer4LaTeX -->
+<!-- Defines the menus and toolbars provided by Writer2LaTeX -->
 <node oor:name="AddonUI">
 	<node oor:name="OfficeToolBar">
-		<node oor:name="org.openoffice.da.writer4latex.OfficeToolBar" oor:op="replace">
+		<node oor:name="org.openoffice.da.writer2latex.OfficeToolBar" oor:op="replace">
 	  		<node oor:name="button1" oor:op="replace">
 	            <prop oor:name="Context" oor:type="xs:string">
 	                <value>com.sun.star.text.TextDocument</value>
@@ -16,7 +16,7 @@
 	                <value>_self</value>
 	            </prop>
 	            <prop oor:name="URL" oor:type="xs:string">
-	                <value>org.openoffice.da.writer4latex:InsertBibTeX</value>
+	                <value>org.openoffice.da.writer2latex:InsertBibTeX</value>
 	            </prop>
 	            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 	                <value>%origin%/icons/bibtex</value>
@@ -34,7 +34,7 @@
 	                <value>_self</value>
 	            </prop>
 	            <prop oor:name="URL" oor:type="xs:string">
-	                <value>org.openoffice.da.writer4latex:ProcessDocument</value>
+	                <value>org.openoffice.da.writer2latex:ProcessDocument</value>
 	            </prop>
 	            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 	                <value>%origin%/icons/latex</value>
@@ -52,7 +52,7 @@
 	                <value>_self</value>
 	            </prop>
 	            <prop oor:name="URL" oor:type="xs:string">
-	                <value>org.openoffice.da.writer4latex:ViewLog</value>
+	                <value>org.openoffice.da.writer2latex:ViewLog</value>
 	            </prop>
 	            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 	                <value>%origin%/icons/log</value>
diff --git a/source/oxt/writer4latex/AddonsAOO4.xcu b/source/oxt/writer2latex/AddonsAOO4.xcu
similarity index 90%
rename from source/oxt/writer4latex/AddonsAOO4.xcu
rename to source/oxt/writer2latex/AddonsAOO4.xcu
index 507a46d..cb7bd76 100644
--- a/source/oxt/writer4latex/AddonsAOO4.xcu
+++ b/source/oxt/writer2latex/AddonsAOO4.xcu
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-<!-- Defines the menus and toolbars provided by Writer4LaTeX -->
+<!-- Defines the menus and toolbars provided by Writer2LaTeX -->
 <node oor:name="AddonUI">
 	<node oor:name="OfficeToolBar">
-		<node oor:name="org.openoffice.da.writer4latex.OfficeToolBar.AOO4" oor:op="replace">
+		<node oor:name="org.openoffice.da.writer2latex.OfficeToolBar.AOO4" oor:op="replace">
 			<prop oor:name="Title" oor:type="xs:string">
-				  <value xml:lang="en-US">Writer4LaTeX</value>
+				  <value xml:lang="en-US">Writer2LaTeX</value>
 			</prop>
 			<node oor:name="ToolBarItems">	
 		  		<node oor:name="button1" oor:op="replace">
@@ -20,7 +20,7 @@
 		                <value>_self</value>
 		            </prop>
 		            <prop oor:name="URL" oor:type="xs:string">
-		                <value>org.openoffice.da.writer4latex:InsertBibTeX</value>
+		                <value>org.openoffice.da.writer2latex:InsertBibTeX</value>
 		            </prop>
 		            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 		                <value>%origin%/icons/bibtex</value>
@@ -38,7 +38,7 @@
 		                <value>_self</value>
 		            </prop>
 		            <prop oor:name="URL" oor:type="xs:string">
-		                <value>org.openoffice.da.writer4latex:ProcessDocument</value>
+		                <value>org.openoffice.da.writer2latex:ProcessDocument</value>
 		            </prop>
 		            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 		                <value>%origin%/icons/latex</value>
@@ -56,7 +56,7 @@
 		                <value>_self</value>
 		            </prop>
 		            <prop oor:name="URL" oor:type="xs:string">
-		                <value>org.openoffice.da.writer4latex:ViewLog</value>
+		                <value>org.openoffice.da.writer2latex:ViewLog</value>
 		            </prop>
 		            <prop oor:name="ImageIdentifier" oor:type="xs:string">
 		                <value>%origin%/icons/log</value>
diff --git a/source/oxt/writer2latex/META-INF/manifest.xml b/source/oxt/writer2latex/META-INF/manifest.xml
index 5292489..b72ce38 100644
--- a/source/oxt/writer2latex/META-INF/manifest.xml
+++ b/source/oxt/writer2latex/META-INF/manifest.xml
@@ -13,6 +13,10 @@
      manifest:full-path="w2l_filters.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
 
+    <manifest:file-entry
+     manifest:full-path="ToolbarOptionPages.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"/>
@@ -24,6 +28,30 @@
     <manifest:file-entry
      manifest:full-path="Options.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
+     
+    <manifest:file-entry
+     manifest:full-path="ToolbarOptions.xcs"
+     manifest:media-type="application/vnd.sun.star.configuration-schema"/>
+
+    <manifest:file-entry
+     manifest:full-path="ToolbarOptions.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+  
+    <manifest:file-entry
+     manifest:full-path="ProtocolHandler.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+ 
+    <manifest:file-entry
+     manifest:full-path="Addons.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+     
+    <manifest:file-entry
+     manifest:full-path="AddonsAOO4.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
+     
+    <manifest:file-entry
+     manifest:full-path="Office/UI/WriterWindowState.xcu"
+     manifest:media-type="application/vnd.sun.star.configuration-data"/>
 
     <manifest:file-entry
      manifest:full-path="W2LDialogs/"
@@ -32,7 +60,11 @@
     <manifest:file-entry
      manifest:full-path="W2LDialogs2/"
      manifest:media-type="application/vnd.sun.star.basic-library"/>
-	 
+     
+    <manifest:file-entry
+     manifest:full-path="W4LDialogs/"
+     manifest:media-type="application/vnd.sun.star.basic-library"/>
+     	 
     <manifest:file-entry
      manifest:full-path="writer2latex.rdb"
      manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
diff --git a/source/oxt/writer4latex/Office/UI/WriterWindowState.xcu b/source/oxt/writer2latex/Office/UI/WriterWindowState.xcu
similarity index 84%
rename from source/oxt/writer4latex/Office/UI/WriterWindowState.xcu
rename to source/oxt/writer2latex/Office/UI/WriterWindowState.xcu
index f25c0da..2d9e3cd 100644
--- a/source/oxt/writer4latex/Office/UI/WriterWindowState.xcu
+++ b/source/oxt/writer2latex/Office/UI/WriterWindowState.xcu
@@ -5,9 +5,9 @@
  oor:package="org.openoffice.Office.UI">
 	<node oor:name="UIElements">
 		<node oor:name="States">
-			<node oor:name="private:resource/toolbar/addon_org.openoffice.da.writer4latex.OfficeToolBar" oor:op="replace">
+			<node oor:name="private:resource/toolbar/addon_org.openoffice.da.writer2latex.OfficeToolBar" oor:op="replace">
 				<prop oor:name="UIName" oor:type="xs:string">
-					<value>Writer4LaTeX</value>
+					<value>Writer2LaTeX</value>
 				</prop>
 			</node>
 		</node>
diff --git a/source/oxt/writer4latex/ProtocolHandler.xcu b/source/oxt/writer2latex/ProtocolHandler.xcu
similarity index 70%
rename from source/oxt/writer4latex/ProtocolHandler.xcu
rename to source/oxt/writer2latex/ProtocolHandler.xcu
index 863586b..040262a 100644
--- a/source/oxt/writer4latex/ProtocolHandler.xcu
+++ b/source/oxt/writer2latex/ProtocolHandler.xcu
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <oor:component-data oor:name="ProtocolHandler" 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">
-    <!-- Declares the dispatch protocol handled by Writer4LaTeX -->
+    <!-- Declares the dispatch protocol handled by Writer2LaTeX -->
     <node oor:name="HandlerSet">
         <!-- It seems that the node name must equal the implementation name of the service -->
-        <node oor:name="org.openoffice.da.comp.writer4latex.Writer4LaTeX" oor:op="replace">
+        <node oor:name="org.openoffice.da.comp.writer2latex.Writer2LaTeX" oor:op="replace">
             <prop oor:name="Protocols" oor:type="oor:string-list">
-                <value>org.openoffice.da.writer4latex:*</value>
+                <value>org.openoffice.da.writer2latex:*</value>
             </prop>
         </node>
     </node>
diff --git a/source/oxt/writer4latex/OptionPages.xcu b/source/oxt/writer2latex/ToolbarOptionPages.xcu
similarity index 70%
rename from source/oxt/writer4latex/OptionPages.xcu
rename to source/oxt/writer2latex/ToolbarOptionPages.xcu
index 05d163c..8be669f 100644
--- a/source/oxt/writer4latex/OptionPages.xcu
+++ b/source/oxt/writer2latex/ToolbarOptionPages.xcu
@@ -9,7 +9,7 @@
     <!-- 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.writer4latex.configuration" 
+        <node oor:name="org.openoffice.da.writer2latex.toolbar.configuration" 
           oor:op="fuse">
         </node>
       </node>
@@ -19,13 +19,13 @@
   <node oor:name="Nodes">
   
 	<!-- We define a single root node -->
-    <node oor:name="org.openoffice.da.writer4latex.configuration" 
+    <node oor:name="org.openoffice.da.writer2latex.toolbar.configuration" 
       oor:op="fuse"> 
       <prop oor:name="Id">
-        <value>org.openoffice.da.writer4latex.configuration</value>
+        <value>org.openoffice.da.writer2latex.toolbar.configuration</value>
       </prop>
       <prop oor:name="Label">
-        <value xml:lang="en-US">Writer4LaTeX</value>
+        <value xml:lang="en-US">Writer2LaTeX toolbar</value>
       </prop>
       <prop oor:name="OptionsPage">
         <value>%origin%/W4LDialogs/ConfigurationRoot.xdl</value>
@@ -36,10 +36,10 @@
 
       <node oor:name="Leaves">
       	<!-- and the root node has several leaves -->
-        <node oor:name="org.openoffice.da.writer4latex.configuration.applications" 
+        <node oor:name="org.openoffice.da.writer2latex.toolbar.configuration.applications" 
           oor:op="fuse">
           <prop oor:name="Id">
-            <value>org.openoffice.da.writer4latex.applications</value>
+            <value>org.openoffice.da.writer2latex.toolbar.applications</value>
           </prop>
           <prop oor:name="Label">
             <value xml:lang="en-US">Applications</value>
@@ -48,13 +48,13 @@
             <value>%origin%/W4LDialogs/Applications.xdl</value>
           </prop>
           <prop oor:name="EventHandlerService">
-            <value>org.openoffice.da.writer4latex.ApplicationsDialog</value>
+            <value>org.openoffice.da.writer2latex.ApplicationsDialog</value>
           </prop>
         </node>
-        <node oor:name="org.openoffice.da.writer4latex.configuration.bibliography" 
+        <node oor:name="org.openoffice.da.writer2latex.toolbar.configuration.bibliography" 
           oor:op="fuse">
           <prop oor:name="Id">
-            <value>org.openoffice.da.writer4latex.bibliography</value>
+            <value>org.openoffice.da.writer2latex.toolbar.bibliography</value>
           </prop>
           <prop oor:name="Label">
             <value xml:lang="en-US">Bibliography</value>
@@ -63,7 +63,7 @@
             <value>%origin%/W4LDialogs/Bibliography.xdl</value>
           </prop>
           <prop oor:name="EventHandlerService">
-            <value>org.openoffice.da.writer4latex.BibliographyDialog</value>
+            <value>org.openoffice.da.writer2latex.BibliographyDialog</value>
           </prop>
         </node>
       </node>
diff --git a/source/oxt/writer4latex/Options.xcs b/source/oxt/writer2latex/ToolbarOptions.xcs
similarity index 94%
rename from source/oxt/writer4latex/Options.xcs
rename to source/oxt/writer2latex/ToolbarOptions.xcs
index a2d430d..34589cf 100644
--- a/source/oxt/writer4latex/Options.xcs
+++ b/source/oxt/writer2latex/ToolbarOptions.xcs
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<oor:component-schema oor:name="Options"
-  oor:package="org.openoffice.da.Writer4LaTeX"
+<oor:component-schema oor:name="ToolbarOptions"
+  oor:package="org.openoffice.da.Writer2LaTeX.toolbar"
   xml:lang="en-US"
   xmlns:oor="http://openoffice.org/2001/registry"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/source/oxt/writer4latex/Options.xcu b/source/oxt/writer2latex/ToolbarOptions.xcu
similarity index 94%
rename from source/oxt/writer4latex/Options.xcu
rename to source/oxt/writer2latex/ToolbarOptions.xcu
index e198084..a06b1ff 100644
--- a/source/oxt/writer4latex/Options.xcu
+++ b/source/oxt/writer2latex/ToolbarOptions.xcu
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<oor:component-data oor:name="Options"
-  oor:package="org.openoffice.da.Writer4LaTeX"
+<oor:component-data oor:name="ToolbarOptions"
+  oor:package="org.openoffice.da.Writer2LaTeX.toolbar"
   xml:lang="en-US"
   xmlns:oor="http://openoffice.org/2001/registry"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/source/oxt/writer4latex/icons/bibtex_16.bmp b/source/oxt/writer2latex/icons/bibtex_16.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/bibtex_16.bmp
rename to source/oxt/writer2latex/icons/bibtex_16.bmp
diff --git a/source/oxt/writer4latex/icons/bibtex_26.bmp b/source/oxt/writer2latex/icons/bibtex_26.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/bibtex_26.bmp
rename to source/oxt/writer2latex/icons/bibtex_26.bmp
diff --git a/source/oxt/writer4latex/icons/custom_16.bmp b/source/oxt/writer2latex/icons/custom_16.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/custom_16.bmp
rename to source/oxt/writer2latex/icons/custom_16.bmp
diff --git a/source/oxt/writer4latex/icons/custom_26.bmp b/source/oxt/writer2latex/icons/custom_26.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/custom_26.bmp
rename to source/oxt/writer2latex/icons/custom_26.bmp
diff --git a/source/oxt/writer4latex/icons/latex_16.bmp b/source/oxt/writer2latex/icons/latex_16.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/latex_16.bmp
rename to source/oxt/writer2latex/icons/latex_16.bmp
diff --git a/source/oxt/writer4latex/icons/latex_26.bmp b/source/oxt/writer2latex/icons/latex_26.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/latex_26.bmp
rename to source/oxt/writer2latex/icons/latex_26.bmp
diff --git a/source/oxt/writer4latex/icons/log_16.bmp b/source/oxt/writer2latex/icons/log_16.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/log_16.bmp
rename to source/oxt/writer2latex/icons/log_16.bmp
diff --git a/source/oxt/writer4latex/icons/log_26.bmp b/source/oxt/writer2latex/icons/log_26.bmp
similarity index 100%
rename from source/oxt/writer4latex/icons/log_26.bmp
rename to source/oxt/writer2latex/icons/log_26.bmp
diff --git a/source/oxt/writer2latex/w2l_filters.xcu b/source/oxt/writer2latex/w2l_filters.xcu
index 6306862..103a09f 100644
--- a/source/oxt/writer2latex/w2l_filters.xcu
+++ b/source/oxt/writer2latex/w2l_filters.xcu
@@ -38,6 +38,32 @@
 		</prop>
 		<prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
 	</node>
+	
+	<!-- TeX import is disabled currently
+	<node oor:name="org.openoffice.da.writer2latex.latex" oor:op="replace" oor:finalized="true" oor:mandatory="true">
+		<prop oor:name="UIName"><value>LaTeX</value></prop>
+		<prop oor:name="Type"><value>org.openoffice.da.writer2latex.LaTeX_File</value></prop>
+		<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+		<prop oor:name="FilterService"><value>org.openoffice.da.comp.writer2latex.TeXImportFilter</value></prop>
+		<prop oor:name="UIComponent"/>
+		<prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH ALIEN 3RDPARTYFILTER</value></prop>
+		<prop oor:name="UserData"/>
+		<prop oor:name="FileFormatVersion"><value>0</value></prop>
+		<prop oor:name="TemplateName"/>
+	</node>
+
+	<node oor:name="org.openoffice.da.writer2latex.xelatex" oor:op="replace" oor:finalized="true" oor:mandatory="true">
+		<prop oor:name="UIName"><value>XeLaTeX</value></prop>
+		<prop oor:name="Type"><value>org.openoffice.da.writer2latex.XeLaTeX_File</value></prop>
+		<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+		<prop oor:name="FilterService"><value>org.openoffice.da.comp.writer2latex.TeXImportFilter</value></prop>
+		<prop oor:name="UIComponent"/>
+		<prop oor:name="Flags"><value>IMPORT TEMPLATE TEMPLATEPATH ALIEN 3RDPARTYFILTER</value></prop>
+		<prop oor:name="UserData"/>
+		<prop oor:name="FileFormatVersion"><value>0</value></prop>
+		<prop oor:name="TemplateName"/>
+	</node>-->
+	
 
 
   </node>
diff --git a/source/oxt/writer2latex/w2l_types.xcu b/source/oxt/writer2latex/w2l_types.xcu
index 764c981..70562ee 100644
--- a/source/oxt/writer2latex/w2l_types.xcu
+++ b/source/oxt/writer2latex/w2l_types.xcu
@@ -26,7 +26,29 @@
 		</prop>
 		<prop oor:name="ClipboardFormat"/>
 	</node>
+	
+	<node oor:name="org.openoffice.da.writer2latex.LaTeX_File" oor:op="replace" oor:finalized="true" oor:mandatory="true">
+		<prop oor:name="UIName"><value>LaTeX File</value></prop>
+		<prop oor:name="MediaType"/>
+		<prop oor:name="ClipboardFormat"/>
+		<prop oor:name="URLPattern"/>
+		<prop oor:name="Extensions"><value>tex</value></prop>
+		<prop oor:name="Preferred"><value>true</value></prop>
+		<prop oor:name="DetectService"><value>org.openoffice.da.comp.writer2latex.TeXDetectService</value></prop>
+		<prop oor:name="PreferredFilter"><value>org.openoffice.da.writer2latex.latex</value></prop>
+	</node>
 
+	<node oor:name="org.openoffice.da.writer2latex.XeLaTeX_File" oor:op="replace" oor:finalized="true" oor:mandatory="true">
+		<prop oor:name="UIName"><value>XeLaTeX File</value></prop>
+		<prop oor:name="MediaType"/>
+		<prop oor:name="ClipboardFormat"/>
+		<prop oor:name="URLPattern"/>
+		<prop oor:name="Extensions"><value>tex</value></prop>
+		<prop oor:name="Preferred"><value>true</value></prop>
+		<prop oor:name="DetectService"><value>org.openoffice.da.comp.writer2latex.TeXDetectService</value></prop>
+		<prop oor:name="PreferredFilter"><value>org.openoffice.da.writer2latex.xelatex</value></prop>
+	</node>
+	
    </node>
 
 </oor:component-data>
diff --git a/source/oxt/writer4latex/META-INF/manifest.xml b/source/oxt/writer4latex/META-INF/manifest.xml
index bc0142a..91a165a 100644
--- a/source/oxt/writer4latex/META-INF/manifest.xml
+++ b/source/oxt/writer4latex/META-INF/manifest.xml
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest>
-    <manifest:file-entry
-     manifest:full-path="ProtocolHandler.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
- 
-    <manifest:file-entry
-     manifest:full-path="Addons.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
-     
-    <manifest:file-entry
-     manifest:full-path="AddonsAOO4.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
-     
-    <manifest:file-entry
-     manifest:full-path="Office/UI/WriterWindowState.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="Options.xcs"
-     manifest:media-type="application/vnd.sun.star.configuration-schema"/>
-
-    <manifest:file-entry
-     manifest:full-path="Options.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
- 
     <manifest:file-entry
      manifest:full-path="W2LOptions.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
@@ -37,22 +9,6 @@
      manifest:full-path="Paths.xcu"
      manifest:media-type="application/vnd.sun.star.configuration-data"/>
  
-    <manifest:file-entry
-     manifest:full-path="w4l_types.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
-
-    <manifest:file-entry
-     manifest:full-path="w4l_filters.xcu"
-     manifest:media-type="application/vnd.sun.star.configuration-data"/>
-
-    <manifest:file-entry
-     manifest:full-path="writer4latex.jar"
-     manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
-
-    <manifest:file-entry
-     manifest:full-path="W4LDialogs/"
-     manifest:media-type="application/vnd.sun.star.basic-library"/>
-     
     <manifest:file-entry
 	 manifest:full-path="help"
 	 manifest:media-type="application/vnd.sun.star.help"/>
diff --git a/source/oxt/writer4latex/description.xml b/source/oxt/writer4latex/description.xml
index 5be2616..71a80e3 100644
--- a/source/oxt/writer4latex/description.xml
+++ b/source/oxt/writer4latex/description.xml
@@ -3,7 +3,7 @@
              xmlns:d="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <identifier value="org.openoffice.da.writer4latex.oxt" />
+  <identifier value="org.openoffice.da.writer2latex-configurations.oxt" />
   <version value="1.5.1" />
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>
@@ -11,12 +11,12 @@
   
   <publisher>
     <name xlink:href="http://writer2latex.sourceforge.net" 
-    lang="en">Writer2LaTeX</name>
+    lang="en">Writer2LaTeX configurations</name>
   </publisher>
   
   <display-name>
-    <name lang="da">Writer4LaTeX frontend</name>
-    <name lang="en">Writer4LaTeX frontend</name>
+    <name lang="da">Writer2LaTeX konfigurationer</name>
+    <name lang="en">Writer4LaTeX configurations</name>
   </display-name>
   
   <extension-description>
diff --git a/source/oxt/writer4latex/descriptions/desc_da.txt b/source/oxt/writer4latex/descriptions/desc_da.txt
index d35f91e..ea5834f 100644
--- a/source/oxt/writer4latex/descriptions/desc_da.txt
+++ b/source/oxt/writer4latex/descriptions/desc_da.txt
@@ -1,3 +1 @@
-Writer4LaTeX integrerer Writer med din LaTeX distribution. 
-
-Sammen med Writer2LaTeX eksportfilteret (som også skal være installeret) giver det dig mulighed for at bruge Writer som LaTeX frontend
\ No newline at end of file
+Writer2LaTeX configurations installerer skabeloner og formater til brug sammen med Writer2LaTeX
\ No newline at end of file
diff --git a/source/oxt/writer4latex/descriptions/desc_en.txt b/source/oxt/writer4latex/descriptions/desc_en.txt
index f73212d..b0b352e 100644
--- a/source/oxt/writer4latex/descriptions/desc_en.txt
+++ b/source/oxt/writer4latex/descriptions/desc_en.txt
@@ -1,3 +1 @@
-Writer4LaTeX integrates Writer with your LaTeX distribution. 
-
-Working together with the Writer2LaTeX export filter (which must be installed) this enables you to use Writer as a LaTeX frontend
\ No newline at end of file
+Writer2LaTeX configurations installs templates and formats for use together with Writer2LaTeX
\ No newline at end of file