diff --git a/data/initial/services.xml b/data/initial/services.xml
index 48a394626..e132173f7 100644
--- a/data/initial/services.xml
+++ b/data/initial/services.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zapit api="4">
 	<sat name="Astra (19.2E) by matze" flags="0" position="192">
-		<TS id="03e9" on="0001" frq="11214000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
-			<S i="3459" n="Service 13401" t="1f" s="0" num="0" f="0"/>
-			<S i="345d" n="Service13405" t="1f" s="0" num="0" f="0"/>
+		<TS id="03e9" on="0001" frq="11214000" inv="2" sr="23500000" fec="3" pol="0" mod="9" sys="1">
+			<S i="345d" n="Service13405" t="1" s="0" num="0" f="0"/>
 			<S i="3462" n="RTL UHD Austria" t="1f" s="0" num="0" f="0"/>
-			<S i="3464" n="Service13412" t="1f" s="0" num="0" f="0"/>
+			<S i="3464" n="Service 13412" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ea" on="0001" frq="11229000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1389" n="BBC World News Europe HD" t="1" s="0" num="0" f="0"/>
@@ -29,7 +28,7 @@
 		</TS>
 		<TS id="03ec" on="0001" frq="11258000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="78b4" n="M+LCAMPEONES" t="19" s="0" num="0" f="0"/>
-			<S i="78b5" n="TEST_04" t="19" s="0" num="0" f="0"/>
+			<S i="78b5" n="M+ELLAS #V HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b6" n="M+ SERIES HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b7" n="M+ GOLF HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b8" n="COSMO HD" t="19" s="0" num="0" f="0"/>
@@ -54,7 +53,7 @@
 			<S i="3401" n="krone.tv" t="16" s="0" num="0" f="0"/>
 			<S i="3402" n="oe24.TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="3403" n="volksmusik" t="16" s="0" num="0" f="0"/>
-			<S i="3404" n="gotv neu" t="16" s="0" num="0" f="0"/>
+			<S i="3404" n="Stimmungsgarten TV" t="16" s="0" num="0" f="0"/>
 			<S i="3405" n="Melodie TV NEU" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ee" on="0001" frq="11288000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
@@ -71,7 +70,7 @@
 			<S i="1338" n="OE3." t="2" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03f0" on="0001" frq="11317000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
-			<S i="7468" n="TEST_08" t="1" s="0" num="0" f="0"/>
+			<S i="7468" n="M+ Ellas #V" t="1" s="0" num="0" f="0"/>
 			<S i="7469" n="NOVA" t="1" s="0" num="0" f="0"/>
 			<S i="746a" n="IBERALIA TV" t="1" s="0" num="0" f="0"/>
 			<S i="746b" n="DISNEY JR" t="1" s="0" num="0" f="0"/>
@@ -175,7 +174,6 @@
 		</TS>
 		<TS id="03fc" on="0001" frq="11508000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="1b58" n="DATASYSTEM" t="c" s="0" num="0" f="0"/>
-			<S i="1b60" n="Cubavision Internacional" t="1" s="0" num="0" f="0"/>
 			<S i="1b64" n="Arirang  HD" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03fd" on="0001" frq="11523000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
@@ -221,14 +219,13 @@
 			<S i="285b" n="phoenix HD" t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0402" on="0001" frq="11597000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
-			<S i="2753" n="Bloomberg Europe TV" t="1" s="0" num="0" f="0"/>
+			<S i="2753" n="Bloomberg Europe TV_OLD_Please retune" t="1" s="0" num="0" f="0"/>
 			<S i="2760" n="Sonlife Broadcasting Network" t="1" s="0" num="0" f="0"/>
 			<S i="2762" n="Algerie 3" t="1" s="0" num="0" f="0"/>
 			<S i="2763" n="Canal Algerie" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0403" on="0001" frq="11611000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="1406" n="Kaufbei.tv" t="16" s="0" num="0" f="0"/>
-			<S i="144f" n="KaCTFL" t="c" s="0" num="0" f="0"/>
 			<S i="15e1" n="TVRUS" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0404" on="0001" frq="11626000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
@@ -258,8 +255,8 @@
 		</TS>
 		<TS id="0408" on="0001" frq="11685000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="75f9" n="M+ LaLiga 7" t="1" s="0" num="0" f="0"/>
+			<S i="75fa" n="M+ LaLiga 10" t="1" s="0" num="0" f="0"/>
 			<S i="75fb" n="." t="1" s="0" num="0" f="0"/>
-			<S i="75fd" n="11685V SID 0x75fd" t="1" s="0" num="0" f="0"/>
 			<S i="75fe" n="M+ LaLiga 8" t="1" s="0" num="0" f="0"/>
 			<S i="75ff" n="M+DEPORTES6" t="1" s="0" num="0" f="0"/>
 			<S i="7600" n="M+ La Resistencia" t="1" s="0" num="0" f="0"/>
@@ -269,6 +266,7 @@
 			<S i="7604" n="M+LCAMPEON8" t="1" s="0" num="0" f="0"/>
 			<S i="7606" n="11685V SID 0x7606" t="1" s="0" num="0" f="0"/>
 			<S i="7607" n="M+ LaLiga 6" t="1" s="0" num="0" f="0"/>
+			<S i="7608" n="M+ LaLiga 9" t="1" s="0" num="0" f="0"/>
 			<S i="7609" n="11685V SID 0x7609" t="64" s="0" num="0" f="0"/>
 			<S i="760a" n="M+LCAMPEON7" t="1" s="0" num="0" f="0"/>
 			<S i="760b" n="M+LCAMPEON9" t="1" s="0" num="0" f="0"/>
@@ -386,6 +384,7 @@
 			<S i="28db" n="WDR Event" t="a" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0410" on="0001" frq="11067000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
