diff --git a/CLIENT_DATA/X86/transcriptionbuddy-install.exe b/CLIENT_DATA/X86/transcriptionbuddy-install.exe
deleted file mode 100644
index ee99509..0000000
Binary files a/CLIENT_DATA/X86/transcriptionbuddy-install.exe and /dev/null differ
diff --git a/CLIENT_DATA/X86/transcriptionbuddy-uninstall.exe b/CLIENT_DATA/X86/transcriptionbuddy-uninstall.exe
deleted file mode 100644
index ba908cf..0000000
Binary files a/CLIENT_DATA/X86/transcriptionbuddy-uninstall.exe and /dev/null differ
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 32586e3..d85d35c 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -54,13 +54,13 @@ delete -sf "$InstallDir$\"
 [Registry_uninstall]
 ; Example of deleting a registry key:
 ;
-deletekey [HKEY_LOCAL_MACHINE\Software\HighCriteria\TranscriptionBuddyPE\WinReg]
+deletekey [HKEY_LOCAL_MACHINE\Software\HighCriteria\TranscriptionBuddyPE]
 
 [LinkFolder_uninstall]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
+set_basefolder common_programs
+delete_subfolder Transcription Buddy
 ;
 ; Example of deleting a shortcut from AllUsers desktop:
 ;
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index fd5fd5b..4e4750e 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -103,40 +103,51 @@ copy "$IniCfgFile$" "$InstallDir$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
-copy "$UnInstallExe$" "$InstallDir$"
+copy -s "%ScriptPath%\X86\*.*" "$InstallDir$"
 
 
 
 [Registry_install]
 ; Example of setting some values of an registry key:
 ;
-openkey [HKEY_LOCAL_MACHINE\Software\HighCriteria\TranscriptionBuddyPE\WinReg]
+HighCriteria\TranscriptionBuddyPE\WinReg]
 set "Name" = "$OrgName$"
 set "Key" = "$LicenseKey$"
 
+openkey [HKEY_LOCAL_MACHINE\Software\HighCriteria\TranscriptionBuddyPE\ProductVersion]
+set "MajorVer" = REG_DWORD:00000004
+set "MinorVer" = REG_DWORD:00000000
+set "NumbBuild" = REG_DWORD:0000002D
+set "CommonReg" = REG_DWORD:00000001
+set "CommonSet" = REG_DWORD:00000000
+set "SetAccess" = REG_DWORD:FFFFFFFF
+openkey [HKEY_LOCAL_MACHINE\Software\HighCriteria\TranscriptionBuddyPE]
+set "Path" = "$InstallDir$"
+set "Module" = "tnpbuddy.exe"
+
+
 [LinkFolder_install]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
+set_basefolder common_programs
+delete_subfolder $ProductId$
 ;
 ; Example of creating an shortcut to the installed exe in AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; set_subfolder $ProductId$
-;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters:
-; 	working_dir: $InstallDir$
-; 	icon_file:
-; 	icon_index:
-; end_link
-;
+set_basefolder common_programs
+set_subfolder Transcription Buddy
+
+set_link
+	name: Transcription Buddy
+	target: $InstallDir$\tnpbuddy.exe
+	parameters:
+	working_dir: $InstallDir$
+	icon_file: $InstallDir$\tnpbuddy.exe
+	icon_index:
+end_link
+
 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
-;
+
 ; set_basefolder common_desktopdirectory
 ; set_subfolder ""
 ;
diff --git a/transcriptionbuddy-install.au3 b/transcriptionbuddy-install.au3
deleted file mode 100644
index d5472bc..0000000
Binary files a/transcriptionbuddy-install.au3 and /dev/null differ
diff --git a/transcriptionbuddy-uninstall.au3 b/transcriptionbuddy-uninstall.au3
deleted file mode 100644
index 9a28022..0000000
Binary files a/transcriptionbuddy-uninstall.au3 and /dev/null differ