diff --git a/mozilla/editor/ui/Makefile.in b/mozilla/editor/ui/Makefile.in
index 5f9e4a2c210..a5a847cf61d 100644
--- a/mozilla/editor/ui/Makefile.in
+++ b/mozilla/editor/ui/Makefile.in
@@ -14,3 +14,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = composer dialogs
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/ui/composer/Makefile.in b/mozilla/editor/ui/composer/Makefile.in
index 5f9e4a2c210..dad17721234 100644
--- a/mozilla/editor/ui/composer/Makefile.in
+++ b/mozilla/editor/ui/composer/Makefile.in
@@ -14,3 +14,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = content skin
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/ui/composer/content/EditorAppShell.xul b/mozilla/editor/ui/composer/content/EditorAppShell.xul
index 556badb253e..9bb320dfd5d 100644
--- a/mozilla/editor/ui/composer/content/EditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/EditorAppShell.xul
@@ -26,7 +26,7 @@
     var editorName = "EditorAppCoreHTML";
   </html:script>
 
-  <html:script language="JavaScript" src="chrome://editor/skin/EditorCommands.js">
+  <html:script language="JavaScript" src="chrome://editor/content/EditorCommands.js">
   </html:script>
 
   <broadcaster id="canPrint"/>
@@ -114,7 +114,7 @@
 		<titledbutton align="left" class="popup" value="Normal"/>
 		<titledbutton align="left" class="popup" value="Size"/>
 		<titledbutton align="left" class="popup" value="Color"/>
-	    <titledbutton src="chrome://editor/skin/images/ED_Bold.gif" align="bottom"
+	    <titledbutton src="chrome://editor/skin/ED_Bold.gif" align="bottom"
 	    	onclick="EditorApplyStyle('b')">
 		    <observes element="Editor:Style:IsBold" attribute="bold" onchange="onBoldChange()"/>
 	    </titledbutton>
diff --git a/mozilla/editor/ui/composer/content/EditorCommands.js b/mozilla/editor/ui/composer/content/EditorCommands.js
index 3cf7d824b79..121ade49154 100644
--- a/mozilla/editor/ui/composer/content/EditorCommands.js
+++ b/mozilla/editor/ui/composer/content/EditorCommands.js
@@ -171,17 +171,23 @@
     }
   }
 
-  function EditorInsertLink()
+function EditorInsertLink()
   {
+    dump("Starting Insert Link...\n");
     appCore = XPAppCoresManager.Find(editorName);  
     if (appCore != null) {
-      dump("Inserting link\n");
-      appCore.insertLink();
+	    dump("Link Properties Dialog starting...\n");
+      var toolkitCore = GetToolkitCore();
+      if (toolkitCore) {
+        toolkitCore.ShowModalDialog("chrome://editordialogs/content/EdLinkProps.xul",
+            window);
+      }
     } else {
       dump("EditorAppCore has not been created!\n");
     }
   }
 
+
   function EditorInsertList(listType)
   {
     appCore = XPAppCoresManager.Find(editorName);  
@@ -298,3 +304,13 @@
 			dump("Can't find bold broadcaster!\n");
 		}
 	}
