diff --git a/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini b/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
index 23420cbcd45..97759ee0a1d 100644
--- a/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
+++ b/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
@@ -56,15 +56,15 @@ Help=AccountSetup.txt
 
 Type=Image
 
-Name=netscape.bmp
+Name=banner9.bmp
 
 Value=
 
-Start_x=7
+Start_x=0
 
-Start_y=7
+Start_y=0
 
-Width=64
+Width=425
 
 Height=56
 
@@ -78,17 +78,32 @@ Type=Text
 
 Name=Text90
 
-Value=Set up POP (Points of Presence) local dial-up access phone numbers so that when users use Internet Setup to create an Internet account, they can choose the phone number that's closest to their location. If you're not including Internet Setup in your installer, skip this screen by clicking Next.
+Value=Set up POP (Points of Presence) local dial-up access phone numbers so that when users use Internet Setup to create an Internet account, they can choose the phone number that's closest to their location.
 
-Start_x=58
+Start_x=5
 
-Start_y=45
+Start_y=25
 
-Width=330
+Width=380
 
 Height=30
 
-
+
+[Widget 1346]
+
+Type=GroupBox
+
+Name=GroupBox296
+
+Value=Description
+
+Start_x=9
+
+Start_y=153
+
+Width=106
+
+Height=30
 
 
 
@@ -102,11 +117,11 @@ Value=
 
 Start_x=8
 
-Start_y=85
+Start_y=90
 
 Width=106
 
-Height=64
+Height=67
 
 dll=NULL
 
@@ -116,6 +131,21 @@ parameters=cckwiz\ase\NCIFiles\*.NCI
 
 
 
+[Widget 592]
+
+Type=Text
+
+Name=Text931
+
+Value=In Internet Setup, list POP files:
+
+Start_x=220
+
+Start_y=92
+
+Width=125
+
+Height=15
 
 
 [Widget 21]
@@ -138,13 +168,13 @@ Type=RadioButton
 
 Name=SortByName
 
-Title=In Internet Setup, list POP files alphabetically by description
+Title=Alphabetically by description
 
 Group=radioGroup
 
-Start_x=12
+Start_x=230
 
-Start_y=157
+Start_y=105
 
 Width=300
 
@@ -160,13 +190,13 @@ Type=RadioButton
 
 Name=SortByPhone
 
-Title=In Internet Setup, list POP files by phone number
+Title=By phone number
 
 Group=radioGroup
 
-Start_x=12
+Start_x=230
 
-Start_y=167
+Start_y=115
 
 Width=300
 
@@ -180,11 +210,11 @@ Type=Text
 
 Name=Text91
 
-Value=List These POP Files in Internet Setup:
+Value=List of POP files for Internet Setup:
 
-Start_x=9
+Start_x=6
 
-Start_y=74
+Start_y=79
 
 Width=125
 
@@ -200,7 +230,7 @@ Name=CreateNCIButton
 
 Value=Create
 
-Start_x=145
+Start_x=135
 
 Start_y=99
 
@@ -226,7 +256,7 @@ Name=EditNCIButton
 
 Value=Edit
 
-Start_x=145
+Start_x=135
 
 Start_y=115
 
@@ -252,9 +282,9 @@ Name=DeleteNCIButton
 
 Value=Delete
 
-Start_x=145
+Start_x=135
 
-Start_y=133
+Start_y=131
 
 Width=51
 
@@ -276,13 +306,13 @@ Type=Text
 
 Name=Text92
 
-Value=To create a new access location file, click Create, and name the file based on the local calling area it serves (e.g., San Diego). Then edit the file, replacing the default values with the ones you want. Save the file to add it to the list of access locations.
+Value=To create a new POP file, click Create, and name the file based on the local calling area it serves (e.g., San Diego). Then edit the file, replacing the default values with the ones you want. Save the file to add it to the list of POP files.
 
-Start_x=210
+Start_x=5
 
-Start_y=95
+Start_y=44
 
-Width=195
+Width=390
 
 Height=62
 
@@ -298,13 +328,13 @@ Name=Text93
 
 Value=To edit an existing file, select it from the list and click Edit to open it in the text editor you've chosen.
 
-Start_x=210
+Start_x=5
 
-Start_y=140
+Start_y=65
 
-Width=200
+Width=400
 
-Height=35
+Height=25
 
 
 
@@ -320,7 +350,7 @@ Value=To change text editors, locate the text editor you want to use. Notepad is
 
 Start_x=10
 
-Start_y=195
+Start_y=200
 
 Width=323
 
@@ -336,15 +366,15 @@ Type=GroupBox
 
 Name=GroupBox14
 
-Value=Change Text Editor
+Value=Text Editor
 
 Start_x=5
 
-Start_y=184
+Start_y=189
 
 Width=397
 
-Height=60
+Height=55
 
 
 
@@ -356,11 +386,11 @@ Type=Text
 
 Name=Text95
 
-Value=Path to text editor you want to use:
+Value=Location of text editor:
 
 Start_x=11
 
-Start_y=208
+Start_y=213
 
 Width=178
 
@@ -380,7 +410,7 @@ Value=notepad
 
 Start_x=11
 
-Start_y=218
+Start_y=223
 
 Width=181
 
@@ -398,7 +428,7 @@ Value=Browse
 
 Start_x=202
 
-Start_y=218
+Start_y=223
 
 Width=50
 
@@ -409,112 +439,6 @@ dll=NULL
 function=BrowseFile
 
 
-
-[Widget 16]
-
-Type=Text
-
-Name=Text96
-
-Value=Page 1 of 1
-
-Description=Current Page
-
-Start_x=272
-
-Start_y=16
-
-Width=38
-
-Height=8
-
-
-
-
-
-[Widget 17]
-
-Type=Text
-
-Name=Text97
-
-Value=Customize
-
-Description=Navigation Status
-
-Start_x=210
-
-Start_y=7
-
-Width=44
-
-Height=9
-
-
-
-
-
-[Widget 18]
-
-Type=Text
-
-Name=Text98
-
-Value=Internet Setup
-
-Description=Current Page
-
-Start_x=267
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 19]
-
-Type=Text
-
-Name=Text99
-
-Value=Build Installer(s)
-
-Description=Navigation Status
-
-Start_x=338
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 20]
-
-Type=Text
-
-Name=Text500
-
-Value=Brand
-
-Description=Navigation Status
-
-Start_x=161
-
-Start_y=7
-
-Width=27
-
-Height=9
 
 
 [Widget 77]
@@ -525,9 +449,9 @@ Name=Button333
 
 Value=Show Example
 
-Start_x=250
+Start_x=340
 
-Start_y=75
+Start_y=170
 
 Width=60
 
diff --git a/mozilla/cck/cckwiz/iniFiles/Branding_page1.ini b/mozilla/cck/cckwiz/iniFiles/Branding_page1.ini
index f4046d35261..30814ebd431 100644
--- a/mozilla/cck/cckwiz/iniFiles/Branding_page1.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Branding_page1.ini
@@ -25,55 +25,34 @@ Caption=2nd level node
 onNext=
 Help=Branding.txt
 
-[Widget 1]
-Type=Text
-Name=Text49
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 2]
-Type=Text
-Name=Text50
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-[Widget 3]
-Type=Text
-Name=Text51
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
 
 
 [Image 1]
 Type=Image
-Name=netscape.bmp
+Name=banner3.bmp
 Value=
-Start_x=7
-Start_y=7
-Width=64
+Start_x=0
+Start_y=0
+Width=425
 Height=56
 
 [Widget 4]
 Type=GroupBox
 Name=GroupBox7
-Value=Animated Logo Button URL
+Value=Animated Logo
 Start_x=2
-Start_y=59
+Start_y=50
 Width=403
-Height=55
+Height=145
+
+[Widget 563]
+Type=Text
+Name=Text563
+Value=Button URL:
+Start_x=8
+Start_y=62
+Width=250
+Height=10
 
 
 [Widget 5]
