diff --git a/CLIENT_DATA/X86/immunet-uninstall32.exe b/CLIENT_DATA/X86/immunet-uninstall32.exe
deleted file mode 100644
index adf7caf..0000000
Binary files a/CLIENT_DATA/X86/immunet-uninstall32.exe and /dev/null differ
diff --git a/CLIENT_DATA/X86_64/immunet-uninstall64.exe b/CLIENT_DATA/X86_64/immunet-uninstall64.exe
deleted file mode 100644
index a1c5047..0000000
Binary files a/CLIENT_DATA/X86_64/immunet-uninstall64.exe and /dev/null differ
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
new file mode 100644
index 0000000..6a0fa72
--- /dev/null
+++ b/CLIENT_DATA/config3264.ins
@@ -0,0 +1,195 @@
+
+if ($LicenseRequired$ = "true")
+	Dosbatch_config_agent_license_key
+endif
+
+if ($immunet_agent_scansettings_clamav_devInit$ = "1")
+	Dosbatch_agent_scansettings_clamav_devInit
+endif
+
+if ($immunet_agent_scansettings_clamav_enable$ = "1")
+	Dosbatch_agent_scansettings_clamav_enable
+endif
+
+if ($immunet_agent_scansettings_clamav_updater_enable$ = "1")
+	Dosbatch_agent_scansettings_clamav_updater_enable
+endif
+
+if ($immunet_agent_scansettings_clamav_options_ondemand_scanarchives$ = "1")
+	Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives
+endif
+
+if ($immunet_agent_scansettings_clamav_options_ondemand_scanpacked$ = "1")
+	Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked
+endif
+
+if ($immunet_agent_scansettings_tetra_options_ondemand_scanarchives$ = "1")
+	Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives
+endif
+
+if ($immunet_agent_scansettings_tetra_options_ondemand_scanpacked$ = "1")
+	Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked
+endif
+
+if ( $immunet_agent_scansettings_ethos_enable$ = "1")
+	Dosbatch_agent_scansettings_ethos_enable
+endif
+
+if ( $immunet_agent_scansettings_spero_enable$ = "1")
+	Dosbatch_agent_scansettings_spero_enable
+endif
+
+if ( $immunet_agent_scansettings_action_malware$ = "1")
+	Dosbatch_agent_scansettings_action_malware
+endif
+
+if ( $immunet_agent_scansettings_action_suspicious$ = "1")
+	Dosbatch_agent_scansettings_action_suspicious
+endif
+
+if ( $immunet_agent_driver_protmode_active$ = "1")
+	Dosbatch_agent_driver_protmode_active
+endif
+
+if ( $immunet_agent_driver_protmode_file$ = "1")
+	Dosbatch_agent_driver_protmode_file
+endif
+
+if ( $immunet_agent_driver_protmode_process$ = "1")
+	Dosbatch_agent_driver_protmode_process
+endif
+
+if ( $immunet_agent_cloud_upload_enable$ = "1")
+	Dosbatch_agent_cloud_upload_enable
+endif
+
+if ( $immunet_agent_cloud_upload_telemetry_enable$ = "1")
+	Dosbatch_agent_cloud_upload_telemetry_enable
+endif
+
+if ( $immunet_agent_cloud_upload_metadata_enable$ = "1")
+	Dosbatch_agent_cloud_upload_metadata_enable
+endif
+
+if ( $immunet_ui_notification_verbose$ = "1")
+	Dosbatch_ui_notification_verbose
+endif
+
+if ( $immunet_ui_notification_gaming$ = "1")
+	Dosbatch_ui_notification_gaming
+endif
+
+if ( $immunet_ui_notification_cloud$ = "1")
+	Dosbatch_ui_notification_cloud
+endif
+
+if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
+	Dosbatch_final_copy_32
+endfi
+
+if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
+	Dosbatch_final_copy_64
+endfi
+
+
+[Dosbatch_config_agent_license_key]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/license/key" -v $LicenseKey$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_devInit]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/defInit" -v $immunet_agent_scansettings_clamav_devInit$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/enable" -v $immunet_agent_scansettings_clamav_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_updater_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $immunet_agent_scansettings_clamav_updater_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_updater_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $immunet_agent_scansettings_clamav_updater_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanarchives" -v $immunet_agent_scansettings_clamav_options_ondemand_scanarchives$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanpacked" -v $immunet_agent_scansettings_clamav_options_ondemand_scanpacked$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanarchives" -v $immunet_agent_scansettings_tetra_options_ondemand_scanarchives$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanpacked" -v $immunet_agent_scansettings_tetra_options_ondemand_scanpacked$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_ethos_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/ethos/enable" -v $immunet_agent_scansettings_ethos_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_spero_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/spero/enable" -v $immunet_agent_scansettings_spero_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_action_malware]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/action/malware" -v $immunet_agent_scansettings_action_malware$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_scansettings_action_suspicious]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/scansettings/action/suspicious" -v $immunet_agent_scansettings_action_suspicious$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_driver_protmode_active]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/driver/protmode/active" -v $immunet_agent_driver_protmode_active$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_driver_protmode_file]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/driver/protmode/file" -v $immunet_agent_driver_protmode_file$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_driver_protmode_process]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/driver/protmode/process" -v $immunet_agent_driver_protmode_process$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_cloud_upload_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/cloud/upload/enabled" -v $immunet_agent_cloud_upload_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_janus_upload_event_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/janus/upload/event/enabled" -v $immunet_agent_janus_upload_event_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_metadata_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/fmd/enabled" -v $immunet_agent_metadata_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_agent_monitor_enable]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/agent/nfm/enabled" -v $immunet_agent_monitor_enable$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_ui_notification_verbose]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/ui/notification/verbose" -v $immunet_ui_notification_verbose$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_ui_notification_gaming]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/ui/notification/gaming" -v $immunet_ui_notification_gaming$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_ui_notification_cloud]
+copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
+xml ed -O -u "/config/ui/notification/cloud" -v $immunet_ui_notification_cloud$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
+
+[Dosbatch_final_copy_32]
+copy "$LogDir$\local.xml" "$InstallDir32$\local.xml"
+
+[Dosbatch_final_copy_64]
+copy "$LogDir$\local.xml" "$InstallDir64$\local.xml"
+
+
+
+
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
new file mode 100644
index 0000000..d586b49
--- /dev/null
+++ b/CLIENT_DATA/define3264.inc
@@ -0,0 +1,44 @@
+
+DefVar	$immunet_agent_scansettings_clamav_devInit$
+Set	$immunet_agent_scansettings_clamav_devInit$ = GetProductProperty("agent_scansettings_clamav_devInit", "1")
+DefVar	$immunet_agent_scansettings_clamav_enable$
+Set	$immunet_agent_scansettings_clamav_enable$ = GetProductProperty("agent_scansettings_clamav_enable", "1")
+DefVar	$immunet_agent_scansettings_clamav_updater_enable$
+Set	$immunet_agent_scansettings_clamav_updater_enable$ = GetProductProperty("agent_scansettings_clamav_updater_enable", "1")
+DefVar	$immunet_agent_scansettings_clamav_options_ondemand_scanarchives$
+Set	$immunet_agent_scansettings_clamav_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanarchives", "1")
+DefVar	$immunet_agent_scansettings_clamav_options_ondemand_scanpacked$
+Set	$immunet_agent_scansettings_clamav_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanpacked", "1")
+DefVar	$immunet_agent_scansettings_tetra_options_ondemand_scanarchives$
+Set	$immunet_agent_scansettings_tetra_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanarchives", "1")
+DefVar	$immunet_agent_scansettings_tetra_options_ondemand_scanpacked$
+Set	$immunet_agent_scansettings_tetra_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanpacked", "1")
+DefVar	$immunet_agent_scansettings_ethos_enable$
+Set	$immunet_agent_scansettings_ethos_enable$ = GetProductProperty("agent_scansettings_ethos_enable", "1")
+DefVar	$immunet_agent_scansettings_spero_enable$
+Set	$immunet_agent_scansettings_spero_enable$ = GetProductProperty("agent_scansettings_spero_enable", "1")
+DefVar	$immunet_agent_scansettings_action_malware$
+Set	$immunet_agent_scansettings_action_malware$ = GetProductProperty("agent_scansettings_action_malware", "1")
+DefVar	$immunet_agent_scansettings_action_suspicious$
+Set	$immunet_agent_scansettings_action_suspicious$ = GetProductProperty("agent_scansettings_action_suspicious", "1")
+DefVar	$immunet_agent_driver_protmode_active$
+Set	$immunet_agent_driver_protmode_active$ = GetProductProperty("agent_driver_protmode_active", "1")
+DefVar	$immunet_agent_driver_protmode_file$
+Set	$immunet_agent_driver_protmode_file$ = GetProductProperty("agent_driver_protmode_file", "1")
+DefVar	$immunet_agent_driver_protmode_process$
+Set	$immunet_agent_driver_protmode_process$ = GetProductProperty("agent_driver_protmode_process", "1")
+DefVar	$immunet_agent_cloud_upload_enable$
+Set	$immunet_agent_cloud_upload_enable$ = GetProductProperty("agent_cloud_upload_enable", "1")
+DefVar	$immunet_agent_janus_upload_event_enable$
+Set	$immunet_agent_janus_upload_event_enable$ = GetProductProperty("agent_janus_upload_event_enable", "1")
+DefVar	$immunet_agent_metadata_enable$
+Set	$immunet_agent_metadata_enable$ = GetProductProperty("agent_metadata_enable", "1")
+DefVar	$immunet_agent_monitor_enable$
+Set	$immunet_agent_monitor_enable$ = GetProductProperty("agent_metadata_enable", "1")
+DefVar	$immunet_ui_notification_verbose$
+Set	$immunet_ui_notification_verbose$ = GetProductProperty("ui_notification_verbose", "1")
+DefVar	$immunet_ui_notification_gaming$
+Set	$immunet_ui_notification_gaming$ = GetProductProperty("ui_notification_gaming", "1")
+DefVar	$immunet_ui_notification_cloud$
+Set	$immunet_ui_notification_cloud$ = GetProductProperty("ui_notification_cloud", "1")
+
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index ca4a3c1..0b32e81 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -1,52 +1,48 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgram32$ = $InstallDir32$ + "\" + $uVersion$ + "\uninstall.exe"
-Set $UninstallProgram64$ = $InstallDir64$ + "\" + $uVersion$ + "\uninstall.exe"
-Set $OldUninstallProgram32$ = $InstallDir32$ + "\" + $OlduVersion32$ + "\uninstall.exe"
-Set $OldUninstallProgram64$ = $InstallDir64$ + "\" + $OlduVersion64$ + "\uninstall.exe"
+Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
 Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
