diff --git a/Win10_1607_German_x32.iso.sha1sum b/Win10_1607_German_x32.iso.sha1sum
deleted file mode 100644
index 220d63b..0000000
--- a/Win10_1607_German_x32.iso.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1fb45c93d5375980f96374e3e84707f380b9fd4d  /home/mario/.opsi-dist-cache/sereby.aio-2.4.0.1/X86/Win10_1607_German_x32.iso
diff --git a/Win10_1607_German_x64.iso.sha1sum b/Win10_1607_German_x64.iso.sha1sum
deleted file mode 100644
index b79e95b..0000000
--- a/Win10_1607_German_x64.iso.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5939c18f959d343ca8d9981f1c3574acdb5b499c  /home/mario/.opsi-dist-cache/sereby.aio-2.4.0.1/X86/Win10_1607_German_x64.iso
diff --git a/builder-product.cfg b/builder-product.cfg
index 907e203..e8ac19c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -17,7 +17,7 @@ DATE=`date "+%Y-%m-%d"`
 # Use Original Win 8.x Iso's
 # ==================================
 
-USEWIN8ISO="1"
+USEWIN8ISO="0"
 
 # ==================================
 # create a new sereby
@@ -85,9 +85,9 @@ RICKTENDOAIO="2014.11.11"
 # ==================================
 
 RICKTENDONET46UPDATE="0"
-RICKTENDONET46VER="462"
-RICKTENDONET46LANGVER="462"
-RICKTENDONET="2016.12.17"
+RICKTENDONET46VER="48"
+RICKTENDONET46LANGVER="48"
+RICKTENDONET="allos"
 
 # ==================================
 # General Runtimes Verison
@@ -142,15 +142,15 @@ if [ "$USEWIN8ISO" = "1" ]; then
 else
   # The DL_FILE[8] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[8]="dotNetFx3.5_8.0.7z"
-  DL_SOURCE[8]="file://"
+  DL_FILE[8]="dotNetFx35_WX_8_x86_x64.zip"
+  DL_SOURCE[8]="https://github.com/abbodi1406/dotNetFx35W10/releases/download/v0.19.03/dotNetFx35_WX_8_x86_x64.zip"
   DL_ARCH[8]="X86"
   DL_WINST_NAME[8]=DotNet80Source
 
   # The DL_FILE[9] is also used in the builder-target-cb.sh 
   # if you change also change there
-  DL_FILE[9]="dotNetFx3.5_8.1.7z"
-  DL_SOURCE[9]="file://"
+  DL_FILE[9]="dotNetFx35_WX_8_x86_x64.zip"
+  DL_SOURCE[9]="https://github.com/abbodi1406/dotNetFx35W10/releases/download/v0.19.03/dotNetFx35_WX_8_x86_x64.zip"
   DL_ARCH[9]="X86"
   DL_WINST_NAME[9]=DotNet81Source
 fi
@@ -234,13 +234,13 @@ DL_SOURCE[22]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
 DL_ARCH[22]="X86"
 DL_WINST_NAME[22]=RicktendoAioExe
 
-DL_FILE[23]="dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_SOURCE[23]="http://repacks.net/uploads/dotNetFx${RICKTENDONET46VER}_Full_x86_x64_Slim.exe"
+DL_FILE[23]="ndp${RICKTENDONET46VER}-x86-x64-${RICKTENDONET}-enu.exe"
+DL_SOURCE[23]="https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0fd66638cde16859462a6243a4629a50/ndp${RICKTENDONET46VER}-x86-x64-${RICKTENDONET}-enu.exe"
 DL_ARCH[23]="X86"
 DL_WINST_NAME[23]=Ricktendo46Exe
 
-DL_FILE[24]="dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
-DL_SOURCE[24]="http://repacks.net/uploads/archives/dotNetFx${RICKTENDONET46LANGVER}LP_Full_x86_x64de_Slim.7z"
+DL_FILE[24]="ndp${RICKTENDONET46LANGVER}-x86-x64-${RICKTENDONET}-deu.exe"
+DL_SOURCE[24]="https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/65592cace88fcfb3e14a5c4a54833794/ndp${RICKTENDONET46LANGVER}-x86-x64-${RICKTENDONET}-deu.exe"
 DL_ARCH[24]="X86"
 DL_WINST_NAME[24]=RicktendoNet46Lang
 
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index c9424df..0dd2c40 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -107,13 +107,16 @@ function create() {
   # ==========================================================================================================
   
   mkdir -p $INST_DIR/CLIENT_DATA/X86/win8xdotnet35
-  7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[8]} sources/sxs -r
+  #7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[8]} sources/sxs -r
+  7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[8]}
   #7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs/microsoft-windows-netfx3-ondemand-package.cab
-  7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[9]} sources/sxs -r
+  #7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[9]} sources/sxs -r
+  7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[9]}
   #7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs/microsoft-windows-netfx3-ondemand-package.cab
   #rm -f $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs/microsoft-windows-netfx3-ondemand-package.cab
   # move the Windows 8 dotnet 2 - 3.5 in place