@@ -91,73 +70,49 @@ Type=EditBox
 Name=AnimatedLogoURL
 Value=
 Start_x=14
-Start_y=87
+Start_y=86
 Width=203
 Height=15
 
-[Widget 181]
-Type=Button
-Name=Button526
-Value=Show Example
-Start_x=236
-Start_y=87
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=button.ini
-
-
-[Widget 411]
-Type=GroupBox
-Name=GroupBox77
-Value=Animated Logo GIF Files
-Start_x=2
-Start_y=120
-Width=403
-Height=80
-
 
 [Widget 7]
 Type=EditBox
 Name=SmallAnimPath
 Value=
 Start_x=12
-Start_y=145
-Width=156
-Height=13
+Start_y=135
+Width=135
+Height=15
 
 [Widget 8]
 Type=Button
 Name=Button11
 Value=Browse
-Start_x=180
-Start_y=145
+Start_x=154
+Start_y=136
 Width=40
 Height=14
 dll=NULL
 function=BrowseFile
 
-[Widget 18]
-Type=Button
-Name=Button126
-Value=Show Example
-Start_x=232
-Start_y=145
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=smallAnim.ini
+[Widget 564]
+Type=Text
+Name=Text564
+Value=Graphic Files:
+Start_x=8
+Start_y=106
+Width=250
+Height=10
+
 
 
 [Widget 9]
 Type=Text
 Name=Text53
-Value=Path to Small (16x16) Animated GIF File:
-Start_x=13
-Start_y=132
-Width=134
+Value=Location of Small (16x16) Animated GIF File:
+Start_x=12
+Start_y=121
+Width=158
 Height=11
 
 
@@ -165,69 +120,128 @@ Height=11
 Type=EditBox
 Name=LargeAnimPath
 Value=
-Start_x=12
-Start_y=176
-Width=155
-Height=14
+Start_x=10
+Start_y=165
+Width=136
+Height=15
 
 [Widget 11]
 Type=Button
 Name=Button12
 Value=Browse
-Start_x=180
-Start_y=175
+Start_x=154
+Start_y=167
 Width=40
 Height=14
 dll=NULL
 function=BrowseFile
 
+[Widget 968]
+Type=Text
+Name=Text535
+Value=Location of Small (16x16) Still Frame GIF File:
+Start_x=208
+Start_y=119
+Width=159
+Height=11
+
+
+[Widget 969]
+Type=EditBox
+Name=SmallStillPath
+Value=
+Start_x=208
+Start_y=133
+Width=139
+Height=15
+
+[Widget 970]
+Type=Button
+Name=Button1279
+Value=Browse
+Start_x=356
+Start_y=134
+Width=40
+Height=15
+dll=NULL
+function=BrowseFile
+
 [Widget 19]
 Type=Button
 Name=Button122
 Value=Show Example
-Start_x=233
-Start_y=175
+Start_x=338
+Start_y=85
 Width=60
 Height=14
 dll=NULL
 function=DisplayImage
-parameters=largeAnim.ini
+parameters=button.ini
 
 
 [Widget 12]
 Type=Text
 Name=Text54
-Value=Path to Large (32x32) Animated GIF File:
-Start_x=12
-Start_y=164
+Value=Location of Large (32x32) Animated GIF File:
+Start_x=11
+Start_y=153
 Width=152
 Height=10
 
+[Widget 971]
+Type=Text
+Name=Text536
+Value=Location of Large (32x32) Still Frame GIF File:
+Start_x=208
+Start_y=152
+Width=148
+Height=11
+
+
+[Widget 972]
+Type=EditBox
+Name=LargeStillPath
+Value=
+Start_x=208
+Start_y=166
+Width=140
+Height=15
+
+[Widget 973]
+Type=Button
+Name=Button1239
+Value=Browse
+Start_x=356
+Start_y=167
+Width=41
+Height=14
+dll=NULL
+function=BrowseFile
 
 [Widget 15]
 Type=Text
 Name=Text56
-Value=Specify a customized animated logo to replace the standard Netscape animated logo, and include your company name in the browser window's title bar.
-Start_x=48
-Start_y=37
-Width=340
-Height=23
+Value=You can specify a customized animated logo to replace the standard Netscape animated logo, as well as include your company name in the browser window's title bar.
+Start_x=2
+Start_y=30
+Width=398
+Height=18
 
 [Widget 429]
 Type=GroupBox
 Name=GroupBox707
-Value=Add Your Company Name to Navigator Window's Title Bar
+Value=Browser Window's Title Bar
 Start_x=2
-Start_y=205
+Start_y=200
 Width=403
-Height=40
+Height=45
 
 [Widget 578]
 Type=Text
 Name=Text524
 Value=Enter Your Company Name:
 Start_x=13
-Start_y=215
+Start_y=210
 Width=250
 Height=10
 
@@ -237,7 +251,7 @@ Type=EditBox
 Name=CompanyName
 Value=
 Start_x=14
-Start_y=227
+Start_y=222
 Width=203
 Height=15
 
@@ -245,7 +259,7 @@ Height=15
 Type=Button
 Name=Button5263
 Value=Show Example
-Start_x=236
+Start_x=336
 Start_y=227
 Width=60
 Height=14
@@ -254,33 +268,3 @@ function=DisplayImage
 parameters=coname.ini
 
 
-[Widget 16]
-Type=Text
-Name=Text57
-Value=Brand
-Description=Current Page
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
-
-[Widget 17]
-Type=Text
-Name=Text58
-Value=Page 1 of 4
-Description=Current Page
-Start_x=154
-Start_y=16
-Width=40
-Height=8
-
-;[Image 2]
-;Type=Image
-;Name=bitmaps\logo.bmp
-;Value=
-;Start_x=223
-;Start_y=92
-;Width=174
-;Height=147
-
diff --git a/mozilla/cck/cckwiz/iniFiles/Branding_page2.ini b/mozilla/cck/cckwiz/iniFiles/Branding_page2.ini
index 4b0eccedd71..90bce647408 100644
--- a/mozilla/cck/cckwiz/iniFiles/Branding_page2.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Branding_page2.ini
@@ -27,30 +27,30 @@ Help=Branding.txt
 
 [Image 1]
 Type=Image
-Name=netscape.bmp
+Name=banner7.bmp
 Value=
-Start_x=7
-Start_y=7
-Width=64
+Start_x=0
+Start_y=0
+Width=425
 Height=56
 
 
 [Widget 1]
 Type=Text
 Name=Text59
-Value=Customize the CD Autorun screen. The CD Autorun screen automatically appears when the user inserts a Communicator CD. If you are only creating a network-downloadable installer, click Next to skip this screen.
-Start_x=58
-Start_y=33
-Width=340
-Height=20
+Value=The CD Autorun screen appears when the user inserts a Communicator CD into their computer's CD-ROM drive. You can customize the background bitmap image that appears on the CD Autorun screen, as well as the text and installation instructions.
+Start_x=5
+Start_y=28
+Width=400
+Height=30
 
 
 [Widget 2]
 Type=GroupBox
 Name=GroupBox8
-Value=CD Autorun Screen Custom Text
-Start_x=5
-Start_y=111
+Value=Text
+Start_x=4
+Start_y=106
 Width=395
 Height=77
 
@@ -59,18 +59,18 @@ Height=77
 [Widget 5]
 Type=GroupBox
 Name=GroupBox9
-Value=CD Autorun Screen Custom Background Bitmap
+Value=Background Bitmap
 Start_x=5
 Start_y=54
 Width=395
-Height=54
+Height=50
 
 [Widget 10]
 Type=Text
 Name=Text62
-Value=Location of custom background bitmap file (640 x 480 pixels):
+Value=Location of background bitmap file (640 x 480 pixels):
 Start_x=12
-Start_y=75
+Start_y=70
 Width=210
 Height=10
 
@@ -79,7 +79,7 @@ Type=EditBox
 Name=ShellBgBitmap
 Value=
 Start_x=12
