diff --git a/CLIENT_DATA/WinPKG.xml b/CLIENT_DATA/WinPKG.xml
index 7f8aabe..fb5cf60 100644
--- a/CLIENT_DATA/WinPKG.xml
+++ b/CLIENT_DATA/WinPKG.xml
@@ -1,13 +1,18 @@
 <settings maximized="1">
   <timer value="40" enabled="1" />
-  <set component="net4.6" checked="1" />
+  <set component="net4.7.1" checked="1" />
   <set component="msjsharp" checked="1" />
   <set component="silver" checked="1" />
-  <set component="jre8" checked="1" />
+  <set component="jre9" checked="1" />
   <set component="AdobeShock" checked="1" />
   <set component="basicruntimes" checked="1" />
   <set component="msdx9" checked="1" />
-  <set component="msvc" checked="1" />
+  <set component="msvc2005" checked="1" />
+  <set component="msvc2008" checked="1" />
+  <set component="msvc2010" checked="1" />
+  <set component="msvc2012" checked="1" />
+  <set component="msvc2013" checked="1" />
+  <set component="msvc2017" checked="1" />
   <set component="AdobeFlash" checked="1" />
   <set component="NetWin8" checked="1" />
 </settings>
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index b0ee904..e0fdedf 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -1,14 +1,14 @@
 DefVar  $reboot$
 Set     $reboot$ = "false"
 
-if ($sereby_dotnet4.6$ = "reinstall")
-    Winbatch_dotnet4.6_uninstall
-    opsiservicecall_dotnet4.6_reinstall
+if ($sereby_dotnet4.7.1$ = "reinstall")
+    Winbatch_dotnet4.7.1_uninstall
+    opsiservicecall_dotnet4.7.1_reinstall
     Set $reboot$ = "true"
 endif
-if ($sereby_dotnet4.6$ = "uninstall")
-    Winbatch_dotnet4.6_uninstall
-    opsiservicecall_dotnet4.6_uninstall
+if ($sereby_dotnet4.7.1$ = "uninstall")
+    Winbatch_dotnet4.7.1_uninstall
+    opsiservicecall_dotnet4.7.1_uninstall
     Set $reboot$ = "true"
 endif
 
@@ -98,14 +98,64 @@ if ($sereby_msdx9$ = "uninstall")
     opsiservicecall_msdx9_uninstall
     Set $reboot$ = "true"
 endif
-if ($sereby_msvc$ = "reinstall")
-    DosInAnIcon_msvc_uninstall
-    opsiservicecall_msvc_reinstall
+if ($sereby_msvc2005$ = "reinstall")
+    DosInAnIcon_msvc2005_uninstall
+    opsiservicecall_msvc2005_reinstall
     Set $reboot$ = "true"
 endif
-if ($sereby_msvc$ = "uninstall")
-    DosInAnIcon_msvc_uninstall
-    opsiservicecall_msvc_uninstall
+if ($sereby_msvc2005$ = "uninstall")
+    DosInAnIcon_msvc2005_uninstall
+    opsiservicecall_msvc2005_uninstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2008$ = "reinstall")
+    DosInAnIcon_msvc2008_uninstall
+    opsiservicecall_msvc2008_reinstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2008$ = "uninstall")
+    DosInAnIcon_msvc2008_uninstall
+    opsiservicecall_msvc2008_uninstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2010$ = "reinstall")
+    DosInAnIcon_msvc2010_uninstall
+    opsiservicecall_msvc2010_reinstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2010$ = "uninstall")
+    DosInAnIcon_msvc2010_uninstall
+    opsiservicecall_msvc2010_uninstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2012$ = "reinstall")
+    DosInAnIcon_msvc2012_uninstall
+    opsiservicecall_msvc2012_reinstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2012$ = "uninstall")
+    DosInAnIcon_msvc2012_uninstall
+    opsiservicecall_msvc2012_uninstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2013$ = "reinstall")
+    DosInAnIcon_msvc2013_uninstall
+    opsiservicecall_msvc2013_reinstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2013$ = "uninstall")
+    DosInAnIcon_msvc2013_uninstall
+    opsiservicecall_msvc2013_uninstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2017$ = "reinstall")
+    DosInAnIcon_msvc2017_uninstall
+    opsiservicecall_msvc2017_reinstall
+    Set $reboot$ = "true"
+endif
+if ($sereby_msvc2017$ = "uninstall")
+    DosInAnIcon_msvc2017_uninstall
+    opsiservicecall_msvc2017_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeFlash$ = "reinstall")
@@ -135,23 +185,23 @@ if ($reboot$ = "true")
     ExitWindows /ImmediateReboot
 endif
 
-[Winbatch_dotnet4.6_uninstall]
-%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u"
+[Winbatch_dotnet4.7.1_uninstall]
+%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.7 /u"
 
-[opsiservicecall_dotnet4.6_reinstall]
+[opsiservicecall_dotnet4.7.1_reinstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_dotnet4.6",
+"sereby_dotnet4.7.1",
 "install",
 "%opsiserviceUser%"
 ]
 
