diff --git a/CLIENT_DATA/AdobeAIR_7zip_config.txt b/CLIENT_DATA/AdobeAIR_7zip_config.txt
index 8003b3e..a95e682 100644
--- a/CLIENT_DATA/AdobeAIR_7zip_config.txt
+++ b/CLIENT_DATA/AdobeAIR_7zip_config.txt
@@ -1,6 +1,6 @@
 ;!@Install@!UTF-8!
-RunProgram="air15-0_win.exe -silent -eulaAccepted"
-ExtractTitle="Geos One Adobe Air 15.x Installer"
-ExtractDialogText="Extracting Adobe AIR 15.x"
+RunProgram="air16-0_win.exe -silent -eulaAccepted"
+ExtractTitle="Geos One Adobe Air 16.x Installer"
+ExtractDialogText="Extracting Adobe AIR 16.x"
 GUIMode="1"
 ;!@InstallEnd@!
diff --git a/air_15.0.0.356_win.exe.sha1sum b/air_15.0.0.356_win.exe.sha1sum
deleted file mode 100644
index b3ba765..0000000
--- a/air_15.0.0.356_win.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c0e6b8b1ed5ffa282945d21b21f8a5e03febc904  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.7.1/X86/air_15.0.0.356_win.exe
diff --git a/air_16.0.0.245_win.exe.sha1sum b/air_16.0.0.245_win.exe.sha1sum
new file mode 100644
index 0000000..c797777
--- /dev/null
+++ b/air_16.0.0.245_win.exe.sha1sum
@@ -0,0 +1 @@
+b32f3624e572ea9d7c6736eba66cf87f363df4c5  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/air_16.0.0.245_win.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 4e73839..1fabe90 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -29,34 +29,36 @@ CREATENEWSEREBY="1"
 # Adobe Air Verison
 # ==================================
 
-AIRVERSION="15.0.0.356"
+AIRVERSION="16.0.0.245"
 
 # ==================================
 # Update Java 7/8
 # ==================================
 
 JRE7UPDATE="1"
-JRE7UVERSION="71"
-JRE7VERSION="7.0.710.14"
+JRE7UVERSION="75"
+JRE7BUILD="13"
+JRE7VERSION="7.0.750.13"
 
 JRE8UPDATE="0"
-JRE8UVERSION="25"
-JRE8VERSION="8.0.250.1"
+JRE8UVERSION="31"
+JRE8BUILD="13"
+JRE8VERSION="8.0.310.13"
 
 # ==================================
 # Update Adobe Flash
 # ==================================
 
 FLASHUPDATE="1"
-FLASHVERSION="16.0.0.235"
-FLASHAXVERSION="16.0.0.235"
+FLASHVERSION="16.0.0.287"
+FLASHAXVERSION="16.0.0.287"
 
 # ==================================
 # Update Adobe Schockave
 # ==================================
 
 SHOCKUPDATE="1"
-SHOCKVERSION="12.1.5.155"
+SHOCKVERSION="12.1.6.156"
 
 # ==================================
 # Update Microsoft Silverlight
@@ -86,7 +88,7 @@ RICKTENDONET="2014.11.25"
 # ==================================
 
 GENERALUPDATE="1"
-GENERALVERSION="1.1.0.11-go2"
+GENERALVERSION="1.1.0.12-go1"
 
 # ==================================
 # MSVC Runtimes Verison
@@ -150,7 +152,7 @@ fi
 
 DL_FILE[10]="air_${AIRVERSION}_win.exe"
 #DL_SOURCE[10]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-9_win.exe"
-DL_SOURCE[10]="http://airdownload.adobe.com/air/win/download/15.0/AdobeAIRInstaller.exe"
+DL_SOURCE[10]="http://airdownload.adobe.com/air/win/download/16.0/AdobeAIRInstaller.exe"
 DL_ARCH[10]="X86"
 DL_WINST_NAME[10]=AdobeAirInstallExe
 
@@ -161,22 +163,30 @@ DL_EXTRACT_FORMAT[11]="7zip"
 DL_EXTRACT_TO[11]="7ZipSFX"
 
 DL_FILE[12]="jre7u${JRE7UVERSION}-x86.exe"
-DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=97807"
+DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101467"
+#DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-i586.exe"
+#DL_DOWNLOADER_OPTION[12]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[12]="X86"
 DL_WINST_NAME[12]=Install7Jre32Exe
 
 DL_FILE[13]="jre7u${JRE7UVERSION}-x64.exe"
-DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=97809"
+DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101469"
+#DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-x64.exe"
+#DL_DOWNLOADER_OPTION[13]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[13]="X86"
 DL_WINST_NAME[13]=Install7Jre64Exe
 
 DL_FILE[14]="jre8u${JRE8UVERSION}-x86.exe"
-DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=98426"
+DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101406"
+#DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-i586.exe"
+#DL_DOWNLOADER_OPTION[14]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[14]="X86"
 DL_WINST_NAME[14]=Install8Jre32Exe
 
 DL_FILE[15]="jre8u${JRE8UVERSION}-x64.exe"
-DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=98428"
+DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101408"
+#DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-x64.exe"
+#DL_DOWNLOADER_OPTION[15]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[15]="X86"
 DL_WINST_NAME[15]=InstallJ8re64Exe
 
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index c69197d..884f54c 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -145,7 +145,7 @@ function create() {
   # integrate Adobe AIR
   # ==========================================================================================================
   
-  mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air15-0_win.exe
+  mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe
   mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
   mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
   sed -e 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
@@ -155,9 +155,9 @@ function create() {
   
   
   # Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally
-  7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air15-0_win.exe
+  7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe
   cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe
-  rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air15-0_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
+  rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
   
   # ==========================================================================================================
   # Update Java
diff --git a/geos_one-general-runtimes_1.1.0.11-go2.7z.sha1sum b/geos_one-general-runtimes_1.1.0.11-go2.7z.sha1sum
deleted file mode 100644
index 5549ddf..0000000
--- a/geos_one-general-runtimes_1.1.0.11-go2.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-b0a96b925c882cec5a2f6c878f7d8cbbe31bdc83  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/geos_one-general-runtimes_1.1.0.11-go2.7z
diff --git a/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum
new file mode 100644
index 0000000..ff47cac
--- /dev/null
+++ b/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum
@@ -0,0 +1 @@
+c48c5ee6794b1ac363147efd89a3fa894e0bbe59  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/geos_one-general-runtimes_1.1.0.12-go1.7z
diff --git a/install_flash_player-16.0.0.235.exe.sha1sum b/install_flash_player-16.0.0.235.exe.sha1sum
deleted file mode 100644
index 70afe0e..0000000
--- a/install_flash_player-16.0.0.235.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-afe602265351cd22b997d5b792b11a3cac6377e4  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/install_flash_player-16.0.0.235.exe
diff --git a/install_flash_player-16.0.0.287.exe.sha1sum b/install_flash_player-16.0.0.287.exe.sha1sum
new file mode 100644
index 0000000..b12bbb2
--- /dev/null
+++ b/install_flash_player-16.0.0.287.exe.sha1sum
@@ -0,0 +1 @@
+6d5a29075531d45c934fc64cea9a62ca11b1d3d2  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/install_flash_player-16.0.0.287.exe
diff --git a/install_flash_player_ax-16.0.0.235.exe.sha1sum b/install_flash_player_ax-16.0.0.235.exe.sha1sum
deleted file mode 100644
index e23bdaa..0000000
--- a/install_flash_player_ax-16.0.0.235.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-82d52d3f6294d7c6831acddfe7e1c61545018402  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/install_flash_player_ax-16.0.0.235.exe
diff --git a/install_flash_player_ax-16.0.0.287.exe.sha1sum b/install_flash_player_ax-16.0.0.287.exe.sha1sum
new file mode 100644
index 0000000..b6abd63
--- /dev/null
+++ b/install_flash_player_ax-16.0.0.287.exe.sha1sum
@@ -0,0 +1 @@
+eb1752fa82af91b5965df1712db51fe3a9cc8941  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/install_flash_player_ax-16.0.0.287.exe
diff --git a/jre7u71-x64.exe.sha1sum b/jre7u71-x64.exe.sha1sum
deleted file mode 100644
index 6ca0c2f..0000000
--- a/jre7u71-x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-714240cf53190bfccb0bb237323a2496300be946  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.7.1/X86/jre7u71-x64.exe
diff --git a/jre7u71-x86.exe.sha1sum b/jre7u71-x86.exe.sha1sum
deleted file mode 100644
index d04d324..0000000
--- a/jre7u71-x86.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-b04ba06f787b596c57ede7e3c0250546d0635f73  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.7.1/X86/jre7u71-x86.exe
diff --git a/jre7u75-x64.exe.sha1sum b/jre7u75-x64.exe.sha1sum
new file mode 100644
index 0000000..2d0da30
--- /dev/null
+++ b/jre7u75-x64.exe.sha1sum
@@ -0,0 +1 @@
+488492de778fc47f67a33c65ea922124279c20d4  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre7u75-x64.exe
diff --git a/jre7u75-x86.exe.sha1sum b/jre7u75-x86.exe.sha1sum
new file mode 100644
index 0000000..f023611
--- /dev/null
+++ b/jre7u75-x86.exe.sha1sum
@@ -0,0 +1 @@
+cd5f2222c6a9db6adfb385eaaeff8f95ea32446f  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre7u75-x86.exe
diff --git a/jre8u25-x64.exe.sha1sum b/jre8u25-x64.exe.sha1sum
deleted file mode 100644
index 06128a9..0000000
--- a/jre8u25-x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-73024362b55d35f77562f203faba892c7540b68d  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.7.1/X86/jre8u25-x64.exe
diff --git a/jre8u25-x86.exe.sha1sum b/jre8u25-x86.exe.sha1sum
deleted file mode 100644
index 37fc016..0000000
--- a/jre8u25-x86.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ff3d21c97e9ca71157f12221ccf0788a9775ec92  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.7.1/X86/jre8u25-x86.exe
diff --git a/jre8u31-x64.exe.sha1sum b/jre8u31-x64.exe.sha1sum
new file mode 100644
index 0000000..367c325
--- /dev/null
+++ b/jre8u31-x64.exe.sha1sum
@@ -0,0 +1 @@
+00b5d23743d097d9b8f50bd14602bf4bae525b00  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre8u31-x64.exe
diff --git a/jre8u31-x86.exe.sha1sum b/jre8u31-x86.exe.sha1sum
new file mode 100644
index 0000000..3cc5ae4
--- /dev/null
+++ b/jre8u31-x86.exe.sha1sum
@@ -0,0 +1 @@
+b8ef84ba6a68c35b5d7a5304b4c0304aa53858b8  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre8u31-x86.exe
diff --git a/sw_lic_full_installer-12.1.5.155.msi.sha1sum b/sw_lic_full_installer-12.1.5.155.msi.sha1sum
deleted file mode 100644
index 6777c86..0000000
--- a/sw_lic_full_installer-12.1.5.155.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-7cb0a40523a2cb0ad5788faecda3ff99cae6fe9e  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/sw_lic_full_installer-12.1.5.155.msi
diff --git a/sw_lic_full_installer-12.1.6.156.msi.sha1sum b/sw_lic_full_installer-12.1.6.156.msi.sha1sum
new file mode 100644
index 0000000..82abba4
--- /dev/null
+++ b/sw_lic_full_installer-12.1.6.156.msi.sha1sum
@@ -0,0 +1 @@
+230da89a11011307b1596c9b84eccbd62e65b3a4  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/sw_lic_full_installer-12.1.6.156.msi
diff --git a/uninstall_flash_player-16.0.0.235.exe.sha1sum b/uninstall_flash_player-16.0.0.235.exe.sha1sum
deleted file mode 100644
index 1451e88..0000000
--- a/uninstall_flash_player-16.0.0.235.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-fb0f4b1998accd99201ee1e3c11857ae5bd94669  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/uninstall_flash_player-16.0.0.235.exe
diff --git a/uninstall_flash_player-16.0.0.287.exe.sha1sum b/uninstall_flash_player-16.0.0.287.exe.sha1sum
new file mode 100644
index 0000000..2a6f3ea
--- /dev/null
+++ b/uninstall_flash_player-16.0.0.287.exe.sha1sum
@@ -0,0 +1 @@
+38257725fa8feb7bf82f1738e8bc20cfdda8608b  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/uninstall_flash_player-16.0.0.287.exe
diff --git a/uninstall_shock_player-12.1.5.155.exe.sha1sum b/uninstall_shock_player-12.1.6.156.exe.sha1sum
similarity index 92%
rename from uninstall_shock_player-12.1.5.155.exe.sha1sum
rename to uninstall_shock_player-12.1.6.156.exe.sha1sum
index 2233121..3e6c445 100644
--- a/uninstall_shock_player-12.1.5.155.exe.sha1sum
+++ b/uninstall_shock_player-12.1.6.156.exe.sha1sum
@@ -1 +1 @@
-4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/uninstall_shock_player-12.1.5.155.exe
+4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/uninstall_shock_player-12.1.6.156.exe