diff --git a/cck/cckcd/shell/nsetup32/rshell.ini b/cck/cckcd/shell/nsetup32/rshell.ini
index ec013867d4f..e87f63f1adb 100644
--- a/cck/cckcd/shell/nsetup32/rshell.ini
+++ b/cck/cckcd/shell/nsetup32/rshell.ini
@@ -470,10 +470,11 @@ button1_bitmaps=..\bmps\comm_up.bmp,..\bmps\comm_dn.bmp,..\bmps\comm_mo.bmp,..\b
 ; Selected and disabled are optional
 
 ;---------------------------------------
+button_cmdline=exe,..\..\Comm\Setup.exe
 
 ; defines button action
 
-; a button click can cause any of 7 actions:
+; a button click can cause any of 6 actions:
 
 ; 1) launch a program:  button1_cmdline=exe,program name
 
@@ -529,24 +530,6 @@ button1_bitmaps=..\bmps\comm_up.bmp,..\bmps\comm_dn.bmp,..\bmps\comm_mo.bmp,..\b
 ;  type may be an html file, or a .gif, or, if a plug-in is already installed,
 ;  it could be an Adobe .pdf...
 
-; 7) put shortcut on desktop:
-
-;  button1_cmdline=desktop,file or directory name,shortcut name,icon file
-
-;    e.g.:  button1_cmdline=desktop,help.html,Netscape ReadMe,help.ico
-
-;  or
-
-;    e.g.: button1_cmdline=desktop,clipart\,Bonus Clipart,clipart\clipart.ico
-
-;  when the 1st argument is desktop, a desktop shortcut (with icon) will
-;  be created that launches/opens that file or directory. The follow-on
-;  arguments point to the file or directory, and also give the name to be
-;  given to the shortcut and the path to the .ico icon file to be used for
-;  the shortcut. The path to any directory must be specified as an absolute
-;  path from the root of the CD. In the example above, it would open the 
-;  'clipart' directory that is at the root level of the CD.
-
 ;---------------------------------------
 button1_text_title=Netscape Client Customization Kit
 
@@ -652,6 +635,7 @@ col2_text_width=200
 ;========== buttons for dialog 2 ========== 
 
 button1_bitmaps=..\bmps\32b_up.bmp,..\bmps\32b_dn.bmp,..\bmps\32b_mo.bmp,..\bmps\32b_mo.bmp
+button1_cmdline=exe,..\..\apps\app1\app1.exe
 button1_text_title=Application1
 button1_text_body=descriptive text
 button1_offset=
@@ -730,6 +714,7 @@ col2_text_width=200
 ;========== buttons for dialog 3 ========== 
 
 button1_bitmaps=..\bmps\16b_up.bmp,..\bmps\16b_dn.bmp,..\bmps\16b_mo.bmp,..\bmps\16b_mo.bmp
+button1_cmdline=exe,..\..\plugins\plugin1\32plugin1.exe
 button1_text_title=Plug-in1
 button1_text_body=descriptive text
 button1_offset=
diff --git a/cck/customcd/shell/nsetup32/rshell.ini b/cck/customcd/shell/nsetup32/rshell.ini
index b5f882558d0..a4babdc2289 100644
--- a/cck/customcd/shell/nsetup32/rshell.ini
+++ b/cck/customcd/shell/nsetup32/rshell.ini
@@ -470,10 +470,11 @@ button1_bitmaps=..\bmps\comm_up.bmp,..\bmps\comm_dn.bmp,..\bmps\comm_mo.bmp,..\b
 ; Selected and disabled are optional
 
 ;---------------------------------------
+button1_cmdline=exe,..\..\Comm\Setup.exe
 
 ; defines button action
 
-; a button click can cause any of 7 actions:
+; a button click can cause any of 6 actions:
 
 ; 1) launch a program:  button1_cmdline=exe,program name
 
@@ -529,24 +530,6 @@ button1_bitmaps=..\bmps\comm_up.bmp,..\bmps\comm_dn.bmp,..\bmps\comm_mo.bmp,..\b
 ;  type may be an html file, or a .gif, or, if a plug-in is already installed,
 ;  it could be an Adobe .pdf...
 
-; 7) put shortcut on desktop:
-
-;  button1_cmdline=desktop,file or directory name,shortcut name,icon file
-
-;    e.g.:  button1_cmdline=desktop,help.html,Netscape ReadMe,help.ico
-
-;  or
-
-;    e.g.: button1_cmdline=desktop,clipart\,Bonus Clipart,clipart\clipart.ico
-
-;  when the 1st argument is desktop, a desktop shortcut (with icon) will
-;  be created that launches/opens that file or directory. The follow-on
-;  arguments point to the file or directory, and also give the name to be
-;  given to the shortcut and the path to the .ico icon file to be used for
-;  the shortcut. The path to any directory must be specified as an absolute
-;  path from the root of the CD. In the example above, it would open the 
-;  'clipart' directory that is at the root level of the CD.
-
 ;---------------------------------------
 button1_text_title=Navigator2000
 
@@ -650,6 +633,7 @@ col2_text_width=200
 ;========== buttons for dialog 2 ========== 
 
 button1_bitmaps=..\bmps\32b_up.bmp,..\bmps\32b_dn.bmp,..\bmps\32b_mo.bmp,..\bmps\32b_mo.bmp
+button1_cmdline=exe,..\..\apps\app1\app1.exe
 button1_text_title=Application1
 button1_text_body=descriptive text
 button1_offset=
@@ -728,6 +712,7 @@ col2_text_width=200
 ;========== buttons for dialog 3 ========== 
 
 button1_bitmaps=..\bmps\16b_up.bmp,..\bmps\16b_dn.bmp,..\bmps\16b_mo.bmp,..\bmps\16b_mo.bmp
+button1_cmdline=exe,..\..\plugins\plugin1\32plug1.exe
 button1_text_title=Plug-in1
 button1_text_body=descriptive text
 button1_offset=