diff --git a/app/src/main/res/raw/i2ptunnel_config b/app/src/main/res/raw/i2ptunnel_config
index 2fd9c52b4df8a757bea5537f218524ca0974ff44..b93f57c69727e90884293ae901358a052fc4e392 100644
--- a/app/src/main/res/raw/i2ptunnel_config
+++ b/app/src/main/res/raw/i2ptunnel_config
@@ -27,7 +27,7 @@ tunnel.0.startOnLoad=true
 
 # irc
 tunnel.1.name=Irc2P
-tunnel.1.description=IRC tunnel to access the Irc2P network
+tunnel.1.description=IRC tunnel to the Irc2P network
 tunnel.1.type=ircclient
 tunnel.1.sharedClient=true
 tunnel.1.interface=127.0.0.1
@@ -52,7 +52,7 @@ tunnel.1.startOnLoad=true
 
 # irc
 tunnel.2.name=IRC welterde
-tunnel.2.description=IRC tunnel to access welterde's network
+tunnel.2.description=IRC tunnel to welterde's network
 tunnel.2.type=ircclient
 tunnel.2.sharedClient=true
 tunnel.2.interface=127.0.0.1
@@ -73,14 +73,14 @@ tunnel.2.option.outbound.length=2
 tunnel.2.option.outbound.lengthVariance=0
 tunnel.2.startOnLoad=true
 
-# irc
-tunnel.3.name=Telecomix IRC
-tunnel.3.description=IRC tunnel to access the Telecomix network
+# irc irc.killyourtv.i2p
+tunnel.3.name=KYTV IRC
+tunnel.3.description=IRC tunnel to KillYourTV's network
 tunnel.3.type=ircclient
 tunnel.3.sharedClient=true
 tunnel.3.interface=127.0.0.1
 tunnel.3.listenPort=6670
-tunnel.3.targetDestination=irc.telecomix.i2p
+tunnel.3.targetDestination=irc.killyourtv.i2p
 tunnel.3.i2cpHost=127.0.0.1
 tunnel.3.i2cpPort=7654
 tunnel.3.option.inbound.nickname=shared clients
@@ -94,50 +94,4 @@ tunnel.3.option.inbound.length=2
 tunnel.3.option.inbound.lengthVariance=0
 tunnel.3.option.outbound.length=2
 tunnel.3.option.outbound.lengthVariance=0
