diff --git a/DP_Biometric_13023.7z.sha1sum b/DP_Biometric_13023.7z.sha1sum
deleted file mode 100644
index 556f1eb..0000000
--- a/DP_Biometric_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3264b427e7e7d284a30fcf6c56a20f658dcfd882  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Biometric_13023.7z
diff --git a/DP_Biometric_13044.7z.aria2 b/DP_Biometric_13044.7z.aria2
new file mode 100644
index 0000000..d3894c3
Binary files /dev/null and b/DP_Biometric_13044.7z.aria2 differ
diff --git a/DP_Biometric_13044.7z.sha1sum b/DP_Biometric_13044.7z.sha1sum
new file mode 100644
index 0000000..4dbb972
--- /dev/null
+++ b/DP_Biometric_13044.7z.sha1sum
@@ -0,0 +1 @@
+71719b4284a936898cbbaaeb24e59f6daac3fe52  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Biometric_13044.7z
diff --git a/DP_Bluetooth_13024.7z.sha1sum b/DP_Bluetooth_13024.7z.sha1sum
deleted file mode 100644
index 26185cd..0000000
--- a/DP_Bluetooth_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c8fc9e6ad27a16314b98acdba6f500a43e3fb355  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Bluetooth_13024.7z
diff --git a/DP_Bluetooth_13044.7z.sha1sum b/DP_Bluetooth_13044.7z.sha1sum
new file mode 100644
index 0000000..cb296a7
--- /dev/null
+++ b/DP_Bluetooth_13044.7z.sha1sum
@@ -0,0 +1 @@
+20cdeb97c76de91a704df8b1666e25610326ea12  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Bluetooth_13044.7z
diff --git a/DP_CardReader_13025.7z.sha1sum b/DP_CardReader_13025.7z.sha1sum
deleted file mode 100644
index 160e02b..0000000
--- a/DP_CardReader_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-790876eebfb76a00b418dc089b2d7db4ec182615  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_CardReader_13025.7z
diff --git a/DP_CardReader_13044.7z.sha1sum b/DP_CardReader_13044.7z.sha1sum
new file mode 100644
index 0000000..98be71a
--- /dev/null
+++ b/DP_CardReader_13044.7z.sha1sum
@@ -0,0 +1 @@
+372dcb1c645b09b66ecd1298aa076a3d4822c800  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_CardReader_13044.7z
diff --git a/DP_Chipset_13025.7z.sha1sum b/DP_Chipset_13025.7z.sha1sum
deleted file mode 100644
index a68275b..0000000
--- a/DP_Chipset_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-b4e6170f14fc27a2b42c34f3d23d38c9f95194d9  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Chipset_13025.7z
diff --git a/DP_Chipset_13045.7z.sha1sum b/DP_Chipset_13045.7z.sha1sum
new file mode 100644
index 0000000..e43fa9d
--- /dev/null
+++ b/DP_Chipset_13045.7z.sha1sum
@@ -0,0 +1 @@
+4ab4a48506cc90dcf803f1c6ea8d9d7eea3a991b  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Chipset_13045.7z
diff --git a/DP_LAN_13023.7z.sha1sum b/DP_LAN_13023.7z.sha1sum
deleted file mode 100644
index 65c62db..0000000
--- a/DP_LAN_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-700321510c44c98f4436ad246ca41d3c0f8595dd  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_LAN_13023.7z
diff --git a/DP_LAN_13044.7z.sha1sum b/DP_LAN_13044.7z.sha1sum
new file mode 100644
index 0000000..df18718
--- /dev/null
+++ b/DP_LAN_13044.7z.sha1sum
@@ -0,0 +1 @@
+cb4ee7d521a66ecf9d72eed6842e358381e33a38  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_LAN_13044.7z
diff --git a/DP_MassStorage_13024.7z.sha1sum b/DP_MassStorage_13024.7z.sha1sum
deleted file mode 100644
index c165f25..0000000
--- a/DP_MassStorage_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-eaf8618b2012037de60b5631f8399a4a187c3275  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_MassStorage_13024.7z
diff --git a/DP_MassStorage_13045.7z.sha1sum b/DP_MassStorage_13045.7z.sha1sum
new file mode 100644
index 0000000..478a6d4
--- /dev/null
+++ b/DP_MassStorage_13045.7z.sha1sum
@@ -0,0 +1 @@
+075cf2cebd82e491e13e6abccaf8fbdec63393ce  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_MassStorage_13045.7z
diff --git a/DP_Misc_13024.7z.sha1sum b/DP_Misc_13024.7z.sha1sum
deleted file mode 100644
index 4fd738b..0000000
--- a/DP_Misc_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-e84cd918ab38211b3ba2bbaaa0420bb43cf01926  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Misc_13024.7z
diff --git a/DP_Misc_13044.7z.sha1sum b/DP_Misc_13044.7z.sha1sum
new file mode 100644
index 0000000..ddeaf29
--- /dev/null
+++ b/DP_Misc_13044.7z.sha1sum
@@ -0,0 +1 @@
+68e3a7463483cc9c1c4377a0d8f7b10640f0a560  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Misc_13044.7z
diff --git a/DP_Modem_13023.7z.sha1sum b/DP_Modem_13023.7z.sha1sum
deleted file mode 100644
index e6ac74e..0000000
--- a/DP_Modem_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-6f8064f1f6303e11528f7134d3c54b69743541e3  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Modem_13023.7z
diff --git a/DP_Modem_13035.7z.sha1sum b/DP_Modem_13035.7z.sha1sum
new file mode 100644
index 0000000..1668741
--- /dev/null
+++ b/DP_Modem_13035.7z.sha1sum
@@ -0,0 +1 @@
+8aa4daca34313f2839e847edb425b00169810189  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Modem_13035.7z
diff --git a/DP_Monitor_13024.7z.sha1sum b/DP_Monitor_13024.7z.sha1sum
deleted file mode 100644
index 5b23342..0000000
--- a/DP_Monitor_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f13010c2f5e06ba8097087eb4550e8a3d8927914  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Monitor_13024.7z
diff --git a/DP_Monitor_13045.7z.sha1sum b/DP_Monitor_13045.7z.sha1sum
new file mode 100644
index 0000000..32ab630
--- /dev/null
+++ b/DP_Monitor_13045.7z.sha1sum
@@ -0,0 +1 @@
+ae0e8774901b3a10def6f220f338aba6c8b10ea9  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Monitor_13045.7z
diff --git a/DP_Notebook_13024.7z.sha1sum b/DP_Notebook_13024.7z.sha1sum
deleted file mode 100644
index 2c20535..0000000
--- a/DP_Notebook_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-dc253b8fb513d3ec2a4014418598c90aed116f5b  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Notebook_13024.7z
diff --git a/DP_Notebook_13044.7z.sha1sum b/DP_Notebook_13044.7z.sha1sum
new file mode 100644
index 0000000..b2bba72
--- /dev/null
+++ b/DP_Notebook_13044.7z.sha1sum
@@ -0,0 +1 @@
+c25d2dc0a9b7ba811b943472a516fabc6279f10c  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Notebook_13044.7z
diff --git a/DP_Printer_13003.7z.sha1sum b/DP_Printer_13003.7z.sha1sum
deleted file mode 100644
index 5fe1323..0000000
--- a/DP_Printer_13003.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3eecd350119a87141c4c3926af033ee4e58aba43  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Printer_13003.7z
diff --git a/DP_Printer_13044.7z.sha1sum b/DP_Printer_13044.7z.sha1sum
new file mode 100644
index 0000000..bcb8d38
--- /dev/null
+++ b/DP_Printer_13044.7z.sha1sum
@@ -0,0 +1 @@
+228d22c965853575b8d1a4bc2b37889b0203c85d  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Printer_13044.7z
diff --git a/DP_Sound_ADI_13023.7z.sha1sum b/DP_Sound_ADI_13023.7z.sha1sum
deleted file mode 100644
index ed90e69..0000000
--- a/DP_Sound_ADI_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3c0bf68f9ee5eff90522ab7d7da7ed28ecbfc4e2  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_ADI_13023.7z
diff --git a/DP_Sound_ADI_13035.7z.sha1sum b/DP_Sound_ADI_13035.7z.sha1sum
new file mode 100644
index 0000000..921705d
--- /dev/null
+++ b/DP_Sound_ADI_13035.7z.sha1sum
@@ -0,0 +1 @@
+28325a142e6ac6bc0ab8fab46d549644d227ff7e  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_ADI_13035.7z
diff --git a/DP_Sound_CMedia_13024.7z.sha1sum b/DP_Sound_CMedia_13024.7z.sha1sum
deleted file mode 100644
index abd6de8..0000000
--- a/DP_Sound_CMedia_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-d7e241c9f7051f26358c0efbd25dfe5525ba6325  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_CMedia_13024.7z
diff --git a/DP_Sound_CMedia_13042.7z.sha1sum b/DP_Sound_CMedia_13042.7z.sha1sum
new file mode 100644
index 0000000..f652fad
--- /dev/null
+++ b/DP_Sound_CMedia_13042.7z.sha1sum
@@ -0,0 +1 @@
+5f3cefe57200737f40920fdabd9d1036847e7d0e  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_CMedia_13042.7z
diff --git a/DP_Sound_Conexant_13023.7z.sha1sum b/DP_Sound_Conexant_13023.7z.sha1sum
deleted file mode 100644
index 544fc13..0000000
--- a/DP_Sound_Conexant_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-0970d6497f77f03be8ad2f46f99b0b791e739100  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_Conexant_13023.7z
diff --git a/DP_Sound_Conexant_13045.7z.sha1sum b/DP_Sound_Conexant_13045.7z.sha1sum
new file mode 100644
index 0000000..3c0f60e
--- /dev/null
+++ b/DP_Sound_Conexant_13045.7z.sha1sum
@@ -0,0 +1 @@
+05a55d193937b2527dcfd2d700c792362edc05ab  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_Conexant_13045.7z
diff --git a/DP_Sound_Creative_13024.7z.sha1sum b/DP_Sound_Creative_13024.7z.sha1sum
deleted file mode 100644
index 0306905..0000000
--- a/DP_Sound_Creative_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5680fde978169cfc71f1dcc238c6d449d1f1a5cd  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_Creative_13024.7z
diff --git a/DP_Sound_Creative_13044.7z.sha1sum b/DP_Sound_Creative_13044.7z.sha1sum
new file mode 100644
index 0000000..a2b7898
--- /dev/null
+++ b/DP_Sound_Creative_13044.7z.sha1sum
@@ -0,0 +1 @@
+55ca011635edb2845923efc151564081a8e17306  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_Creative_13044.7z
diff --git a/DP_Sound_IDT_13023.7z.sha1sum b/DP_Sound_IDT_13023.7z.sha1sum
deleted file mode 100644
index be34a58..0000000
--- a/DP_Sound_IDT_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-bdeefd2fd2bc532e0e2717ebdd91ba7b79337d9f  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_IDT_13023.7z
diff --git a/DP_Sound_IDT_13044.7z.sha1sum b/DP_Sound_IDT_13044.7z.sha1sum
new file mode 100644
index 0000000..d5c2e91
--- /dev/null
+++ b/DP_Sound_IDT_13044.7z.sha1sum
@@ -0,0 +1 @@
+9be12c67be4983dab296389f8774c52c772e8ba1  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_IDT_13044.7z
diff --git a/DP_Sound_Others_13023.7z.sha1sum b/DP_Sound_Others_13023.7z.sha1sum
deleted file mode 100644
index 2ba3eea..0000000
--- a/DP_Sound_Others_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-35c0e5acd19f231a869678e0089381f6f25bef74  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_Others_13023.7z
diff --git a/DP_Sound_Others_13044.7z.sha1sum b/DP_Sound_Others_13044.7z.sha1sum
new file mode 100644
index 0000000..4a40d29
--- /dev/null
+++ b/DP_Sound_Others_13044.7z.sha1sum
@@ -0,0 +1 @@
+50ad28455a07027a6a677ce89af80f69cc9ef4a9  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_Others_13044.7z
diff --git a/DP_Sound_VIA_13014.7z.sha1sum b/DP_Sound_VIA_13014.7z.sha1sum
deleted file mode 100644
index a64b460..0000000
--- a/DP_Sound_VIA_13014.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ea65874b453944afe3b660fcbfca41ba114a56cb  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sound_VIA_13014.7z
diff --git a/DP_Sound_VIA_13035.7z.sha1sum b/DP_Sound_VIA_13035.7z.sha1sum
new file mode 100644
index 0000000..11346e3
--- /dev/null
+++ b/DP_Sound_VIA_13035.7z.sha1sum
@@ -0,0 +1 @@
+80121ba3458d20c47d086c07af793622c75d78cd  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sound_VIA_13035.7z
diff --git a/DP_Sounds_HDMI_13024.7z.sha1sum b/DP_Sounds_HDMI_13024.7z.sha1sum
deleted file mode 100644
index ebea237..0000000
--- a/DP_Sounds_HDMI_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-50896563e23f2bf91e81f2c346a6c573dbae9b81  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sounds_HDMI_13024.7z
diff --git a/DP_Sounds_HDMI_13043.7z.sha1sum b/DP_Sounds_HDMI_13043.7z.sha1sum
new file mode 100644
index 0000000..a47a712
--- /dev/null
+++ b/DP_Sounds_HDMI_13043.7z.sha1sum
@@ -0,0 +1 @@
+9f540c91a3183401827161fe16b5f035675f5bb9  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sounds_HDMI_13043.7z
diff --git a/DP_Sounds_Realtek_13022.7z.sha1sum b/DP_Sounds_Realtek_13022.7z.sha1sum
deleted file mode 100644
index 51e3a96..0000000
--- a/DP_Sounds_Realtek_13022.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-509e95cbff50be9f9f3aaa13b1734173cf748fc8  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Sounds_Realtek_13022.7z
diff --git a/DP_Sounds_Realtek_13044.7z.sha1sum b/DP_Sounds_Realtek_13044.7z.sha1sum
new file mode 100644
index 0000000..ed9e447
--- /dev/null
+++ b/DP_Sounds_Realtek_13044.7z.sha1sum
@@ -0,0 +1 @@
+00697a60ed050b36f1fb48b6f5b2e4e93209b9f1  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Sounds_Realtek_13044.7z
diff --git a/DP_TV_Aver_13024.7z.sha1sum b/DP_TV_Aver_13024.7z.sha1sum
deleted file mode 100644
index 9446ca9..0000000
--- a/DP_TV_Aver_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-25429a9d9c5d7a918ad4d18a62efe80f3bea4599  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_TV_Aver_13024.7z
diff --git a/DP_TV_Aver_13043.7z.sha1sum b/DP_TV_Aver_13043.7z.sha1sum
new file mode 100644
index 0000000..762f1f3
--- /dev/null
+++ b/DP_TV_Aver_13043.7z.sha1sum
@@ -0,0 +1 @@
+de11a505a8d1bd3df1541ae2b1e8085e246cc8cd  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_TV_Aver_13043.7z
diff --git a/DP_TV_Beholder_13014.7z.sha1sum b/DP_TV_Beholder_13014.7z.sha1sum
index b2ec73a..2263021 100644
--- a/DP_TV_Beholder_13014.7z.sha1sum
+++ b/DP_TV_Beholder_13014.7z.sha1sum
@@ -1 +1 @@
-342b31cabbd46e0b88f847be6ac9b9c7c86bde7a  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_TV_Beholder_13014.7z
+342b31cabbd46e0b88f847be6ac9b9c7c86bde7a  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_TV_Beholder_13014.7z
diff --git a/DP_TV_DVB_13021.7z.sha1sum b/DP_TV_DVB_13021.7z.sha1sum
deleted file mode 100644
index 99d324b..0000000
--- a/DP_TV_DVB_13021.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-dd1f6c330bc0b2c7ac9b6af43a21f59c08799572  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_TV_DVB_13021.7z
diff --git a/DP_TV_DVB_13033.7z.sha1sum b/DP_TV_DVB_13033.7z.sha1sum
new file mode 100644
index 0000000..26601af
--- /dev/null
+++ b/DP_TV_DVB_13033.7z.sha1sum
@@ -0,0 +1 @@
+5b7cb2886954562ae2e91070295acc194950e7ee  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_TV_DVB_13033.7z
diff --git a/DP_TV_Others_13012.7z.sha1sum b/DP_TV_Others_13012.7z.sha1sum
deleted file mode 100644
index d0c9d07..0000000
--- a/DP_TV_Others_13012.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-22265b3e477c0f8222e90a1f8da3a8099fd4586c  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_TV_Others_13012.7z
diff --git a/DP_TV_Others_13045.7z.sha1sum b/DP_TV_Others_13045.7z.sha1sum
new file mode 100644
index 0000000..3cb9c98
--- /dev/null
+++ b/DP_TV_Others_13045.7z.sha1sum
@@ -0,0 +1 @@
+7036fd4965beb266f9d49f13cf888759f5ac8c14  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_TV_Others_13045.7z
diff --git a/DP_Telephone_13025.7z.sha1sum b/DP_Telephone_13025.7z.sha1sum
deleted file mode 100644
index c36f1b7..0000000
--- a/DP_Telephone_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ef6ecd0498a61e4b059c800e15b65883e1d84d0f  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Telephone_13025.7z
diff --git a/DP_Telephone_13044.7z.sha1sum b/DP_Telephone_13044.7z.sha1sum
new file mode 100644
index 0000000..0fc7476
--- /dev/null
+++ b/DP_Telephone_13044.7z.sha1sum
@@ -0,0 +1 @@
+aba9e37e57cac60ae9c9769f20b268fd65bfcf15  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Telephone_13044.7z
diff --git a/DP_Touchpad_Alps_13025.7z.sha1sum b/DP_Touchpad_Alps_13025.7z.sha1sum
deleted file mode 100644
index f45dba9..0000000
--- a/DP_Touchpad_Alps_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-73e00c35479f2cfdfb5d758dd9f81c7c052399cc  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Touchpad_Alps_13025.7z
diff --git a/DP_Touchpad_Alps_13045.7z.sha1sum b/DP_Touchpad_Alps_13045.7z.sha1sum
new file mode 100644
index 0000000..0d13502
--- /dev/null
+++ b/DP_Touchpad_Alps_13045.7z.sha1sum
@@ -0,0 +1 @@
+ccb2bb36682ca4a384fa887be60fec1f6c5a3e69  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Touchpad_Alps_13045.7z
diff --git a/DP_Touchpad_Elan_13014.7z.sha1sum b/DP_Touchpad_Elan_13014.7z.sha1sum
deleted file mode 100644
index 74f9635..0000000
--- a/DP_Touchpad_Elan_13014.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5319b08c88dbfbc0a66f6ad11bda37e729531062  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Touchpad_Elan_13014.7z
diff --git a/DP_Touchpad_Elan_13043.7z.sha1sum b/DP_Touchpad_Elan_13043.7z.sha1sum
new file mode 100644
index 0000000..745d112
--- /dev/null
+++ b/DP_Touchpad_Elan_13043.7z.sha1sum
@@ -0,0 +1 @@
+729247a1089f5978061cd1f7be8639d4b79c6e40  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Touchpad_Elan_13043.7z
diff --git a/DP_Touchpad_Others_13013.7z.sha1sum b/DP_Touchpad_Others_13013.7z.sha1sum
deleted file mode 100644
index 2de4a0c..0000000
--- a/DP_Touchpad_Others_13013.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-11d19cb2ece5ddfa4cf14086b0ef29f87f110746  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Touchpad_Others_13013.7z
diff --git a/DP_Touchpad_Others_13042.7z.sha1sum b/DP_Touchpad_Others_13042.7z.sha1sum
new file mode 100644
index 0000000..01bd48f
--- /dev/null
+++ b/DP_Touchpad_Others_13042.7z.sha1sum
@@ -0,0 +1 @@
+d7f1ecea9549275ecef75b847b91f23940e7a711  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Touchpad_Others_13042.7z
diff --git a/DP_Touchpad_Synaptics_13023.7z.sha1sum b/DP_Touchpad_Synaptics_13023.7z.sha1sum
deleted file mode 100644
index 760aca7..0000000
--- a/DP_Touchpad_Synaptics_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ecf06b1ffd0b378a9c0a87623ff94b97933682c2  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Touchpad_Synaptics_13023.7z
diff --git a/DP_Touchpad_Synaptics_13045.7z.sha1sum b/DP_Touchpad_Synaptics_13045.7z.sha1sum
new file mode 100644
index 0000000..578f8b6
--- /dev/null
+++ b/DP_Touchpad_Synaptics_13045.7z.sha1sum
@@ -0,0 +1 @@
+21bb4ef816a6b9153d5ff545a73efb35c728f1d6  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Touchpad_Synaptics_13045.7z
diff --git a/DP_Video_AMD_13045.7z.sha1sum b/DP_Video_AMD_13045.7z.sha1sum
new file mode 100644
index 0000000..5fd847b
--- /dev/null
+++ b/DP_Video_AMD_13045.7z.sha1sum
@@ -0,0 +1 @@
+abc9711ddd72b385892a158f6e95123549237a60  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_AMD_13045.7z
diff --git a/DP_Video_AMD_Desktop_13024.7z.sha1sum b/DP_Video_AMD_Desktop_13024.7z.sha1sum
deleted file mode 100644
index a300972..0000000
--- a/DP_Video_AMD_Desktop_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3f40f9245c544c445d24f68ab6dbbadd4b2973c9  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_AMD_Desktop_13024.7z
diff --git a/DP_Video_AMD_Notebook_13023.7z.sha1sum b/DP_Video_AMD_Notebook_13023.7z.sha1sum
deleted file mode 100644
index 86c5ed8..0000000
--- a/DP_Video_AMD_Notebook_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5bd95f522e5cc82844aa6aaecb841fceafdbe4a0  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_AMD_Notebook_13023.7z
diff --git a/DP_Video_AMD_Server_13014.7z.sha1sum b/DP_Video_AMD_Server_13014.7z.sha1sum
deleted file mode 100644
index e294c46..0000000
--- a/DP_Video_AMD_Server_13014.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1e90ff212e91d875e76b66baa7b37e6736c79470  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_AMD_Server_13014.7z
diff --git a/DP_Video_Hybrid_13012.7z.sha1sum b/DP_Video_Hybrid_13012.7z.sha1sum
deleted file mode 100644
index 9450abc..0000000
--- a/DP_Video_Hybrid_13012.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-b2067e164ff99dfc2a9ff5cd1a956e2a401b6877  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_Hybrid_13012.7z
diff --git a/DP_Video_Hybrid_13045.7z.sha1sum b/DP_Video_Hybrid_13045.7z.sha1sum
new file mode 100644
index 0000000..72d4d8a
--- /dev/null
+++ b/DP_Video_Hybrid_13045.7z.sha1sum
@@ -0,0 +1 @@
+48a6edc53820fac50d35d62f35b486a3c273f219  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_Hybrid_13045.7z
diff --git a/DP_Video_Intel_13024.7z.sha1sum b/DP_Video_Intel_13024.7z.sha1sum
deleted file mode 100644
index 9562278..0000000
--- a/DP_Video_Intel_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f3087e0fd3e5560a1d26a9c5f61462513fd0c35c  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_Intel_13024.7z
diff --git a/DP_Video_Intel_13044.7z.sha1sum b/DP_Video_Intel_13044.7z.sha1sum
new file mode 100644
index 0000000..8894eb7
--- /dev/null
+++ b/DP_Video_Intel_13044.7z.sha1sum
@@ -0,0 +1 @@
+aa381d37e4cc6275d4ae2fcc3a9e1f841859c307  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_Intel_13044.7z
diff --git a/DP_Video_MacBook_13015.7z.sha1sum b/DP_Video_MacBook_13015.7z.sha1sum
deleted file mode 100644
index 0e15804..0000000
--- a/DP_Video_MacBook_13015.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c0433c89fdb0e22135c4820485681720eb222662  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_MacBook_13015.7z
diff --git a/DP_Video_MacBook_13044.7z.sha1sum b/DP_Video_MacBook_13044.7z.sha1sum
new file mode 100644
index 0000000..5788e80
--- /dev/null
+++ b/DP_Video_MacBook_13044.7z.sha1sum
@@ -0,0 +1 @@
+c328fb1dea0b0c0f4192263b0a870672a932d7ab  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_MacBook_13044.7z
diff --git a/DP_Video_Others_13022.7z.sha1sum b/DP_Video_Others_13022.7z.sha1sum
deleted file mode 100644
index 2d12bda..0000000
--- a/DP_Video_Others_13022.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-7797881477c3b71af8541aebebc46e3cbee9da43  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_Others_13022.7z
diff --git a/DP_Video_Others_13034.7z.sha1sum b/DP_Video_Others_13034.7z.sha1sum
new file mode 100644
index 0000000..93ebbe8
--- /dev/null
+++ b/DP_Video_Others_13034.7z.sha1sum
@@ -0,0 +1 @@
+a91a94adc7f7526d11169e918c257abb227fba31  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_Others_13034.7z
diff --git a/DP_Video_Server_13045.7z.sha1sum b/DP_Video_Server_13045.7z.sha1sum
new file mode 100644
index 0000000..5942bea
--- /dev/null
+++ b/DP_Video_Server_13045.7z.sha1sum
@@ -0,0 +1 @@
+c1d13dc57286bd3017f9d449c68708cb7282296c  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_Server_13045.7z
diff --git a/DP_Video_nVIDIA_13045.7z.sha1sum b/DP_Video_nVIDIA_13045.7z.sha1sum
new file mode 100644
index 0000000..1a17bce
--- /dev/null
+++ b/DP_Video_nVIDIA_13045.7z.sha1sum
@@ -0,0 +1 @@
+dbae30cdfdaca65a77a571dc8b8a8ee392ab1112  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_Video_nVIDIA_13045.7z
diff --git a/DP_Video_nVIDIA_Desktop_13025.7z.sha1sum b/DP_Video_nVIDIA_Desktop_13025.7z.sha1sum
deleted file mode 100644
index 4b58115..0000000
--- a/DP_Video_nVIDIA_Desktop_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1523a0a3f08249b8ee696c470dd6762200c53281  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_nVIDIA_Desktop_13025.7z
diff --git a/DP_Video_nVIDIA_Notebook_13024.7z.sha1sum b/DP_Video_nVIDIA_Notebook_13024.7z.sha1sum
deleted file mode 100644
index b5f151f..0000000
--- a/DP_Video_nVIDIA_Notebook_13024.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c8da7faf6cdfb94918d007ac367e4311f4f7a35f  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_nVIDIA_Notebook_13024.7z
diff --git a/DP_Video_nVIDIA_Server_13023.7z.sha1sum b/DP_Video_nVIDIA_Server_13023.7z.sha1sum
deleted file mode 100644
index 580df94..0000000
--- a/DP_Video_nVIDIA_Server_13023.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-788ecfcef19e966a4c47b76c4db74295d9cc0315  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_Video_nVIDIA_Server_13023.7z
diff --git a/DP_WLAN_13025.7z.sha1sum b/DP_WLAN_13025.7z.sha1sum
deleted file mode 100644
index 061ce44..0000000
--- a/DP_WLAN_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-a750982d85bb21e2d3584752c77d82de6fa8b808  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_WLAN_13025.7z
diff --git a/DP_WLAN_13044.7z.sha1sum b/DP_WLAN_13044.7z.sha1sum
new file mode 100644
index 0000000..87f4025
--- /dev/null
+++ b/DP_WLAN_13044.7z.sha1sum
@@ -0,0 +1 @@
+de750e89a5dee28ca9f5a8e47419f5bdbb0f6b08  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_WLAN_13044.7z
diff --git a/DP_WebCam_13025.7z.sha1sum b/DP_WebCam_13025.7z.sha1sum
deleted file mode 100644
index db442bf..0000000
--- a/DP_WebCam_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-cbf1fd7710991de768681c5114c87c8f5471e808  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_WebCam_13025.7z
diff --git a/DP_WebCam_13044.7z.sha1sum b/DP_WebCam_13044.7z.sha1sum
new file mode 100644
index 0000000..7241f92
--- /dev/null
+++ b/DP_WebCam_13044.7z.sha1sum
@@ -0,0 +1 @@
+41f5b22d342007dc1a4b8a6b1826802298c828aa  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_WebCam_13044.7z
diff --git a/DP_xUSB_13025.7z.sha1sum b/DP_xUSB_13025.7z.sha1sum
deleted file mode 100644
index 71ae1fd..0000000
--- a/DP_xUSB_13025.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-b4ce913a2b8be458b2cda0040c3b4b34d018685f  /home/mario/.opsi-dist-cache/adiaproject.dia.winxp-3.4.12/X86/DP_xUSB_13025.7z
diff --git a/DP_xUSB_13044.7z.sha1sum b/DP_xUSB_13044.7z.sha1sum
new file mode 100644
index 0000000..54365fa
--- /dev/null
+++ b/DP_xUSB_13044.7z.sha1sum
@@ -0,0 +1 @@
+e0ad99e7c60b7f2ffacd0a5727f723805793b95c  /home/mario/.opsi-dist-cache/adiaproject.dia.vista-13.04/X86/DP_xUSB_13044.7z
diff --git a/builder-product.cfg b/builder-product.cfg
index 135e595..57b1d5a 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -1,13 +1,53 @@
 ############################
 # Setup product information 
 ############################