-Start_y=88
+Start_y=83
 Width=155
 Height=14
 
@@ -88,7 +88,7 @@ Type=Button
 Name=Button13
 Value=Browse
 Start_x=171
-Start_y=88
+Start_y=83
 Width=40
 Height=14
 dll=NULL
@@ -98,8 +98,8 @@ function=BrowseFile
 Type=Button
 Name=Button127
 Value=Show Example
-Start_x=226
-Start_y=88
+Start_x=330
+Start_y=83
 Width=60
 Height=14
 dll=NULL
@@ -109,9 +109,9 @@ parameters=shell1.ini
 [Widget 3]
 Type=Text
 Name=Text60
-Value=Display This Text in the Title Bar of the CD Autorun Screen:
+Value=Display This Text in the Title Bar:
 Start_x=12
-Start_y=123
+Start_y=118
 Width=210
 Height=10
 
@@ -120,7 +120,7 @@ Type=EditBox
 Name=ShellTitleText
 Value=
 Start_x=13
-Start_y=136
+Start_y=131
 Width=272
 Height=14
 
@@ -128,8 +128,8 @@ Height=14
 Type=Button
 Name=Button123
 Value=Show Example
-Start_x=300
-Start_y=136
+Start_x=330
+Start_y=160
 Width=60
 Height=14
 dll=NULL
@@ -140,9 +140,9 @@ parameters=shell2.ini
 [Widget 8]
 Type=Text
 Name=Text61
-Value=Display This Text Below the Title Bar on the CD Autorun Screen:
+Value=Display This Text Below the Title Bar:
 Start_x=12
-Start_y=154
+Start_y=149
 Width=210
 Height=10
 
@@ -152,48 +152,25 @@ Type=EditBox
 Name=ShellBelowTitleText
 Value=
 Start_x=12
-Start_y=165
+Start_y=160
 Width=272
 Height=14
 
-[Widget 24]
-Type=Button
-Name=Button124
-Value=Show Example
-Start_x=300
-Start_y=165
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=shell3.ini
-
-
-[Widget 11]
-Type=Text
-Name=Text63
-Value=Page 2 of 4
-Description=Current Page
-Start_x=153
-Start_y=16
-Width=40
-Height=8
-
 
 [Widget 12]
 Type=GroupBox
 Name=GroupBox10
 Value=Custom Installation Text File
-Start_x=3
-Start_y=190
+Start_x=4
+Start_y=187
 Width=396
-Height=55
+Height=59
 
 
 [Widget 13]
 Type=Text
 Name=Text64
-Value=You can display your own customized installation instructions when the user clicks the Installation Guide button in the CD Autorun screen.
+Value=When the user clicks the Installation Guide button, your customized installation instructions will appear.
 Start_x=11
 Start_y=200
 Width=386
@@ -205,7 +182,7 @@ Type=Text
 Name=Text65
 Value=Location of installation text file (install.txt):
 Start_x=12
-Start_y=218
+Start_y=212
 Width=148
 Height=12
 
@@ -215,7 +192,7 @@ Type=EditBox
 Name=ShellInstallTextFile
 Value=
 Start_x=12
-Start_y=228
+Start_y=223
 Width=155
 Height=14
 
@@ -224,7 +201,7 @@ Type=Button
 Name=Button14
 Value=Browse
 Start_x=171
-Start_y=228
+Start_y=223
 Width=40
 Height=14
 dll=NULL
@@ -234,8 +211,8 @@ function=BrowseFile
 Type=Button
 Name=Button125
 Value=Show Example
-Start_x=226
-Start_y=228
+Start_x=330
+Start_y=223
 Width=60
 Height=14
 dll=NULL
@@ -243,47 +220,4 @@ function=DisplayImage
 parameters=shell4.ini
 
 
-[Widget 17]
-Type=Text
-Name=Text66
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 18]
-Type=Text
-Name=Text67
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 19]
-Type=Text
-Name=Text68
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 20]
-Type=Text
-Name=Text69
-Value=Brand
-Description=Current Page
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
 
diff --git a/mozilla/cck/cckwiz/iniFiles/Branding_page3.ini b/mozilla/cck/cckwiz/iniFiles/Branding_page3.ini
index 15b773d1cc6..41ff6b725ef 100644
--- a/mozilla/cck/cckwiz/iniFiles/Branding_page3.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Branding_page3.ini
@@ -27,20 +27,20 @@ Help=Branding.txt
 
 [Image 1]
 Type=Image
-Name=netscape.bmp
+Name=banner8.bmp
 Value=
-Start_x=7
-Start_y=7
-Width=64
+Start_x=0
+Start_y=0
+Width=425
 Height=56
 
 
 [Widget 1]
 Type=Text
 Name=Text70
-Value=Display my custom logo graphic on all pages of Account Setup. Enter the path to the custom bitmap (.bmp) file:
+Value=The logo graphic appears on all Internet Setup screens.
 Start_x=7
-Start_y=81
+Start_y=53
 Width=360
 Height=13
 
@@ -49,8 +49,8 @@ Height=13
 Type=EditBox
 Name=AcctSetupBgBitmap
 Value=
-Start_x=8
-Start_y=97
+Start_x=7
+Start_y=81
 Width=155
 Height=14
 
@@ -58,8 +58,8 @@ Height=14
 Type=Button
 Name=Button16
 Value=Browse
-Start_x=169
-Start_y=97
+Start_x=170
+Start_y=81
 Width=40
 Height=14
 dll=NULL
@@ -69,8 +69,8 @@ function=BrowseFile
 Type=Button
 Name=Button128
 Value=Show Example
-Start_x=217
-Start_y=97
+Start_x=334
+Start_y=81
 Width=60
 Height=14
 dll=NULL
@@ -81,19 +81,29 @@ parameters=accnt1.ini
 [Widget 4]
 Type=Text
 Name=Text71
-Value=Display my technical support phone number on the first page of Account Setup:
+Value=Your Company Name appears on all Internet Setup screens.
 Start_x=10
-Start_y=148
+Start_y=128
+Width=266
+Height=12
+
+[Widget 4917]
+Type=Text
+Name=Text7194
+Value=Enter your Company Name:
+Start_x=10
+Start_y=141
 Width=266
 Height=12
 
 
+
 [Widget 5]
 Type=EditBox
-Name=TechSupportNumber
+Name=Company_Name
 Value=
 Start_x=10
-Start_y=162
+Start_y=152
 Width=245
 Height=15
 
@@ -101,60 +111,58 @@ Height=15
 Type=Button
 Name=Button129
 Value=Show Example
-Start_x=264
-Start_y=162
+Start_x=334
+Start_y=152
 Width=60
 Height=14
 dll=NULL
 function=DisplayImage
-parameters=accnt2.ini
+parameters=accnt3.ini
 
 [Widget 6]
 Type=Text
 Name=Text72
-Value=Specify a custom logo and custom text for Account Setup. Account Setup makes it easy for your users to create
-Start_y=37
-Width=369
+Value=You can specify a custom logo, company name, and technical support phone number to be displayed in Internet Setup.
+Start_y=27
+Width=380
 Height=12
-start_X=6
+start_X=5
 
 [Widget 689]
 Type=Text
 Name=Text721
-Value=new Internet accounts. If you're not including Account Setup in your installer, skip this screen by clicking Next.
-Start_x=5
-Start_y=48
+Value=Location of logo graphic bitmap (.bmp) file (need dimensions in pixels):
+Start_x=7
+Start_y=66
 Width=366
 Height=17
 
 
-[Widget 8]
-Type=Text
-Name=Text74
-Value=Page 3 of 4
-Description=Current Page
-Start_x=152
-Start_y=16
-Width=40
-Height=8
-
-
 [Widget 9]
 Type=Text
 Name=Text75
