diff --git a/CLIENT_DATA/Ricktendo_JS_package.xml b/CLIENT_DATA/Ricktendo_JS_package.xml
new file mode 100644
index 0000000..26f9711
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_JS_package.xml
@@ -0,0 +1,9 @@
+<package id="msjsharp" name="Microsoft Visual J/F-Sharp 2.0 SE" group="Sonstige Runtimes">
+	<check type="file" condition="notexist" path="%Windir%\Microsoft.NET\Framework\VJSharp\vjshost.dll" />
+	<install>
+		<cmd name="Microsoft Visual J-Sharp 2.0 SE" path="vjsharp\x86\jsredist.msi" param="/qb!" arch="x86" />
+		<cmd name="Microsoft Visual F-Sharp 2.0" path="fsharp\fsharpredist2.0.msi" param="/qb!" arch="x86" />
+		<cmd name="Microsoft Visual J-Sharp 2.0 SE x64" path="vjsharp\x64\jsredist.msi" param="/qb!" arch="x64" />
+		<cmd name="Microsoft Visual F-Sharp 2.0 x64" path="fsharp\fsharpredist2.0.msi" param="/qb!" arch="x64" />
+	</install>
+</package>
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_VB_package.xml b/CLIENT_DATA/Ricktendo_VB_package.xml
new file mode 100644
index 0000000..6f96b04
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_VB_package.xml
@@ -0,0 +1,7 @@
+<package id="msvb" name="%NAME% Runtimes" group="Standard Programme" priority="1">
+    <variable name="NAME" value="Visual Basic and C" />
+	
+	<install>
+		<cmd path="extra.exe" param="/SILENT /NORESTART" />
+	</install>
+</package>
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_VC_package.xml b/CLIENT_DATA/Ricktendo_VC_package.xml
new file mode 100644
index 0000000..37ebbe2
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_VC_package.xml
@@ -0,0 +1,47 @@
+<package id="msvc" name="%NAME% Runtimes" group="Standard Programme" priority="1">
+    <variable name="NAME" value="Visual C++" />
+		
+	<install>
+		<cmd name="%NAME% 2005" path="2005\x86\vcredist.msi" param="/qb!">
+			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x86" />
+			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x64" />
+		</cmd>
+		<cmd name="%NAME% 2008" path="2008\x86\vc_red.msi" param="/qb!">
+			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x86" />
+			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x64" />
+		</cmd>
+		<cmd name="%NAME% 2010" path="2010\x86\vc_red.msi" param="/qb!">
+			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x86" />
+			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x64" />
+		</cmd>
+		<cmd name="%NAME% 2012 Minimum" path="2012\x86\vc_runtimeMinimum_x86.msi" param="/qb!"> 
+			<check type="os"   condition=">" value="6.0.6002.0" />
+		    <check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
+			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
+		</cmd>
+		<cmd name="%NAME% 2012 Additional" path="2012\x86\vc_runtimeAdditional_x86.msi" param="/qb!">
+			<check type="os"   condition=">" value="6.0.6002.0" />
+		    <check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
+			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
+		</cmd>
+		
+		
+		<cmd arch="x64" name="%NAME% 2005 x64" path="2005\x64\vcredist.msi" param="/q">
+			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\amd64\msdia80.dll" value="5.0.50727.6229"/>
+		</cmd>
+		<cmd arch="x64" name="%NAME% 2008 x64" path="2008\x64\vc_red.msi" param="/qb!">
+			<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia90.dll" value="5.0.30729.7523"/>
+		</cmd>
+		<cmd arch="x64" name="%NAME% 2010 x64" path="2010\x64\vc_red.msi" param="/qb!">
+			<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia100.dll" value="50.0.40219.1"/>
+		</cmd>
+		<cmd arch="x64" name="%NAME% 2012 Minimum x64" path="2012\x64\vc_runtimeMinimum_x64.msi" param="/qb!"> 
+			<check type="os"   condition=">" value="6.0.6002.0" />
+			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
+		</cmd>
+		<cmd arch="x64" name="%NAME% 2012 Additional x64" path="2012\x64\vc_runtimeAdditional_x64.msi" param="/qb!">
+			<check type="os"   condition=">" value="6.0.6002.0" />
+			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
+		</cmd>
+	</install>
+</package>
\ No newline at end of file
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 75649b2..94d9450 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -108,6 +108,11 @@ if ($sereby_msvc$ = "reinstall")
     opsiservicecall_msvc_uninstall
     Set $reboot$ = "true"
 endif
+if ($sereby_msvb$ = "reinstall")
+    Winbatch_msvb_uninstall
+    opsiservicecall_msvb_uninstall
+    Set $reboot$ = "true"
+endif
 if ($sereby_AdobeFlash$ = "reinstall")
     Winbatch_AdobeFlash_uninstall
     opsiservicecall_AdobeFlash_uninstall