-VENDOR="adia-project.net"
-PN="adiaproject.dia.vista"
-VERSION="3.4.12"
+VENDOR="driveroff.net"
+PN="driveroff.vista"
+VERSION="13.04"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
 
+BIOMETRIC="13.04.4"
+BLUETOOTH="13.04.4"
+CARDREADER="13.04.4"
+CHIPSET="13.04.5"
+LAN="13.04.4"
+MASSSTORAGE="13.04.5"
+MISC="13.04.4"
+MODEM="13.03.5"
+MONITOR="13.04.5"
+NOTEBOOK="13.04.4"
+PRINTER="13.04.4"
+SOUNDADI="13.03.5"
+SOUNDCMEDIA="13.04.2"
+SOUNDCONEXANT="13.04.5"
+SOUNDCREATIVE="13.04.4"
+SOUNDIDT="13.04.4"
+SOUNDOTHERS="13.04.4"
+SOUNDVIA="13.03.5"
+SOUNDHDMI="13.04.3"
+SOUNDREALTEK="13.04.4"
+TVAVER="13.04.3"
+TVBEHOLDER="13.01.4"
+TVDVB="13.03.3"
+TVOTHERS="13.04.5"
+TELEPHONE="13.04.4"
+TOUCHPADALPS="13.04.5"
+TOUCHPADELANTECH="13.04.3"
+TOUCHPADOTHERS="13.04.2"
+TOUCHPADSYNAPTICS="13.04.5"
+VIDEOAMD="13.04.5"
+VIDEOHYBRID="13.04.5"
+VIDEOINTEL="13.04.4"
+VIDEOMACBOOK="13.04.4"
+VIDEOOTHERS="13.03.4"
+VIDEOSERVER="13.04.5"
+VIDEONVIDIA="13.04.5"
+WLAN="13.04.4"
+WEBCAM="13.04.4"
+XUSB="13.04.4"
+
 # TYPE - defines, if the install files are public or restricted. 
 # Valid value: restricted | public
 TYPE="public"