+			<S i="7a47" n="Promo TSA" t="19" s="0" num="0" f="0"/>
 			<S i="7a48" n="Telesur SD" t="1" s="0" num="0" f="0"/>
 			<S i="7a49" n="Telesur HD" t="19" s="0" num="0" f="0"/>
 			<S i="7a4a" n="SENDER NEU JERUSALEM" t="1" s="0" num="0" f="0"/>
@@ -422,7 +421,7 @@
 			<S i="7575" n="11097V SID 0x7575" t="1" s="0" num="0" f="0"/>
 			<S i="7576" n="11097V SID 0x7576" t="1" s="0" num="0" f="0"/>
 			<S i="7577" n="CLASSICA" t="1" s="0" num="0" f="0"/>
-			<S i="7578" n="M+ LaLiga 10" t="1" s="0" num="0" f="0"/>
+			<S i="7578" n="11097V SID 0x7578" t="1" s="0" num="0" f="0"/>
 			<S i="7579" n="M+ LaLiga 5" t="1" s="0" num="0" f="0"/>
 			<S i="757a" n="11097V SID 0x757a" t="1" s="0" num="0" f="0"/>
 			<S i="757b" n="M+LCAMPEONES" t="1" s="0" num="0" f="0"/>
@@ -431,7 +430,7 @@
 			<S i="757e" n="11097V SID 0x757e" t="1" s="0" num="0" f="0"/>
 			<S i="757f" n="M+ Fest" t="1" s="0" num="0" f="0"/>
 			<S i="7580" n="11097V SID 0x7580" t="1" s="0" num="0" f="0"/>
-			<S i="7581" n="M+ LaLiga 9" t="1" s="0" num="0" f="0"/>
+			<S i="7581" n="11097V SID 0x7581" t="1" s="0" num="0" f="0"/>
 			<S i="7582" n="DAZN 2 BAR" t="1" s="0" num="0" f="0"/>
 			<S i="7583" n="11097V SID 0x7583" t="1" s="0" num="0" f="0"/>
 			<S i="7584" n="M+#VAMOSBAR2" t="1" s="0" num="0" f="0"/>
@@ -469,19 +468,27 @@
 			<S i="772a" n="DAZN 2" t="1" s="0" num="0" f="0"/>
 			<S i="772b" n="CAZA Y PESCA" t="1" s="0" num="0" f="0"/>
 			<S i="772c" n="ANTENA 3" t="1" s="0" num="0" f="0"/>
-			<S i="772d" n="BLAZE" t="1" s="0" num="0" f="0"/>
+			<S i="772d" n="AMC BREAK" t="1" s="0" num="0" f="0"/>
 			<S i="772e" n="NICKELODEON" t="1" s="0" num="0" f="0"/>
 			<S i="772f" n="DISCOVERY" t="1" s="0" num="0" f="0"/>
 			<S i="7730" n="COSMO" t="1" s="0" num="0" f="0"/>
 			<S i="7731" n="HISTORIA" t="1" s="0" num="0" f="0"/>
-			<S i="7732" n="CRIMEN+INVES" t="1" s="0" num="0" f="0"/>
+			<S i="7732" n="AMC CRIME" t="1" s="0" num="0" f="0"/>
 			<S i="7733" n="M+ #VAMOS" t="1" s="0" num="0" f="0"/>
 			<S i="7734" n="M+ #VAMOS" t="1" s="0" num="0" f="0"/>
-			<S i="7736" n="M+ Cine Español" t="1" s="0" num="0" f="0"/>
+			<S i="7736" n="M+Cine Español" t="1" s="0" num="0" f="0"/>
 			<S i="7737" n="11156V SID 0x7737" t="64" s="0" num="0" f="0"/>
 			<S i="7738" n="24 HORAS" t="1" s="0" num="0" f="0"/>
 			<S i="7739" n="M+DEPORTES1" t="1" s="0" num="0" f="0"/>
 		</TS>
+		<TS id="0418" on="0001" frq="11185000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
+			<S i="10cc" n="SPORTDIGITAL FUSSBALL HD" t="19" s="1" num="0" f="0"/>
+			<S i="10cd" n="SPORT1+" t="19" s="1" num="0" f="0"/>
+			<S i="10ce" n="eSPORTS1" t="19" s="1" num="0" f="0"/>
+			<S i="10cf" n="EDGEsport" t="19" s="1" num="0" f="0"/>
+			<S i="10d0" n="WAIDWERK" t="19" s="1" num="0" f="0"/>
+			<S i="10d1" n="ClipMyHorse.TV" t="19" s="1" num="0" f="0"/>
+		</TS>
 		<TS id="041a" on="0001" frq="10729000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="7853" n="M+ LaLiga 1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="7854" n="ALQUILER HD" t="19" s="0" num="0" f="0"/>
@@ -508,7 +515,7 @@
 			<S i="749a" n="DIVINITY" t="1" s="0" num="0" f="0"/>
 			<S i="749b" n="FOX NEWS" t="1" s="0" num="0" f="0"/>
 			<S i="749c" n="BabyTV" t="1" s="0" num="0" f="0"/>
-			<S i="749d" n="M+ LOS OSCAR" t="1" s="0" num="0" f="0"/>
+			<S i="749d" n="M+ CRIMEN" t="1" s="0" num="0" f="0"/>
 			<S i="749e" n="BOING" t="1" s="0" num="0" f="0"/>
 			<S i="749f" n="ENERGY" t="1" s="0" num="0" f="0"/>
 			<S i="74a0" n="BARÇA TV" t="1" s="0" num="0" f="0"/>
@@ -673,7 +680,7 @@
 			<S i="28ef" n="MDR SPUTNIK" t="a" s="0" num="0" f="0"/>
 			<S i="28f0" n="MDR AKTUELL" t="a" s="0" num="0" f="0"/>
 			<S i="28f1" n="MDR KLASSIK" t="a" s="0" num="0" f="0"/>