@@ -293,6 +298,17 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
+[Winbatch_msvb_uninstall]
+
+[opsiservicecall_msvb_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msvb",
+"install",
+"%opsiserviceUser%"
+]
+
 [Winbatch_AdobeFlash_uninstall]
 $UninstallFlashExe$ -uninstall
 
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index f9832b1..4db3652 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -43,6 +43,9 @@ endif
 if ($sereby_msvc$ = "install")
     DosInAnIcon_msvc_config
 endif
+if ($sereby_msvb$ = "install")
+    DosInAnIcon_msvb_config
+endif
 if ($sereby_AdobeFlash$ = "install")
     DosInAnIcon_AdobeFlash_config
 endif
@@ -117,6 +120,10 @@ xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.
 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"
 
+[DosInAnIcon_msvb_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msvb']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
 [DosInAnIcon_AdobeFlash_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
 xml ed -O -u "/settings/set[@component='AdobeFlash']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index 3881ce1..2a7b02f 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -32,6 +32,8 @@ DefVar	$sereby_msdxm$
 Set 	$sereby_msdxm$ = GetProductProperty("sereby_msdxm", "install")
 DefVar	$sereby_msvc$
 Set 	$sereby_msvc$ = GetProductProperty("sereby_msvc", "install")
+DefVar	$sereby_msvb$
+Set 	$sereby_msvb$ = GetProductProperty("sereby_msvb", "install")
 DefVar	$sereby_AdobeFlash$
 Set 	$sereby_AdobeFlash$ = GetProductProperty("sereby_AdobeFlash", "install")
 DefVar	$sereby_AdobeAir$
diff --git a/VBCFJRedist_AIO_x86_x64_2013.8.22.exe.sha1sum b/VBCFJRedist_AIO_x86_x64_2013.8.22.exe.sha1sum
new file mode 100644
index 0000000..01898bf
--- /dev/null
+++ b/VBCFJRedist_AIO_x86_x64_2013.8.22.exe.sha1sum
@@ -0,0 +1 @@
+4914dcdc7e332107dc30d614d2bf59755c27ed28  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/VBCFJRedist_AIO_x86_x64_2013.8.22.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 42c7ca9..8c5342a 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -123,6 +123,19 @@ DL_ARCH[17]="X86"
 DL_EXTRACT_TO[17]="Unlocker"
 DL_EXTRACT_FORMAT[17]="7zip"
 
+RICKTENDOAIO="2013.8.22"
+RICKTENDOAIOUPDATE="1"
+
+MSVC2005VER="8.00.50727.6229"
+MSVC2008VER="9.00.30729.7523"
+MSVC2010VER="10.00.40219.01"
+MSVC2012VER="11.0.60610.1"
+
+DL_FILE[18]="VBCFJRedist_AIO_x86_x64_${RICKTENDOAIO}.exe"
+DL_SOURCE[18]="http://brianspcrepair.com/ricktendo/Setup/VBCFJRedist_AIO_x86_x64.exe"
+DL_ARCH[18]="X86"
+DL_WINST_NAME[18]=RicktendoAioExe
+
 ##################
 ### Uninstallers
 ##################
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index bcd2116..bdf8800 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -51,6 +51,10 @@ function create() {
     7z x -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[6]}
     7z x -y -o$INST_DIR/CLIENT_DATA/X86/win8xdotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]}
 
+    # extract Ricktendo AIO now so the unix2dos dont change the extracted files
+    mkdir -p $INST_DIR/CLIENT_DATA/X86/Ricktendo
+    7z x -o$INST_DIR/CLIENT_DATA/X86/Ricktendo $INST_DIR/CLIENT_DATA/X86/${DL_FILE[18]}
+
     # 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
     
@@ -195,6 +199,27 @@ function create() {
 	sed "s!v5!v${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
     fi
 
+    # MSCV & J/F Sharp
+    if [ "$RICKTENDOAIOUPDATE" = "1" ]; then
+	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/*
+	mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/20* $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/
+	mv -v $INST_DIR/CLIENT_DATA/Ricktendo_VC_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
+	sed "/msdia80.dll/ s!.\..\......\.....!${MSVC2005VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
+	sed "/msdia90.dll/ s!.\..\......\.....!${MSVC2008VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
+	sed "/msdia100.dll/ s!..\..\......\..!${MSVC2010VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
+	sed "/atl110.dll/ s!..\..\......\..!${MSVC2012VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
+
+	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/*
+	mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/*sharp $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/
+	mv -v $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/package.xml
+    fi
+
+    mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/MSVB
+    mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/extra.exe $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/
+    mv -v $INST_DIR/CLIENT_DATA/Ricktendo_VB_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/package.xml
+    sed 's/.*<\/settings>.*/\t<set component="msvb" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
+    sed "s!.\..\..\....!${MSVBVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVB/package.xml
+    
     # move the uninstallers in place (directory layout like the sereby package)
     mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
     mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE