diff --git a/CLIENT_DATA/Ricktendo_NET451_package.xml b/CLIENT_DATA/Ricktendo_NET451_package.xml
new file mode 100644
index 0000000..c3327eb
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_NET451_package.xml
@@ -0,0 +1,9 @@
+<package id="net4.5.1" name=".NET Framework 4.5.1" group="Microsoft .NET Framework" priority="44">
+	<check type="os" condition=">" value="6.0.6002.0" />
+	<check type="os" condition="<" value="6.2.9200.0" />
+	<check type="file" condition="<" value="4.0.30319.18408" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
+	<install>
+                <cmd arch="x86" path="netfx_Full_LDR_x86.msi" param="/norestart /qb-!" />
+                <cmd arch="x64" path="netfx_Full_LDR_x64.msi" param="/norestart /qb-!" />
+	</install>
+</package>
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_NET45_package.xml b/CLIENT_DATA/Ricktendo_NET45_package.xml
deleted file mode 100644
index eed88a6..0000000
--- a/CLIENT_DATA/Ricktendo_NET45_package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<package id="net4.5" name=".NET Framework 4.5.1" group="Microsoft .NET Framework" priority="44">
-	<check type="os" condition=">" value="6.0.6002.0" />
-	<check type="os" condition="<" value="6.2.9200.0" />
-	<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4\System.dll" />
-	<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\v4\Config\NetFx45_IIS_schema_update.xml" />
-	<install>
-		<cmd arch="x86" path="netfx_Full_LDR_x86.msi" param="/norestart /qb-!" />
-		<cmd arch="x64" path="netfx_Full_LDR_x64.msi" param="/norestart /qb-!" />
-	</install>
-</package>
\ No newline at end of file
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index ecb5ed7..afa35b6 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -56,9 +56,9 @@ if ($sereby_dotnet4.0$ = "reinstall")
     opsiservicecall_dotnet4.0_uninstall
     Set $reboot$ = "true"
 endif
-if ($sereby_dotnet4.5$ = "reinstall")
-    Winbatch_dotnet4.5_uninstall
-    opsiservicecall_dotnet4.5_uninstall
+if ($sereby_dotnet4.5.1$ = "reinstall")
+    Winbatch_dotnet4.5.1_uninstall
+    opsiservicecall_dotnet4.5.1_uninstall
     Set $reboot$ = "true"
 endif
 
@@ -191,14 +191,14 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Winbatch_dotnet4.5_uninstall]
-%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u"
+[Winbatch_dotnet4.5.1_uninstall]
+%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.1 /u"
 
-[opsiservicecall_dotnet4.5_uninstall]
+[opsiservicecall_dotnet4.5.1_uninstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_dotnet4.5",
+"sereby_dotnet4.5.1",
 "install",
 "%opsiserviceUser%"
 ]
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index 12a7440..25508f2 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -16,8 +16,8 @@ endif
 if ($sereby_dotnet4.0$ = "install")
     DosInAnIcon_dotnet4.0_config
 endif
-if ($sereby_dotnet4.5$ = "install")
-    DosInAnIcon_dotnet4.5_config
+if ($sereby_dotnet4.5.1$ = "install")
+    DosInAnIcon_dotnet4.5.1_config
 endif
 if ($sereby_msjsharp$ = "install")
     DosInAnIcon_msjsharp_config
@@ -84,9 +84,9 @@ xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
 xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
-[DosInAnIcon_dotnet4.5_config]
+[DosInAnIcon_dotnet4.5.1_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+xml ed -O -u "/settings/set[@component='net4.5.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
 [DosInAnIcon_msjsharp_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index a98d9a9..d18441d 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -14,8 +14,8 @@ DefVar	$sereby_dotnet3.5$
 Set 	$sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install")
 DefVar	$sereby_dotnet4.0$
 Set 	$sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none")
-DefVar	$sereby_dotnet4.5$
-Set 	$sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
+DefVar	$sereby_dotnet4.5.1$
+Set 	$sereby_dotnet4.5.1$ = GetProductProperty("sereby_dotnet4.5.1", "install")
 DefVar	$sereby_msjsharp$
 Set 	$sereby_msjsharp$ = GetProductProperty("sereby_msjsharp", "install")
 DefVar	$sereby_msfsharp$
diff --git a/OPSI/control b/OPSI/control
index 623ebec..d7f5310 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -101,10 +101,10 @@ default: ["install"]
 
 [ProductProperty]
 type: unicode
-name: sereby_dotnet4.5
+name: sereby_dotnet4.5.1
 multivalue: False
 editable: False
-description: Install Microsoft Netframework 4.5
+description: Install Microsoft Netframework 4.5.1
 values: ["install", "none", "reinstall"]
 default: ["install"]
 
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 939c22b..d1b0d03 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -106,36 +106,14 @@ function create() {
   # Integrate .net for win 8.0 into winpkg
   # ==========================================================================================================
   
-  for NETVER in 2.0 3.0 3.5
-  do
-    # convert all the cmd's to axept check entities
-    sed '/_Install.bat/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    sed '/NET Framework/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    # force a check on os verison for every cmd command
-    sed 's/.*\t<\/cmd>.*/\t\t<check type="os"   condition="<" value="6.2.9200.0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    # remove the installer and package end tags
-    sed -e '/^\t<\/install>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    
-    # append the win 8.x install cmd via a cmd script that runs it
-    echo "<cmd path=\"_Install8X.bat\" >" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    echo "<check type=\"os\"   condition=\">\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    echo "</cmd>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    
-    # add back the install and package end tags
-    echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    tidy_xml $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
-    
     # create the needed install cmd script for win 8.x
-    echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "echo Installing .NET Framwork $NETVER" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-    echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
-  done
+    echo "@echo off" > $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "echo Installing .NET Framwork 2.0 - 3.5.1" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+    echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
   
   # ==========================================================================================================
   # Replace the General Runtimes with the Msi version off GeosOne
@@ -196,14 +174,10 @@ function create() {
   # Update Shockwave
   # ==========================================================================================================
   
-  sed 's!<install>!<install>' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
-  sed 's/.*<install>.*/\t<variable name="VERSION_FILE"    value="1204144" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
-  sed "s!SwHelper_.*\.exe!SwHelper_%VERSION_FILE%.exe!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
-  
   if [ "$SHOCKUPDATE" = "1" ]; then
     rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi
     mv $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package/variable[@name='VERSION_FILE']/@value" "${SHOCKVERSION//./}"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package/variable[@name='BUILD']/@value" "${SHOCKVERSION//./}"
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package[@id='AdobeShock']/@name" "Adobe Shockwave Player v${SHOCKVERSION}"
   fi
   
@@ -252,9 +226,9 @@ function create() {
     rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/*
     7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[21]}
     #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5.1 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]}
-    mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/package.xml
+    mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET451_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5.1/package.xml
   else
-    rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
+    rm $INST_DIR/CLIENT_DATA/Ricktendo_NET451_package.xml
   fi
   
   # ==========================================================================================================
@@ -264,6 +238,8 @@ function create() {
   if [ "$MSVCUPDATE" = "1" ]; then
     rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
     mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
+  else
+    sed "s!mst!mst REINSTALLMODE=dmus!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
   fi
   
   # ==========================================================================================================