-			<S i="28f4" n="Inforadio" t="a" s="0" num="0" f="0"/>
+			<S i="28f4" n="rbb24 Inforadio" t="a" s="0" num="0" f="0"/>
 			<S i="28f5" n="rbbKultur" t="a" s="0" num="0" f="0"/>
 			<S i="28f6" n="Antenne Brbg." t="a" s="0" num="0" f="0"/>
 			<S i="28f7" n="rbb 88.8" t="a" s="0" num="0" f="0"/>
@@ -706,11 +713,17 @@
 		<TS id="042c" on="0001" frq="11778000" inv="2" sr="29500000" fec="11" pol="1" mod="9" sys="1">
 			<S i="1644" n="DW English HD" t="19" s="0" num="0" f="0"/>
 			<S i="1645" n="BVN TV" t="16" s="0" num="0" f="0"/>
+			<S i="1647" n="Cubavision Internacional" t="19" s="0" num="0" f="0"/>
+			<S i="1659" n="UA:Pershyi" t="1" s="0" num="0" f="0"/>
+			<S i="1663" n="RADA eng" t="16" s="0" num="0" f="0"/>
+			<S i="166d" n="MALYATKO TV" t="1" s="0" num="0" f="0"/>
+			<S i="1677" n="TVRUS" t="16" s="0" num="0" f="0"/>
+			<S i="1681" n="Kaufbei.TV" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="042e" on="0001" frq="11817000" inv="2" sr="29700000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1f41" n="BET" t="19" s="0" num="0" f="0"/>
 			<S i="1f42" n="OLYMPIA TV" t="19" s="0" num="0" f="0"/>
-			<S i="1f43" n="MTV HITS" t="19" s="0" num="0" f="0"/>
+			<S i="1f43" n="11817V SID 0x1f43" t="1" s="0" num="0" f="0"/>
 			<S i="1f44" n="MTV" t="19" s="0" num="0" f="0"/>
 			<S i="1f45" n="FRANCEINFO:" t="19" s="0" num="0" f="0"/>
 			<S i="1f46" n="HISTOIRE TV" t="19" s="0" num="0" f="0"/>
@@ -782,7 +795,7 @@
 			<S i="22c5" n="CLIQUE TV" t="19" s="0" num="0" f="0"/>
 			<S i="22c6" n="TV5 MONDE" t="19" s="0" num="0" f="0"/>
 			<S i="22c7" n="MULTISPORTS 5" t="19" s="0" num="0" f="0"/>
-			<S i="22c8" n="COMEDY CENTRAL" t="19" s="0" num="0" f="0"/>
+			<S i="22c8" n="11934V SID 0x22c8" t="1" s="0" num="0" f="0"/>
 			<S i="22c9" n="M6 MUSIC" t="19" s="0" num="0" f="0"/>
 			<S i="22ca" n="DISNEY JUNIOR" t="19" s="0" num="0" f="0"/>
 			<S i="22cb" n="DJAZZ" t="19" s="0" num="0" f="0"/>
@@ -809,6 +822,7 @@
 			<S i="6ffb" n="Nick.Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6ffc" n="Nick_Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6ffd" n="Nick_Jr_" t="1" s="0" num="0" f="0"/>
+			<S i="6ffe" n="Nickelodeon Ukraine Pluto TV" t="1" s="0" num="0" f="0"/>
 			<S i="6fff" n="MTV" t="1" s="0" num="0" f="0"/>
 			<S i="7004" n="Comedy Central" t="1" s="0" num="0" f="0"/>
 			<S i="7005" n="Nick_Jr.." t="1" s="0" num="0" f="0"/>
@@ -1035,6 +1049,7 @@
 			<S i="23a5" n="NETFLIX" t="c9" s="0" num="0" f="0"/>
 			<S i="23a6" n="DOWNLOAD SAGEM" t="c0" s="0" num="0" f="0"/>
 			<S i="23a7" n="DOWNLOAD HUMAX" t="c0" s="0" num="0" f="0"/>
+			<S i="23a8" n="LICENCE L" t="c1" s="0" num="0" f="0"/>
 			<S i="23aa" n="6PLAY" t="c9" s="0" num="0" f="0"/>
 			<S i="23ab" n="CANAL VOD" t="c9" s="0" num="0" f="0"/>
 			<S i="23ac" n="ESPACE CLIENT" t="c9" s="0" num="0" f="0"/>
@@ -1122,10 +1137,13 @@
 			<S i="0d42" n="QVC2" t="1" s="0" num="0" f="0"/>
 			<S i="2f44" n="QVC Deutschland" t="1" s="0" num="0" f="0"/>
 			<S i="2f5a" n="Bibel TV" t="1" s="0" num="0" f="0"/>
+			<S i="2f69" n="Canal Algerie" t="1" s="0" num="0" f="0"/>
+			<S i="2f6a" n="Algerie 3" t="1" s="0" num="0" f="0"/>
 			<S i="2f6c" n="Cherie 25" t="1" s="0" num="0" f="0"/>
 			<S i="2f6d" n="Cherie 25" t="1" s="0" num="0" f="0"/>
 			<S i="2f71" n="NRJ 12" t="1" s="0" num="0" f="0"/>
 			<S i="2f72" n="NRJ 12" t="1" s="0" num="0" f="0"/>
+			<S i="2f9a" n="SBN International" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0455" on="0001" frq="12574000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="1518" n="sonnenklar.TV HD" t="19" s="0" num="0" f="0"/>
@@ -1140,10 +1158,10 @@
 		</TS>
 		<TS id="0457" on="0001" frq="12603000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="000d" n="ASTRA SDT" t="81" s="0" num="0" f="0"/>
