diff --git a/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst b/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst
new file mode 100644
index 0000000..62d0e97
Binary files /dev/null and b/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst differ
diff --git a/CLIENT_DATA/setup.iss b/CLIENT_DATA/setup.iss
deleted file mode 100644
index 817a5da..0000000
--- a/CLIENT_DATA/setup.iss
+++ /dev/null
@@ -1,12 +0,0 @@
-[InstallShield Silent]
-Version=v7.00
-File=Response File
-[File Transfer]
-OverwrittenReadOnly=NoToAll
-[{BB8774C6-2751-484E-99B3-9348549E6B64}-DlgOrder]
-Dlg0={BB8774C6-2751-484E-99B3-9348549E6B64}-SdFinish-0
-Count=1
-[{BB8774C6-2751-484E-99B3-9348549E6B64}-SdFinish-0]
-Result=1
-bOpt1=0
-bOpt2=0
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 502646e..6f4616e 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -122,16 +122,15 @@ inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] INSTALLDIR=$InstallDir$
 [Winbatch_install]
 msiexec /i "$LogDir$\$ProductId$\commonfilesinstaller\Adobe Common File Installer.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 msiexec /i "$LogDir$\$ProductId$\help center\Adobe Help Center 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
-msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
+msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM=Adobe_Photoshop_CS2_9.0.2.mst
 msiexec /i "$LogDir$\$ProductId$\bridge\Adobe Bridge 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
-msiexec /i "$LogDir$\$ProductId$\stock photography\Adobe Stock Photos 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
 ; "$LogDir$\$ProductId$\setup.exe" /s /v /qn
 
 [Winbatch_update]
 "$Install902Exe$" -s
 
 [Winbatch_update_bridge]
-"$InstallBridge104Exe$"
+"$UpdateBridge104Exe$"
 
 [Files_delete]
 del -sf "$LogDir$\$ProductId$\"
@@ -150,11 +149,11 @@ copy "$IniCfgFile$" "$InstallDir$"
 [Registry_install]
 ; Disable Registry window
 ; openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Adobe Photoshop CS2 - $MsiId$]
-openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\$MsiId$]
-set "EPIC_REGS_TYPE" = REG_DWORD:00000004
-set "EPIC_REGS_STATE" = REG_DWORD:00000002
-set "EPIC_REGS_LANG" = REG_DWORD:00000000
-set "EPIC_REGS_COUNT" = REG_DWORD:00000000
+; openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\$MsiId$]
+; set "EPIC_REGS_TYPE" = REG_DWORD:00000004
+; set "EPIC_REGS_STATE" = REG_DWORD:00000002
+; set "EPIC_REGS_LANG" = REG_DWORD:00000000
+; set "EPIC_REGS_COUNT" = REG_DWORD:00000000
 
 [LinkFolder_install]
 ; Example of deleting a folder from AllUsers startmenu:
diff --git a/MultiProcessorSupport.zip.sha1sum b/MultiProcessorSupport.zip.sha1sum
new file mode 100644
index 0000000..072cb08
--- /dev/null
+++ b/MultiProcessorSupport.zip.sha1sum
@@ -0,0 +1 @@
+eb1b7e565dddb926a42c58862de6f1493c7ba879  /home/mario/.opsi-dist-cache/adobe.photoshopcs2-9.0.2/X86/MultiProcessorSupport.zip
diff --git a/builder-product.cfg b/builder-product.cfg
index 64f4930..a02a83c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -26,6 +26,7 @@ DL_EXTRACT_TO[1]="Temp"
 DL_FILE[2]="ps902.exe"
 DL_SOURCE[2]="http://download.adobe.com/pub/adobe/photoshop/win/cs2/ps902.exe"
 DL_ARCH[2]="X86"
+DL_EXTRACT_TO[2]="Temp"
 DL_EXTRACT_FORMAT[2]="7zip"
 
 DL_FILE[3]="Adobe_Bridge_1.0.3.zip"