+
+Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$
 Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
 
-
-
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
-
 	if FileExists($IniFile32$)
-    		Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
-    		Set $OlduVersion32$ = GetValueFromInifile($IniFile32$,"COMMON","uVersion","0.0.0")
-    		if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "")
-            		comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version"
-            		Winbatch_uninstall_msi_old_32
-            		sub_check_exitcode
-    		endif
-		Set $OldUninstallProgram32$ = $InstallDir32$ + $OlduVersion32$ + "\uninstall.exe"
-	endif
-
-	if FileExists($OldUninstallProgram32$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_old_32
-		sub_check_exitcode
-		ExitWindows /ImmediateReboot
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","")
 	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
 
+        if FileExists($IniFile32$)
+		Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
+		Set $OlduVersion32$ = GetValueFromInifile($IniFile32$,"COMMON","uVersion","0.0.0")
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
+		if FileExists($UninstallProgramOld32$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			sub_check_exitcode
+			ExitWindows /ImmediateReboot
+		endif
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $OlduVersion32$ + "\uninstall.exe"
+		if FileExists($UninstallProgramOld32$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			sub_check_exitcode
+			ExitWindows /ImmediateReboot
+		endif
+        endif
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
+		Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 		sub_check_exitcode
 		ExitWindows /ImmediateReboot
 	endif
 
-	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
-		comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
-		Winbatch_uninstall_msi_32
-		sub_check_exitcode
-	endif
-	
 	comment "Delete files"
 	Files_uninstall_32 /32Bit
 	comment "Cleanup registry"
@@ -54,39 +50,38 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 endif
 
 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-	Message "Uninstalling " + $ProductId$ + " 64 Bit..."
-
 	if FileExists($IniFile64$)
-    		Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
-    		Set $OlduVersion64$ = GetValueFromInifile($IniFile64$,"COMMON","uVersion","0.0.0")
-    		if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "")
-            		comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version"
-            		Winbatch_uninstall_msi_old_64
-            		sub_check_exitcode
-    		endif
-		Set $OldUninstallProgram64$ = $InstallDir64$ + $OlduVersion64$ + "\uninstall.exe"
-	endif
-
-	if FileExists($OldUninstallProgram64$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_old_64
-		sub_check_exitcode
-		ExitWindows /ImmediateReboot
+    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","")
+	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","")
+	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","")
 	endif
+	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
 
+        if FileExists($IniFile64$)
+		Set $UninstallProgr64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
+		Set $OlduVersion64$ = GetValueFromInifile($IniFile64$,"COMMON","uVersion","0.0.0")
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
+		if FileExists($UninstallProgramOld64$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			sub_check_exitcode
+			ExitWindows /ImmediateReboot
+		endif
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $OlduVersion64$ + "\uninstall.exe"
+		if FileExists($UninstallProgramOld64$)
+			comment "Uninstall program found, starting uninstall"
+			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
+			sub_check_exitcode
+			ExitWindows /ImmediateReboot
+		endif
+        endif
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
+		Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 		sub_check_exitcode
 		ExitWindows /ImmediateReboot
 	endif
 
-	if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
-		comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
-		Winbatch_uninstall_msi_64
-		sub_check_exitcode
-	endif
-	
 	comment "Delete files"
 	Files_uninstall_64 /64Bit
 	comment "Cleanup registry"
@@ -97,27 +92,21 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old_32]
-"$RealUninstallProgramm32$" "$OldUninstallProgram32$"
+"$UninstallProgramOld32$" /S
 
 [Winbatch_uninstall_32]
-"$RealUninstallProgramm32$" "$UninstallProgram32$"
-
-[Winbatch_uninstall_msi_old_32]
-msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
-
-[Winbatch_uninstall_msi_32]
-msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
+"$UninstallProgram32$" /S
 
 [Files_uninstall_32]
+; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+;
 delete -sf "$InstallDir32$\"
 
-
-
 [Winbatch_uninstall_old_64]
-"$RealUninstallProgramm64$" "$OldUninstallProgram64$"
+"$UninstallProgramOld64$" /S
 
 [Winbatch_uninstall_64]
-"$RealUninstallProgramm64$" "$UninstallProgram64$"
+"$UninstallProgram64$" /S
 
 [Winbatch_uninstall_msi_old_64]
 msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
@@ -126,7 +115,9 @@ msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 
 [Files_uninstall_64]
-delete -sf "$InstallDir64$\"
+; Example for recursively deleting the installation directory:
+;
+del -sf "$InstallDir64$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key:
diff --git a/CLIENT_DATA/local.xml b/CLIENT_DATA/local.xml
index a3bb4e0..a5b0883 100644
--- a/CLIENT_DATA/local.xml
+++ b/CLIENT_DATA/local.xml
@@ -54,7 +54,7 @@
     <enabled>0</enabled>
    </fmd>
    <nfm>
-    <enable>1</enable>
+    <enable>0</enable>
    </nfm> 
   </agent>
   <ui>
diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins
new file mode 100644
index 0000000..7b85744
--- /dev/null
+++ b/CLIENT_DATA/login.ins
@@ -0,0 +1,24 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/en/credits/
+
+[Actions]
+Message "Profile Patch for VLC ...."
+
+comment "Did we run this script before ? - and set version stamp in profile"
+if getValue("installationstate", getProductMap) = "installed"
+	comment "Product is installed"
+	if not (scriptWasExecutedBefore)
+		comment "loginscript was not run yet "
+		Files_profile_copy
+		Registry_currentuser_set
+	endif
+endif
+
+[Files_profile_copy]
+copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME"
+
+[Registry_currentuser_set]
+openkey [HKCU\Software\ACME]
+set "show_greeting_window" = "no"
diff --git a/CLIENT_DATA/opsi-sourcefire.immunet.ini b/CLIENT_DATA/opsi-sourcefire.immunet.ini
index 345c080..af81326 100644
--- a/CLIENT_DATA/opsi-sourcefire.immunet.ini
+++ b/CLIENT_DATA/opsi-sourcefire.immunet.ini
@@ -1,8 +1,6 @@
 [X86]
-MsiId32={A6EE99EA-420C-4FA6-8A7C-FDB60D278855}
 
 [X86_64]
-MsiId64={82CD33B2-1DE6-4663-B6F0-1592B2376F78}
 
 [COMMON]
 PN=sourcefire.immunet
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index baa90b7..7a4d5e0 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -1,20 +1,16 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
-; DefVar $MsiId32$
-DefVar $MsiIdOld32$
 DefVar $UninstallProgram32$
-DefVar $OldUninstallProgram32$
+DefVar $UninstallProgramOld32$
 DefVar $IniFile32$
-; DefVar $MsiId64$
-DefVar $MsiIdOld64$
 DefVar $UninstallProgram64$
-DefVar $OldUninstallProgram64$
+DefVar $UninstallProgramOld64$
 DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -28,35 +24,17 @@ DefVar $LicenseKey$
 DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
+DefVar $OlduVersion32$
+DefVar $OlduVersion64$
 
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
-DefVar $agent_scansettings_clamav_devInit$
-DefVar $agent_scansettings_clamav_enable$
-DefVar $agent_scansettings_clamav_updater_enable$
-DefVar $agent_scansettings_clamav_options_ondemand_scanarchives$
-DefVar $agent_scansettings_clamav_options_ondemand_scanpacked$
-DefVar $agent_scansettings_tetra_options_ondemand_scanarchives$
-DefVar $agent_scansettings_tetra_options_ondemand_scanpacked$
-DefVar $agent_scansettings_ethos_enable$
-DefVar $agent_scansettings_spero_enable$
-DefVar $agent_scansettings_action_malware$
-DefVar $agent_scansettings_action_suspicious$
-DefVar $agent_driver_protmode_active$
-DefVar $agent_driver_protmode_file$
-DefVar $agent_driver_protmode_process$
-DefVar $agent_cloud_upload_enable$
-DefVar $agent_cloud_upload-telemetry_enable$
-DefVar $agent_cloud_upload-metadata_enable$
-DefVar $ui_notification_verbose$
-DefVar $ui_notification_gaming$
-DefVar $ui_notification_cloud$
-
-
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
 ; and adds the following variables:
 ;   from builder-product.cfg :  all variables definded by attribute WINST[index]
@@ -67,79 +45,7 @@ DefVar $ui_notification_cloud$
 ;
 @@BUILDER_VARIABLES@@
 
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_clamav_devInit$ = GetProductProperty("agent_scansettings_clamav_devInit", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_clamav_enable$ = GetProductProperty("agent_scansettings_clamav_enable", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_clamav_updater_enable$ = GetProductProperty("agent_scansettings_clamav_updater_enable", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_clamav_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanarchives", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_clamav_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanpacked", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_tetra_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanarchives", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_tetra_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanpacked", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_ethos_enable$ = GetProductProperty("agent_scansettings_ethos_enable", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_spero_enable$ = GetProductProperty("agent_scansettings_spero_enable", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_action_malware$ = GetProductProperty("agent_scansettings_action_malware", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_scansettings_action_suspicious$ = GetProductProperty("agent_scansettings_action_suspicious", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_driver_protmode_active$ = GetProductProperty("agent_driver_protmode_active", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_driver_protmode_file$ = GetProductProperty("agent_driver_protmode_file", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_driver_protmode_process$ = GetProductProperty("agent_driver_protmode_process", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $agent_cloud_upload_enable$ = GetProductProperty("agent_cloud_upload_enable", "1")
-Set $agent_cloud_upload-telemetry_enable$ = GetProductProperty("agent_cloud_upload-telemetry_enable", "1")
-Set $agent_cloud_upload-metadata_enable$ = GetProductProperty("agent_cloud_upload-metadata_enable", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $ui_notification_verbose$ = GetProductProperty("ui_notification_verbose", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $ui_notification_gaming$ = GetProductProperty("ui_notification_gaming", "1")
-
-comment "Flag_NoWindowsTour"
-comment "description: No Windows Tour"
-Set $ui_notification_cloud$ = GetProductProperty("ui_notification_cloud", "1")
+include_insert "define3264.inc"
 
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
@@ -147,29 +53,34 @@ Set $ui_notification_cloud$ = GetProductProperty("ui_notification_cloud", "1")
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "sourcefire.immunet"
 Set $MinimumSpace$    = "100 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\Immunet"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\Immunet"
-Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
-Set $LicenseRequired$ = "false"
+Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
+
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
 	isFatalError
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
 	if FileExists("%ScriptPath%\delsub3264.ins")
 		comment "Start uninstall sub section"
 		Sub "%ScriptPath%\delsub3264.ins"
 	endif
 	
+	if FileExists("%ScriptPath%\config3264.ins")
+		comment "Start Config sub section"
+		Sub "%ScriptPath%\config3264.ins"
+	endif
+	
 	if $LicenseRequired$ = "true"
 		comment "Licensing required, reserve license and get license key"
 		Sub_get_licensekey
@@ -178,96 +89,13 @@ else
 	comment "installing"
 
 	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-		Message "Installing " + $ProductId$ + " 32 Bit..."
-		comment "Start setup program"
-		comment "Copy files"
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
+		ChangeDirectory "%SCRIPTPATH%"
 		comment "Stop Immunet Service"
 		Dosbatch_stop_immunet
+		comment "Copy files"
 		Files_install_32 /32Bit
-		comment "Set license key"
-		Dosbatch_config_agent_license_key_32
-
-
-		if ($agent_scansettings_clamav_devInit$ = "1")
-			Dosbatch_agent_scansettings_clamav_devInit_32
-		endif
-
-		if ($agent_scansettings_clamav_enable$ = "1")
-			Dosbatch_agent_scansettings_clamav_enable_32
-		endif
-
-		if ($agent_scansettings_clamav_updater_enable$ = "1")
-			Dosbatch_agent_scansettings_clamav_updater_enable_32
-		endif
-
-		if ($agent_scansettings_clamav_options_ondemand_scanarchives$ = "1")
-			Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives_32
-		endif
-
-		if ($agent_scansettings_clamav_options_ondemand_scanpacked$ = "1")
-			Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked_32
-		endif
-
-		if ($agent_scansettings_tetra_options_ondemand_scanarchives$ = "1")
-			Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives_32
-		endif
-
-		if ($agent_scansettings_tetra_options_ondemand_scanpacked$ = "1")
-			Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked_32
-		endif
-
-		if ( $agent_scansettings_ethos_enable$ = "1")
-			Dosbatch_agent_scansettings_ethos_enable_32
-		endif
-
-		if ( $agent_scansettings_spero_enable$ = "1")
-			Dosbatch_agent_scansettings_spero_enable_32
-		endif
-
-		if ( $agent_scansettings_action_malware$ = "1")
-			Dosbatch_agent_scansettings_action_malware_32
-		endif
-
-		if ( $agent_scansettings_action_suspicious$ = "1")
-			Dosbatch_agent_scansettings_action_suspicious_32
-		endif
-
-		if ( $agent_driver_protmode_active$ = "1")
-			Dosbatch_agent_driver_protmode_active_32
-		endif
-
-		if ( $agent_driver_protmode_file$ = "1")
-			Dosbatch_agent_driver_protmode_file_32
-		endif
-
-		if ( $agent_driver_protmode_process$ = "1")
-			Dosbatch_agent_driver_protmode_process_32
-		endif
-
-		if ( $agent_cloud_upload_enable$ = "1")
-			Dosbatch_agent_cloud_upload_enable_32
-		endif
-		
-		if ( $agent_cloud_upload-telemetry_enable$ = "1")
-			Dosbatch_agent_cloud_upload-telemetry_enable_32
-		endif
-		
-		if ( $agent_cloud_upload-metadata_enable$ = "1")
-			Dosbatch_agent_cloud_upload-metadata_enable_32
-		endif
-
-		if ( $ui_notification_verbose$ = "1")
-			Dosbatch_ui_notification_verbose_32
-		endif
-
-		if ( $ui_notification_gaming$ = "1")
-			Dosbatch_ui_notification_gaming_32
-		endif
-
-		if ( $ui_notification_cloud$ = "1")
-			Dosbatch_ui_notification_cloud_32
-		endif
-
+		comment "Start setup program"
 		Winbatch_install_32
 		Sub_check_exitcode
 		comment "Patch Registry"
@@ -279,95 +107,13 @@ else
 	endif
 
 	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-		Message "Installing " + $ProductId$ + " 64 Bit..."
-		comment "Start setup program"
+		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
+		ChangeDirectory "%SCRIPTPATH%"
 		comment "Stop Immunet Service"
 		Dosbatch_stop_immunet
 		comment "Copy files"
 		Files_install_64 /64Bit
-		comment "Set license key"
-		Dosbatch_config_agent_license_key_64
-
-		if ($agent_scansettings_clamav_devInit$ = "1")
-			Dosbatch_agent_scansettings_clamav_devInit_64
-		endif
-
-		if ($agent_scansettings_clamav_enable$ = "1")
-			Dosbatch_agent_scansettings_clamav_enable_64
-		endif
-
-		if ($agent_scansettings_clamav_updater_enable$ = "1")
-			Dosbatch_agent_scansettings_clamav_updater_enable_64
-		endif
-
-		if ($agent_scansettings_clamav_options_ondemand_scanarchives$ = "1")
-			Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives_64
-		endif
-
-		if ($agent_scansettings_clamav_options_ondemand_scanpacked$ = "1")
-			Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked_64
-		endif
-
-		if ($agent_scansettings_tetra_options_ondemand_scanarchives$ = "1")
-			Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives_64
-		endif
-
-		if ($agent_scansettings_tetra_options_ondemand_scanpacked$ = "1")
-			Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked_64
-		endif
-
-		if ( $agent_scansettings_ethos_enable$ = "1")
-			Dosbatch_agent_scansettings_ethos_enable_64
-		endif
-
-		if ( $agent_scansettings_spero_enable$ = "1")
-			Dosbatch_agent_scansettings_spero_enable_64
-		endif
-
-		if ( $agent_scansettings_action_malware$ = "1")
-			Dosbatch_agent_scansettings_action_malware_64
-		endif
-
-		if ( $agent_scansettings_action_suspicious$ = "1")
-			Dosbatch_agent_scansettings_action_suspicious_64
-		endif
-
-		if ( $agent_driver_protmode_active$ = "1")
-			Dosbatch_agent_driver_protmode_active_64
-		endif
-
-		if ( $agent_driver_protmode_file$ = "1")
-			Dosbatch_agent_driver_protmode_file_64
-		endif
-
-		if ( $agent_driver_protmode_process$ = "1")
-			Dosbatch_agent_driver_protmode_process_64
-		endif
-
-		if ( $agent_cloud_upload_enable$ = "1")
-			Dosbatch_agent_cloud_upload_enable_64
-		endif
-		
-		if ( $agent_cloud_upload-telemetry_enable$ = "1")
-			Dosbatch_agent_cloud_upload-telemetry_enable_64
-		endif
-		
-		if ( $agent_cloud_upload-metadata_enable$ = "1")
-			Dosbatch_agent_cloud_upload-metadata_enable_64
-		endif
-
-		if ( $ui_notification_verbose$ = "1")
-			Dosbatch_ui_notification_verbose_64
-		endif
-
-		if ( $ui_notification_gaming$ = "1")
-			Dosbatch_ui_notification_gaming_64
-		endif
-
-		if ( $ui_notification_cloud$ = "1")
-			Dosbatch_ui_notification_cloud_64
-		endif
-
+		comment "Start setup program"
 		Winbatch_install_64
 		Sub_check_exitcode
 		comment "Patch Registry"
@@ -377,7 +123,9 @@ else
 		comment "Start Immunet Service"
 		Dosbatch_start_immunet
 	endif
-	
+
+	comment "Reboot"
+	ExitWindows /Reboot
 endif
 
 [Dosbatch_stop_immunet]
@@ -387,194 +135,19 @@ taskkill /IM iptray.exe
 [Dosbatch_start_immunet]
 net start immunetprotect
 
-
-[Dosbatch_config_agent_license_key_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-; xml ed -O -u "/config/agent/license/key" -v $LicenseKey$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_devInit_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/defInit" -v $agent_scansettings_clamav_devInit$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/enable" -v $agent_scansettings_clamav_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_updater_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $agent_scansettings_clamav_updater_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_updater_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $agent_scansettings_clamav_updater_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanarchives" -v $agent_scansettings_clamav_options_ondemand_scanarchives$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanpacked" -v $agent_scansettings_clamav_options_ondemand_scanpacked$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanarchives" -v $agent_scansettings_tetra_options_ondemand_scanarchives$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanpacked" -v $agent_scansettings_tetra_options_ondemand_scanpacked$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_ethos_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/ethos/enable" -v $agent_scansettings_ethos_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_spero_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/spero/enable" -v $agent_scansettings_spero_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_action_malware_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/action/malware" -v $agent_scansettings_action_malware$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_scansettings_action_suspicious_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/action/suspicious" -v $agent_scansettings_action_suspicious$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_driver_protmode_active_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/active" -v $agent_driver_protmode_active$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_driver_protmode_file_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/file" -v $agent_driver_protmode_file$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_driver_protmode_process_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/process" -v $agent_driver_protmode_process$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_cloud_upload_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/cloud/upload/enabled" -v $agent_cloud_upload_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_cloud_upload-telemetry_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/janus/upload/event/enabled" -v $agent_cloud_upload-telemetry_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_agent_cloud_upload-metadata_enable_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/agent/fmd/enabled" -v $agent_cloud_upload-metadata_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_ui_notification_verbose_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/ui/notification/verbose" -v $ui_notification_verbose$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_ui_notification_gaming_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/ui/notification/gaming" -v $ui_notification_gaming$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-[Dosbatch_ui_notification_cloud_32]
-copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
-xml ed -O -u "/config/ui/notification/cloud" -v $ui_notification_cloud$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
-
-
-
-
-[Dosbatch_config_agent_license_key_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-; xml ed -O -u "/config/agent/license/key" -v $LicenseKey$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_devInit_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/defInit" -v $agent_scansettings_clamav_devInit$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/enable" -v $agent_scansettings_clamav_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_updater_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $agent_scansettings_clamav_updater_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_updater_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/updater/enable" -v $agent_scansettings_clamav_updater_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_options_ondemand_scanarchives_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanarchives" -v $agent_scansettings_clamav_options_ondemand_scanarchives$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_clamav_options_ondemand_scanpacked_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/clamav/options/ondemand/scanpacked" -v $agent_scansettings_clamav_options_ondemand_scanpacked$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_tetra_options_ondemand_scanarchives_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanarchives" -v $agent_scansettings_tetra_options_ondemand_scanarchives$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanpacked" -v $agent_scansettings_tetra_options_ondemand_scanpacked$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_ethos_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/ethos/enable" -v $agent_scansettings_ethos_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_spero_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/spero/enable" -v $agent_scansettings_spero_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_action_malware_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/action/malware" -v $agent_scansettings_action_malware$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_scansettings_action_suspicious_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/scansettings/action/suspicious" -v $agent_scansettings_action_suspicious$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_driver_protmode_active_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/active" -v $agent_driver_protmode_active$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_driver_protmode_file_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/file" -v $agent_driver_protmode_file$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_driver_protmode_process_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/driver/protmode/process" -v $agent_driver_protmode_process$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_cloud_upload_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/cloud/upload/enabled" -v $agent_cloud_upload_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_cloud_upload-telemetry_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/janus/upload/event/enabled" -v $agent_cloud_upload-telemetry_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_agent_cloud_upload-metadata_enable_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/agent/fmd/enabled" -v $agent_cloud_upload-metadata_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_ui_notification_verbose_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/ui/notification/verbose" -v $ui_notification_verbose$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_ui_notification_gaming_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/ui/notification/gaming" -v $ui_notification_gaming$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
-[Dosbatch_ui_notification_cloud_64]
-copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
-xml ed -O -u "/config/ui/notification/cloud" -v $ui_notification_cloud$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
-
 [Winbatch_install_32]
 reg.exe Add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "$Install32Exe$" /d "WINXPSP3"
 "$Install32Exe$" /S
 reg.exe Delete "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "$Install32Exe$" /f
 
 [Files_install_32]
+; copy the ini file to the InstallDir
 copy "$IniCfgFile$" "$InstallDir32$"
-copy -s "%ScriptPath%\*.xml" "$InstallDir32$"
+copy "%ScriptPath%\*.xml" "$LogDir$"
+
+; Example of recursively copying some files into the installation directory:
+;
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
 reg.exe Add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "$Install64Exe$" /d "WINXPSP3"
@@ -582,9 +155,13 @@ reg.exe Add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\La
 reg.exe Delete "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "$Install64Exe$" /f
 
 [Files_install_64]
+; copy the ini file to the InstallDir
 copy "$IniCfgFile$" "$InstallDir64$"
-copy -s "%ScriptPath%\*.xml" "$InstallDir64$"
+copy "%ScriptPath%\*.xml" "$LogDir$"
 
+; Example of recursively copying some files into the installation directory:
+;
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
@@ -689,8 +266,3 @@ else
 	endif
 endif
 
-
-
-
-
-
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index eb5f269..5675029 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -1,20 +1,16 @@
 ; Copyright (c) uib gmbh (www.uib.de)
 ; This sourcecode is owned by uib gmbh
 ; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
 
-; DefVar $MsiId32$
-DefVar $MsiIdOld32$
 DefVar $UninstallProgram32$
-DefVar $OldUninstallProgram32$
+DefVar $UninstallProgramOld32$
 DefVar $IniFile32$
-; DefVar $MsiId64$
-DefVar $MsiIdOld64$
 DefVar $UninstallProgram64$
-DefVar $OldUninstallProgram64$
+DefVar $UninstallProgramOld64$
 DefVar $IniFile64$
 DefVar $IniCfgFile$
 DefVar $LogDir$
@@ -26,11 +22,15 @@ DefVar $LicenseRequired$
 DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
+DefVar $OlduVersion32$
+DefVar $OlduVersion64$
 
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -43,19 +43,21 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;
 @@BUILDER_VARIABLES@@
 
+include_insert "define3264.inc"
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "sourcefire.immunet"
 Set $InstallDir32$    = "%ProgramFiles32Dir%\Immunet"
 Set $InstallDir64$    = "%ProgramFiles64Dir%\Immunet"
 Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
diff --git a/OPSI/control b/OPSI/control
index 4e572b3..237c6e7 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -11,7 +11,7 @@ description: Das Antiviren-Programm Immunet Protect basiert auf Cloud-Computing.
 advice: ADVICE
 version: VERSION
 priority: PRIORITY
-licenseRequired: False
+licenseRequired: True
 productClasses: 
 setupScript: setup3264.ins
 uninstallScript: uninstall3264.ins
@@ -179,7 +179,7 @@ default: ["1"]
 
 [ProductProperty]
 type: unicode
-name: agent_cloud_upload-telemetry_enable
+name: agent_janus_upload_event_enable
 multivalue: False
 editable: False
 description: Enable Upload to Cloud telemetry data
@@ -188,13 +188,22 @@ default: ["1"]
 
 [ProductProperty]
 type: unicode
-name: agent_cloud_upload-metadata_enable
+name: agent_metadata_enable
 multivalue: False
 editable: False
 description: Enable Upload to Cloud file metadata
 values: ["0", "1"]
 default: ["1"]
 
+[ProductProperty]
+type: unicode
+name: agent_monitor_enable
+multivalue: False
+editable: False
+description: Enable Monitor network traffic to detect connections to potentially malicious hosts
+values: ["0", "1"]
+default: ["1"]
+
 [ProductProperty]
 type: unicode
 name: ui_notification_verbose
diff --git a/builder-product.cfg b/builder-product.cfg
index 9bb279a..21b602c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -33,24 +33,16 @@ DL_WINST_NAME[2]=Install64Exe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+# replace points, split into array
+a=( ${VERSION//./ } )
+
 WINST_NAME[0]="uVersion"
-WINST_VALUE[0]="3.1.0"
+WINST_VALUE[0]="${a[0]}.${a[1]}.${a[2]}"
 
-WINST_NAME[1]="MsiId32"
-WINST_VALUE[1]="{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}"
-
-WINST_NAME[2]="MsiId64"
-WINST_VALUE[2]="{82CD33B2-1DE6-4663-B6F0-1592B2376F78}"
-
-WINST_NAME[3]="RealUninstallProgramm32"
-WINST_VALUE[3]="@DL_EXTRACT_WINST_PATH[1]@\\immunet-uninstall32.exe"
-
-WINST_NAME[4]="RealUninstallProgramm64"
-WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[2]@\\immunet-uninstall64.exe"
-
-WINST_NAME[5]="OlduVersion32"
-WINST_VALUE[5]="3.0.5"
-
-WINST_NAME[6]="OlduVersion64"
-WINST_VALUE[6]="3.0.5"
+OPSI_INI_SECTION[0]="X86"
+OPSI_INI_OPTION[0]="UninstallProg32"
+OPSI_INI_VALUE[0]="${a[0]}.${a[1]}.${a[2]}\uninstall.exe"
 
+OPSI_INI_SECTION[1]="X86_64"
+OPSI_INI_OPTION[1]="UninstallProg64"
+OPSI_INI_VALUE[1]="${a[0]}.${a[1]}.${a[2]}\uninstall.exe"