+			<S i="1c20" n="Bloomberg Europe TV" t="1" s="0" num="0" f="0"/>
 			<S i="1c54" n="FP URMET" t="c" s="0" num="0" f="0"/>
 			<S i="1c63" n="STB Panasonic" t="c" s="0" num="0" f="0"/>
 			<S i="1c66" n="Datendienst T1M" t="c" s="0" num="0" f="0"/>
-			<S i="1c70" n="KaCTFL" t="c" s="0" num="0" f="0"/>
 			<S i="1c71" n="Panasonic Viera" t="80" s="0" num="0" f="0"/>
 			<S i="1c79" n="Radio Horeb" t="2" s="0" num="0" f="0"/>
 			<S i="1c7a" n="Sky News Intl" t="1" s="0" num="0" f="0"/>
@@ -1183,7 +1201,7 @@
 			<S i="315f" n="EROTIKA TV - NEU!" t="1" s="0" num="0" f="0"/>
 			<S i="3160" n="BunnyClub24" t="1" s="0" num="0" f="0"/>
 			<S i="3161" n="Clipmobile" t="1" s="0" num="0" f="0"/>
-			<S i="3162" n="Wir24TV HD" t="1" s="0" num="0" f="0"/>
+			<S i="3162" n="muxx.tv" t="1" s="0" num="0" f="0"/>
 			<S i="3163" n="ALT Sendersuchlauf starten!!" t="1" s="0" num="0" f="0"/>
 			<S i="3164" n="Schlager Radio" t="1" s="0" num="0" f="0"/>
 			<S i="3165" n="MBS - Test6" t="1" s="0" num="0" f="0"/>
@@ -1246,6 +1264,7 @@
 			<S i="32da" n="Volksmusik.TV" t="1" s="0" num="0" f="0"/>
 			<S i="32db" n="RiC" t="1" s="0" num="0" f="0"/>
 			<S i="32dd" n="ntv Austria" t="16" s="0" num="0" f="0"/>
+			<S i="32de" n="Wir24TV" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0460" on="0001" frq="12728000" inv="2" sr="23500000" fec="2" pol="1" mod="9" sys="1">
 			<S i="2649" n="F3 BNORMANDIE" t="1" s="0" num="0" f="0"/>
@@ -1267,8 +1286,6 @@
 			<S i="6eeb" n="WDR Test A" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0451" on="0035" frq="12515000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
-			<S i="0fdc" n="Radio Lebensquelle" t="2" s="0" num="0" f="0"/>
-			<S i="0fde" n="Radio Freundes-Dienst" t="2" s="0" num="0" f="0"/>
 			<S i="0fe0" n="Vivid" t="16" s="0" num="0" f="0"/>
 			<S i="0fe1" n="Vivid CZ" t="16" s="0" num="0" f="0"/>
 			<S i="0fe2" n="RTL Lounge" t="16" s="0" num="0" f="0"/>
@@ -1283,7 +1300,7 @@
 			<S i="1013" n="Bergblick" t="16" s="0" num="0" f="0"/>
 			<S i="101a" n="VRT Radio1" t="2" s="0" num="0" f="0"/>
 			<S i="101b" n="VRT Radio2" t="2" s="0" num="0" f="0"/>
-			<S i="101c" n="TEST First" t="19" s="0" num="0" f="0"/>
+			<S i="101c" n="Canal+  First  HD" t="19" s="0" num="0" f="0"/>
 			<S i="101d" n="AXN Deutschland" t="16" s="0" num="0" f="0"/>
 			<S i="1034" n="Eleven Sports Pro League 1 FR" t="16" s="0" num="0" f="0"/>
 			<S i="103f" n="NRJ" t="2" s="0" num="0" f="0"/>
@@ -1294,7 +1311,6 @@
 			<S i="000f" n="Sky Nature HD" t="19" s="0" num="0" f="0"/>
 			<S i="0013" n="Junior" t="16" s="0" num="0" f="0"/>
 			<S i="0016" n="Heimatkanal" t="16" s="0" num="0" f="0"/>
-			<S i="0018" n="Classica" t="16" s="0" num="0" f="0"/>
 			<S i="008b" n="Sky Cinema Family HD" t="19" s="0" num="0" f="0"/>
 			<S i="0093" n="Sky One HD" t="19" s="0" num="0" f="0"/>
 			<S i="00de" n="Sky Sport 2" t="16" s="0" num="0" f="0"/>
@@ -1451,7 +1467,6 @@
 			<S i="0191" n="Jukebox" t="16" s="0" num="0" f="0"/>
 			<S i="0192" n="Crime + Investigation" t="16" s="0" num="0" f="0"/>
 			<S i="0194" n="Cartoon Network" t="16" s="0" num="0" f="0"/>
-			<S i="0196" n="Kinowelt TV" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="000c" on="0085" frq="12304000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
 			<S i="0069" n="Sky Sport Bundesliga 1 HD" t="19" s="0" num="0" f="0"/>
@@ -1471,9 +1486,9 @@
 		</TS>
 		<TS id="000d" on="0085" frq="11992000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
 			<S i="001b" n="Nicktoons" t="16" s="0" num="0" f="0"/>
-			<S i="0031" n="Spiegel TV Wissen" t="16" s="0" num="0" f="0"/>
+			<S i="0031" n="Curiosity Channel powered by Spiegel" t="16" s="0" num="0" f="0"/>
 			<S i="006e" n="Sky Atlantic HD" t="19" s="0" num="0" f="0"/>
-			<S i="006f" n="Sky Cinema Mittelerde HD" t="19" s="0" num="0" f="0"/>
+			<S i="006f" n="Sky Cinema 007 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0070" n="NatGeo HD" t="19" s="0" num="0" f="0"/>
 			<S i="0072" n="Sky Sport 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="007f" n="13th Street HD" t="19" s="0" num="0" f="0"/>