@@ -30,300 +70,279 @@ DL_ARCH[2]="X86_64"
 DL_DOWNLOADER[2]="plowdown"
 DL_EXTRACT_FORMAT[2]="7zip"
 
-DL_FILE[3]="DP_Biometric_13023.7z"
-DL_SOURCE[3]="http://driveroff.net/dp/DP_Biometric_13023.7z.torrent"
+DL_FILE[3]="DP_Biometric_${BIOMETRIC//./}.7z"
+DL_SOURCE[3]="http://driveroff.net/dp/DP_Biometric_${BIOMETRIC//./}.7z.torrent"
 DL_ARCH[3]="X86"
 DL_DOWNLOADER[3]="aria2c"
 DL_EXTRACT_FORMAT[3]="7zip"
 DL_EXTRACT_TO[3]="drivers/Vista"
 
-DL_FILE[4]="DP_Bluetooth_13024.7z"
-DL_SOURCE[4]="http://driveroff.net/dp/DP_Bluetooth_13024.7z.torrent"
+DL_FILE[4]="DP_Bluetooth_${BLUETOOTH//./}.7z"
+DL_SOURCE[4]="http://driveroff.net/dp/DP_Bluetooth_${BLUETOOTH//./}.7z.torrent"
 DL_ARCH[4]="X86"
 DL_DOWNLOADER[4]="aria2c"
 DL_EXTRACT_FORMAT[4]="7zip"
 DL_EXTRACT_TO[4]="drivers/Vista"
 
-DL_FILE[5]="DP_CardReader_13025.7z"
-DL_SOURCE[5]="http://driveroff.net/dp/DP_CardReader_13025.7z.torrent"
+DL_FILE[5]="DP_CardReader_${CARDREADER//./}.7z"
+DL_SOURCE[5]="http://driveroff.net/dp/DP_CardReader_${CARDREADER//./}.7z.torrent"
 DL_ARCH[5]="X86"
 DL_DOWNLOADER[5]="aria2c"
 DL_EXTRACT_FORMAT[5]="7zip"
 DL_EXTRACT_TO[5]="drivers/Vista"
 
-DL_FILE[6]="DP_Chipset_13025.7z"
-DL_SOURCE[6]="http://driveroff.net/dp/DP_Chipset_13025.7z.torrent"
+DL_FILE[6]="DP_Chipset_${CHIPSET//./}.7z"
+DL_SOURCE[6]="http://driveroff.net/dp/DP_Chipset_${CHIPSET//./}.7z.torrent"
 DL_ARCH[6]="X86"
 DL_DOWNLOADER[6]="aria2c"
 DL_EXTRACT_FORMAT[6]="7zip"
 DL_EXTRACT_TO[6]="drivers/Vista"
 
-DL_FILE[7]="DP_LAN_13023.7z"
-DL_SOURCE[7]="http://driveroff.net/dp/DP_LAN_13023.7z.torrent"
+DL_FILE[7]="DP_LAN_${LAN//./}.7z"
+DL_SOURCE[7]="http://driveroff.net/dp/DP_LAN_${LAN//./}.7z.torrent"
 DL_ARCH[7]="X86"
 DL_DOWNLOADER[7]="aria2c"
 DL_EXTRACT_FORMAT[7]="7zip"
 DL_EXTRACT_TO[7]="drivers/Vista"
 
