diff --git a/CLIENT_DATA/local.xml b/CLIENT_DATA/local.xml
new file mode 100644
index 0000000..3fc03f4
--- /dev/null
+++ b/CLIENT_DATA/local.xml
@@ -0,0 +1,58 @@
+ <config>
+  <agent>
+   <initialscan>1</initialscan>
+   <agent_registered>1</agent_registered>
+   <scansettings>
+    <clamav>
+     <defInit>1</defInit>
+     <enable>1</enable>
+     <updater>
+      <enable>1</enable>
+     </updater>
+     <options>
+      <ondemand>
+       <scanarchives>1</scanarchives>
+       <scanpacked>1</scanpacked>
+      </ondemand>
+     </options>
+    </clamav>
+    <tetra>
+     <options>
+      <ondemand>
+       <scanarchives>1</scanarchives>
+       <scanpacked>1</scanpacked>
+      </ondemand>
+     </options>
+    </tetra>
+    <ethos>
+     <enable>1</enable>
+    </ethos>
+    <spero>
+     <enable>1</enable>
+    </spero>
+    <action>
+     <malware>1</malware>
+     <suspicious>1</suspicious>
+    </action>
+   </scansettings>
+   <driver>
+    <protmode>
+     <active>1</active>
+     <file>1</file>
+     <process>1</process>
+    </protmode>
+   </driver>
+   <cloud>
+    <upload>
+     <enabled>1</enabled>
+    </upload>
+   </cloud>
+  </agent>
+  <ui>
+   <notification>
+    <verbose>1</verbose>
+    <gaming>1</gaming>
+    <cloud>1</cloud>
+   </notification>
+  </ui>
+ </config>
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 08c2077..5ac53f3 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -113,14 +113,16 @@ else
 	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"
-		Winbatch_install_32
-		Sub_check_exitcode
 		comment "Copy files"
 		Files_install_32 /32Bit
+		Winbatch_install_32
+		Sub_check_exitcode
 		comment "Patch Registry"
 		Registry_install /32Bit
 		comment "Create shortcuts"
 		LinkFolder_install
+		comment "Stop Immunet Service"
+		Dosbatch_stop_immunet
 		if ($agent_scansettings_clamav_devInit$ = "1")
 			Dosbatch_agent_scansettings_clamav_devInit_32
 		endif
@@ -148,16 +150,18 @@ else
 		if ($agent_scansettings_tetra_options_ondemand_scanpacked$ = "1")
 			Dosbatch_agent_scansettings_tetra_options_ondemand_scanpacked_32
 		endif
+		comment "Start Immunet Service"
+		Dosbatch_start_immunet
 
 	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"
-		Winbatch_install_64
-		Sub_check_exitcode
 		comment "Copy files"
 		Files_install_64 /64Bit
+		Winbatch_install_64
+		Sub_check_exitcode
 		comment "Patch Registry"
 		Registry_install /64Bit
 		comment "Create shortcuts"
@@ -167,6 +171,12 @@ else
 endif
 
 
+[Dosbatch_stop_immunet]
+net stop immunetprotect
+taskkill /IM iptray.exe
+
+[Dosbatch_start_immunet]
+net start immunetprotect
 
 
 [Dosbatch_agent_scansettings_clamav_devInit_32]
@@ -227,7 +237,7 @@ xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanpacked" -v $
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
 ;
-;copy -s "%ScriptPath%\custom\*.*" "$InstallDir32$"
+copy -s "%ScriptPath%\*.xml" "$InstallDir32$"
 
 [Winbatch_install_64]
 ; Choose one of the following examples as basis for your installation
@@ -240,7 +250,7 @@ xml ed -O -u "/config/agent/scansettings/tetra/options/ondemand/scanpacked" -v $
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:
 ;