@@ -1481,6 +1496,7 @@
 		</TS>
 		<TS id="000f" on="0085" frq="10920000" inv="2" sr="22000000" fec="7" pol="0" mod="0" sys="0">
 			<S i="0021" n="Genius family" t="16" s="0" num="0" f="0"/>
+			<S i="0022" n="AutoMotorSport HD temp" t="19" s="1" num="0" f="0"/>
 			<S i="0023" n="Schlager Deluxe" t="1" s="0" num="0" f="0"/>
 			<S i="0025" n="." t="16" s="0" num="0" f="0"/>
 			<S i="0026" n="HGTV" t="1" s="0" num="0" f="0"/>
diff --git a/data/initial/ubouquets.xml b/data/initial/ubouquets.xml
index 3bfd8d3da..4cb6a1cd4 100644
--- a/data/initial/ubouquets.xml
+++ b/data/initial/ubouquets.xml
@@ -142,7 +142,7 @@
 	</Bouquet>
 	<Bouquet name="musik" hidden="0" locked="0">
 		<S i="41" n="DELUXE MUSIC" t="7" on="85" s="192" frq="12148" l="0"/>
-		<S i="3404" n="gotv neu" t="3ed" on="1" s="192" frq="11273" l="0"/>
+		<S i="3404" n="Stimmungsgarten TV" t="3ed" on="1" s="192" frq="11273" l="0"/>
 		<S i="3405" n="Melodie TV NEU" t="3ed" on="1" s="192" frq="11273" l="0"/>
 		<S i="313c" n="Deutsches Musik Fernsehen" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3164" n="Schlager Radio" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -150,7 +150,6 @@
 		<S i="23a2" n="DEUTSCHE GRAMMOPHON+" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="306" n="FOLX MUSIC TELEVISION" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="3159" n="Lilo TV" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="18" n="Classica" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="191" n="Jukebox" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="6ff0" n="MTV 00s" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="MTV 80s" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -159,7 +158,6 @@
 		<S i="157f" n="Deluxe Music HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="2781" n="MTV HD Austria" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="1f41" n="BET" t="42e" on="1" s="192" frq="11817" l="0"/>
-		<S i="1f43" n="MTV HITS" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1f44" n="MTV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="220a" n="MCM" t="44c" on="1" s="192" frq="12402" l="0"/>
 	</Bouquet>
@@ -180,7 +178,7 @@
 		<S i="2775" n="BILD HD" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="79f4" n="EURONEWS FRENCH SD" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="79fe" n="EURONEWS GERMAN SD" t="443" on="1" s="192" frq="12226" l="0"/>
-		<S i="2753" n="Bloomberg Europe TV" t="402" on="1" s="192" frq="11597" l="0"/>
+		<S i="2753" n="Bloomberg Europe TV_OLD_Please retune" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="1c7a" n="Sky News Intl" t="457" on="1" s="192" frq="12603" l="0"/>
 		<S i="1146" n="CNN Int." t="404" on="1" s="192" frq="11626" l="0"/>
 		<S i="1389" n="BBC World News Europe HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
@@ -194,6 +192,7 @@
 		<S i="18f8" n="RT Esp HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18ef" n="RT France HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="1b03" n="TV5MONDE EUROPE HD" t="3fe" on="1" s="192" frq="11538" l="0"/>
+		<S i="1c20" n="Bloomberg Europe TV" t="457" on="1" s="192" frq="12603" l="0"/>
 	</Bouquet>
 	<Bouquet name="österreich" hidden="0" locked="0">
 		<S i="132f" n="ORF1 HD" t="3ef" on="1" s="192" frq="11302" l="0"/>
@@ -265,9 +264,8 @@
 		<S i="3338" n="4MEDIATHEK" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="33b0" n="Service 13232" t="3eb" on="1" s="192" frq="11243" l="0"/>
 		<S i="33b1" n="Service 13233" t="3eb" on="1" s="192" frq="11243" l="0"/>
-		<S i="3459" n="Service 13401" t="3e9" on="1" s="192" frq="11214" l="0"/>
 		<S i="345d" n="Service13405" t="3e9" on="1" s="192" frq="11214" l="0"/>
-		<S i="3464" n="Service13412" t="3e9" on="1" s="192" frq="11214" l="0"/>
+		<S i="3464" n="Service 13412" t="3e9" on="1" s="192" frq="11214" l="0"/>
 	</Bouquet>
 	<Bouquet name="austriasat" hidden="0" locked="0">
 		<S i="1013" n="Bergblick" t="451" on="35" s="192" frq="12515" l="0"/>
@@ -326,7 +324,6 @@
 		<S i="65" n="Universal TV HD" t="9" on="85" s="192" frq="11170" l="0"/>
 		<S i="1c" n="Boomerang" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="194" n="Cartoon Network" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="18" n="Classica" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="192" n="Crime + Investigation" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="16" n="Heimatkanal" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="13" n="Junior" t="2" on="85" s="192" frq="11758" l="0"/>
@@ -334,7 +331,7 @@
 		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="1b" n="Nicktoons" t="d" on="85" s="192" frq="11992" l="0"/>
 		<S i="206" n="Romance TV" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="31" n="Spiegel TV Wissen" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="31" n="Curiosity Channel powered by Spiegel" t="d" on="85" s="192" frq="11992" l="0"/>
 		<S i="191" n="Jukebox" t="b" on="85" s="192" frq="12382" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Cinema" hidden="0" locked="0">
@@ -345,13 +342,12 @@
 		<S i="29" n="Sky Cinema Best Of" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="8" n="Sky Cinema Fun" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="204" n="Sky Cinema Classics" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="196" n="Kinowelt TV" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="83" n="Sky Cinema Premieren HD" t="6" on="85" s="192" frq="11914" l="0"/>
 		<S i="87" n="Sky Cinema Premieren +24 HD" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="8b" n="Sky Cinema Family HD" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="74" n="Sky Cinema Action HD" t="9" on="85" s="192" frq="11170" l="0"/>
 		<S i="6b" n="Sky Cinema Best Of HD" t="c" on="85" s="192" frq="12304" l="0"/>