-DL_FILE[8]="DP_MassStorage_13024.7z"
-DL_SOURCE[8]="http://driveroff.net/dp/DP_MassStorage_13024.7z.torrent"
+DL_FILE[8]="DP_MassStorage_${MASSSTORAGE//./}.7z"
+DL_SOURCE[8]="http://driveroff.net/dp/DP_MassStorage_${MASSSTORAGE//./}.7z.torrent"
 DL_ARCH[8]="X86"
 DL_DOWNLOADER[8]="aria2c"
 DL_EXTRACT_FORMAT[8]="7zip"
 DL_EXTRACT_TO[8]="drivers/Vista"
 
-DL_FILE[9]="DP_Misc_13024.7z"
-DL_SOURCE[9]="http://driveroff.net/dp/DP_Misc_13024.7z.torrent"
+DL_FILE[9]="DP_Misc_${MISC//./}.7z"
+DL_SOURCE[9]="http://driveroff.net/dp/DP_Misc_${MISC//./}.7z.torrent"
 DL_ARCH[9]="X86"
 DL_DOWNLOADER[9]="aria2c"
 DL_EXTRACT_FORMAT[9]="7zip"
 DL_EXTRACT_TO[9]="drivers/Vista"
 
-DL_FILE[10]="DP_Modem_13023.7z"
-DL_SOURCE[10]="http://driveroff.net/dp/DP_Modem_13023.7z.torrent"
+DL_FILE[10]="DP_Modem_${MODEM//./}.7z"
+DL_SOURCE[10]="http://driveroff.net/dp/DP_Modem_${MODEM//./}.7z.torrent"
 DL_ARCH[10]="X86"
 DL_DOWNLOADER[10]="aria2c"
 DL_EXTRACT_FORMAT[10]="7zip"
 DL_EXTRACT_TO[10]="drivers/Vista"
 
-DL_FILE[11]="DP_Monitor_13024.7z"
-DL_SOURCE[11]="http://driveroff.net/dp/DP_Monitor_13024.7z.torrent"
+DL_FILE[11]="DP_Monitor_${MONITOR//./}.7z"
+DL_SOURCE[11]="http://driveroff.net/dp/DP_Monitor_${MONITOR//./}.7z.torrent"
 DL_ARCH[11]="X86"
 DL_DOWNLOADER[11]="aria2c"
 DL_EXTRACT_FORMAT[11]="7zip"
 DL_EXTRACT_TO[11]="drivers/Vista"
 
-DL_FILE[12]="DP_Notebook_13024.7z"
-DL_SOURCE[12]="http://driveroff.net/dp/DP_Notebook_13024.7z.torrent"
+DL_FILE[12]="DP_Notebook_${NOTEBOOK//./}.7z"
+DL_SOURCE[12]="http://driveroff.net/dp/DP_Notebook_${NOTEBOOK//./}.7z.torrent"
 DL_ARCH[12]="X86"
 DL_DOWNLOADER[12]="aria2c"
 DL_EXTRACT_FORMAT[12]="7zip"
 DL_EXTRACT_TO[12]="drivers/Vista"
 
-DL_FILE[13]="DP_Printer_13003.7z"
-DL_SOURCE[13]="http://driveroff.net/dp/DP_Printer_13003.7z.torrent"
+DL_FILE[13]="DP_Printer_${PRINTER//./}.7z"
+DL_SOURCE[13]="http://driveroff.net/dp/DP_Printer_${PRINTER//./}.7z.torrent"
 DL_ARCH[13]="X86"
 DL_DOWNLOADER[13]="aria2c"
 DL_EXTRACT_FORMAT[13]="7zip"
 DL_EXTRACT_TO[13]="drivers/Vista"
 