-[opsiservicecall_dotnet4.6_uninstall]
+[opsiservicecall_dotnet4.7.1_uninstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_dotnet4.6",
+"sereby_dotnet4.7.1",
 "none",
 "%opsiserviceUser%"
 ]
@@ -350,22 +400,128 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[DosInAnIcon_msvc_uninstall]
+[DosInAnIcon_msvc2005_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2005/uninstall.bat"
 
-[opsiservicecall_msvc_reinstall]
+[opsiservicecall_msvc2005_reinstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_msvc",
+"sereby_msvc2005",
 "install",
 "%opsiserviceUser%"
 ]
 
-[opsiservicecall_msvc_uninstall]
+[opsiservicecall_msvc2005_uninstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_msvc",
+"sereby_msvc2005",
+"none",
+"%opsiserviceUser%"
+]
+
+[DosInAnIcon_msvc2008_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2008/uninstall.bat"
+
+[opsiservicecall_msvc2008_reinstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2008",
+"install",
+"%opsiserviceUser%"
+]
+
+[opsiservicecall_msvc2008_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2008",
+"none",
+"%opsiserviceUser%"
+]
+
+[DosInAnIcon_msvc2010_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2010/uninstall.bat"
+
+[opsiservicecall_msvc2010_reinstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2010",
+"install",
+"%opsiserviceUser%"
+]
+
+[opsiservicecall_msvc2010_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2010",
+"none",
+"%opsiserviceUser%"
+]
+
+[DosInAnIcon_msvc2012_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2012/uninstall.bat"
+
+[opsiservicecall_msvc2012_reinstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2012",
+"install",
+"%opsiserviceUser%"
+]
+
+[opsiservicecall_msvc2012_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2012",
+"none",
+"%opsiserviceUser%"
+]
+
+[DosInAnIcon_msvc2013_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2013/uninstall.bat"
+
+[opsiservicecall_msvc2013_reinstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2013",
+"install",
+"%opsiserviceUser%"
+]
+
+[opsiservicecall_msvc2013_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2013",
+"none",
+"%opsiserviceUser%"
+]
+
+[DosInAnIcon_msvc2017_uninstall]
+"%ScriptPath%\Install/Packages/MSVC/2017/uninstall.bat"
+
+[opsiservicecall_msvc2017_reinstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2017",
+"install",
+"%opsiserviceUser%"
+]
+
+[opsiservicecall_msvc2017_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvc2017",
 "none",
 "%opsiserviceUser%"
 ]
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index a98df3a..82013ad 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -1,8 +1,8 @@
 
 DosInAnIcon_init_config
 
-if ($sereby_dotnet4.6$ = "install")
-    DosInAnIcon_dotnet4.6_config
+if ($sereby_dotnet4.7.1$ = "install")
+    DosInAnIcon_dotnet4.7.1_config
 endif
 if ($sereby_win8xdotnet3x$ = "install")
     DosInAnIcon_win8xdotnet3x_config
@@ -31,8 +31,23 @@ endif
 if ($sereby_msdx9$ = "install")
     DosInAnIcon_msdx9_config
 endif
-if ($sereby_msvc$ = "install")
-    DosInAnIcon_msvc_config
+if ($sereby_msvc2005$ = "install")
+    DosInAnIcon_msvc2005_config
+endif
+if ($sereby_msvc2008$ = "install")
+    DosInAnIcon_msvc2008_config
+endif
+if ($sereby_msvc2010$ = "install")
+    DosInAnIcon_msvc2010_config
+endif
+if ($sereby_msvc2012$ = "install")
+    DosInAnIcon_msvc2012_config
+endif
+if ($sereby_msvc2013$ = "install")
+    DosInAnIcon_msvc2013_config
+endif
+if ($sereby_msvc2017$ = "install")
+    DosInAnIcon_msvc2017_config
 endif
 if ($sereby_AdobeFlash$ = "install")
     DosInAnIcon_AdobeFlash_config
@@ -52,9 +67,9 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDi
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
 xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
-[DosInAnIcon_dotnet4.6_config]
+[DosInAnIcon_dotnet4.7.1_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net4.6']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+xml ed -O -u "/settings/set[@component='net4.7.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
 [DosInAnIcon_win8xdotnet3x_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
@@ -92,9 +107,29 @@ xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v 1 "$LogDir$
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
 xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
-[DosInAnIcon_msvc_config]
+[DosInAnIcon_msvc2005_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='msvc']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+xml ed -O -u "/settings/set[@component='msvc2005']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
+[DosInAnIcon_msvc2008_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvc2008']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
+[DosInAnIcon_msvc2010_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvc2010']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
+[DosInAnIcon_msvc2012_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvc2012']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
+[DosInAnIcon_msvc2013_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvc2013']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
+[DosInAnIcon_msvc2017_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvc2017']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
 [DosInAnIcon_AdobeFlash_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index b398b47..11f9299 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -4,8 +4,8 @@ DefVar	$sereby_timer_value$
 Set 	$sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5")
 DefVar	$sereby_timer_enabled$
 Set	$sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
-DefVar	$sereby_dotnet4.6$
-Set 	$sereby_dotnet4.6$ = GetProductProperty("sereby_dotnet4.6", "install")
+DefVar	$sereby_dotnet4.7.1$
+Set 	$sereby_dotnet4.7.1$ = GetProductProperty("sereby_dotnet4.7.1", "install")
 DefVar	$sereby_win8xdotnet3x$
 Set 	$sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
 DefVar	$sereby_msjsharp$
@@ -24,8 +24,18 @@ DefVar	$sereby_basicruntimes$
 Set 	$sereby_basicruntimes$ = GetProductProperty("sereby_basicruntimes", "install")
 DefVar	$sereby_msdx9$
 Set 	$sereby_msdx9$ = GetProductProperty("sereby_msdx9", "install")
-DefVar	$sereby_msvc$
-Set 	$sereby_msvc$ = GetProductProperty("sereby_msvc", "install")
+DefVar	$sereby_msvc2005$
+Set 	$sereby_msvc2005$ = GetProductProperty("sereby_msvc2005", "install")
+DefVar	$sereby_msvc2008$
+Set 	$sereby_msvc2008$ = GetProductProperty("sereby_msvc2008", "install")
+DefVar	$sereby_msvc2010$
+Set 	$sereby_msvc2010$ = GetProductProperty("sereby_msvc2010", "install")
+DefVar	$sereby_msvc2012$
+Set 	$sereby_msvc2012$ = GetProductProperty("sereby_msvc2012", "install")
+DefVar	$sereby_msvc2013$
+Set 	$sereby_msvc2013$ = GetProductProperty("sereby_msvc2013", "install")
+DefVar	$sereby_msvc2017$
+Set 	$sereby_msvc2017$ = GetProductProperty("sereby_msvc2017", "install")
 DefVar	$sereby_AdobeFlash$
 Set 	$sereby_AdobeFlash$ = GetProductProperty("sereby_AdobeFlash", "install")
 DefVar	$sereby_AdobeAir$
diff --git a/OPSI/control b/OPSI/control
index ee6e262..f68cf3c 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -56,10 +56,10 @@ default: ["1"]
 
 [ProductProperty]
 type: unicode
-name: sereby_dotnet4.6
+name: sereby_dotnet4.7.1
 multivalue: False
 editable: False
-description: Install Microsoft Netframework 4.6
+description: Install Microsoft Netframework 4.7.1
 values: ["install", "none", "reinstall", "uninstall"]
 default: ["install"]
 
@@ -106,7 +106,7 @@ multivalue: False
 editable: False
 description: Install Java 9 Runtime Environment
 values: ["install", "none", "reinstall", "uninstall"]
-default: ["none"]
+default: ["install"]
 
 [ProductProperty]
 type: unicode
@@ -146,7 +146,52 @@ default: ["install"]
 
 [ProductProperty]
 type: unicode
-name: sereby_msvc
+name: sereby_msvc2005
+multivalue: False
+editable: False
+description: Install Microsoft Visual C++ Runtimes
+values: ["install", "none", "reinstall", "uninstall"]
+default: ["install"]
+
+[ProductProperty]
+type: unicode
+name: sereby_msvc2008
+multivalue: False
+editable: False
+description: Install Microsoft Visual C++ Runtimes
+values: ["install", "none", "reinstall", "uninstall"]
+default: ["install"]
+
+[ProductProperty]
+type: unicode
+name: sereby_msvc2010
+multivalue: False
+editable: False
+description: Install Microsoft Visual C++ Runtimes
+values: ["install", "none", "reinstall", "uninstall"]
+default: ["install"]
+
+[ProductProperty]
+type: unicode
+name: sereby_msvc2012
+multivalue: False
+editable: False
+description: Install Microsoft Visual C++ Runtimes
+values: ["install", "none", "reinstall", "uninstall"]
+default: ["install"]
+
+[ProductProperty]
+type: unicode
+name: sereby_msvc2013
+multivalue: False
+editable: False
+description: Install Microsoft Visual C++ Runtimes
+values: ["install", "none", "reinstall", "uninstall"]
+default: ["install"]
+
+[ProductProperty]
+type: unicode
+name: sereby_msvc2017
 multivalue: False
 editable: False
 description: Install Microsoft Visual C++ Runtimes
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index cb5f40d..acc2f1d 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -181,6 +181,7 @@ function create() {
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='BUILD']/@value" "${JRE8VERSION}"
   fi
   sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
+  sed -e 's/.*<\/settings>.*/\t<set component="jre8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
   
   if [ "$JRE9UPDATE" = "1" ]; then
     mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/{x86,x64}
@@ -199,7 +200,6 @@ function create() {
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml "/package/variable[@name='BUILD']/@value" "${JRE9VERSION}"
   fi
   sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v9/package.xml
-  sed -e 's/.*<\/settings>.*/\t<set component="jre9" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
   
   # ==========================================================================================================
   # Update Flash