-		<S i="6f" n="Sky Cinema Mittelerde HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="6f" n="Sky Cinema 007 HD" t="d" on="85" s="192" frq="11992" l="0"/>
 		<S i="b" n="Sky Cinema Thriller HD" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="8c" n="Warner TV Film HD" t="4" on="85" s="192" frq="12031" l="0"/>
 	</Bouquet>
@@ -503,6 +499,8 @@
 		<S i="293" n="Handystar TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="26" n="HGTV" t="f" on="85" s="192" frq="10920" l="0"/>
 		<S i="21" n="Genius family" t="f" on="85" s="192" frq="10920" l="0"/>
+		<S i="1681" n="Kaufbei.TV" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="32de" n="Wir24TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="526f" n="QVC HD" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="1580" n="QVC ZWEI HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="2779" n="QVC STYLE HD" t="409" on="1" s="192" frq="10964" l="0"/>
@@ -564,10 +562,16 @@
 		<S i="2777" n="MTV HD" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="1197" n="EDGEsport" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="10cf" n="EDGEsport" t="418" on="1" s="192" frq="11185" l="0"/>
+		<S i="10ce" n="eSPORTS1" t="418" on="1" s="192" frq="11185" l="0"/>
 		<S i="1195" n="SPORT1+" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="10cd" n="SPORT1+" t="418" on="1" s="192" frq="11185" l="0"/>
 		<S i="1194" n="SPORTDIGITAL FUSSBALL HD" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="10cc" n="SPORTDIGITAL FUSSBALL HD" t="418" on="1" s="192" frq="11185" l="0"/>
 		<S i="1198" n="WAIDWERK" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="10d0" n="WAIDWERK" t="418" on="1" s="192" frq="11185" l="0"/>
 		<S i="119a" n="ClipMyHorse.TV" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="10d1" n="ClipMyHorse.TV" t="418" on="1" s="192" frq="11185" l="0"/>
 		<S i="307a" n="RTL UHD" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="183d" n="Pro7Sat.1 UHD" t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="2" n="UHD1 by ASTRA / HD+" t="40b" on="1" s="192" frq="10993" l="0"/>
@@ -661,7 +665,14 @@
 		<S i="1645" n="BVN TV" t="42c" on="1" s="192" frq="11778" l="0"/>
 		<S i="7a49" n="Telesur HD" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="1090" n="TV Trwam" t="3ee" on="1" s="192" frq="11288" l="0"/>
-		<S i="101c" n="TEST First" t="451" on="35" s="192" frq="12515" l="0"/>
+		<S i="101c" n="Canal+  First  HD" t="451" on="35" s="192" frq="12515" l="0"/>
+		<S i="7a47" n="Promo TSA" t="410" on="1" s="192" frq="11067" l="0"/>
+		<S i="1647" n="Cubavision Internacional" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="1659" n="UA:Pershyi" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="1663" n="RADA eng" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="1677" n="TVRUS" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="2f69" n="Canal Algerie" t="454" on="1" s="192" frq="12551" l="0"/>
+		<S i="2f6a" n="Algerie 3" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="75f3" n="" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="30d5" n="." t="413" on="1" s="192" frq="11111" l="0"/>
 		<S i="75fb" n="." t="408" on="1" s="192" frq="11685" l="0"/>
@@ -679,7 +690,6 @@
 		<S i="785a" n="10729V SID 0x785a" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="7586" n="11097V SID 0x7586" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="7585" n="11097V SID 0x7585" t="412" on="1" s="192" frq="11097" l="0"/>
-		<S i="75fd" n="11685V SID 0x75fd" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="7606" n="11685V SID 0x7606" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="760c" n="11685V SID 0x760c" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="757a" n="11097V SID 0x757a" t="412" on="1" s="192" frq="11097" l="0"/>
@@ -711,6 +721,10 @@
 		<S i="757c" n="11097V SID 0x757c" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="769c" n="10788V SID 0x769c" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="7576" n="11097V SID 0x7576" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7581" n="11097V SID 0x7581" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7578" n="11097V SID 0x7578" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="1f43" n="11817V SID 0x1f43" t="42e" on="1" s="192" frq="11817" l="0"/>
+		<S i="22c8" n="11934V SID 0x22c8" t="434" on="1" s="192" frq="11934" l="0"/>
 	</Bouquet>
 	<Bouquet name="MTV Networks" hidden="0" locked="0">
 		<S i="7004" n="Comedy Central" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -721,6 +735,7 @@
 		<S i="6ff0" n="MTV 00s" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="MTV 80s" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="7006" n="MTV" t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ffe" n="Nickelodeon Ukraine Pluto TV" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="7005" n="Nick_Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ffc" n="Nick_Jr." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
@@ -774,7 +789,7 @@
 		<S i="7696" n="M+ SERIES 2" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="746d" n="M+ COMEDIA" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="746e" n="M+ DRAMA" t="3f0" on="1" s="192" frq="11317" l="0"/>
-		<S i="7736" n="M+ Cine Español" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="7736" n="M+Cine Español" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="78bf" n="M+ CLÁSICOS HD" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="76c0" n="M+ ESTRENOS" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7588" n="M+ ESTRENOS 2" t="412" on="1" s="192" frq="11097" l="0"/>
@@ -782,7 +797,7 @@
 		<S i="78b7" n="M+ GOLF HD" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="77c6" n="M+ CLÁSICOS" t="40a" on="1" s="192" frq="10979" l="0"/>
 		<S i="7789" n="M+ GOLF" t="424" on="1" s="192" frq="10876" l="0"/>