-  mv -v $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.X
+  #mv -v $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.X
+  mv -v $INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/Install/NET/WIN8.X
   
   # ==========================================================================================================
   # extract Ricktendo AIO now so the unix2dos dont change the extracted files
@@ -132,7 +135,8 @@ function create() {
   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 "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.X /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
+  echo "%NETPARENTDIR%\WIN8.X/dotNetFx35_WX_8_x86_x64.exe /SILENT /NORESTART" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
   echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/NETforWin8/NETEnable.bat
   
   # ==========================================================================================================
@@ -194,7 +198,7 @@ function create() {
     rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/*.xml
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x86/silent.bat
-    mv $INST_DIR/CLIENT_DATA/X86/JRE11u${JRE11UVERSION}-b${JRE11BUILD}-x86.msi $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x86/jre.msi
+    mv $INST_DIR/CLIENT_DATA/X86/jre${JRE11UVERSION}-b${JRE11BUILD}-x86.msi $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x86/jre.msi
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x64/silent.bat
     mv $INST_DIR/CLIENT_DATA/X86/jre${JRE11UVERSION}-b${JRE11BUILD}-x64.msi $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x64/jre.msi
     patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml "/package/check[@type='os']"
@@ -270,9 +274,9 @@ function create() {
     #7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/net46/*.exe
     7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.6 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
     mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.6/package.xml
-  else
-    rm $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml
-    mv -v $INST_DIR/CLIENT_DATA/Sereby_NET_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.8/package.xml
+  #else
+    #rm $INST_DIR/CLIENT_DATA/Ricktendo_NET46_package.xml
+    #mv -v $INST_DIR/CLIENT_DATA/Sereby_NET_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.8/package.xml
   fi
   
   # ==========================================================================================================
diff --git a/dotNetFx35_WX_8_x86_x64.zip.sha1sum b/dotNetFx35_WX_8_x86_x64.zip.sha1sum
new file mode 100644
index 0000000..9b2f592
--- /dev/null
+++ b/dotNetFx35_WX_8_x86_x64.zip.sha1sum
@@ -0,0 +1 @@
+76a39d38a5faa5e149ed0454da8635d23292520c  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/dotNetFx35_WX_8_x86_x64.zip
diff --git a/dotNetFx462LP_Full_x86_x64de_Slim_2016.12.17.7z.sha1sum b/dotNetFx462LP_Full_x86_x64de_Slim_2016.12.17.7z.sha1sum
deleted file mode 100644
index d5ffa88..0000000
--- a/dotNetFx462LP_Full_x86_x64de_Slim_2016.12.17.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-0041c5ded2dc3f3830f54451b56aad7557043731  /home/mario/.opsi-dist-cache/sereby.aio-2.4.0.1/X86/dotNetFx462LP_Full_x86_x64de_Slim_2016.12.17.7z
diff --git a/dotNetFx462_Full_x86_x64_Slim_2016.12.17.exe.sha1sum b/dotNetFx462_Full_x86_x64_Slim_2016.12.17.exe.sha1sum
deleted file mode 100644
index 79e42d6..0000000
--- a/dotNetFx462_Full_x86_x64_Slim_2016.12.17.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1886c2b3b6eba37fcf79d59c9e5b100930150fda  /home/mario/.opsi-dist-cache/sereby.aio-2.4.0.1/X86/dotNetFx462_Full_x86_x64_Slim_2016.12.17.exe
diff --git a/dotnetfx_cleanup_tool-2.4.7.1.zip.sha1sum b/dotnetfx_cleanup_tool-2.4.7.1.zip.sha1sum
deleted file mode 100644
index da778cb..0000000
--- a/dotnetfx_cleanup_tool-2.4.7.1.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-2b70dcb8868242e5085c29ed52b13d23c1897cf7  /home/mario/.opsi-dist-cache/sereby.aio-2.4.7.1/X86/dotnetfx_cleanup_tool-2.4.7.1.zip
diff --git a/ndp48-x86-x64-allos-deu.exe.sha1sum b/ndp48-x86-x64-allos-deu.exe.sha1sum
new file mode 100644
index 0000000..0325963
--- /dev/null
+++ b/ndp48-x86-x64-allos-deu.exe.sha1sum
@@ -0,0 +1 @@
+4f257180e4f0c4b34872bc5e91d9375865008f01  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/ndp48-x86-x64-allos-deu.exe
diff --git a/ndp48-x86-x64-allos-enu.exe.sha1sum b/ndp48-x86-x64-allos-enu.exe.sha1sum
new file mode 100644
index 0000000..26c14c6
--- /dev/null
+++ b/ndp48-x86-x64-allos-enu.exe.sha1sum
@@ -0,0 +1 @@
+8dd233698d5eb4609b86c2ac917279fe39e0ef4c  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/ndp48-x86-x64-allos-enu.exe