-DL_FILE[14]="DP_Sound_ADI_13023.7z"
-DL_SOURCE[14]="http://driveroff.net/dp/DP_Sound_ADI_13023.7z.torrent"
+DL_FILE[14]="DP_Sound_ADI_${SOUNDADI//./}.7z"
+DL_SOURCE[14]="http://driveroff.net/dp/DP_Sound_ADI_${SOUNDADI//./}.7z.torrent"
 DL_ARCH[14]="X86"
 DL_DOWNLOADER[14]="aria2c"
 DL_EXTRACT_FORMAT[14]="7zip"
 DL_EXTRACT_TO[14]="drivers/Vista"
 
-DL_FILE[15]="DP_Sound_CMedia_13024.7z"
-DL_SOURCE[15]="http://driveroff.net/dp/DP_Sound_CMedia_13024.7z.torrent"
+DL_FILE[15]="DP_Sound_CMedia_${SOUNDCMEDIA//./}.7z"
+DL_SOURCE[15]="http://driveroff.net/dp/DP_Sound_CMedia_${SOUNDCMEDIA//./}.7z.torrent"
 DL_ARCH[15]="X86"
 DL_DOWNLOADER[15]="aria2c"
 DL_EXTRACT_FORMAT[15]="7zip"
 DL_EXTRACT_TO[15]="drivers/Vista"
 
-DL_FILE[16]="DP_Sound_Conexant_13023.7z"
-DL_SOURCE[16]="http://driveroff.net/dp/DP_Sound_Conexant_13023.7z.torrent"
+DL_FILE[16]="DP_Sound_Conexant_${SOUNDCONEXANT//./}.7z"
+DL_SOURCE[16]="http://driveroff.net/dp/DP_Sound_Conexant_${SOUNDCONEXANT//./}.7z.torrent"
 DL_ARCH[16]="X86"
 DL_DOWNLOADER[16]="aria2c"
 DL_EXTRACT_FORMAT[16]="7zip"
 DL_EXTRACT_TO[16]="drivers/Vista"
 
-DL_FILE[17]="DP_Sound_Creative_13024.7z"
-DL_SOURCE[17]="http://driveroff.net/dp/DP_Sound_Creative_13024.7z.torrent"
+DL_FILE[17]="DP_Sound_Creative_${SOUNDCREATIVE//./}.7z"
+DL_SOURCE[17]="http://driveroff.net/dp/DP_Sound_Creative_${SOUNDCREATIVE//./}.7z.torrent"
 DL_ARCH[17]="X86"
 DL_DOWNLOADER[17]="aria2c"
 DL_EXTRACT_FORMAT[17]="7zip"
 DL_EXTRACT_TO[17]="drivers/Vista"
 
-DL_FILE[18]="DP_Sound_IDT_13023.7z"
-DL_SOURCE[18]="http://driveroff.net/dp/DP_Sound_IDT_13023.7z.torrent"
+DL_FILE[18]="DP_Sound_IDT_${SOUNDIDT//./}.7z"
+DL_SOURCE[18]="http://driveroff.net/dp/DP_Sound_IDT_${SOUNDIDT//./}.7z.torrent"
 DL_ARCH[18]="X86"
 DL_DOWNLOADER[18]="aria2c"
 DL_EXTRACT_FORMAT[18]="7zip"
 DL_EXTRACT_TO[18]="drivers/Vista"
 
-DL_FILE[19]="DP_Sound_Others_13023.7z"
-DL_SOURCE[19]="http://driveroff.net/dp/DP_Sound_Others_13023.7z.torrent"
+DL_FILE[19]="DP_Sound_Others_${SOUNDOTHERS//./}.7z"
+DL_SOURCE[19]="http://driveroff.net/dp/DP_Sound_Others_${SOUNDOTHERS//./}.7z.torrent"
 DL_ARCH[19]="X86"
 DL_DOWNLOADER[19]="aria2c"
 DL_EXTRACT_FORMAT[19]="7zip"
 DL_EXTRACT_TO[19]="drivers/Vista"
 
-DL_FILE[20]="DP_Sound_VIA_13014.7z"
-DL_SOURCE[20]="http://driveroff.net/dp/DP_Sound_VIA_13014.7z.torrent"
+DL_FILE[20]="DP_Sound_VIA_${SOUNDVIA//./}.7z"
+DL_SOURCE[20]="http://driveroff.net/dp/DP_Sound_VIA_${SOUNDVIA//./}.7z.torrent"
 DL_ARCH[20]="X86"
 DL_DOWNLOADER[20]="aria2c"
 DL_EXTRACT_FORMAT[20]="7zip"
 DL_EXTRACT_TO[20]="drivers/Vista"
 
-DL_FILE[21]="DP_Sounds_HDMI_13024.7z"
-DL_SOURCE[21]="http://driveroff.net/dp/DP_Sounds_HDMI_13024.7z.torrent"
+DL_FILE[21]="DP_Sounds_HDMI_${SOUNDHDMI//./}.7z"
+DL_SOURCE[21]="http://driveroff.net/dp/DP_Sounds_HDMI_${SOUNDHDMI//./}.7z.torrent"
 DL_ARCH[21]="X86"
 DL_DOWNLOADER[21]="aria2c"
 DL_EXTRACT_FORMAT[21]="7zip"
 DL_EXTRACT_TO[21]="drivers/Vista"
 
-DL_FILE[22]="DP_Sounds_Realtek_13022.7z"
-DL_SOURCE[22]="http://driveroff.net/dp/DP_Sounds_Realtek_13022.7z.torrent"
+DL_FILE[22]="DP_Sounds_Realtek_${SOUNDREALTEK//./}.7z"
+DL_SOURCE[22]="http://driveroff.net/dp/DP_Sounds_Realtek_${SOUNDREALTEK//./}.7z.torrent"
 DL_ARCH[22]="X86"
 DL_DOWNLOADER[22]="aria2c"
 DL_EXTRACT_FORMAT[22]="7zip"
 DL_EXTRACT_TO[22]="drivers/Vista"
 
-DL_FILE[23]="DP_TV_Aver_13024.7z"
-DL_SOURCE[23]="http://driveroff.net/dp/DP_TV_Aver_13024.7z.torrent"
+DL_FILE[23]="DP_TV_Aver_${TVAVER//./}.7z"
+DL_SOURCE[23]="http://driveroff.net/dp/DP_TV_Aver_${TVAVER//./}.7z.torrent"
 DL_ARCH[23]="X86"
 DL_DOWNLOADER[23]="aria2c"
 DL_EXTRACT_FORMAT[23]="7zip"
 DL_EXTRACT_TO[23]="drivers/Vista"
 
-DL_FILE[24]="DP_TV_Beholder_13014.7z"
-DL_SOURCE[24]="http://driveroff.net/dp/DP_TV_Beholder_13014.7z.torrent"
+DL_FILE[24]="DP_TV_Beholder_${TVBEHOLDER//./}.7z"
+DL_SOURCE[24]="http://driveroff.net/dp/DP_TV_Beholder_${TVBEHOLDER//./}.7z.torrent"
 DL_ARCH[24]="X86"
 DL_DOWNLOADER[24]="aria2c"
 DL_EXTRACT_FORMAT[24]="7zip"
 DL_EXTRACT_TO[24]="drivers/Vista"
 