-Value=Display my company name in Account Setup screens:
-Start_x=10
-Start_y=211
-Width=191
+Value=Your Technical Support Phone Number appears on the first Internet Setup screen.
+Start_x=12
+Start_y=193
+Width=300
+Height=9
+
+[Widget 4993]
+Type=Text
+Name=Text7539
+Value=Enter your Technical Support Phone Number:
+Start_x=12
+Start_y=206
+Width=300
 Height=9
 
 
 [Widget 10]
 Type=EditBox
-Name=Company_Name
+Name=TechSupportNumber
 Value=
 Start_x=10
-Start_y=223
+Start_y=218
 Width=246
 Height=14
 
@@ -162,56 +170,14 @@ Height=14
 Type=Button
 Name=Button130
 Value=Show Example
-Start_x=267
-Start_y=223
+Start_x=335
+Start_y=217
 Width=60
 Height=14
 dll=NULL
 function=DisplayImage
-parameters=accnt3.ini
+parameters=accnt2.ini
 
-[Widget 11]
-Type=Text
-Name=Text76
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 12]
-Type=Text
-Name=Text77
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 13]
-Type=Text
-Name=Text78
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 14]
-Type=Text
-Name=Text79
-Value=Brand
-Description=Current Page
-Start_x=161
-Start_y=7
-Width=27
-Height=9
 
 [Widget 6435]
 
@@ -219,15 +185,15 @@ Type=GroupBox
 
 Name=GroupBox1
 
-Value=Custom Logo Graphic
+Value=Logo Graphic
 
 Start_x=3
 
-Start_y=70
+Start_y=40
 
 Width=402
 
-Height=55
+Height=65
 
 
 [Widget 653]
@@ -236,15 +202,15 @@ Type=GroupBox
 
 Name=GroupBox2
 
-Value=Technical Support Phone Number
+Value=Company Name
 
 Start_x=3
 
-Start_y=135
+Start_y=115
 
 Width=402
 
-Height=55
+Height=60
 
 
 [Widget 923]
@@ -253,22 +219,12 @@ Type=GroupBox
 
 Name=GroupBox313
 
-Value=Company Name
+Value=Technical Support Phone Number
 
 Start_x=3
 
-Start_y=200
+Start_y=180
 
 Width=402
 
-Height=45
-
-
-;[Image 2]
-;Type=Image
-;Name=bitmaps\accnt.bmp
-;Value=
-;Start_x=219
-;Start_y=83
-;Width=183
-;Height=157
+Height=60
diff --git a/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini b/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
index 69e167fe177..36237ea6a1d 100644
--- a/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
@@ -56,15 +56,15 @@ Help=Branding.txt
 
 Type=Image
 
-Name=netscape.bmp
+Name=banner6.bmp
 
 Value=
 
-Start_x=7
+Start_x=0
 
-Start_y=7
+Start_y=0
 
-Width=64
+Width=425
 
 Height=56
 
@@ -78,11 +78,11 @@ Type=Text
 
 Name=Text23
 
-Value=Customize the installer.
+Value=You can customize the Splash Screen and text that appear during installation.
 
-Start_x=57
+Start_x=3
 
-Start_y=41
+Start_y=31
 
 Width=294
 
@@ -96,7 +96,7 @@ Type=GroupBox
 
 Name=GroupBox6
 
-Value=Installer Splash Screen
+Value=Splash Screen
 
 Start_x=3
 
@@ -120,7 +120,7 @@ Start_x=13
 
 Start_y=65
 
-Width=200
+Width=300
 
 Height=25
 
@@ -132,13 +132,13 @@ Type=Text
 
 Name=Text25
 
-Value=Enter the path to your custom bitmap (setup.bmp) for the Installer splash screen:
+Value=Location of your custom splash screen bitmap (setup.bmp) file (390 pixels x 261 pixels):
 
 Start_x=13
 
 Start_y=85
 
-Width=178
+Width=300
 
 Height=20
 
@@ -154,7 +154,7 @@ Value=
 
 Start_x=11
 
-Start_y=107
+Start_y=97
 
 Width=179
 
@@ -172,7 +172,7 @@ Value=Browse
 
 Start_x=195
 
-Start_y=107
+Start_y=97
 
 Width=40
 
@@ -194,11 +194,11 @@ Name=GroupBox5
 
 Value=Installer Screen Text
 
-Start_x=4
+Start_x=3
 
 Start_y=133
 
-Width=399
+Width=402
 
 Height=67
 
@@ -284,9 +284,9 @@ Name=Button133
 
 Value=Show Example
 
-Start_x=272
+Start_x=330
 
-Start_y=166
+Start_y=180
 
 Width=60
 
@@ -308,9 +308,9 @@ Name=Button116
 
 Value=Show Example
 
-Start_x=252
+Start_x=330
 
-Start_y=105
+Start_y=108
 
 Width=60
 
@@ -322,114 +322,3 @@ function=DisplayImage
 
 parameters=splash.ini
 
-
-
-
-[Widget 11]
-
-Type=Text
-
-Name=Text26
-
-Value=Page 4 of 4
-
-Description=Current Page
-
-Start_x=152
-
-Start_y=16
-
-Width=40
-
-Height=8
-
-
-
-
-
-[Widget 12]
-
-Type=Text
-
-Name=Text27
-
-Value=Customize
-
-Description=Navigation Status
-
-Start_x=210
-
-Start_y=7
-
-Width=44
-
-Height=9
-
-
-
-
-
-[Widget 13]
-
-Type=Text
-
-Name=Text28
-
-Value=Account Setup
-
-Description=Navigation Status
-
-Start_x=267
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 14]
-
-Type=Text
-
-Name=Text29
-
-Value=Build Installer(s)
-
-Description=Navigation Status
-
-Start_x=338
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 15]
-
-Type=Text
-
-Name=Text30
-
-Value=Brand
-
-Description=Current Page
-
-Start_x=161
-
-Start_y=7
-
-Width=27
-
-Height=9
-
-
-
diff --git a/mozilla/cck/cckwiz/iniFiles/CheckList.ini b/mozilla/cck/cckwiz/iniFiles/CheckList.ini
index d51c810a5f9..67f16707d2a 100644
--- a/mozilla/cck/cckwiz/iniFiles/CheckList.ini
+++ b/mozilla/cck/cckwiz/iniFiles/CheckList.ini
@@ -27,19 +27,19 @@ Help=Checklist.txt
 
 [Image 1]
 Type=Image
-Name=netscape.bmp
+Name=banner1.bmp
 Value=
-Start_x=7
-Start_y=7
-Width=64
+Start_x=0
+Start_y=0
+Width=425
 Height=56
 
 [Widget 19]
 Type=Button
 Name=Button142
-Value=New Configuration
-Start_x=10
-Start_y=225
+Value=New
+Start_x=300
+Start_y=208
 Width=77
 Height=17
 dll=NULL
@@ -49,39 +49,29 @@ target=CustomizationList
 [Widget 1]
 Type=Text
 Name=Text31
-Value=Welcome to the Netscape Client Customization Kit (CCK) Wizard!
-Start_x=97
-Start_y=7
-Width=215
+Value=This wizard helps you create customized Netscape Communicator installers that you can distribute to your users.
+Start_x=7
+Start_y=24
+Width=350
 Height=11
 
 
 [Widget 2]
 Type=Text
 Name=Text32
-Value=The CCK Wizard lets you create customized Netscape Communicator installers that you can distribute to your users.
-Start_x=97
-Start_y=18
+Value=Before you begin:
+Start_x=7
+Start_y=34
 Width=231
 Height=20
 
 
-[Widget 3]
-Type=Text
-Name=Text33
-Value=Before you begin, you should prepare any customization files that you intend to use, such as:
-Start_x=97
-Start_y=93
-Width=237
-Height=18
-
-
 [Widget 4]
 Type=ComboBox
 Name=CustomizationList
 Value=
 Start_x=98
-Start_y=225
+Start_y=220
 Width=185
 Height=99
 subsection=Options for ComboBox1