@@ -37,14 +38,21 @@ DL_EXTRACT_TO[3]="Temp/bridge"
 DL_FILE[4]="AdobeBridge_1.0.4_updater.exe"
 DL_SOURCE[4]="http://download.adobe.com/pub/adobe/bridge/win/1.x/AdobeBridge_1.0.4_updater.exe"
 DL_ARCH[4]="X86"
-DL_EXTRACT_TO[4]="Updater/bridge"
-DL_WINST_NAME[4]=InstallBridge104Exe
+DL_EXTRACT_FORMAT[4]="cp"
+DL_EXTRACT_TO[4]="Updater"
+
+DL_FILE[5]="MultiProcessorSupport.zip"
+DL_SOURCE[5]="ftp://ftp.adobe.com/pub/adobe/photoshop/win/cs2/MultiProcessorSupport.zip"
+DL_ARCH[5]="X86"
+DL_EXTRACT_FORMAT[5]="7zip"
+DL_EXTRACT_TO[5]="Temp/MultiProcessor"
+
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
-WINST_NAME[0]="Install902Exe"
-WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\Updater\\setup.exe"
+WINST_NAME[0]="UpdateBridge104Exe"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\Updater\\AdobeBridge_1.0.4_updater.exe"
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 141e78d..dcb1faa 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -28,10 +28,24 @@ function create() {
     echo "Create"
     builder_create
 
+    mkdir -p $INST_DIR/CLIENT_DATA/X86/Updater/Core
     mv $INST_DIR/CLIENT_DATA/X86/Temp/Adobe\(R\)\ Photoshop\(R\)\ CS2 $INST_DIR/CLIENT_DATA/X86/Core
+    rm -rf $INST_DIR/CLIENT_DATA/X86/Core/stock\ photography
     rm -rf $INST_DIR/CLIENT_DATA/X86/Core/bridge
     mv $INST_DIR/CLIENT_DATA/X86/Temp/bridge $INST_DIR/CLIENT_DATA/X86/Core/bridge
-    mv $INST_DIR/CLIENT_DATA/setup.iss $INST_DIR/CLIENT_DATA/X86/Updater
+    mkdir -p $INST_DIR/CLIENT_DATA/X86/Temp/Core
+    cabextract -d $INST_DIR/CLIENT_DATA/X86/Temp/Core $INST_DIR/CLIENT_DATA/X86/Core/Data1.cab
+    pushd $INST_DIR/CLIENT_DATA/X86/Temp/Updater
+    unshield x data1.cab
+    mv -vf App/honesty/Photoshop.exe $INST_DIR/CLIENT_DATA/X86/Temp/Core/Photoshop.exe
+    mv -vf App/AdobeXMP.dll $INST_DIR/CLIENT_DATA/X86/Temp/Core/AdobeXMP.dll
+    mv -vf Plug-ins/plug-ins/adobe_photoshop_only/automate/HDRMergeAuto.8li $INST_DIR/CLIENT_DATA/X86/Temp/Core/_FD1D92819EBF46FF92AC39DAF7FC6EBC
+    mv -vf Plug-ins/plug-ins/extensions/MMXCore.8BX $INST_DIR/CLIENT_DATA/X86/Temp/Core/_5F2B3A39CBEC4319B5D0C4FBD75C7014
+    rm $INST_DIR/CLIENT_DATA/X86/Core/{*.exe,*.wri,Setup.ini}
+    popd
+    mv -vf $INST_DIR/CLIENT_DATA/X86/Temp/MultiProcessor/MultiProcessor\ Support.8BX $INST_DIR/CLIENT_DATA/X86/Temp/Core/_021C6307CEDB410187380C39E7D94594
+    gcab -cvn $INST_DIR/CLIENT_DATA/X86/Core/Data1.cab $INST_DIR/CLIENT_DATA/X86/Temp/Core/*
+    mv $INST_DIR/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst $INST_DIR/CLIENT_DATA/X86/Core/
     rm -rf $INST_DIR/CLIENT_DATA/X86/Temp
 }