-;copy -s "%ScriptPath%\custom\*.*" "$InstallDir64$"
+copy -s "%ScriptPath%\*.xml" "$InstallDir64$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/local.xml b/local.xml
deleted file mode 100644
index 039ddbd..0000000
--- a/local.xml
+++ /dev/null
@@ -1,113 +0,0 @@
- <config>
-  <exclusions>
-   <info>
-    <item>256|2|1|0|CSIDL_SYSTEM\CatRoot2</item>
-    <item>256|2|1|0|CSIDL_WINDOWS\Prefetch</item>
-    <item>256|2|1|0|CSIDL_BASEDIR</item>
-    <item>256|2|1|0|CSIDL_APPDATA\Avira\AntiVir Desktop\TEMP</item>
-    <item>256|2|1|0|CSIDL_LOCAL_APPDATA\Avira\AntiVir Desktop\TEMP</item>
-    <item>256|2|1|0|CSIDL_PROGRAM_FILES\Avira\AntiVir Desktop\TEMP</item>
-    <item>256|2|1|0|CSIDL_PROGRAM_FILES\AVAST Software</item>
-    <item>256|2|1|0|CSIDL_WINDOWS\Temp\_avast5_</item>
-    <item>256|2|1|0|CSIDL_WINDOWS\Temp\_avast_</item>
-    <item>256|2|1|0|CSIDL_COMMON_APPDATA\Kaspersky Lab\AVP8\Data</item>
-   </info>
-  </exclusions>
-  <agent>
-   <directory>
-    <base>C:\Programme\Immunet</base>
-   </directory>
-   <uuid>583c81d3-6245-4663-a43a-0101c90a0889</uuid>
-   <client_pubkey><![CDATA[-----BEGIN PUBLIC KEY-----
-MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANCuPrxwWDzKkCd0PYXWejNm2FNlzH9x
-wLwvyuwQr+MEc/wVrjkh5KGGdxiSlM2SEX4mNdlHpQGKXg0JXT6yQc8CAwEAAQ==
------END PUBLIC KEY-----
-]]></client_pubkey>
-   <client_prvkey><![CDATA[-----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBANCuPrxwWDzKkCd0PYXWejNm2FNlzH9xwLwvyuwQr+MEc/wVrjkh
-5KGGdxiSlM2SEX4mNdlHpQGKXg0JXT6yQc8CAwEAAQJBALsR2M+YbqFgfUXBIH3g
-PP/jTD3G3kHJOZv5xBFHDEWW0wek0632aJtigHx/GlF21cJsSRBowdbXVE48bbrR
-2RECIQD3GokiBaAuLW2nLqPXL+ia/9H1JdOrxAvYhdxHXJGrDQIhANgxlBkDVJNn
-Ma0jE/MhrcnxGqQMOUTccKjwRAyj3HlLAiBm9K1yeXmWA+OOJsapIBMAkdo/FDWv
-eY2d95giO5WN+QIgHTledp8foKlTar8SJEyKLIEeA8zvNOLDi+KmoDrKQ88CIQCV
-6i05YQkWklFt7DvCA9n5vbpMndDpXa0uNZrVMCaS0Q==
------END RSA PRIVATE KEY-----
-]]></client_prvkey>
-   <initialscan>0</initialscan>
-   <agent_registered>1</agent_registered>
-   <engine>
-    <clamav>
-     <lastupdate>1329292914</lastupdate>
-     <lastupdatechecked>1329297819</lastupdatechecked>
-    </clamav>
-   </engine>
-   <scansettings>
-    <clamav>
-     <defInit>1</defInit>
-     <enable>1</enable>
-     <updater>
-      <enable>1</enable>
-     </updater>
-     <options>
-      <ondemand>
-       <scanarchives>0</scanarchives>
-       <scanpacked>0</scanpacked>
-      </ondemand>
-     </options>
-    </clamav>
-    <tetra>
-     <options>
-      <ondemand>
-       <scanarchives>0</scanarchives>
-       <scanpacked>0</scanpacked>
-      </ondemand>
-     </options>
-    </tetra>
-    <ethos>
-     <enable>1</enable>
-    </ethos>
-    <spero>
-     <enable>1</enable>
-    </spero>
-    <action>
-     <malware>1</malware>
-     <suspicious>1</suspicious>
-    </action>
-   </scansettings>
-   <driver>
-    <protmode>
-     <active>1</active>
-     <file>1</file>
-     <process>1</process>
-    </protmode>
-   </driver>
-   <cloud>
-    <upload>
-     <enabled>0</enabled>
-    </upload>
-   </cloud>
-  </agent>
-  <ui>
-   <notification>
-    <feedlist>
-     <feed0>
-      <lastmod>Tue, 07 Jun 2011 20:30:04 GMT</lastmod>
-      <hash>cab4f2b07feb88ead811596959cb9682</hash>
-     </feed0>
-     <feed1>
-      <lastmod>Tue, 08 Feb 2011 16:53:51 GMT</lastmod>
-     </feed1>
-    </feedlist>
-    <verbose>0</verbose>
-    <gaming>0</gaming>
-    <cloud>0</cloud>
-   </notification>
-   <banner>
-    <currentfile>C:\Dokumente und Einstellungen\All Users\Immunet\banner.e2a10156d49939370f5f43556fc81b14.dll</currentfile>
-    <lastmod>Thu, 14 Jul 2011 20:33:03 GMT</lastmod>
-   </banner>
-  </ui>
-  <updater>
-   <lastupdatechecked>1329297819</lastupdatechecked>
-  </updater>
- </config>