-tunnel.3.startOnLoad=true
-
-# irc irc.killyourtv.i2p
-tunnel.4.name=KYTV IRC
-tunnel.4.description=IRC tunnel to access KillYourTV's network
-tunnel.4.type=ircclient
-tunnel.4.sharedClient=true
-tunnel.4.interface=127.0.0.1
-tunnel.4.listenPort=6671
-tunnel.4.targetDestination=irc.killyourtv.i2p
-tunnel.4.i2cpHost=127.0.0.1
-tunnel.4.i2cpPort=7654
-tunnel.4.option.inbound.nickname=shared clients
-tunnel.4.option.outbound.nickname=shared clients
-tunnel.4.option.i2cp.delayOpen=true
-tunnel.4.option.i2cp.reduceIdleTime=600000
-tunnel.4.option.i2cp.reduceOnIdle=true
-tunnel.4.option.i2cp.reduceQuantity=1
-tunnel.4.option.i2p.streaming.connectDelay=1000
-tunnel.4.option.inbound.length=2
-tunnel.4.option.inbound.lengthVariance=0
-tunnel.4.option.outbound.length=2
-tunnel.4.option.outbound.lengthVariance=0
-tunnel.4.startOnLoad=true
-
-# irc irc.stream.i2p
-tunnel.5.name=Nameless IRC
-tunnel.5.description=IRC tunnel to access the Nameless network
-tunnel.5.type=ircclient
-tunnel.5.sharedClient=true
-tunnel.5.interface=127.0.0.1
-tunnel.5.listenPort=6672
-tunnel.5.targetDestination=irc.stream.i2p
-tunnel.5.i2cpHost=127.0.0.1
-tunnel.5.i2cpPort=7654
-tunnel.5.option.inbound.nickname=shared clients
-tunnel.5.option.outbound.nickname=shared clients
-tunnel.5.option.i2cp.delayOpen=true
-tunnel.5.option.i2cp.reduceIdleTime=600000
-tunnel.5.option.i2cp.reduceOnIdle=true
-tunnel.5.option.i2cp.reduceQuantity=1
-tunnel.5.option.i2p.streaming.connectDelay=1000
-tunnel.5.option.inbound.length=2
-tunnel.5.option.inbound.lengthVariance=0
-tunnel.5.option.outbound.length=2
-tunnel.5.option.outbound.lengthVariance=0
-tunnel.5.startOnLoad=true
+tunnel.3.startOnLoad=true
\ No newline at end of file
diff --git a/app/src/main/res/raw/more_hosts_txt b/app/src/main/res/raw/more_hosts_txt
index 2fee30ecc1bcd44b22e7cdb497486ada590fc137..1028dcd58d083aa72b8ddac799fc3e4785916f2f 100644
--- a/app/src/main/res/raw/more_hosts_txt
+++ b/app/src/main/res/raw/more_hosts_txt
@@ -1,2 +1 @@
 irc.welterde.i2p=qv0mnQG0CqKM0b4613~8rOKBLA9ZQLCdU0Iiz6Ou8eszJjvjNCHTaa-Rcorz50~7zMu8Lh~OYplf2JatBhWirTsmbVRlOxtAvqYl0oAfY1bUpUu9AeU9wfgj806jw0vIO6JNDpSiRRhGL6HHYLqDvqvE4JgFFpMjF30dIdBxCGsVa1EbwlUUCpgZV1Psl45l~1wkMJ7NsSglHy46l5m9uYXNxu-NERrMN0~mGxnFsAllJZZCKixFQY-mDDiEMksCF7aNueTm~SknvrVQIue9jVf5lZVvxPSmKuRIEGL3bAC-IF3Jhv0NEhuxAYpzKBT1yMupJficIHhcqwk-iUHNnUqgEH8MRQM4SrrcGeBvwZ-daQVOv~ujLijiFl4QrrNLzArgYOxRZMO1Jz3kAgWxULw3RNiszmIcuxYvGT4z7e5YeuroejyE1ExMis-3JBmbjrd2kOKWX5LqgMeAkDjYIsI8QPigxLbC3l7Y5tbyrZA0t~vvOU--2wP6Kg5rb7r1AAAA
-irc.telecomix.i2p=ogLZQpnNgs514P0hp-vwPU3iHhKUymyotVxyX7fC8-a4dFAUXx~HUR0ezvkb3RVI3Snvh~yl7QJHzs3hIy2jjZmo~rlZLmtpEVgu1IvrMYusR3KQZ-1Tdfr3JftxA~dr3vmmro3hIhR18xRWA87A~y2VyEGGw4how-EEYS~VT6hnxoJ4FQztvQF0in2A70fCQ1obVYD3lBL~Jn9VV-~tgjohOZHSkIA4yCD80~QfhHa0g4GqJRgQry5fEjAvc1h5owsNyQ8siU3NfldvTd4Tj~dRuD3F91Svk6Wepp~IbPyIKgWPDGWW3RQWFoyDyHjwLI8IdPg0Io8Q4oRgTcA4JJaaHop2WzV7E-thM41h8evo~jO-XDzfW0DFtFTRRK7use5cYLbNlRXVlHQCe7qHALYi3JkH6wBsW5o8irHFMiGYe-YmGEwVRRQ0p2j-tRVJC4jYEOTSTO2Fr~hAUxramtah9wKOd05bSIOYxQxb0~0fGsw3gDMBCZW8PrhFUn3LAAAA