diff --git a/profile/resources/content/createProfileWizard.xul b/profile/resources/content/createProfileWizard.xul
index afa3693b16b3..e43415c3dc38 100644
--- a/profile/resources/content/createProfileWizard.xul
+++ b/profile/resources/content/createProfileWizard.xul
@@ -4,15 +4,21 @@
 <?xul-overlay href="chrome://global/content/wizardOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/createProfileWizard.dtd">
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % profileDTD SYSTEM "chrome://communicator/locale/profile/createProfileWizard.dtd">
+%profileDTD;
+]>
+
 
 <window title="&newprofile.title;" align="vertical"
-  class="color-dialog"
-	xmlns:html="http://www.w3.org/TR/REC-html40"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onclose="onCancel();"
-	onload="Startup('newProfile1_1','content');">
+        class="color-dialog"
+        xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onclose="onCancel();"
+        onload="Startup('newProfile1_1','content');">
 
 	<script language="javascript" src="chrome://global/content/strres.js"></script>
 	<script language="javascript" src="chrome://communicator/content/profile/createProfileWizard.js"></script>
diff --git a/profile/resources/content/newProfile1_1.xul b/profile/resources/content/newProfile1_1.xul
index 69bee5a823e7..963accc96e28 100644
--- a/profile/resources/content/newProfile1_1.xul
+++ b/profile/resources/content/newProfile1_1.xul
@@ -24,7 +24,13 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/profile/profile.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/newProfile1_1.dtd" >
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % profileDTD SYSTEM "chrome://communicator/locale/profile/newProfile1_1.dtd" >
+%profileDTD;
+]>
+
 <window 
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
diff --git a/profile/resources/content/newProfile1_2.xul b/profile/resources/content/newProfile1_2.xul
index 69bb813b6ade..0fd33425d52e 100644
--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@@ -27,10 +27,10 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/newProfile1_2.dtd" >
 <window 
   xmlns:html="http://www.w3.org/TR/REC-html40"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="dialog wizardPanel"
-	width="500" height="500"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="color-dialog wizardPanel"
+  width="500" height="500"
   orient="vertical"
-	onload="initFields();parent.wizardManager.onPageLoad('newProfile1_2');"> 
+  onload="initFields();parent.wizardManager.onPageLoad('newProfile1_2');"> 
 
 	<script language="javascript" src="chrome://global/content/strres.js"></script>
   <script language="JavaScript" src="chrome://communicator/content/profile/newProfile1_2.js"></script>
diff --git a/profile/resources/content/profileSelection.xul b/profile/resources/content/profileSelection.xul
index 7453bd71d999..1097fdc854e1 100644
--- a/profile/resources/content/profileSelection.xul
+++ b/profile/resources/content/profileSelection.xul
@@ -31,13 +31,19 @@
 <?xml-stylesheet href="chrome://communicator/skin/profile/profile.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/profileSelection.dtd" >
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % profileDTD SYSTEM "chrome://communicator/locale/profile/profileSelection.dtd">
+%profileDTD;
+]>
+
 <window
   xmlns:html="http://www.w3.org/TR/REC-html40"
   width="475" height="335"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-	class="color-dialog profile"
-	title="&windowtitle.label;"
+  class="color-dialog profile"
+  title="&windowtitle.label;"
   align="vertical"
   onclose="onExit();"
   onload="StartUp();"> 
diff --git a/profile/resources/locale/en-US/createProfileWizard.dtd b/profile/resources/locale/en-US/createProfileWizard.dtd
index e17fd1e62c06..50061f539326 100644
--- a/profile/resources/locale/en-US/createProfileWizard.dtd
+++ b/profile/resources/locale/en-US/createProfileWizard.dtd
@@ -1,9 +1,9 @@
 <!-- extracted from cpw.xul -->
 
 <!ENTITY profileWizard.title          "Create Profile">
-<!ENTITY window.title.label           "Mozilla Profile Manager">
+<!ENTITY window.title.label           "&brandShortName; Profile Manager">
 <!ENTITY newprofile.title             "Create Profile">
-<!ENTITY dialup.title	                "Dialup">
+<!ENTITY dialup.title	              "Dialup">
 <!ENTITY mailnews.title               "Mail News">
 <!ENTITY addrbook.title               "Address Book">
 
