diff --git a/CLIENT_DATA/local.xml b/CLIENT_DATA/local.xml
index 3fc03f4..a508b13 100644
--- a/CLIENT_DATA/local.xml
+++ b/CLIENT_DATA/local.xml
@@ -1,58 +1,58 @@
  <config>
   <agent>
-   <initialscan>1</initialscan>
-   <agent_registered>1</agent_registered>
+   <initialscan>0</initialscan>
+   <agent_registered>0</agent_registered>
    <scansettings>
     <clamav>
-     <defInit>1</defInit>
-     <enable>1</enable>
+     <defInit>0</defInit>
+     <enable>0</enable>
      <updater>
-      <enable>1</enable>
+      <enable>0</enable>
      </updater>
      <options>
       <ondemand>
-       <scanarchives>1</scanarchives>
-       <scanpacked>1</scanpacked>
+       <scanarchives>0</scanarchives>
+       <scanpacked>0</scanpacked>
       </ondemand>
      </options>
     </clamav>
     <tetra>
      <options>
       <ondemand>
-       <scanarchives>1</scanarchives>
-       <scanpacked>1</scanpacked>
+       <scanarchives>0</scanarchives>
+       <scanpacked>0</scanpacked>
       </ondemand>
      </options>
     </tetra>
     <ethos>
-     <enable>1</enable>
+     <enable>0</enable>
     </ethos>
     <spero>
-     <enable>1</enable>
+     <enable>0</enable>
     </spero>
     <action>
-     <malware>1</malware>
-     <suspicious>1</suspicious>
+     <malware>0</malware>
+     <suspicious>0</suspicious>
     </action>
    </scansettings>
    <driver>
     <protmode>
-     <active>1</active>
-     <file>1</file>
-     <process>1</process>
+     <active>0</active>
+     <file>0</file>
+     <process>0</process>
     </protmode>
    </driver>
    <cloud>
     <upload>
-     <enabled>1</enabled>
+     <enabled>0</enabled>
     </upload>
    </cloud>
   </agent>
   <ui>
    <notification>
-    <verbose>1</verbose>
-    <gaming>1</gaming>
-    <cloud>1</cloud>
+    <verbose>0</verbose>
+    <gaming>0</gaming>
+    <cloud>0</cloud>
    </notification>
   </ui>
  </config>
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 5ac53f3..30adfb9 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -35,6 +35,17 @@ 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 $ui_notification_verbose$
+DefVar $ui_notification_gaming$
+DefVar $ui_notification_cloud$
 
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -90,6 +101,51 @@ 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")
+
+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")
+
+
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
 	isFatalError
@@ -150,6 +206,51 @@ else
 		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 ( $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 Immunet Service"
 		Dosbatch_start_immunet
 
@@ -166,6 +267,83 @@ else
 		Registry_install /64Bit
 		comment "Create shortcuts"
 		LinkFolder_install
+		comment "Stop Immunet Service"
+		Dosbatch_stop_immunet
+		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 ( $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 Immunet Service"
+		Dosbatch_start_immunet
+
 	endif
 	
 endif
@@ -211,20 +389,128 @@ xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanarchives" -v
 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
 
-;/config/agent/scansettings/ethos/enable
-;/config/agent/scansettings/spero/enable
-;/config/agent/scansettings/action/malware
-;/config/agent/scansettings/action/suspicious
-;/config/agent/driver/protmode/active
-;/config/agent/driver/protmode/file
-;/config/agent/driver/protmode/process
-;/config/agent/cloud/upload/enabled
-;/config/ui/notification/verbose
-;/config/ui/notification/gaming
-;/config/ui/notification/cloud
-;/config/ui/banner/currentfile
-;/config/ui/banner/lastmod
-;/config/updater/lastupdatechecked
+[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_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_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_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]