@@ -94,19 +84,19 @@ parameters=cckwiz\customizations\*.*
 [Widget 5]
 Type=Text
 Name=Text34
-Value=If you're ready to begin, select New... to create a new installer configuration. To edit an existing configuration, select it and then click Next, or click Create a copy... to copy an existing configuration.
-Start_x=98
+Value=To create a new installer configuration, click "New". To edit an existing configuration, select it from the drop down list below and then click "Next", or click "Create a Copy" to copy an existing configuration.
+Start_x=7
 Start_y=188
-Width=237
+Width=400
 Height=26
 
 
 [Widget 6]
 Type=Text
 Name=Text35
-Value=A bookmarks file
-Start_x=110
-Start_y=113
+Value=* Bookmarks file
+Start_x=20
+Start_y=98
 Width=123
 Height=9
 
@@ -114,79 +104,59 @@ Height=9
 [Widget 7]
 Type=Text
 Name=Text36
-Value=A Read Me file and license file
-Start_x=109
-Start_y=134
-Width=124
+Value=* Read Me and License Agreement files
+Start_x=20
+Start_y=117
+Width=200
 Height=9
 
 
 [Widget 8]
 Type=Text
 Name=Text37
-Value=A custom animation
-Start_x=110
-Start_y=123
-Width=120
+Value=* Small and large custom animation files
+Start_x=20
+Start_y=108
+Width=200
 Height=9
 
 
 [Widget 9]
 Type=Text
 Name=Text38
-Value=Background bitmap for CD shell (for CD-based installers)
-Start_x=109
-Start_y=154
-Width=206
+Value=* Background bitmap for CD Autorun screen (for CD-based installers)
+Start_x=20
+Start_y=136
+Width=300
 Height=11
 
 
 [Widget 10]
 Type=Text
 Name=Text39
-Value=Splash screen for the installer
-Start_x=109
-Start_y=144
-Width=103
-Height=11
+Value=* Splash screen for the Communicator installer
+Start_x=20
+Start_y=127
+Width=200
+Height=9
 
 
 [Widget 11]
 Type=Text
 Name=Text40
-Value=Custom bitmap for Account Setup screens
-Start_x=109
-Start_y=165
-Width=187
+Value=* Custom logo bitmap for Internet Setup screens (only for installers that include Internet Setup)
+Start_x=20
+Start_y=146
+Width=300
 Height=11
 
 
 [Widget 12]
 Type=Text
 Name=Text41
-Value=This wizard guides you through four stages:
-Start_x=97
-Start_y=37
-Width=206
-Height=10
-
-
-[Widget 13]
-Type=Text
-Name=Text42
-Value=Stage 2: Customize Communicator
-Start_x=98
-Start_y=60
-Width=206
-Height=10
-
-
-[Widget 14]
-Type=Text
-Name=Text43
-Value=Stage 3: Provide connection information
-Start_x=97
-Start_y=70
+Value=1. Decide on the type of installer(s) you want to create:
+Start_x=7
+Start_y=45
 Width=206
 Height=10
 
@@ -194,39 +164,58 @@ Height=10
 [Widget 15]
 Type=Text
 Name=Text44
-Value=Stage 4: Build your installer(s)
-Start_x=98
-Start_y=80
-Width=206
-Height=10
+Value=For instructions on creating these files, click the Help button on each wizard screen, or see the "Netscape Communicator Administrator's Guide" included on your CCK CD (and also available in print from Netscape Press).
+Start_x=7
+Start_y=165
+Width=400
+Height=30
 
 
 [Widget 16]
 Type=Text
 Name=Text45
-Value=Third-party installers
-Start_x=109
-Start_y=175
-Width=187
+Value=* Third-party installers (.exe files)
+Start_x=20
+Start_y=156
+Width=200
 Height=11
 
 
 [Widget 17]
 Type=Text
 Name=Text46
-Value=Stage1: Add your branding
-Start_x=98
-Start_y=50
-Width=206
-Height=10
+Value=* CD-based installer or network-downloadable installer?  (you can create one or both during the same wizard session)
+Start_x=20
+Start_y=57
+Width=370
+Height=10
+
+[Widget 13]
+Type=Text
+Name=Text42
+Value=* Include Internet Setup?  (configures Communicator and users's dialer software so that users can connect to your network using a standard modem and phone line)
+Start_x=20
+Start_y=67
+Width=350
+Height=20
+
+[Widget 14]
+Type=Text
+Name=Text43
+Value=2. Decide which customizations you want to make and create the customized files that you want to use, such as:
+Start_x=7
+Start_y=87
+Width=400
+Height=15
+
 
 
 [Widget 18]
 Type=Button
 Name=Button8
-Value=Create a copy...
-Start_x=297
-Start_y=225
+Value=Create a Copy
+Start_x=300
+Start_y=228
 Width=77
 Height=17
 dll=NULL
diff --git a/mozilla/cck/cckwiz/iniFiles/Customize_page1.ini b/mozilla/cck/cckwiz/iniFiles/Customize_page1.ini
index 9e2166119be..3a12f94f3ba 100644
--- a/mozilla/cck/cckwiz/iniFiles/Customize_page1.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Customize_page1.ini
@@ -27,29 +27,38 @@ Help=customize.txt
 
 [Image 1]
 Type=Image
-Name=netscape.bmp
+Name=banner4.bmp
 Value=
-Start_x=7
-Start_y=7
-Width=64
+Start_x=0
+Start_y=0
+Width=425
 Height=56
 
 
 [Widget 1]
 Type=GroupBox
 Name=GroupBox11
-Value=Set Navigator's Default Home Page
-Start_x=3
-Start_y=56
+Value=Default Home Page
+Start_x=2
+Start_y=46
 Width=401
 Height=52
 
 [Widget 2]
 Type=Text
 Name=Text80
-Value=This is the page users will see when they first start Navigator. Clicking the Home Button will also take users to the home page you specify:
+Value=This page is displayed when users first start the Netscape browser, or when they click the Home button.
 Start_x=9
-Start_y=69
+Start_y=57
+Width=392
+Height=17
+
+[Widget 251]
+Type=Text
+Name=Text8023
+Value=Home Page URL:
+Start_x=9
+Start_y=68
 Width=392
 Height=17
 
@@ -59,7 +68,7 @@ Type=EditBox
 Name=HomePageURL
 Value=
 Start_x=8
-Start_y=88
+Start_y=78
 Width=206
 Height=13
 
@@ -67,8 +76,8 @@ Height=13
 Type=Button
 Name=Button118
 Value=Show Example
-Start_x=223
-Start_y=88
+Start_x=339
+Start_y=78
 Width=60
 Height=14
 dll=NULL
@@ -78,38 +87,48 @@ parameters=home.ini
 [Widget 4]
 Type=GroupBox
 Name=GroupBox12
-Value=Add My Command to Help Menu
+Value=Bookmarks and Personal Toolbar Buttons
 Start_x=3
-Start_y=115
+Start_y=102
 Width=401
-Height=70
+Height=55
 
 
 [Widget 5]
 Type=Text
 Name=Text81
-Value=Name of command to be added to the Help Menu for your online customer support page:
-Start_x=9
-Start_y=128
-Width=300
-Height=8
+Value=You can add an item to the Help Menu which provides a link to your online customer support page:
+Start_x=8
+Start_y=173
+Width=350
+Height=9
+
+[Widget 796]
+Type=Text
+Name=Text825
+Value=Menu Item Text:
+Start_x=8
+Start_y=184
+Width=199
+Height=10
+
 
 
 [Widget 6]
 Type=EditBox
 Name=HelpMenuCommandName
 Value=
-Start_x=8
-Start_y=136
-Width=257
+Start_x=6
+Start_y=194
+Width=258
 Height=14
 
 [Widget 20]
 Type=Button
 Name=Button119
 Value=Show Example
-Start_x=279
-Start_y=139
+Start_x=340
+Start_y=221
 Width=60
 Height=14
 dll=NULL
@@ -119,46 +138,46 @@ parameters=help.ini
 [Widget 7]
 Type=Text
 Name=Text82
-Value=Customer Support Page URL:
-Start_x=9
-Start_y=155
+Value=Help Menu Item URL:
+Start_x=7
+Start_y=210
 Width=199
-Height=8
+Height=10
 
 
 [Widget 8]
 Type=EditBox
 Name=HomeMenuCommandURL
 Value=
-Start_x=9
-Start_y=165
+Start_x=6
+Start_y=220
 Width=257
 Height=14
 
 [Widget 9]
 Type=GroupBox
 Name=GroupBox13
-Value=Use My Custom Bookmarks and Personal Toolbar Buttons
+Value=Help Menu
 Start_x=2
-Start_y=186
+Start_y=162
 Width=403
-Height=57
+Height=79
 
 [Widget 50]
 Type=Text
 Name=Text100
 Value=The bookmarks file stores your custom bookmarks and personal toolbar buttons.
-Start_x=8
-Start_y=199
+Start_x=11
+Start_y=114
 Width=299
-Height=11
+Height=10
 
 [Widget 10]
 Type=Text
 Name=Text83
-Value=Path to Bookmarks File (bookmark.htm):
-Start_x=8
-Start_y=210
+Value=Location of Bookmarks (bookmark.htm) File:
+Start_x=12
+Start_y=128
 Width=150
 Height=8
 
@@ -167,8 +186,8 @@ Height=8
 Type=EditBox
 Name=CustomBookmarkFile
 Value=
-Start_x=6
-Start_y=221
+Start_x=11
+Start_y=138
 Width=155
 Height=14
 
@@ -176,8 +195,8 @@ Height=14
 Type=Button
 Name=Button17
 Value=Browse
-Start_x=165
-Start_y=221
+Start_x=180
+Start_y=138
 Width=40
 Height=14
 dll=NULL
@@ -187,8 +206,8 @@ function=BrowseFile
 Type=Button
 Name=Button120
 Value=Show Example
-Start_x=220
-Start_y=221
+Start_x=340
+Start_y=137
 Width=60
 Height=14
 dll=NULL
@@ -198,64 +217,11 @@ parameters=bkmk.ini
 [Widget 13]
 Type=Text
 Name=Text84
-Value=Specify the home page, customer support URL, custom bookmarks, and personal toolbar buttons.
-Start_x=61
-Start_y=39
-Width=336
-Height=12
+Value=You can specify the Netscape browser default home page, bookmarks, personal toolbar buttons, and also add your customer support URL to the Help Menu.
+Start_x=8
+Start_y=26
+Width=390
+Height=18
 
 
-[Widget 14]
-Type=Text
-Name=Text85
-Value=Page 1 of 3
-Description=Current Page
-Start_x=207
-Start_y=17
-Width=40
-Height=8
-
-
-[Widget 15]
-Type=Text
-Name=Text86
-Value=Customize
-Description=Current Page
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 16]
-Type=Text
-Name=Text87
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 17]
-Type=Text
-Name=Text88
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 18]
-Type=Text
-Name=Text89
-Value=Brand
-Description=Navigation Status
-Start_x=161
-Start_y=7
-Width=27
-Height=9
 
