diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 6fb74cf..2c90baa 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -133,14 +133,14 @@ del -sf "$InstallDir64$\"
 [LinkFolder_uninstall]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
+set_basefolder common_programs
+delete_subfolder $NAME$
 ;
 ; Example of deleting a shortcut from AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
+set_basefolder common_desktopdirectory
+set_subfolder ""
+delete_element $NAME$
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 0e13feb..057e44c 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -80,7 +80,7 @@ else
 		comment "Patch Registry"
 		Registry_install /32Bit
 		comment "Create shortcuts"
-		LinkFolder_install
+		LinkFolder_install_32
 	endif
 
 	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
@@ -94,7 +94,7 @@ else
 		comment "Patch Registry"
 		Registry_install /64Bit
 		comment "Create shortcuts"
-		LinkFolder_install
+		LinkFolder_install_64
 	endif
 	
 endif
@@ -129,39 +129,77 @@ copy -s "%ScriptPath%\X86_64\*.*" "$InstallDir64$"
 ; set "name2" = REG_DWORD:0001
 ; set "name3" = REG_BINARY:00 af 99 cd
 
-[LinkFolder_install]
+[LinkFolder_install_32]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
+set_basefolder common_programs
+delete_subfolder $NAME$
 ;
 ; Example of creating an shortcut to the installed exe in AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; set_subfolder $ProductId$
+set_basefolder common_programs
+set_subfolder $NAME$
 ;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters:
-; 	working_dir: $InstallDir$
-; 	icon_file:
-; 	icon_index:
-; end_link
+set_link
+	name: $NAME$
+	target: "$InstallDir32$\Imagine.exe"
+	parameters:
+	working_dir: $InstallDir32$
+	icon_file:
+	icon_index:
+end_link
 ;
 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
+set_basefolder common_desktopdirectory
+set_subfolder ""
 ;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
+set_link
+	name: $ProductId$
+	target: "$InstallDir32$\Imagine.exe"
+	parameters:
+	working_dir: $InstallDir32$
+	icon_file:
+	icon_index:
+end_link
+
+
+[LinkFolder_install_64]
+; Example of deleting a folder from AllUsers startmenu:
+;
+set_basefolder common_programs
+delete_subfolder $NAME$
+;
+; Example of creating an shortcut to the installed exe in AllUsers startmenu:
+;
+set_basefolder common_programs
+set_subfolder $NAME$
+;
+set_link
+	name: $NAME$
+	target: "$InstallDir64$\Imagine.exe"
+	parameters:
+	working_dir: $InstallDir64$
+	icon_file:
+	icon_index:
+end_link
+;
+; Example of creating an shortcut to the installed exe on AllUsers desktop:
+;
+set_basefolder common_desktopdirectory
+set_subfolder ""
+;
+set_link
+	name: $NAME$
+	target: "$InstallDir64$\Imagine.exe"
+	parameters:
+	working_dir: $InstallDir64$
+	icon_file:
+	icon_index:
+end_link
+
+
+
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"