diff --git a/profile/resources/locale/en-US/newProfile1_1.dtd b/profile/resources/locale/en-US/newProfile1_1.dtd
index f565bd21f9dd..02d283aa6bf8 100644
--- a/profile/resources/locale/en-US/newProfile1_1.dtd
+++ b/profile/resources/locale/en-US/newProfile1_1.dtd
@@ -1,5 +1,5 @@
 
-<!ENTITY          pnl1.p1.text      "Mozilla stores information about your settings, preferences, bookmarks, and stored messages in your personal profile.">
+<!ENTITY          pnl1.p1.text      "&brandShortName; stores information about your settings, preferences, bookmarks, and mail in your personal profile.">
 <!ENTITY          pnl1.p2.text      "If you are sharing this copy of Mozilla with other users, you can use profiles to keep each user's information separate. To do this, each user should create his or her own profile.">
 <!ENTITY          pnl1.p3.text      "If you are the only person using this copy of Mozilla, you must have at least one profile. If you would like, you can create multiple profiles for yourself to store different sets of setting and preferences. For example, you may want to have separate profiles for business and personal use.">
 <!ENTITY          pnl1.p4.text      "To begin creating your profile, click Next.">
diff --git a/profile/resources/locale/en-US/profileSelection.dtd b/profile/resources/locale/en-US/profileSelection.dtd
index 83338f7664ce..78d0dfe23f38 100644
--- a/profile/resources/locale/en-US/profileSelection.dtd
+++ b/profile/resources/locale/en-US/profileSelection.dtd
@@ -27,11 +27,11 @@
 
 <!ENTITY            windowtitle.label     "Select User Profile">
 
-<!ENTITY            welcome.label         "Welcome to Mozilla">
-<!ENTITY            profilemanager.label  "Mozilla Profile Manager">
+<!ENTITY            welcome.label         "Welcome to &brandShortName;">
+<!ENTITY            profilemanager.label  "&brandShortName; Profile Manager">
 
-<!ENTITY            introgeneral.label    "To access your personal profile, which contains your mail, settings and other personalized information, please choose your profile from the list, and click Start Mozilla to begin your session.">
-<!ENTITY            introroaming.label    "If you have a Roaming Access profile which does not exist on this computer, choose Roaming Access. Mozilla will then prompt you to log into your Roaming Access server.">
+<!ENTITY            introgeneral.label    "To access your personal profile, which contains your mail, settings and other personalized information, please choose your profile from the list, and click Start &brandShortName; to begin your session.">
+<!ENTITY            introroaming.label    "If you have a Roaming Access profile which does not exist on this computer, choose Roaming Access. &brandShortName; will then prompt you to log into your Roaming Access server.">
 
 <!ENTITY            profilename.label     "Profile Name:">
 
@@ -41,7 +41,7 @@
 
 <!ENTITY            manageprofiles.label  "Manage Profiles">
 
-<!ENTITY            start.label           "Start Mozilla">
+<!ENTITY            start.label           "Start &vendorShortName;">
 <!ENTITY            exit.label            "Exit">
 <!ENTITY            manage.label          "Manage Profiles...">
 
@@ -52,7 +52,7 @@
 <!ENTITY            newButton.label       "Create Profile...">
 
 <!-- manager entities -->
-<!ENTITY            pmTextA.label         "Mozilla stores information about your settings, preferences, bookmarks, mail and other user items in your user profile.">
-<!ENTITY            pmTextC.label         "You must select a profile, or create a new profile, the first time you start Mozilla.">
-<!ENTITY            pmTextB.label         "Indicates a profile created with a previous version of Communicator. These profiles must be converted before they can be loaded with Mozilla. This is an automated process.">
+<!ENTITY            pmTextA.label         "&brandShortName; stores information about your settings, preferences, bookmarks, mail and other user items in your user profile.">
+<!ENTITY            pmTextC.label         "You must select a profile, or create a new profile, the first time you start &brandShortName;.">
+<!ENTITY            pmTextB.label         "Indicates a profile created with a previous version of Communicator. These profiles must be converted before they can be loaded with &brandShortName;. This is an automated process.">