diff --git a/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini b/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
index bbcf0c3d7a8..440379b871e 100644
--- a/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
@@ -56,15 +56,15 @@ Help=customize.txt
 
 Type=Image
 
-Name=netscape.bmp
+Name=banner5.bmp
 
 Value=
 
-Start_x=7
+Start_x=0
 
-Start_y=7
+Start_y=0
 
-Width=64
+Width=425
 
 Height=56
 
@@ -78,15 +78,15 @@ Type=Text
 
 Name=Text1
 
-Value=Specify the Start Menu settings and the paths to your custom Read Me and License Agreement files.
+Value=You can modify the Netscape Communicator name that appears in the Start Menu, and provide your own Read Me and License Agreement files to replace the standard ones.
 
-Start_x=59
+Start_x=3
 
-Start_y=36
+Start_y=25
 
-Width=322
+Width=375
 
-Height=13
+Height=25
 
 
 
@@ -102,7 +102,7 @@ Value=
 
 Start_x=7
 
-Start_y=95
+Start_y=80
 
 Width=224
 
@@ -116,11 +116,11 @@ Type=Text
 
 Name=Text2
 
-Value=Enter the additional text that you want to include in the Netscape Communicator Program Folder name in the Start Menu. You must include the words "Netscape Communicator" in the Program Folder name, but you can add your own additional text:
+Value=The words "Netscape Communicator" must remain part of the Program Folder name in the Start Menu, but you can include additional text after the words "Netscape Communicator":
 
 Start_x=8
 
-Start_y=68
+Start_y=60
 
 Width=375
 
@@ -128,6 +128,21 @@ Height=25
 
 
 
+[Widget 361]
+
+Type=Text
+
+Name=Text2056
+
+Value=Create the following icons in the Start Menu:
+
+Start_x=8
+
+Start_y=98
+
+Width=140
+
+Height=13
 
 
 [Widget 4]
@@ -138,38 +153,15 @@ Name=CreateReadmeIcon
 
 Value=
 
-Title=Create Readme icon in Start menu
+Title=Readme
 
 Start_x=8
 
-Start_y=115
+Start_y=110
 
-Width=143
+Width=50
 
-Height=10
-
-
-[Widget 65]
-
-Type=Button
-
-Name=Button222
-
-Value=Show Example
-
-Start_x=250
-
-Start_y=95
-
-Width=60
-
-Height=14
-
-dll=NULL
-
-function=DisplayImage
-
-parameters=folder.ini
+Height=10
 
 
 
@@ -181,13 +173,13 @@ Name=CreateLicenseIcon
 
 Value=
 
-Title=Create License icon in Start menu
+Title=License Agreement
 
 Start_x=8
 
-Start_y=128
+Start_y=123
 
-Width=143
+Width=80
 
 Height=10
 
@@ -200,18 +192,33 @@ Type=GroupBox
 
 Name=GroupBox22
 
-Value=Start Menu Settings
+Value=Start Menu
 
 Start_x=3
 
-Start_y=57
+Start_y=47
 
 Width=400
 
-Height=186
+Height=95
 
 
 
+[Widget 2683]
+
+Type=GroupBox
+
+Name=GroupBox226
+
+Value=Read Me and License Agreement Files
+
+Start_x=3
+
+Start_y=147
+
+Width=400
+
+Height=98
 
 
 
@@ -224,11 +231,11 @@ Name=ReadMeFile
 
 Value=
 
-Start_x=8
+Start_x=7
 
-Start_y=186
+Start_y=190
 
-Width=168
+Width=224
 
 Height=14
 
@@ -242,9 +249,9 @@ Name=Button2
 
 Value=Browse
 
-Start_x=179
+Start_x=240
 
-Start_y=186
+Start_y=189
 
 Width=35
 
@@ -266,7 +273,7 @@ Value=Path to Read Me file (readme.txt):
 
 Start_x=8
 
-Start_y=172
+Start_y=181
 
 Width=150
 
@@ -282,11 +289,11 @@ Name=LicenseFile
 
 Value=
 
-Start_x=8
+Start_x=7
 
-Start_y=218
+Start_y=221
 
-Width=168
+Width=224
 
 Height=14
 
@@ -300,9 +307,9 @@ Name=Button1
 
 Value=Browse
 
-Start_x=179
+Start_x=240
 
-Start_y=218
+Start_y=221
 
 Width=35
 
@@ -322,9 +329,9 @@ Name=Button121
 
 Value=Show Example
 
-Start_x=155
+Start_x=335
 
-Start_y=120
+Start_y=122
 
 Width=60
 
@@ -348,7 +355,7 @@ Value=Path to License Agreement file (license.txt):
 
 Start_x=8
 
-Start_y=207
+Start_y=211
 
 Width=150
 