+
+  function GetToolkitCore() {
+    var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+    if (!toolkitCore) {
+      toolkitCore = new ToolkitCore();
+      if (toolkitCore)
+        toolkitCore.Init("ToolkitCore");
+    }
+    return toolkitCore;
+  }
diff --git a/mozilla/editor/ui/composer/content/Makefile.in b/mozilla/editor/ui/composer/content/Makefile.in
index 5f9e4a2c210..0dcab8b0348 100644
--- a/mozilla/editor/ui/composer/content/Makefile.in
+++ b/mozilla/editor/ui/composer/content/Makefile.in
@@ -14,3 +14,25 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_CONTENT = \
+	$(srcdir)/EditorAppShell.xul \
+	$(srcdir)/EditorCommands.js \
+	$(srcdir)/EditorInitPage.html \
+	$(srcdir)/EditorInitPagePlain.html \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content
+
diff --git a/mozilla/editor/ui/composer/content/makefile.win b/mozilla/editor/ui/composer/content/makefile.win
index 5b1d33dc105..641e0afc1b0 100644
--- a/mozilla/editor/ui/composer/content/makefile.win
+++ b/mozilla/editor/ui/composer/content/makefile.win
@@ -14,3 +14,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+install::
+	$(MAKE_INSTALL) EditorAppShell.xul         $(DIST)\bin\chrome\editor\composer\content
+	$(MAKE_INSTALL) EditorCommands.js          $(DIST)\bin\chrome\editor\composer\content
+	$(MAKE_INSTALL) EditorInitPage.html        $(DIST)\bin\chrome\editor\composer\content
+	$(MAKE_INSTALL) EditorInitPagePlain.html   $(DIST)\bin\chrome\editor\composer\content
+
+clobber::
+  rm -f $(DIST)\bin\chrome\editor\composer\content\EditorAppShell.xul
+  rm -f $(DIST)\bin\chrome\editor\composer\content\EditorCommands.js	
+  rm -f $(DIST)\bin\chrome\editor\composer\content\EditorInitPage.html 
+  rm -f $(DIST)\bin\chrome\editor\composer\content\EditorInitPagePlain.html	
diff --git a/mozilla/editor/ui/composer/makefile.win b/mozilla/editor/ui/composer/makefile.win
index 5b1d33dc105..adde2754e8d 100644
--- a/mozilla/editor/ui/composer/makefile.win
+++ b/mozilla/editor/ui/composer/makefile.win
@@ -14,3 +14,10 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DIRS= content skin
+
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/editor/ui/composer/skin/Makefile.in b/mozilla/editor/ui/composer/skin/Makefile.in
index 5f9e4a2c210..276c3fb1b95 100644
--- a/mozilla/editor/ui/composer/skin/Makefile.in
+++ b/mozilla/editor/ui/composer/skin/Makefile.in
@@ -14,3 +14,46 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_SKIN = \
+	$(srcdir)/Editor.css \
+	$(NULL)
+
+EXPORT_RESOURCE_TOOLBAR = \
+	$(srcdir)/images/ED_Bold.gif \
+	$(srcdir)/images/ED_Bullets.gif \
+	$(srcdir)/images/ED_Center.gif \
+	$(srcdir)/images/ED_ClearStyle.gif \
+	$(srcdir)/images/ED_Copy.gif \
+	$(srcdir)/images/ED_Cut.gif \
+	$(srcdir)/images/ED_Dedent.gif \
+	$(srcdir)/images/ED_Find.gif \
+	$(srcdir)/images/ED_HLine.gif \
+	$(srcdir)/images/ED_Image.gif \
+	$(srcdir)/images/ED_Indent.gif \
+	$(srcdir)/images/ED_Italic.gif \
+	$(srcdir)/images/ED_Left.gif \
+	$(srcdir)/images/ED_Link.gif \
+	$(srcdir)/images/ED_Numbers.gif \
+	$(srcdir)/images/ED_Paste.gif \
+	$(srcdir)/images/ED_Redo.gif \
+	$(srcdir)/images/ED_Right.gif \
+	$(srcdir)/images/ED_Spell.gif \
+	$(srcdir)/images/ED_Table.gif \
+	$(srcdir)/images/ED_Target.gif \
+	$(srcdir)/images/ED_Underline.gif \
+	$(srcdir)/images/ED_Undo.gif \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/skin
+	$(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(DIST)/bin/chrome/editor/skin/images
diff --git a/mozilla/editor/ui/composer/skin/makefile.win b/mozilla/editor/ui/composer/skin/makefile.win
index 5b1d33dc105..0be0bf9890c 100644
--- a/mozilla/editor/ui/composer/skin/makefile.win
+++ b/mozilla/editor/ui/composer/skin/makefile.win
@@ -14,3 +14,58 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+  $(MAKE_INSTALL) images\ED_Bold.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Bullets.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Center.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_ClearStyle.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Copy.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Cut.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Dedent.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Find.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_HLine.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Image.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Indent.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Italic.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Left.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Link.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Numbers.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Paste.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Redo.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Right.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Spell.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Table.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Target.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Underline.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+  $(MAKE_INSTALL) images\ED_Undo.gif			$(DIST)\bin\chrome\editor\composer\skin\images
+
+clobber::
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Bold.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Bullets.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Center.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_ClearStyle.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Copy.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Cut.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Dedent.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Find.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_HLine.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Image.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Indent.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Italic.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Left.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Link.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Numbers.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Paste.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Redo.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Right.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Spell.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Table.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Target.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Underline.gif			
+  rm -f $(DIST)\bin\chrome\editor\composer\skin\images\ED_Undo.gif			
+
diff --git a/mozilla/editor/ui/dialogs/Makefile.in b/mozilla/editor/ui/dialogs/Makefile.in
index 5f9e4a2c210..dad17721234 100644
--- a/mozilla/editor/ui/dialogs/Makefile.in
+++ b/mozilla/editor/ui/dialogs/Makefile.in
@@ -14,3 +14,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = content skin
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/ui/dialogs/content/Makefile.in b/mozilla/editor/ui/dialogs/content/Makefile.in
index 5f9e4a2c210..68fbf0a764b 100644
--- a/mozilla/editor/ui/dialogs/content/Makefile.in
+++ b/mozilla/editor/ui/dialogs/content/Makefile.in
@@ -14,3 +14,23 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_CONTENT = \
+	$(srcdir)/EdLinkProps.xul \
+	$(srcdir)/EdImageProps.xul \
+	$(srcdir)/EdCharacterProps.xul \
+	$(NULL)
+
+install::
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/dialogs/content
diff --git a/mozilla/editor/ui/dialogs/content/makefile.win b/mozilla/editor/ui/dialogs/content/makefile.win
index 5b1d33dc105..37ffffc079a 100644
--- a/mozilla/editor/ui/dialogs/content/makefile.win
+++ b/mozilla/editor/ui/dialogs/content/makefile.win
@@ -14,3 +14,17 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+install::
+	$(MAKE_INSTALL) EdLinkProps.xul       $(DIST)\bin\chrome\editor\dialogs\content
+	$(MAKE_INSTALL) EdImageProps.xul      $(DIST)\bin\chrome\editor\dialogs\content	
+	$(MAKE_INSTALL) EdCharacterProps.xul  $(DIST)\bin\chrome\editor\dialogs\content
+
+clobber::
+  rm -f $(DIST)\bin\chrome\editor\dialogs\content\EdLinkProps.xul
+  rm -f $(DIST)\bin\chrome\editor\dialogs\content\EdImageProps.xul	
+  rm -f $(DIST)\bin\chrome\editor\dialogs\content\EdCharacterProps.xul	
diff --git a/mozilla/editor/ui/dialogs/makefile.win b/mozilla/editor/ui/dialogs/makefile.win
index 5b1d33dc105..7f53711af5b 100644
--- a/mozilla/editor/ui/dialogs/makefile.win
+++ b/mozilla/editor/ui/dialogs/makefile.win
@@ -14,3 +14,10 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..
+
+DIRS= content skin
+
+include <$(DEPTH)\config\rules.mak>
+
diff --git a/mozilla/editor/ui/dialogs/skin/Makefile.in b/mozilla/editor/ui/dialogs/skin/Makefile.in
index 5f9e4a2c210..1ca61d533d8 100644
--- a/mozilla/editor/ui/dialogs/skin/Makefile.in
+++ b/mozilla/editor/ui/dialogs/skin/Makefile.in
@@ -14,3 +14,21 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH = ../../../..
+topsrcdir	= @top_srcdir@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_SKIN = \
+	$(srcdir)/EditorDialog.css \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/dialogs/skin
diff --git a/mozilla/editor/ui/dialogs/skin/makefile.win b/mozilla/editor/ui/dialogs/skin/makefile.win
index 5b1d33dc105..3cb74de2e28 100644
--- a/mozilla/editor/ui/dialogs/skin/makefile.win
+++ b/mozilla/editor/ui/dialogs/skin/makefile.win
@@ -14,3 +14,14 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) EditorDialog.css  $(DIST)\bin\chrome\editor\dialogs\skin	
+
+clobber::
+  rm -f $(DIST)\bin\chrome\editor\dialogs\skin\EditorDialog.css
diff --git a/mozilla/editor/ui/makefile.win b/mozilla/editor/ui/makefile.win
index 5b1d33dc105..ab9a8b3be63 100644
--- a/mozilla/editor/ui/makefile.win
+++ b/mozilla/editor/ui/makefile.win
@@ -14,3 +14,10 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+DIRS= composer dialogs
+
+include <$(DEPTH)\config\rules.mak>