-		<S i="749d" n="M+ LOS OSCAR" t="41c" on="1" s="192" frq="10758" l="0"/>
+		<S i="749d" n="M+ CRIMEN" t="41c" on="1" s="192" frq="10758" l="0"/>
 		<S i="74ff" n="M+ Fest" t="420" on="1" s="192" frq="10817" l="0"/>
 		<S i="757f" n="M+ Fest" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="772e" n="NICKELODEON" t="416" on="1" s="192" frq="11156" l="0"/>
@@ -804,8 +819,8 @@
 		<S i="7607" n="M+ LaLiga 6" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="75f9" n="M+ LaLiga 7" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="75fe" n="M+ LaLiga 8" t="408" on="1" s="192" frq="11685" l="0"/>
-		<S i="7581" n="M+ LaLiga 9" t="412" on="1" s="192" frq="11097" l="0"/>
-		<S i="7578" n="M+ LaLiga 10" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7608" n="M+ LaLiga 9" t="408" on="1" s="192" frq="11685" l="0"/>
+		<S i="75fa" n="M+ LaLiga 10" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="78b4" n="M+LCAMPEONES" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="757b" n="M+LCAMPEONES" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="74d5" n="M+LCAMPEON1" t="3f8" on="1" s="192" frq="11435" l="0"/>
@@ -833,7 +848,7 @@
 		<S i="76c9" n="TEST V" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7600" n="M+ La Resistencia" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="772b" n="CAZA Y PESCA" t="416" on="1" s="192" frq="11156" l="0"/>
-		<S i="772d" n="BLAZE" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="772d" n="AMC BREAK" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="7587" n="NEOX" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="75d9" n="CONTRATO" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="7730" n="COSMO" t="416" on="1" s="192" frq="11156" l="0"/>
@@ -851,7 +866,7 @@
 		<S i="74a3" n="GOL" t="41c" on="1" s="192" frq="10758" l="0"/>
 		<S i="772f" n="DISCOVERY" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="746f" n="FOX" t="3f0" on="1" s="192" frq="11317" l="0"/>
-		<S i="7468" n="TEST_08" t="3f0" on="1" s="192" frq="11317" l="0"/>
+		<S i="7468" n="M+ Ellas #V" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="74a4" n="DAZN F1" t="41c" on="1" s="192" frq="10758" l="0"/>
 		<S i="76a4" n="DAZN 1" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="772a" n="DAZN 2" t="416" on="1" s="192" frq="11156" l="0"/>
@@ -861,7 +876,7 @@
 		<S i="746b" n="DISNEY JR" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7697" n="NICK JR" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="7471" n="AXN WHITE" t="3f0" on="1" s="192" frq="11317" l="0"/>
-		<S i="7732" n="CRIMEN+INVES" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="7732" n="AMC CRIME" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="74a2" n="MTV ESPAÑA" t="41c" on="1" s="192" frq="10758" l="0"/>
 		<S i="778d" n="NAT GEOGRAPH" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="7472" n="NAT GEO WILD" t="3f0" on="1" s="192" frq="11317" l="0"/>
@@ -901,7 +916,7 @@
 		<S i="788b" n="DISNEY CH HD" t="414" on="1" s="192" frq="11126" l="0"/>
 		<S i="78b8" n="COSMO HD" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="7504" n="FOX HD" t="420" on="1" s="192" frq="10817" l="0"/>
-		<S i="78b5" n="TEST_04" t="3ec" on="1" s="192" frq="11258" l="0"/>
+		<S i="78b5" n="M+ELLAS #V HD" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="7854" n="ALQUILER HD" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="78c0" n="COMEDYCENTRALHD" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="7820" n="NICKELODEONHD" t="428" on="1" s="192" frq="10935" l="0"/>
@@ -910,7 +925,6 @@
 		<S i="7856" n="AXN HD" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="7863" n="LA 1 HD" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="7826" n="EUROSPORT1HD" t="428" on="1" s="192" frq="10935" l="0"/>
-		<S i="74ce" n="TEST_16" t="3f8" on="1" s="192" frq="11435" l="0"/>
 		<S i="7855" n="DAZN 1 HD" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="785f" n="DAZN 2 HD" t="41a" on="1" s="192" frq="10729" l="0"/>
 		<S i="74d8" n="DAZN 3 HD" t="3f8" on="1" s="192" frq="11435" l="0"/>
@@ -941,6 +955,7 @@
 		<S i="75dd" n="TEST TÉCNICO" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="7691" n="TEST Z" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="76a7" n="TEST F1" t="41e" on="1" s="192" frq="10788" l="0"/>
+		<S i="74ce" n="TEST_16" t="3f8" on="1" s="192" frq="11435" l="0"/>
 		<S i="75c7" n="" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="75ca" n="" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="75e3" n="" t="422" on="1" s="192" frq="10847" l="0"/>
@@ -1028,7 +1043,6 @@
 		<S i="2016" n="DISNEY+" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="427e" n="ANIMAUX" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="4287" n="MANGAS" t="446" on="1" s="192" frq="12285" l="0"/>
-		<S i="1f43" n="MTV HITS" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1f44" n="MTV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="4280" n="XXL" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="23d1" n="LE PORN" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1053,7 +1067,6 @@
 		<S i="23a4" n="ASSOCIATION MATERIEL" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23a3" n="TOUS VOS PROGRAMMES" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="22c6" n="TV5 MONDE" t="434" on="1" s="192" frq="11934" l="0"/>
-		<S i="22c8" n="COMEDY CENTRAL" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="2329" n="TCM CINEMA" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="22c9" n="M6 MUSIC" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="22cb" n="DJAZZ" t="434" on="1" s="192" frq="11934" l="0"/>
@@ -1223,6 +1236,7 @@
 		<S i="6ff1" n="MTV 80s" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="fe0" n="Vivid" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="100b" n="Hustler TV" t="451" on="35" s="192" frq="12515" l="0"/>