@@ -368,34 +375,11 @@ Value=Enter the paths to your custom Read Me and License Agreement files. If you
 
 Start_x=10
 
-Start_y=150
+Start_y=159
 
-Width=300
+Width=380
 
-Height=22
-
-
-[Widget 6532]
-
-Type=Button
-
-Name=Button2932
-
-Value=Show Example
-
-Start_x=250
-
-Start_y=187
-
-Width=60
-
-Height=14
-
-dll=NULL
-
-function=DisplayImage
-
-parameters=readme.ini
+Height=25
 
 
 [Widget 8038]
@@ -406,9 +390,9 @@ Name=Button8512
 
 Value=Show Example
 
-Start_x=250
+Start_x=335
 
-Start_y=217
+Start_y=225
 
 Width=60
 
@@ -420,108 +404,6 @@ function=DisplayImage
 
 parameters=license.ini
 
-[Widget 14]
-
-Type=Text
-
-Name=Text6
-
-Value=Page 3 of 3
-
-Description=Current Page
-
-Start_x=207
-
-Start_y=16
-
-Width=38
-
-Height=8
 
 
 
-
-
-[Widget 15]
-
-Type=Text
-
-Name=Text7
-
-Value=Customize
-
-Description=Current Page
-
-Start_x=210
-
-Start_y=7
-
-Width=44
-
-Height=9
-
-
-
-
-
-[Widget 16]
-
-Type=Text
-
-Name=Text8
-
-Value=Account Setup
-
-Description=Navigation Status
-
-Start_x=267
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 17]
-
-Type=Text
-
-Name=Text9
-
-Value=Build Installer(s)
-
-Description=Navigation Status
-
-Start_x=338
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 18]
-
-Type=Text
-
-Name=Text10
-
-Value=Brand
-
-Description=Navigation Status
-
-Start_x=161
-
-Start_y=7
-
-Width=27
-
-Height=9
diff --git a/mozilla/cck/cckwiz/iniFiles/Done.ini b/mozilla/cck/cckwiz/iniFiles/Done.ini
index 2c7626c87b4..e41e73af33f 100644
--- a/mozilla/cck/cckwiz/iniFiles/Done.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Done.ini
@@ -7,14 +7,31 @@ Caption=1st level node
 
 [Navigation Controls]
 onNext=
-Help=Branding.txt
+Help=Branding.txt
+
+[Image 1]
+
+Type=Image
+
+Name=banner11.bmp
+
+Value=
+
+Start_x=0
+
+Start_y=0
+
+Width=425
+
+Height=56
+
 
 [Widget 1]
 Type=Text
 Name=Text111
-Value=A CD layout has been created for your customized Communicator.
+Value=Installer creation is complete.
 Start_x=11
-Start_y=9
+Start_y=50
 Width=264
 Height=12
 
@@ -22,10 +39,10 @@ Height=12
 [Widget 5]
 Type=Text
 Name=Text113
-Value=Done.
+Value=The following custom installer(s) have been created: (lists name and location of each)
 Start_x=11
-Start_y=25
-Width=41
+Start_y=75
+Width=300
 Height=10
 
 
diff --git a/mozilla/cck/cckwiz/iniFiles/Info.ini b/mozilla/cck/cckwiz/iniFiles/Info.ini
new file mode 100644
index 00000000000..c9542adeb5f
--- /dev/null
+++ b/mozilla/cck/cckwiz/iniFiles/Info.ini
@@ -0,0 +1,176 @@
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+; 
+;  The contents of this file are subject to the Netscape Public License
+;  Version 1.0 (the "NPL"); you may not use this file except in
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+;  http://www.mozilla.org/NPL/
+; 
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+;  for the specific language governing rights and limitations under the
+;  NPL.
+; 
+;  The Initial Developer of this code under the NPL is Netscape
+;  Communications Corporation.  Portions created by Netscape are
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+;  Reserved.
+;
+
+[Local Variables]
+Name=Customize_page2
+Title=CCK Wizard
+Caption=2nd level node
+
+[Navigation Controls]
+onNext=
+Help=info.txt
+
+[Image 1]
+Type=Image
+Name=banner2.bmp
+Value=
+Start_x=0
+Start_y=0
+Width=425
+Height=56
+
+
+[Widget 2]
+Type=Text
+Name=Text102
+Value=Your answers to the following questions will help the wizard determine what type of Communicator installer(s) you want to create.
+Start_x=6
+Start_y=24
+Width=382
+Height=19
+
+[Widget 1894] 
+Type=CheckBox 
+Name=CD image 
+Value=
+Title=CD-ready installer (for distributing Communicator on CD). You'll be able to customize the CD Autorun screen.
+Start_x=6
+Start_y=54
+Width=350
+Height=13
+
+[Widget 1895] 
+Type=CheckBox 
+Name=Network 
+Value=
+Title=Network-ready installer (for distributing Communicator by having users download it from your FTP site)
+Start_x=6
+Start_y=70
+Width=330
+Height=13
+
+[Widget 1896]
+Type=Text
+Name=Text8302
+Value=Internet Setup is an application that lets users easily create new Internet accounts or set up Communicator to connect to an existing account that they've already established with you. Internet Setup also configures users's dialer software so that they can connect to their accounts using a modem and phone line. Internet Setup does not support ISDN, DSL, or T1 connections.
+Start_x=6
+Start_y=121
+Width=400
+Height=45
+
+[Widget 1897] 
+Type=CheckBox 
+Name=Include Internet Setup
+Value=
+Title=Include Internet Setup in your installer
+Start_x=6
+Start_y=148
+Width=144
+Height=13
+
+
+
+[Widget 3]
+Type=GroupBox
+Name=GroupBox15
+Value=Company Identifier
+Start_x=3
+Start_y=165
+Width=396
+Height=80
+
+
+[Widget 4]
+Type=Text
+Name=Text103
+Value=URL for your FTP server's download directory:
+Start_x=25
+Start_y=103
+Width=148
+Height=15
+
+[Widget 5509]
+Type=EditBox
+Name=FTPLocation
+Value=
+Start_x=175
+Start_y=100
+Width=188
+Height=15
+
+[Widget 472]
+Type=Text
+Name=Text10389
+Value=Enter the complete URL to your FTP server's download directory where users will go to download the installer (e.g., FTP://ftp.netadvantage.com/communicator/download).
+Start_x=25
+Start_y=83
+Width=370
+Height=20
+
+
+[Widget 4937]
+Type=Text
+Name=Text174
+Value=Enter your company identifier (up to 10 characters; no spaces):
+Start_x=8
+Start_y=215
+Width=292
+Height=10
+
+
+
+[Widget 5]
+Type=EditBox
+Name=OrganizationName
+Value=
+Start_x=8
+Start_y=226
+Width=95
+Height=13
+
+[Widget 2062]
+Type=Button
+Name=Button1195
+Value=Show Example
+Start_x=322
+Start_y=224
+Width=62
+Height=15
+dll=NULL
+function=DisplayImage
+parameters=string.ini
+
+
+[Widget 6]
+Type=Text
+Name=Text104
+Value=Type of installer(s) you want to create:
+Start_x=7
+Start_y=43
+Width=126
+Height=12
+
+
+[Widget 7]
+Type=Text
+Name=Text105
+Value=The Company Identifier is included as part of Navigator's user agent string and allows Netscape to track the number of customized browsers distributed by your company. For example, if your company name is Net Advantage, you can enter NETADVANTA as your company identifier. The resulting user agent string would be: Mozilla/4.5[en]{C-UDP;NETADVANTA} (Win95;I).
+Start_x=6
+Start_y=178
+Width=390
+Height=35
diff --git a/mozilla/cck/cckwiz/iniFiles/build_page1.ini b/mozilla/cck/cckwiz/iniFiles/build_page1.ini
index a21957a4ae7..b2537537cd2 100644
--- a/mozilla/cck/cckwiz/iniFiles/build_page1.ini
+++ b/mozilla/cck/cckwiz/iniFiles/build_page1.ini
@@ -58,15 +58,15 @@ Help=Installer.txt
 
 Type=Image
 