-DL_FILE[25]="DP_TV_DVB_13021.7z"
-DL_SOURCE[25]="http://driveroff.net/dp/DP_TV_DVB_13021.7z.torrent"
+DL_FILE[25]="DP_TV_DVB_${TVDVB//./}.7z"
+DL_SOURCE[25]="http://driveroff.net/dp/DP_TV_DVB_${TVDVB//./}.7z.torrent"
 DL_ARCH[25]="X86"
 DL_DOWNLOADER[25]="aria2c"
 DL_EXTRACT_FORMAT[25]="7zip"
 DL_EXTRACT_TO[25]="drivers/Vista"
 
-DL_FILE[26]="DP_TV_Others_13012.7z"
-DL_SOURCE[26]="http://driveroff.net/dp/DP_TV_Others_13012.7z.torrent"
+DL_FILE[26]="DP_TV_Others_${TVOTHERS//./}.7z"
+DL_SOURCE[26]="http://driveroff.net/dp/DP_TV_Others_${TVOTHERS//./}.7z.torrent"
 DL_ARCH[26]="X86"
 DL_DOWNLOADER[26]="aria2c"
 DL_EXTRACT_FORMAT[26]="7zip"
 DL_EXTRACT_TO[26]="drivers/Vista"
 
-DL_FILE[27]="DP_Telephone_13025.7z"
-DL_SOURCE[27]="http://driveroff.net/dp/DP_Telephone_13025.7z.torrent"
+DL_FILE[27]="DP_Telephone_${TELEPHONE//./}.7z"
+DL_SOURCE[27]="http://driveroff.net/dp/DP_Telephone_${TELEPHONE//./}.7z.torrent"
 DL_ARCH[27]="X86"
 DL_DOWNLOADER[27]="aria2c"
 DL_EXTRACT_FORMAT[27]="7zip"
 DL_EXTRACT_TO[27]="drivers/Vista"
 
-DL_FILE[28]="DP_Touchpad_Alps_13025.7z"
-DL_SOURCE[28]="http://driveroff.net/dp/DP_Touchpad_Alps_13025.7z.torrent"
+DL_FILE[28]="DP_Touchpad_Alps_${TOUCHPADALPS//./}.7z"
+DL_SOURCE[28]="http://driveroff.net/dp/DP_Touchpad_Alps_${TOUCHPADALPS//./}.7z.torrent"
 DL_ARCH[28]="X86"
 DL_DOWNLOADER[28]="aria2c"
 DL_EXTRACT_FORMAT[28]="7zip"
 DL_EXTRACT_TO[28]="drivers/Vista"
 
-DL_FILE[29]="DP_Touchpad_Elan_13014.7z"
-DL_SOURCE[29]="http://driveroff.net/dp/DP_Touchpad_Elan_13014.7z.torrent"
+DL_FILE[29]="DP_Touchpad_Elan_${TOUCHPADELANTECH//./}.7z"
+DL_SOURCE[29]="http://driveroff.net/dp/DP_Touchpad_Elan_${TOUCHPADELANTECH//./}.7z.torrent"
 DL_ARCH[29]="X86"
 DL_DOWNLOADER[29]="aria2c"
 DL_EXTRACT_FORMAT[29]="7zip"
 DL_EXTRACT_TO[29]="drivers/Vista"
 
-DL_FILE[30]="DP_Touchpad_Others_13013.7z"
-DL_SOURCE[30]="http://driveroff.net/dp/DP_Touchpad_Others_13013.7z.torrent"
+DL_FILE[30]="DP_Touchpad_Others_${TOUCHPADOTHERS//./}.7z"
+DL_SOURCE[30]="http://driveroff.net/dp/DP_Touchpad_Others_${TOUCHPADOTHERS//./}.7z.torrent"
 DL_ARCH[30]="X86"
 DL_DOWNLOADER[30]="aria2c"
 DL_EXTRACT_FORMAT[30]="7zip"
 DL_EXTRACT_TO[30]="drivers/Vista"
 
-DL_FILE[31]="DP_Touchpad_Synaptics_13023.7z"
-DL_SOURCE[31]="http://driveroff.net/dp/DP_Touchpad_Synaptics_13023.7z.torrent"
+DL_FILE[31]="DP_Touchpad_Synaptics_${TOUCHPADSYNAPTICS//./}.7z"
+DL_SOURCE[31]="http://driveroff.net/dp/DP_Touchpad_Synaptics_${TOUCHPADSYNAPTICS//./}.7z.torrent"
 DL_ARCH[31]="X86"
 DL_DOWNLOADER[31]="aria2c"
 DL_EXTRACT_FORMAT[31]="7zip"
 DL_EXTRACT_TO[31]="drivers/Vista"
 
-DL_FILE[32]="DP_Video_AMD_Desktop_13024.7z"
-DL_SOURCE[32]="http://driveroff.net/dp/DP_Video_AMD_Desktop_13024.7z.torrent"
+DL_FILE[32]="DP_Video_AMD_${VIDEOAMD//./}.7z"
+DL_SOURCE[32]="http://driveroff.net/dp/DP_Video_AMD_${VIDEOAMD//./}.7z.torrent"
 DL_ARCH[32]="X86"
 DL_DOWNLOADER[32]="aria2c"
 DL_EXTRACT_FORMAT[32]="7zip"
 DL_EXTRACT_TO[32]="drivers/Vista"
 
-DL_FILE[33]="DP_Video_AMD_Notebook_13023.7z"
-DL_SOURCE[33]="http://driveroff.net/dp/DP_Video_AMD_Notebook_13023.7z.torrent"
+DL_FILE[33]="DP_Video_Hybrid_${VIDEOHYBRID//./}.7z"
+DL_SOURCE[33]="http://driveroff.net/dp/DP_Video_Hybrid_${VIDEOHYBRID//./}.7z.torrent"
 DL_ARCH[33]="X86"
 DL_DOWNLOADER[33]="aria2c"
 DL_EXTRACT_FORMAT[33]="7zip"
 DL_EXTRACT_TO[33]="drivers/Vista"
 
-DL_FILE[34]="DP_Video_AMD_Server_13014.7z"
-DL_SOURCE[34]="http://driveroff.net/dp/DP_Video_AMD_Server_13014.7z.torrent"
+DL_FILE[34]="DP_Video_Intel_${VIDEOINTEL//./}.7z"
+DL_SOURCE[34]="http://driveroff.net/dp/DP_Video_Intel_${VIDEOINTEL//./}.7z.torrent"
 DL_ARCH[34]="X86"
 DL_DOWNLOADER[34]="aria2c"
 DL_EXTRACT_FORMAT[34]="7zip"
 DL_EXTRACT_TO[34]="drivers/Vista"
 
-DL_FILE[35]="DP_Video_Hybrid_13012.7z"
-DL_SOURCE[35]="http://driveroff.net/dp/DP_Video_Hybrid_13012.7z.torrent"
+DL_FILE[35]="DP_Video_MacBook_${VIDEOMACBOOK//./}.7z"
+DL_SOURCE[35]="http://driveroff.net/dp/DP_Video_MacBook_${VIDEOMACBOOK//./}.7z.torrent"
 DL_ARCH[35]="X86"
 DL_DOWNLOADER[35]="aria2c"
 DL_EXTRACT_FORMAT[35]="7zip"
 DL_EXTRACT_TO[35]="drivers/Vista"
 
-DL_FILE[36]="DP_Video_Intel_13024.7z"
-DL_SOURCE[36]="http://driveroff.net/dp/DP_Video_Intel_13024.7z.torrent"
+DL_FILE[36]="DP_Video_Others_${VIDEOOTHERS//./}.7z"
+DL_SOURCE[36]="http://driveroff.net/dp/DP_Video_Others_${VIDEOOTHERS//./}.7z.torrent"
 DL_ARCH[36]="X86"
 DL_DOWNLOADER[36]="aria2c"
 DL_EXTRACT_FORMAT[36]="7zip"
 DL_EXTRACT_TO[36]="drivers/Vista"
 