+		<S i="22" n="AutoMotorSport HD temp" t="f" on="85" s="192" frq="10920" l="0"/>
 		<S i="fe1" n="Vivid CZ" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="101d" n="AXN Deutschland" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="1013" n="Bergblick" t="451" on="35" s="192" frq="12515" l="0"/>
@@ -1235,7 +1249,6 @@
 	<Bouquet name="Globecast" hidden="0" locked="0">
 		<S i="1af9" n="France 24 (en Francais)" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="1afa" n="France 24 (In English)" t="3fe" on="1" s="192" frq="11538" l="0"/>
-		<S i="1b60" n="Cubavision Internacional" t="3fc" on="1" s="192" frq="11508" l="0"/>
 		<S i="18f0" n="EXTREMADURA SAT" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18f1" n="TVGA HD EUROPA" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18ed" n="RT HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
@@ -1251,7 +1264,7 @@
 		<S i="3166" n="MBS - Test4" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3167" n="MBS - Test5" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3165" n="MBS - Test6" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="3162" n="Wir24TV HD" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3162" n="muxx.tv" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="315e" n="MBS - Test3" t="459" on="1" s="192" frq="12633" l="0"/>
 	</Bouquet>
 	<Bouquet name="RAI" hidden="0" locked="0">
@@ -1262,6 +1275,10 @@
 		<S i="1a92" n="CGTN Documentary HD" t="452" on="1" s="192" frq="12522" l="0"/>
 		<S i="1a93" n="CGTN Francais HD" t="452" on="1" s="192" frq="12522" l="0"/>
 	</Bouquet>
+	<Bouquet name="Harmonic/Telespazio/RFI" hidden="0" locked="0">
+		<S i="166d" n="MALYATKO TV" t="42c" on="1" s="192" frq="11778" l="0"/>
+		<S i="2f9a" n="SBN International" t="454" on="1" s="192" frq="12551" l="0"/>
+	</Bouquet>
 	<Bouquet name="DATA" hidden="0" locked="0">
 		<S i="c8" n="BDL VoD" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="6e5a" n="ARD-Data-1" t="431" on="1" s="192" frq="12109" l="0"/>
@@ -1284,7 +1301,6 @@
 		<S i="1c71" n="Panasonic Viera" t="457" on="1" s="192" frq="12603" l="0"/>
 		<S i="1c1e" n="EPG Nagraguide" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="1c54" n="FP URMET" t="457" on="1" s="192" frq="12603" l="0"/>
-		<S i="1c70" n="KaCTFL" t="457" on="1" s="192" frq="12603" l="0"/>
 		<S i="1c83" n="Kathrein Download" t="457" on="1" s="192" frq="12603" l="0"/>
 		<S i="a83" n="NDS Applikation" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="75ad" n="10847V SID 0x75ad" t="422" on="1" s="192" frq="10847" l="0"/>
@@ -1312,7 +1328,6 @@
 		<S i="fb1" n="Pace TDS 865 NSDX" t="c" on="85" s="192" frq="12304" l="0"/>
 		<S i="23e5" n="12363V SID 0x23e5" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="1ee7" n="SES-LCN2" t="457" on="1" s="192" frq="12603" l="0"/>
-		<S i="144f" n="KaCTFL" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="23e7" n="DOWNLOAD TNTSAT 9191" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23e8" n="DOWNLOAD TNTSAT 9192" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23e9" n="DOWNLOAD TNTSAT 9193" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1394,6 +1409,7 @@
 		<S i="782c" n="10935V SID 0x782c" t="428" on="1" s="192" frq="10935" l="0"/>
 		<S i="23a6" n="DOWNLOAD SAGEM" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23a7" n="DOWNLOAD HUMAX" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23a8" n="LICENCE L" t="44a" on="1" s="192" frq="12363" l="0"/>
 	</Bouquet>
 	<Bouquet name="Favourites (TV)" hidden="0" locked="0">
 </Bouquet>
@@ -1405,7 +1421,7 @@
 		<S i="28da" n="Die Maus" t="40f" on="1" s="192" frq="11052" l="0"/>
 		<S i="28f6" n="Antenne Brbg." t="425" on="1" s="192" frq="10891" l="0"/>
 		<S i="28f9" n="Fritz" t="425" on="1" s="192" frq="10891" l="0"/>
-		<S i="28f4" n="Inforadio" t="425" on="1" s="192" frq="10891" l="0"/>
+		<S i="28f4" n="rbb24 Inforadio" t="425" on="1" s="192" frq="10891" l="0"/>
 		<S i="28f5" n="rbbKultur" t="425" on="1" s="192" frq="10891" l="0"/>
 		<S i="28f7" n="rbb 88.8" t="425" on="1" s="192" frq="10891" l="0"/>
 		<S i="28f8" n="radioeins" t="425" on="1" s="192" frq="10891" l="0"/>
@@ -1480,7 +1496,6 @@
 		<S i="316f" n="Radio Paloma" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="316e" n="ffn " t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="1efb" n="RTL RADIO" t="457" on="1" s="192" frq="12603" l="0"/>
-		<S i="fde" n="Radio Freundes-Dienst" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="2f3b" n="TOGGO Radio" t="441" on="1" s="192" frq="12187" l="0"/>
 	</Bouquet>
 	<Bouquet name="Radio_Österreich" hidden="0" locked="0">
@@ -1501,7 +1516,6 @@
 		<S i="334e" n="FM4" t="45b" on="1" s="192" frq="12662" l="0"/>
 	</Bouquet>
 	<Bouquet name="religion" hidden="0" locked="0">
-		<S i="fdc" n="Radio Lebensquelle" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="3354" n="RADIO MARIA" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3173" n="Radio Gloria" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="1c79" n="Radio Horeb" t="457" on="1" s="192" frq="12603" l="0"/>