-Name=netscape.bmp
+Name=banner10.bmp
 
 Value=
 
-Start_x=7
+Start_x=0
 
-Start_y=7
+Start_y=0
 
-Width=64
+Width=425
 
 Height=56
 
@@ -84,9 +84,9 @@ Value=
 
 Start_x=10
 
-Start_y=77
+Start_y=92
 
-Width=117
+Width=119
 
 Height=76
 
@@ -123,7 +123,7 @@ Value=Components:
 
 Start_x=11
 
-Start_y=63
+Start_y=78
 
 Width=80
 
@@ -139,15 +139,33 @@ Type=Text
 
 Name=Text12
 
-Value=Select the components you want to include in your installer, and build your installers.
+Value=Select the components you want to include in your installer(s), and include any additional components as necessary. Once you are finished, click "Build Installers" to create your custom installer(s).
 
-Start_x=15
+Start_x=7
 
-Start_y=32
+Start_y=25
 
-Width=361
+Width=400
+
+Height=20
+
+
+[Widget 13]
+
+Type=Text
+
+Name=Text291
+
+Value=To see a summary of your customizations before you build your installer(s), click "Show Summary".
+
+Start_x=7
+
+Start_y=45
+
+Width=315
+
+Height=20
 
-Height=11
 
 
 
@@ -163,9 +181,9 @@ Value=You can add installers for two other products below.  Each must be in a si
 
 Start_x=150
 
-Start_y=58
+Start_y=75
 
-Width=242
+Width=250
 
 Height=29
 
@@ -183,7 +201,7 @@ Value=
 
 Start_x=150
 
-Start_y=100
+Start_y=108
 
 Width=162
 
@@ -199,9 +217,9 @@ Name=Button3
 
 Value=Browse
 
-Start_x=326
+Start_x=330
 
-Start_y=100
+Start_y=108
 
 Width=36
 
@@ -223,7 +241,7 @@ Value=
 
 Start_x=150
 
-Start_y=124
+Start_y=139
 
 Width=162
 
@@ -239,9 +257,9 @@ Name=Text14
 
 Value=Size (in bytes):
 
-Start_x=320
+Start_x=330
 
-Start_y=114
+Start_y=128
 
 Width=50
 
@@ -259,7 +277,7 @@ Value=Component Description:
 
 Start_x=151
 
-Start_y=114
+Start_y=127
 
 Width=100
 
@@ -276,9 +294,9 @@ Value=
 
 Start_x=330
 
-Start_y=126
+Start_y=139
 
-Width=25
+Width=45
 
 Height=14
 
@@ -293,7 +311,7 @@ Value=Path to executable (.exe) file of your custom component:
 
 Start_x=150
 
-Start_y=88
+Start_y=96
 
 Width=183
 
@@ -304,13 +322,13 @@ Height=11
 
 Type=EditBox
 
-Name=CustomComponent37
+Name=CustomComponent137
 
 Value=
 
 Start_x=150
 
-Start_y=154
+Start_y=184
 
 Width=164
 
@@ -326,9 +344,9 @@ Name=Button386
 
 Value=Browse
 
-Start_x=329
+Start_x=331
 
-Start_y=156
+Start_y=185
 
 Width=36
 
@@ -344,13 +362,13 @@ function=BrowseFile
 
 Type=EditBox
 
-Name=CustomComponent3
+Name=CustomComponent23
 
 Value=
 
 Start_x=150
 
-Start_y=182
+Start_y=221
 
 Width=162
 
@@ -368,7 +386,7 @@ Value=Component Description:
 
 Start_x=150
 
-Start_y=170
+Start_y=210
 
 Width=117
 
@@ -384,9 +402,9 @@ Name=Text1489
 
 Value=Size (in bytes):
 
-Start_x=320
+Start_x=330
 
-Start_y=170
+Start_y=210
 
 Width=51
 
@@ -403,9 +421,9 @@ Value=
 
 Start_x=330
 
-Start_y=182
+Start_y=222
 
-Width=25
+Width=45
 
 Height=14
 
@@ -420,37 +438,13 @@ Value=Path to executable (.exe) file of your custom component:
 
 Start_x=151
 
-Start_y=142
+Start_y=172
 
 Width=183
 
 Height=11
 
 
-
-[Widget 12]
-
-Type=Text
-
-Name=Text17
-
-Value=Page 1 of 2
-
-Description=Current Page
-
-Start_x=344
-
-Start_y=19
-
-Width=46
-
-Height=9
-
-
-
-
-
-
 [Widget 16]
 
 Type=GroupBox
@@ -461,11 +455,11 @@ Value=Select Components
 
 Start_x=3
 
-Start_y=47
+Start_y=62
 
-Width=133
+Width=135
 
-Height=140
+Height=160
 
 
 [Widget 1306]
@@ -478,11 +472,11 @@ Value=Description
 
 Start_x=10
 
-Start_y=160
+Start_y=175
 
-Width=120
+Width=118
 
-Height=20
+Height=40
 
 
 
@@ -496,74 +490,11 @@ Value=Provide Additional Components
 
 Start_x=145
 
-Start_y=47
+Start_y=62
 
 Width=260
 
-Height=150
-
-;--
-
-[Widget 13]
-
-Type=GroupBox
-
-Name=GroupBox23
-
-Value=Choose installers to create
-
-Start_x=3
-
-Start_y=195
-
-Width=402
-
-Height=50
-
-
-
-
-
-[Widget 14]
-
-Type=CheckBox
-
-Name=CreateCDImage
-
-Value=
-
-Title=Create CD image
-
-Start_x=12
-
-Start_y=205
-
-Width=111
-
-Height=13
-
-
-
-
-
-[Widget 15]
-
-Type=CheckBox
-
-Name=CreateNetworkDownloadable
-
-Value=
-
-Title=Create Network-downloadable installer
-
-Start_x=12
-
-Start_y=218
-
-Width=140
-
-Height=12
-
+Height=183
 
 
 [Widget 17]
@@ -572,13 +503,13 @@ Type=Button
 
 Name=Button5
 
-Value=Show Summary...
+Value=Show Summary
 
-Start_x=165
+Start_x=330
 
-Start_y=209
+Start_y=43
 
-Width=101
+Width=75
 
 Height=15
 
@@ -597,7 +528,7 @@ Width=101
 Height=15
 
 
-[Widget 144]
+;[Widget 144]
 
 Type=Text
 
@@ -613,133 +544,3 @@ Width=115
 
 Height=8
 
-
-[Widget 867]
-
-Type=EditBox
-
-Name=FTPLocation
-
-Value=
-
-Start_x=155
-
-Start_y=227
-
-Width=162
-
-Height=14
-
-;--
-
-
-[Widget 21]
-
-Type=Text
-
-Name=Text19
-
-Value=Customize
-
-Description=Navigation Status
-
-Start_x=210
-
-Start_y=7
-
-Width=44
-
-Height=9
-
-
-
-
-
-[Widget 22]
-
-Type=Text
-
-Name=Text20
-
-Value=Account Setup
-
-Description=Navigation Status
-
-Start_x=267
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 23]
-
-Type=Text
-
-Name=Text21
-
-Value=Build Installer(s)
-
-Description=Current Page
-
-Start_x=338
-
-Start_y=7
-
-Width=52
-
-Height=9
-
-
-
-
-
-[Widget 24]
-
-Type=Text
-
-Name=Text22
-
-Value=Brand
-
-Description=Navigation Status
-
-Start_x=161
-
-Start_y=7
-
-Width=27
-
-Height=9
-
-
-
-
-
-;[Widget 25]
-
-;Type=Button
-
-;Name=Button6
-
-;Value=Build Installers
-
-;Start_x=272
-
-;Start_y=219
-
-;Width=85
-
-;Height=15
-
-;dll=IBEngine.dll
-
-;function=BrowseFile
-
-
-