-DL_FILE[37]="DP_Video_MacBook_13015.7z"
-DL_SOURCE[37]="http://driveroff.net/dp/DP_Video_MacBook_13015.7z.torrent"
+DL_FILE[37]="DP_Video_Server_${VIDEOSERVER//./}.7z"
+DL_SOURCE[37]="http://driveroff.net/dp/DP_Video_Server_${VIDEOSERVER//./}.7z.torrent"
 DL_ARCH[37]="X86"
 DL_DOWNLOADER[37]="aria2c"
 DL_EXTRACT_FORMAT[37]="7zip"
 DL_EXTRACT_TO[37]="drivers/Vista"
 
-DL_FILE[38]="DP_Video_Others_13022.7z"
-DL_SOURCE[38]="http://driveroff.net/dp/DP_Video_Others_13022.7z.torrent"
+DL_FILE[38]="DP_Video_nVIDIA_${VIDEONVIDIA//./}.7z"
+DL_SOURCE[38]="http://driveroff.net/dp/DP_Video_nVIDIA_${VIDEONVIDIA//./}.7z.torrent"
 DL_ARCH[38]="X86"
 DL_DOWNLOADER[38]="aria2c"
 DL_EXTRACT_FORMAT[38]="7zip"
 DL_EXTRACT_TO[38]="drivers/Vista"
 
-DL_FILE[39]="DP_Video_nVIDIA_Desktop_13025.7z"
-DL_SOURCE[39]="http://driveroff.net/dp/DP_Video_nVIDIA_Desktop_13025.7z.torrent"
+DL_FILE[39]="DP_WLAN_${WLAN//./}.7z"
+DL_SOURCE[39]="http://driveroff.net/dp/DP_WLAN_${WLAN//./}.7z.torrent"
 DL_ARCH[39]="X86"
 DL_DOWNLOADER[39]="aria2c"
 DL_EXTRACT_FORMAT[39]="7zip"
 DL_EXTRACT_TO[39]="drivers/Vista"
 
-DL_FILE[40]="DP_Video_nVIDIA_Notebook_13024.7z"
-DL_SOURCE[40]="http://driveroff.net/dp/DP_Video_nVIDIA_Notebook_13024.7z.torrent"
+DL_FILE[40]="DP_WebCam_${WEBCAM//./}.7z"
+DL_SOURCE[40]="http://driveroff.net/dp/DP_WebCam_${WEBCAM//./}.7z.torrent"
 DL_ARCH[40]="X86"
 DL_DOWNLOADER[40]="aria2c"
 DL_EXTRACT_FORMAT[40]="7zip"
 DL_EXTRACT_TO[40]="drivers/Vista"
 
-DL_FILE[41]="DP_Video_nVIDIA_Server_13023.7z"
-DL_SOURCE[41]="http://driveroff.net/dp/DP_Video_nVIDIA_Server_13023.7z.torrent"
+DL_FILE[41]="DP_xUSB_${XUSB//./}.7z"
+DL_SOURCE[41]="http://driveroff.net/dp/DP_xUSB_${XUSB//./}.7z.torrent"
 DL_ARCH[41]="X86"
 DL_DOWNLOADER[41]="aria2c"
 DL_EXTRACT_FORMAT[41]="7zip"
 DL_EXTRACT_TO[41]="drivers/Vista"
 
-DL_FILE[42]="DP_WLAN_13025.7z"
-DL_SOURCE[42]="http://driveroff.net/dp/DP_WLAN_13025.7z.torrent"
-DL_ARCH[42]="X86"
-DL_DOWNLOADER[42]="aria2c"
-DL_EXTRACT_FORMAT[42]="7zip"
-DL_EXTRACT_TO[42]="drivers/Vista"
-
-DL_FILE[43]="DP_WebCam_13025.7z"
-DL_SOURCE[43]="http://driveroff.net/dp/DP_WebCam_13025.7z.torrent"
-DL_ARCH[43]="X86"
-DL_DOWNLOADER[43]="aria2c"
-DL_EXTRACT_FORMAT[43]="7zip"
-DL_EXTRACT_TO[43]="drivers/Vista"
-
-DL_FILE[44]="DP_xUSB_13025.7z"
-DL_SOURCE[44]="http://driveroff.net/dp/DP_xUSB_13025.7z.torrent"
-DL_ARCH[44]="X86"
-DL_DOWNLOADER[44]="aria2c"
-DL_EXTRACT_FORMAT[44]="7zip"
-DL_EXTRACT_TO[44]="drivers/Vista"
-
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index e5d0a91..447d49a 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -27,12 +27,12 @@ function cleanup() {
 function create() {
     echo "Create"
     builder_create
-    rm $INST_DIR/CLIENT_DATA/*/DriversInstaller_Release_${VERSION}_Full/*.url
-    mkdir -p $INST_DIR/CLIENT_DATA/X86_64/drivers/Vista64
-    rsync -avr $INST_DIR/CLIENT_DATA/X86/drivers/Vista/* $INST_DIR/CLIENT_DATA/X86_64/drivers/Vista64/
-    rsync -avr $INST_DIR/CLIENT_DATA/X86/DriversInstaller_Release_${VERSION}_Full/* $INST_DIR/CLIENT_DATA/X86
-    rsync -avr $INST_DIR/CLIENT_DATA/X86_64/DriversInstaller_Release_${VERSION}_Full/* $INST_DIR/CLIENT_DATA/X86_64
-    rm -rf $INST_DIR/CLIENT_DATA/*/DriversInstaller_Release_${VERSION}_Full/
+    rm $INST_DIR/CLIENT_DATA/*/DriversInstaller_Release_*_Full/*.url
+    mkdir -p $INST_DIR/CLIENT_DATA/X86_64/drivers
+    cp -al $INST_DIR/CLIENT_DATA/X86/drivers/Vista $INST_DIR/CLIENT_DATA/X86_64/drivers/Vista64/
+    rsync -avr $INST_DIR/CLIENT_DATA/X86/DriversInstaller_Release_*_Full/* $INST_DIR/CLIENT_DATA/X86
+    rsync -avr $INST_DIR/CLIENT_DATA/X86_64/DriversInstaller_Release_*_Full/* $INST_DIR/CLIENT_DATA/X86_64
+    rm -rf $INST_DIR/CLIENT_DATA/*/DriversInstaller_Release_*_Full/
 
     ################################################################################
     # windows NT / 2000 / 2003 / Longhorn
@@ -68,6 +68,8 @@ function create() {
     # delete empty dirs
     find $INST_DIR/CLIENT_DATA/X86/drivers -type d -empty -exec rmdir {} \;
     find $INST_DIR/CLIENT_DATA/X86/drivers -type d -empty -exec rmdir {} \;
+    find $INST_DIR/CLIENT_DATA/X86/drivers -type d -empty -exec rmdir {} \;
+    find $INST_DIR/CLIENT_DATA/X86/drivers -type d -empty -exec rmdir {} \;
 
     ################################################################################
     # windows NT / 2000 / 2003 / Longhorn
@@ -102,5 +104,7 @@ function create() {
     # delete empty dirs
     find $INST_DIR/CLIENT_DATA/X86_64/drivers -type d -empty -exec rmdir {} \;
     find $INST_DIR/CLIENT_DATA/X86_64/drivers -type d -empty -exec rmdir {} \;
+    find $INST_DIR/CLIENT_DATA/X86_64/drivers -type d -empty -exec rmdir {} \;
+    find $INST_DIR/CLIENT_DATA/X86_64/drivers -type d -empty -exec rmdir {} \;
 }