diff --git a/data/initial/services.xml b/data/initial/services.xml
index d8baf2398..43bd28f5e 100644
--- a/data/initial/services.xml
+++ b/data/initial/services.xml
@@ -57,18 +57,13 @@
 			<S i="3404" n="gotv neu" 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">
-			<S i="1078" n="RAI News 24" t="1" s="0" num="0" f="0"/>
-			<S i="1081" n="Deutschland Vozrozhdenie" t="16" s="0" num="0" f="0"/>
-			<S i="1086" n="QVC UHD" t="1f" s="0" num="0" f="0"/>
-			<S i="1090" n="D7 TV" t="1" s="0" num="0" f="0"/>
-		</TS>
 		<TS id="03ef" on="0001" frq="11302000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="132f" n="ORF1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="1330" n="ORF2W HD" t="19" s="0" num="0" f="0"/>
 			<S i="1331" n="ServusTV HD Oesterreich" t="19" s="0" num="0" f="0"/>
 			<S i="1332" n="ServusTV HD Deutschland" t="19" s="0" num="0" f="0"/>
 			<S i="1334" n="ORF2N HD" t="19" s="0" num="0" f="0"/>
+			<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="FOX LIFE" t="1" s="0" num="0" f="0"/>
@@ -103,6 +98,9 @@
 			<S i="18ee" n="RT Esp HD" t="1" s="0" num="0" f="0"/>
 			<S i="18ef" n="RT France HD" t="1" s="0" num="0" f="0"/>
 			<S i="18f0" n="EXTREMADURA SAT" t="1" s="0" num="0" f="0"/>
+			<S i="18f1" n="TVGA HD EUROPA" t="1" s="0" num="0" f="0"/>
+			<S i="18f2" n="RADIO GALEGA" t="2" s="0" num="0" f="0"/>
+			<S i="18f3" n="RADIO GALEGA MUSICA" t="2" s="0" num="0" f="0"/>
 			<S i="18f8" n="RT Esp HD" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03f5" on="0001" frq="11391000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
@@ -153,14 +151,15 @@
 			<S i="74dc" n="11435V SID 0x74dc" t="64" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03f9" on="0001" frq="11464000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
-			<S i="ef74" n="SAT.1 HD" t="19" s="1" num="0" f="0"/>
-			<S i="ef75" n="ProSieben HD" t="19" s="1" num="0" f="0"/>
-			<S i="ef76" n="kabel eins HD" t="19" s="1" num="0" f="0"/>
-			<S i="ef77" n="SIXX HD" t="19" s="1" num="0" f="0"/>
-			<S i="ef78" n="Pro7 MAXX HD" t="19" s="1" num="0" f="0"/>
-			<S i="ef8a" n="kabel eins HD Austria" t="19" s="0" num="0" f="0"/>
-			<S i="ef8b" n="sixx HD Austria" t="19" s="0" num="0" f="0"/>
-			<S i="ef8c" n="Pro7 MAXX HD Austria" t="19" s="0" num="0" f="0"/>
+			<S i="ef74" n="SAT.1 HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef75" n="ProSieben HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef76" n="kabel eins HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef77" n="SIXX HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef78" n="Pro7 MAXX HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef79" n="Kabel Eins Doku HD" t="19" s="1" num="0" f="1"/>
+			<S i="ef8a" n="kabel eins HD Austria" t="19" s="0" num="0" f="1"/>
+			<S i="ef8b" n="sixx HD Austria" t="19" s="0" num="0" f="1"/>
+			<S i="ef8c" n="Pro7 MAXX HD Austria" t="19" s="0" num="0" f="1"/>
 		</TS>
 		<TS id="03fb" on="0001" frq="11493000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="283d" n="Das Erste HD" t="19" s="0" num="0" f="0"/>
@@ -179,13 +178,11 @@
 			<S i="1af8" n="Russia Today" t="1" s="0" num="0" f="0"/>
 			<S i="1af9" n="France 24 (en Français)" t="1" s="0" num="0" f="0"/>
 			<S i="1afa" n="France 24 (in English)" t="1" s="0" num="0" f="0"/>
-			<S i="1afe" n="France 24 (in Arabic)" t="1" s="0" num="0" f="0"/>
 			<S i="1b00" n="CGTN Documentary" t="1" s="0" num="0" f="0"/>
 			<S i="1b01" n="CGTN F" t="1" s="0" num="0" f="0"/>
 			<S i="1b02" n="CGTN" t="1" s="0" num="0" f="0"/>
 			<S i="1b03" n="TV5MONDE EUROPE" t="1" s="0" num="0" f="0"/>
 			<S i="1b06" n="TRT World HD" t="1" s="0" num="0" f="0"/>
-			<S i="1b0d" n="TEST" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ff" on="0001" frq="11552000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="16a8" n="a.tv HD" t="19" s="0" num="0" f="0"/>
@@ -215,22 +212,12 @@
 		<TS id="0403" on="0001" frq="11611000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="13fc" n="TSR Turkce" t="2" s="0" num="0" f="0"/>
 			<S i="1406" n="Kaufbei.tv" t="16" s="0" num="0" f="0"/>
-			<S i="140a" n="YOL TV" t="1" s="0" num="0" f="0"/>
 			<S i="1417" n="TBN Russia" t="1" s="0" num="0" f="0"/>
-			<S i="1419" n="Juvelirochka" t="1" s="0" num="0" f="0"/>
 			<S i="141b" n="8 TV RU" t="1" 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">
-			<S i="1131" n="TVE INTERNACIONAL EUROPA" t="1" s="0" num="0" f="0"/>
-			<S i="1132" n="CANAL 24 HORAS" t="1" s="0" num="0" f="0"/>
-			<S i="113b" n="RNE RADIO 1" t="2" s="0" num="0" f="0"/>
-			<S i="113c" n="RNE RADIO 3" t="2" s="0" num="0" f="0"/>
-			<S i="113d" n="RNE RADIO 4" t="2" s="0" num="0" f="0"/>
-			<S i="113e" n="RNE RADIO 5 TODO NOTICIAS" t="2" s="0" num="0" f="0"/>
-			<S i="113f" n="RNE RADIO CLASICA" t="2" s="0" num="0" f="0"/>
-			<S i="1140" n="RNE RADIO EXTERIOR DE ESPAÑA" t="2" s="0" num="0" f="0"/>
 			<S i="1146" n="CNN Int." t="1" s="0" num="0" f="0"/>
 			<S i="114e" n="DW English" t="1" s="0" num="0" f="0"/>
 			<S i="1158" n="Al Jazeera English" t="1" s="0" num="0" f="0"/>
@@ -276,7 +263,7 @@
 			<S i="2776" n="Handystar TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="2777" n="MTV HD" t="19" s="1" num="0" f="0"/>
 			<S i="2778" n="Channel21 HD" t="19" s="0" num="0" f="0"/>
-			<S i="2779" n="QVC Style HD" t="19" s="0" num="0" f="0"/>
+			<S i="2779" n="QVC STYLE HD" t="19" s="0" num="0" f="0"/>
 			<S i="277e" n="TLC HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="2781" n="MTV HD Austria" t="19" s="0" num="0" f="0"/>
 		</TS>
@@ -313,9 +300,7 @@
 			<S i="76c8" n="COMEDY CENTRAL" t="1" s="0" num="0" f="0"/>
 			<S i="76c9" n="VIAJAR" t="1" s="0" num="0" f="0"/>
 			<S i="76ca" n="M. SERIESMANIA" t="1" s="0" num="0" f="0"/>
-			<S i="76cb" n="11038V SID 0x76cb" t="1" s="0" num="0" f="0"/>
 			<S i="76cc" n="TELEDEPORTE" t="1" s="0" num="0" f="0"/>
-			<S i="76cd" n="11038V SID 0x76cd" t="64" s="0" num="0" f="0"/>
 			<S i="76ce" n="CANAL COCINA" t="1" s="0" num="0" f="0"/>
 			<S i="76cf" n="AMC" t="1" s="0" num="0" f="0"/>
 		</TS>
@@ -330,10 +315,8 @@
 			<S i="047e" n="RT Esp" t="1" s="0" num="0" f="0"/>
 			<S i="7a45" n="TV Record SD" t="1" s="0" num="0" f="0"/>
 			<S i="7a48" n="TELESUR" t="1" s="0" num="0" f="0"/>
-			<S i="7a49" n="TBN Espana" t="1" s="0" num="0" f="0"/>
 			<S i="7a4a" n="TVGA" t="1" s="0" num="0" f="0"/>
 			<S i="7a4b" n="I24 Francis" t="1" s="0" num="0" f="0"/>
-			<S i="7a4d" n="TELEMAROC" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0411" on="0001" frq="11082000" inv="2" sr="22000000" fec="3" pol="0" mod="9" sys="1">
 			<S i="2e87" n="RTL HD Austria" t="19" s="0" num="0" f="0"/>
@@ -486,8 +469,6 @@
 			<S i="5279" n="Genius Plus" t="16" s="0" num="0" f="0"/>
 			<S i="527d" n="Comedy Central HD AT" t="19" s="0" num="0" f="0"/>
 			<S i="527e" n="WELT HD" t="19" s="0" num="0" f="0"/>
-			<S i="52cb" n="10773H SID 0x52cb" t="64" s="0" num="0" f="0"/>
-			<S i="52cc" n="10773H SID 0x52cc" t="64" s="0" num="0" f="0"/>
 			<S i="52cf" n="10773H SID 0x52cf" t="64" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="041e" on="0001" frq="10788000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
@@ -520,7 +501,7 @@
 			<S i="157d" n="HSE24 EXTRA HD" t="19" s="0" num="0" f="0"/>
 			<S i="157e" n="1-2-3.tv HD" t="19" s="0" num="0" f="0"/>
 			<S i="157f" n="Deluxe Music HD" t="19" s="1" num="0" f="0"/>
-			<S i="1580" n="QVC2 HD" t="19" s="0" num="0" f="0"/>
+			<S i="1580" n="QVC ZWEI HD" t="19" s="0" num="0" f="0"/>
 			<S i="1581" n="SPORT1 HD" t="19" s="1" num="0" f="0"/>
 			<S i="1586" n="Disney Channel HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="1589" n="Deluxe Music HD Austria" t="19" s="0" num="0" f="0"/>
@@ -636,10 +617,11 @@
 		</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="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" t="19" s="0" num="0" f="0"/>
+			<S i="1f46" n="HISTOIRE TV" t="19" s="0" num="0" f="0"/>
 			<S i="1f47" n="RMC SPORT 4" t="19" s="0" num="0" f="0"/>
 			<S i="1f48" n="NICKELODEON" t="19" s="0" num="0" f="0"/>
 			<S i="1f49" n="PINK X" t="19" s="0" num="0" f="0"/>
@@ -657,13 +639,14 @@
 			<S i="200c" n="NRJ HITS" t="19" s="0" num="0" f="0"/>
 			<S i="200d" n="SUNDANCE TV" t="19" s="0" num="0" f="0"/>
 			<S i="200e" n="M6 BOUTIQUE" t="19" s="0" num="0" f="0"/>
-			<S i="200f" n="VICELAND" t="19" s="0" num="0" f="0"/>
+			<S i="200f" n="VICE TV" t="19" s="0" num="0" f="0"/>
 			<S i="2010" n="NICKELODEON+1" t="19" s="0" num="0" f="0"/>
 			<S i="2011" n="RMC DECOUVERTE" t="19" s="0" num="0" f="0"/>
 			<S i="2012" n="BEIN SPORTS 2" t="19" s="0" num="0" f="0"/>
 			<S i="2013" n="BEIN SPORTS 3" t="19" s="0" num="0" f="0"/>
 			<S i="2014" n="TFX" t="19" s="0" num="0" f="0"/>
 			<S i="2015" n="TMC" t="19" s="0" num="0" f="0"/>
+			<S i="2016" n="11856V SID 0x2016" t="1" s="0" num="0" f="0"/>
 			<S i="2017" n="MELODY" t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0431" on="0001" frq="12109000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
@@ -701,7 +684,7 @@
 			<S i="22c5" n="CLIQUE TV" t="19" s="0" num="0" f="0"/>
 			<S i="22ca" n="DISNEY JUNIOR" t="19" s="0" num="0" f="0"/>
 			<S i="22cd" n="CANAL+" t="19" s="0" num="0" f="0"/>
-			<S i="22ce" n="4K UHD - EVENEMENT" t="1f" s="0" num="0" f="0"/>
+			<S i="22ce" n="EVENEMENT SPORT 4K UHD" t="1f" s="0" num="0" f="0"/>
 			<S i="22d0" n="NICKELODEON JUNIOR" t="19" s="0" num="0" f="0"/>
 			<S i="22d1" n="MULTISPORTS 2" t="19" s="0" num="0" f="0"/>
 			<S i="22d2" n="RMC SPORT 1" t="19" s="0" num="0" f="0"/>
@@ -714,6 +697,7 @@
 			<S i="6ff6" n="Nick Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6ff7" n="Nick Jr.." t="1" s="0" num="0" f="0"/>
 			<S i="6ff9" n="Nick Junior Global" t="1" s="0" num="0" f="0"/>
+			<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="6fff" n="MTV Music 24" t="1" s="0" num="0" f="0"/>
 			<S i="7004" n="Comedy Central" t="1" s="0" num="0" f="0"/>
@@ -858,7 +842,7 @@
 			<S i="19ce" n="PARAMOUNT CHANNEL" t="19" s="0" num="0" f="0"/>
 			<S i="19cf" n="LIBIDO TV" t="19" s="0" num="0" f="0"/>
 			<S i="19d0" n="PENTHOUSE BLACK" t="19" s="0" num="0" f="0"/>
-			<S i="19d1" n="EVENEMENT" t="19" s="0" num="0" f="0"/>
+			<S i="19d1" n="CHAINE EVENEMENT" t="19" s="0" num="0" f="0"/>
 			<S i="19d2" n="SEASONS" t="19" s="0" num="0" f="0"/>
 			<S i="19d3" n="FOOT+ 24/24" t="19" s="0" num="0" f="0"/>
 			<S i="19d4" n="EQUIDIA" t="19" s="0" num="0" f="0"/>
@@ -963,7 +947,7 @@
 			<S i="07d0" n="INSIGHT TV UHD" t="1f" s="0" num="0" f="0"/>
 			<S i="07d1" n="INSIGHT TV UHD SPAIN" t="1f" s="0" num="0" f="0"/>
 			<S i="07d5" n="INSIGHT UHD Russia" t="1f" s="0" num="0" f="0"/>
-			<S i="07da" n="QVC2 UHD" t="1f" s="0" num="0" f="0"/>
+			<S i="07da" n="QVC ZWEI UHD" t="1f" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="044a" on="0001" frq="12363000" inv="2" sr="27500000" fec="3" pol="1" mod="0" sys="0">
 			<S i="238e" n="AUDIO PRIMO" t="2" s="0" num="0" f="0"/>
@@ -975,7 +959,7 @@
 			<S i="2394" n="12363V SID 0x2394" t="1" s="0" num="0" f="0"/>
 			<S i="2395" n="SUD RADIO" t="2" s="0" num="0" f="0"/>
 			<S i="2396" n="12363V SID 0x2396" t="2" s="0" num="0" f="0"/>
-			<S i="2397" n="BFM BUSINESS" t="2" s="0" num="0" f="0"/>
+			<S i="2397" n="12363V SID 0x2397" t="2" s="0" num="0" f="0"/>
 			<S i="2398" n="DOWNLOAD R7 G5 PACE" t="c0" s="0" num="0" f="0"/>
 			<S i="2399" n="RADIOS 2" t="c6" s="0" num="0" f="0"/>
 			<S i="239a" n="RADIOS 1" t="c6" s="0" num="0" f="0"/>
@@ -989,7 +973,6 @@
 			<S i="23a2" n="DEUTSCHE GRAMMOPHON+" t="c9" s="0" num="0" f="0"/>
 			<S i="23a3" n="CANAL+ A LA DEMANDE" t="c9" s="0" num="0" f="0"/>
 			<S i="23a5" n="NETFLIX" t="c9" s="0" num="0" f="0"/>
-			<S i="23a6" n="EVENEMENT" t="c9" 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"/>
@@ -1001,6 +984,7 @@
 			<S i="23b5" n="12363V SID 0x23b5" t="2" s="0" num="0" f="0"/>
 			<S i="23b6" n="BBCW SERVICE" t="2" s="0" num="0" f="0"/>
 			<S i="23b7" n="BBC ARABIC" t="2" s="0" num="0" f="0"/>
+			<S i="23b8" n="MELODY" t="2" s="0" num="0" f="0"/>
 			<S i="23ba" n="DOWNLOAD G5 SAMSUNG" t="c0" s="0" num="0" f="0"/>
 			<S i="23bb" n="DOWNLOAD G5 PACE" t="c0" s="0" num="0" f="0"/>
 			<S i="23bc" n="12363V SID 0x23bc" t="1" s="0" num="0" f="0"/>
@@ -1021,7 +1005,7 @@
 			<S i="23cc" n="RADIO CLASSIQUE" t="2" s="0" num="0" f="0"/>
 			<S i="23cd" n="RTL" t="2" s="0" num="0" f="0"/>
 			<S i="23ce" n="EUROPE 1" t="2" s="0" num="0" f="0"/>
-			<S i="23cf" n="RMC" t="2" s="0" num="0" f="0"/>
+			<S i="23cf" n="12363V SID 0x23cf" t="2" s="0" num="0" f="0"/>
 			<S i="23d0" n="RIRE &amp; CHANSONS" t="2" s="0" num="0" f="0"/>
 			<S i="23d1" n="LE PORN" t="c9" s="0" num="0" f="0"/>
 			<S i="23d2" n="12363V SID 0x23d2" t="1" s="0" num="0" f="0"/>
@@ -1054,7 +1038,7 @@
 			<S i="23ed" n="DATA SERVICE R7" t="c" s="0" num="0" f="0"/>
 			<S i="23ee" n="BEUR FM" t="2" s="0" num="0" f="0"/>
 			<S i="23ef" n="DATA SYSTEM[98]" t="c1" s="0" num="0" f="0"/>
-			<S i="23f1" n="NUMEROTATIONS" t="c9" s="0" num="0" f="0"/>
+			<S i="23f1" n="NUMEROTATIONS CANAL+" t="c9" s="0" num="0" f="0"/>
 			<S i="23f2" n="FOX PLAY" t="c9" s="0" num="0" f="0"/>
 			<S i="23f3" n="DATA SERVICE R9" t="c" s="0" num="0" f="0"/>
 			<S i="23f4" n="INFO TECHNIQUE" t="c9" s="0" num="0" f="0"/>
@@ -1062,6 +1046,8 @@
 		<TS id="044c" on="0001" frq="12402000" inv="2" sr="29700000" fec="2" pol="1" mod="9" sys="1">
 			<S i="21fd" n="FRANCE 4" t="19" s="0" num="0" f="0"/>
 			<S i="21fe" n="RMC SPORT 3" t="19" s="0" num="0" f="0"/>
+			<S i="21ff" n="ES1" t="19" s="0" num="0" f="0"/>
+			<S i="2200" n=".." t="19" s="0" num="0" f="0"/>
 			<S i="2201" n="TV BREIZH" t="19" s="0" num="0" f="0"/>
 			<S i="2202" n="RFM TV" t="19" s="0" num="0" f="0"/>
 			<S i="2203" n="TIJI" t="19" s="0" num="0" f="0"/>
@@ -1177,7 +1163,7 @@
 			<S i="3154" n="Achtung Sexy TV" t="1" s="0" num="0" f="0"/>
 			<S i="3155" n="Traumfrauen TV" t="1" s="0" num="0" f="0"/>
 			<S i="3156" n="Heiss und Sexy TV" t="1" s="0" num="0" f="0"/>
-			<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="1" s="0" num="0" f="0"/>
+			<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="1" s="0" num="0" f="0"/>
 			<S i="315a" n="nice" t="1" s="0" num="0" f="0"/>
 			<S i="315b" n="Babestation24" t="1" s="0" num="0" f="0"/>
 			<S i="315c" n="freenet Shopping" t="1" s="0" num="0" f="0"/>
@@ -1335,7 +1321,7 @@
 			<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="001e" n="Sky Sport Austria 1" t="16" s="0" num="0" f="0"/>
-			<S i="0029" n="Sky Cinema Hits" t="16" s="0" num="0" f="0"/>
+			<S i="0029" n="Sky Cinema Best Of" 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 1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="00de" n="Sky Sport 2" t="16" s="0" num="0" f="0"/>
@@ -1359,7 +1345,7 @@
 			<S i="0f9a" n="Pace TDC 866 NSDX" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0003" on="0085" frq="11719000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="0008" n="Sky Cinema Comedy" t="16" s="0" num="0" f="0"/>
+			<S i="0008" n="Sky Cinema Fun" t="16" s="0" num="0" f="0"/>
 			<S i="0009" n="Sky Cinema Action" t="16" s="0" num="0" f="0"/>
 			<S i="001c" n="Boomerang" t="16" s="0" num="0" f="0"/>
 			<S i="0085" n="Beate Uhse HD" t="19" s="0" num="0" f="0"/>
@@ -1391,7 +1377,8 @@
 			<S i="0fb8" n="Pace DS 830 NP" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0004" on="0085" frq="12031000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="000a" n="Sky Cinema" t="16" s="0" num="0" f="0"/>
+			<S i="000a" n="Sky Cinema Premieren" t="16" s="0" num="0" f="0"/>
+			<S i="000b" n="Sky Cinema Thriller HD" t="19" s="0" num="0" f="0"/>
 			<S i="0012" n="Sky Select" t="16" s="0" num="0" f="0"/>
 			<S i="0014" n="Sky Cinema Emotion" t="16" s="0" num="0" f="0"/>
 			<S i="0017" n="Sky Krimi HD" t="19" s="0" num="0" f="0"/>
@@ -1402,7 +1389,6 @@
 			<S i="0134" n="Sky Sport 7 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0136" n="Eurosport360HD 5" t="19" s="0" num="0" f="0"/>
 			<S i="0197" n="Sky Cinema Family" t="16" s="0" num="0" f="0"/>
-			<S i="0204" n="Sky Cinema Nostalgie" t="16" s="0" num="0" f="0"/>
 			<S i="0a83" n="NDS Applikation" t="c1" s="0" num="0" f="0"/>
 			<S i="0dac" n="BEM Service" t="95" s="0" num="0" f="0"/>
 			<S i="0dad" n="GFD Service" t="96" s="0" num="0" f="0"/>
@@ -1413,7 +1399,7 @@
 		<TS id="0005" on="0085" frq="12460000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
 			<S i="0030" n="N24 DOKU" t="1" s="0" num="0" f="0"/>
 			<S i="003e" n="EWTN katholisches TV" t="1" s="0" num="0" f="0"/>
-			<S i="0040" n="QVC Style" t="1" s="0" num="0" f="0"/>
+			<S i="0040" n="QVC STYLE" t="1" s="0" num="0" f="0"/>
 			<S i="004a" n="Nicer Dicer TV" t="1" s="0" num="0" f="0"/>
 			<S i="00ab" n="." t="2" s="0" num="0" f="0"/>
 			<S i="00ac" n="egoFM" t="2" s="0" num="0" f="0"/>
@@ -1433,12 +1419,11 @@
 			<S i="0fb9" n="12460H SID 0xfb9" t="64" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0006" on="0085" frq="11914000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="000b" n="Sky Cinema +1" t="16" s="0" num="0" f="0"/>
-			<S i="002b" n="Sky Cinema +24" t="16" s="0" num="0" f="0"/>
+			<S i="002b" n="Sky Cinema Premieren +24" t="16" s="0" num="0" f="0"/>
 			<S i="0076" n="Nat Geo Wild HD" t="19" s="0" num="0" f="0"/>
 			<S i="0081" n="Sky Sport 1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0082" n="Discovery HD" t="19" s="0" num="0" f="0"/>
-			<S i="0083" n="Sky Cinema HD" t="19" s="0" num="0" f="0"/>
+			<S i="0083" n="Sky Cinema Premieren HD" t="19" s="0" num="0" f="0"/>
 			<S i="010b" n="Sky Sport Bundesliga 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="010c" n="Sky Sport 3 HD" t="19" s="0" num="0" f="0"/>
 			<S i="010e" n="Eurosport360HD 1" t="19" s="0" num="0" f="0"/>
@@ -1446,6 +1431,7 @@
 			<S i="0148" n="Sky Sport 9 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0149" n="Sky Sport Austria 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="014a" n="Eurosport360HD 7" t="19" s="0" num="0" f="0"/>
+			<S i="0204" n="Sky Cinema Classics" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0007" on="0085" frq="12148000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
 			<S i="0035" n="N24 DOKU Austria" t="1" s="0" num="0" f="0"/>
@@ -1494,8 +1480,7 @@
 			<S i="006d" n="Eurosport 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0071" n="History HD" t="19" s="0" num="0" f="0"/>
 			<S i="0080" n="E! Entertainm. HD" t="19" s="0" num="0" f="0"/>
-			<S i="0086" n="Sky Cinema +1 HD" t="19" s="0" num="0" f="0"/>
-			<S i="0087" n="Sky Cinema +24 HD" t="19" s="0" num="0" f="0"/>
+			<S i="0087" n="Sky Cinema Premieren +24 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0088" n="TNT Comedy HD" t="19" s="0" num="0" f="0"/>
 			<S i="00a8" n="Motorvision TV" t="16" s="0" num="0" f="0"/>
 			<S i="0101" n="Sky Sport Bundesliga 10 HD" t="19" s="0" num="0" f="0"/>
@@ -1512,7 +1497,7 @@
 		</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"/>
-			<S i="006b" n="Sky Cinema Hits HD" t="19" s="0" num="0" f="0"/>
+			<S i="006b" n="Sky Cinema Best Of HD" t="19" s="0" num="0" f="0"/>
 			<S i="006c" n="Sky Sport News HD" t="19" s="0" num="0" f="0"/>
 			<S i="0075" n="Sky Serien &amp; Shows HD" t="19" s="0" num="0" f="0"/>
 			<S i="007c" n="Fox HD" t="19" s="0" num="0" f="0"/>
@@ -1531,7 +1516,7 @@
 		<TS id="000d" on="0085" frq="11992000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
 			<S i="0031" n="Spiegel TV Wissen" 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 Special 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"/>
@@ -1544,7 +1529,7 @@
 			<S i="0023" n="Zee One" t="1" s="0" num="0" f="0"/>
 			<S i="0025" n="Sky Sport News" t="1" s="0" num="0" f="0"/>
 			<S i="0026" n="HGTV" t="1" s="0" num="0" f="0"/>
-			<S i="0027" n="MediaShop- Meine Einkaufswelt" t="1" s="0" num="0" f="0"/>
+			<S i="0027" n="Mediashop Life" t="1" s="0" num="0" f="0"/>
 			<S i="0037" n="." t="19" s="0" num="0" f="0"/>
 			<S i="0038" n="." t="1" s="0" num="0" f="0"/>
 			<S i="0039" n="." t="16" s="0" num="0" f="0"/>
diff --git a/data/initial/ubouquets.xml b/data/initial/ubouquets.xml
index aecd16a5d..b1f1f78d5 100644
--- a/data/initial/ubouquets.xml
+++ b/data/initial/ubouquets.xml
@@ -111,6 +111,7 @@
 		<S i="445e" n="kabel eins" t="453" on="1" s="192" frq="12544" l="0"/>
 		<S i="4465" n="kabel eins Doku" t="453" on="1" s="192" frq="12544" l="0"/>
 		<S i="2f1c" n="VOX" t="441" on="1" s="192" frq="12187" l="0"/>
+		<S i="7094" n="VOXup" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="33" n="TELE 5" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="308" n="SIXX" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="304" n="TLC" t="5" on="85" s="192" frq="12460" l="0"/>
@@ -188,7 +189,6 @@
 		<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="1af8" n="Russia Today" t="3fe" on="1" s="192" frq="11538" l="0"/>
-		<S i="1078" n="RAI News 24" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1389" n="BBC World News Europe HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="1b61" n="Al Jazeera Channel" t="3fc" on="1" s="192" frq="11508" l="0"/>
 		<S i="1158" n="Al Jazeera English" t="404" on="1" s="192" frq="11626" l="0"/>
@@ -303,7 +303,6 @@
 		<S i="1260" n="3+" t="3f7" on="1" s="192" frq="11420" l="0"/>
 		<S i="3070" n="RTL 2 CH" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="4e26" n="SAT.1 CH" t="43a" on="1" s="192" frq="12051" l="0"/>
-		<S i="7094" n="VOXup" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="4e21" n="ProSieben Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="4e23" n="Kabel 1 Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="3403" n="Starparadies A" t="3ed" on="1" s="192" frq="11273" l="0"/>
@@ -339,23 +338,22 @@
 		<S i="80" n="E! Entertainm. HD" t="b" on="85" s="192" frq="12382" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Cinema" hidden="0" locked="0">
-		<S i="a" n="Sky Cinema" t="4" on="85" s="192" frq="12031" l="0"/>
-		<S i="b" n="Sky Cinema +1" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="2b" n="Sky Cinema +24" t="6" on="85" s="192" frq="11914" l="0"/>
+		<S i="a" n="Sky Cinema Premieren" t="4" on="85" s="192" frq="12031" l="0"/>
+		<S i="2b" n="Sky Cinema Premieren +24" t="6" on="85" s="192" frq="11914" l="0"/>
 		<S i="197" n="Sky Cinema Family" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="9" n="Sky Cinema Action" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="29" n="Sky Cinema Hits" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="204" n="Sky Cinema Nostalgie" t="4" on="85" s="192" frq="12031" l="0"/>
-		<S i="8" n="Sky Cinema Comedy" t="3" on="85" s="192" frq="11719" l="0"/>
+		<S i="29" n="Sky Cinema Best Of" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="8" n="Sky Cinema Fun" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="14" n="Sky Cinema Emotion" t="4" on="85" s="192" frq="12031" 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="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="83" n="Sky Cinema HD" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="86" n="Sky Cinema +1 HD" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="87" n="Sky Cinema +24 HD" 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="6f" n="Sky Cinema Mittelerde HD" t="d" on="85" s="192" frq="11992" l="0"/>
-		<S i="6b" n="Sky Cinema Hits HD" t="c" on="85" s="192" frq="12304" 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 Special 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="TNT Film HD" t="4" on="85" s="192" frq="12031" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Kids" hidden="0" locked="0">
@@ -489,7 +487,6 @@
 		<S i="3e" n="EWTN katholisches TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="3139" n="K-TV" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="5278" n="SOPHIA TV" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="1081" n="Deutschland Vozrozhdenie" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1269" n="Die Neue Zeit TV" t="3f7" on="1" s="192" frq="11420" l="0"/>
 		<S i="2760" n="Sonlife Broadcasting Network" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="33a8" n="Bibel TV HD" t="3eb" on="1" s="192" frq="11243" l="0"/>
@@ -499,7 +496,7 @@
 	<Bouquet name="shopping/games" hidden="0" locked="0">
 		<S i="2f44" n="QVC Deutschland" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="d42" n="QVC2" t="454" on="1" s="192" frq="12551" l="0"/>
-		<S i="40" n="QVC Style" t="5" on="85" s="192" frq="12460" l="0"/>
+		<S i="40" n="QVC STYLE" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="702" n="QVC" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="79ea" n="HSE24 EXTRA" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="4d" n="HSE24 TREND" t="21" on="85" s="192" frq="12480" l="0"/>
@@ -512,7 +509,7 @@
 		<S i="383" n="meinTVshop" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="296" n="1-2-3.tv" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="295" n="AstroTV" t="21" on="85" s="192" frq="12480" l="0"/>
-		<S i="27" n="MediaShop- Meine Einkaufswelt" t="f" on="85" s="192" frq="10920" l="0"/>
+		<S i="27" n="Mediashop Life" t="f" on="85" s="192" frq="10920" l="0"/>
 		<S i="301" n="Channel21" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="315c" n="freenet Shopping" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="313c" n="Deutsches Musik Fernsehen" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -522,15 +519,14 @@
 		<S i="381" n="e8 television" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="202" n="Immer etwas Neues TV" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="20" n="Sonnenklar TV" t="21" on="85" s="192" frq="12480" l="0"/>
-		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="293" n="Handystar TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="32d7" n="Mei Musi TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="4a" n="Nicer Dicer 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="1419" n="Juvelirochka" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="526f" n="QVC HD" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="1580" n="QVC2 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"/>
+		<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"/>
 		<S i="5270" n="HSE24 HD" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="157d" n="HSE24 EXTRA HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="2776" n="Handystar TV HD" t="409" on="1" s="192" frq="10964" l="0"/>
@@ -574,6 +570,7 @@
 		<S i="2eaf" n="NITRO HD" t="411" on="1" s="192" frq="11082" l="0"/>
 		<S i="ef11" n="VOX HD" t="421" on="1" s="192" frq="10832" l="0"/>
 		<S i="ef76" n="kabel eins HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
+		<S i="ef79" n="Kabel Eins Doku HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
 		<S i="ef77" n="SIXX HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
 		<S i="2774" n="TLC HD" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="5273" n="Comedy Central HD" t="41d" on="1" s="192" frq="10773" l="0"/>
@@ -650,18 +647,17 @@
 	<Bouquet name="UHD" hidden="0" locked="0">
 		<S i="307a" n="RTL UHD" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="3462" n="RTL UHD Austria" t="3e9" on="1" s="192" frq="11214" l="0"/>
-		<S i="1086" n="QVC UHD" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1" n="SES UHD Demo Channel" 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"/>
 		<S i="30de" n="Fashion 4K" t="413" on="1" s="192" frq="11111" l="0"/>
 		<S i="183a" n="Travelxp 4k" t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="229" n="Sky Sport UHD" t="10" on="85" s="192" frq="11797" l="0"/>
 		<S i="228" n="Sky Sport Bundesliga UHD" t="10" on="85" s="192" frq="11797" l="0"/>
-		<S i="22ce" n="4K UHD - EVENEMENT" t="434" on="1" s="192" frq="11934" l="0"/>
+		<S i="22ce" n="EVENEMENT SPORT 4K UHD" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="7d0" n="INSIGHT TV UHD" t="449" on="1" s="192" frq="12343" l="0"/>
 		<S i="7d1" n="INSIGHT TV UHD SPAIN" t="449" on="1" s="192" frq="12343" l="0"/>
 		<S i="7d5" n="INSIGHT UHD Russia" t="449" on="1" s="192" frq="12343" l="0"/>
-		<S i="7da" n="QVC2 UHD" t="449" on="1" s="192" frq="12343" l="0"/>
+		<S i="7da" n="QVC ZWEI UHD" t="449" on="1" s="192" frq="12343" l="0"/>
 	</Bouquet>
 	<Bouquet name="Astra_TV" hidden="0" locked="0">
 		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
@@ -672,16 +668,12 @@
 		<S i="7036" n="Test-R" t="41b" on="1" s="192" frq="10743" l="0"/>
 		<S i="1b03" n="TV5MONDE EUROPE" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="7a48" n="TELESUR" t="410" on="1" s="192" frq="11067" l="0"/>
-		<S i="7a49" n="TBN Espana" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="7a4a" n="TVGA" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="7a4b" n="I24 Francis" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="7a45" n="TV Record SD" t="410" on="1" s="192" frq="11067" l="0"/>
-		<S i="7a4d" n="TELEMAROC" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="139d" n="NHK WORLD-JPN" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="2762" n="Algerie 3" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="2763" n="Canal Algerie" t="402" on="1" s="192" frq="11597" l="0"/>
-		<S i="1131" n="TVE INTERNACIONAL EUROPA" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="1132" n="CANAL 24 HORAS" t="404" on="1" s="192" frq="11626" l="0"/>
 		<S i="7699" n="MEZZO" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="788d" n="CAZAyPESCA HD" t="414" on="1" s="192" frq="11126" l="0"/>
 		<S i="2f6c" n="Cherie 25" t="454" on="1" s="192" frq="12551" l="0"/>
@@ -690,7 +682,6 @@
 		<S i="141b" n="8 TV RU" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="3338" n="4MEDIATHEK" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="15e1" n="TVRUS" t="403" on="1" s="192" frq="11611" l="0"/>
-		<S i="140a" n="YOL TV" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="76c4" n="11038V SID 0x76c4" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="101e" n="Elevensports1" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="13d9" n="MB LIVE" t="3ea" on="1" s="192" frq="11229" l="0"/>
@@ -727,12 +718,12 @@
 		<S i="7587" n="11097V SID 0x7587" t="412" on="1" s="192" frq="11097" 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="76cb" n="11038V SID 0x76cb" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="76c1" n="11038V SID 0x76c1" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7474" n="11317V SID 0x7474" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7473" n="11317V SID 0x7473" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7472" n="11317V SID 0x7472" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="78be" n="11258V SID 0x78be" t="3ec" on="1" s="192" frq="11258" l="0"/>
+		<S i="2016" n="11856V SID 0x2016" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="78b9" n="11258V SID 0x78b9" t="3ec" on="1" s="192" frq="11258" l="0"/>
 	</Bouquet>
 	<Bouquet name="MTV Networks" hidden="0" locked="0">
@@ -746,6 +737,7 @@
 		<S i="7006" n="MTV" 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"/>
 		<S i="6ff9" n="Nick Junior Global" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff7" n="Nick Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff6" n="Nick Jr." t="436" on="1" s="192" frq="11973" l="0"/>
@@ -1108,7 +1100,7 @@
 		<S i="4281" n="TREK" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="219d" n="ASSOCIATION MATERIEL" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="232b" n="TF1 SERIES FILMS" t="442" on="1" s="192" frq="12207" l="0"/>
-		<S i="1f46" n="HISTOIRE" t="42e" on="1" s="192" frq="11817" l="0"/>
+		<S i="1f46" n="HISTOIRE TV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="19cd" n="VOYAGE" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="232d" n="BOING" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="2333" n="BOOMERANG" t="442" on="1" s="192" frq="12207" l="0"/>
@@ -1131,8 +1123,8 @@
 		<S i="2017" n="MELODY" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="220a" n="MCM" t="44c" on="1" s="192" frq="12402" l="0"/>
 		<S i="200d" n="SUNDANCE TV" t="430" on="1" s="192" frq="11856" l="0"/>
-		<S i="200f" n="VICELAND" t="430" on="1" s="192" frq="11856" l="0"/>
-		<S i="23f1" n="NUMEROTATIONS" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="200f" n="VICE TV" t="430" on="1" s="192" frq="11856" l="0"/>
+		<S i="23f1" n="NUMEROTATIONS CANAL+" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23f2" n="FOX PLAY" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="232c" n="PARIS PREMIERE" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="2461" n="EUROSPORT 1" t="440" on="1" s="192" frq="12168" l="0"/>
@@ -1140,7 +1132,7 @@
 		<S i="22c5" n="CLIQUE TV" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="26af" n="GOLF+" t="43e" on="1" s="192" frq="12129" l="0"/>
 		<S i="196d" n="EXTREME SPORTS" t="44e" on="1" s="192" frq="12441" l="0"/>
-		<S i="19d1" n="EVENEMENT" t="444" on="1" s="192" frq="12246" l="0"/>
+		<S i="19d1" n="CHAINE EVENEMENT" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="2011" n="RMC DECOUVERTE" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="19cb" n="RMC SPORT NEWS" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="22d2" n="RMC SPORT 1" t="434" on="1" s="192" frq="11934" l="0"/>
@@ -1170,13 +1162,15 @@
 		<S i="21af" n="MOSAIQUE BEIN SPORTS" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="1f4a" n="MEZZO" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1966" n="MEZZO LIVE" t="44e" on="1" s="192" frq="12441" l="0"/>
+		<S i="1f42" n="OLYMPIA TV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1f41" n="BET" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="26b3" n="PENTHOUSE" t="43e" on="1" s="192" frq="12129" l="0"/>
 		<S i="19d0" n="PENTHOUSE BLACK" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="1f49" n="PINK X" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="19cf" n="LIBIDO TV" t="444" on="1" s="192" frq="12246" l="0"/>
+		<S i="21ff" n="ES1" t="44c" on="1" s="192" frq="12402" l="0"/>
+		<S i="2200" n=".." t="44c" on="1" s="192" frq="12402" l="0"/>
 		<S i="23a5" n="NETFLIX" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="23a6" n="EVENEMENT" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d4" n="DIAGNOSTIC TECHNIQUE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="239d" n="." t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="1f4f" n="TRACE LATINA" t="42e" on="1" s="192" frq="11817" l="0"/>
@@ -1311,7 +1305,6 @@
 		<S i="1033" n="VElevenSports2" t="451" on="35" s="192" frq="12515" l="0"/>
 	</Bouquet>
 	<Bouquet name="Globecast" hidden="0" locked="0">
-		<S i="1afe" n="France 24 (in Arabic)" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="1af9" n="France 24 (en Français)" 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="1af8" n="Russia Today" t="3fe" on="1" s="192" frq="11538" l="0"/>
@@ -1319,7 +1312,7 @@
 		<S i="1b60" n="Cubavision Internacional" t="3fc" on="1" s="192" frq="11508" l="0"/>
 		<S i="1b63" n="Arirang TV" 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="1b0d" n="TEST" t="3fe" on="1" s="192" frq="11538" 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"/>
 		<S i="18f8" n="RT Esp HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18ee" n="RT Esp HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
@@ -1328,7 +1321,7 @@
 		<S i="18ec" n="TELESUR HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 	</Bouquet>
 	<Bouquet name="MEDIA BROADCAST" hidden="0" locked="0">
-		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="315a" n="nice" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3138" n="health.tv" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="313f" n="freenet TV connect" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -1342,9 +1335,6 @@
 	<Bouquet name="RRSAT/NTV" hidden="0" locked="0">
 		<S i="10d6" n="TV TRWAM" t="418" on="1" s="192" frq="11185" l="0"/>
 	</Bouquet>
-	<Bouquet name="RAI" hidden="0" locked="0">
-		<S i="1078" n="RAI News 24" t="3ee" on="1" s="192" frq="11288" l="0"/>
-	</Bouquet>
 	<Bouquet name="CCTV" hidden="0" locked="0">
 		<S i="1b02" n="CGTN" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="1b01" n="CGTN F" t="3fe" on="1" s="192" frq="11538" l="0"/>
@@ -1353,9 +1343,6 @@
 	<Bouquet name="Arqiva" hidden="0" locked="0">
 		<S i="1158" n="Al Jazeera English" t="404" on="1" s="192" frq="11626" l="0"/>
 	</Bouquet>
-	<Bouquet name="Harmonic/Telespazio/RFI" hidden="0" locked="0">
-		<S i="1090" n="D7 TV" t="3ee" on="1" s="192" frq="11288" 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"/>
@@ -1387,7 +1374,6 @@
 		<S i="7507" n="10817V SID 0x7507" t="420" on="1" s="192" frq="10817" l="0"/>
 		<S i="7794" n="10876V SID 0x7794" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="77ca" n="10979V SID 0x77ca" t="40a" on="1" s="192" frq="10979" l="0"/>
-		<S i="76cd" n="11038V SID 0x76cd" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7564" n="11097V SID 0x7564" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="7728" n="11156V SID 0x7728" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="1c7e" n="IDS DOWNLOAD SVC" t="457" on="1" s="192" frq="12603" l="0"/>
@@ -1491,8 +1477,6 @@
 		<S i="78c2" n="11258V SID 0x78c2" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="74dc" n="11435V SID 0x74dc" t="3f8" on="1" s="192" frq="11435" l="0"/>
 		<S i="7865" n="10729V SID 0x7865" t="41a" on="1" s="192" frq="10729" l="0"/>
-		<S i="52cb" n="10773H SID 0x52cb" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="52cc" n="10773H SID 0x52cc" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="21f3" n="DOWNLOAD G10 SAGEM" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="21f4" n="DOWNLOAD G10 HUMAX" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="ff5" n="MZ-102" t="451" on="35" s="192" frq="12515" l="0"/>
@@ -1603,6 +1587,7 @@
 		<S i="3349" n="OE2 V" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3343" n="OE2 W" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="334d" n="OE3" t="45b" on="1" s="192" frq="12662" l="0"/>
+		<S i="1338" n="OE3." t="3ef" on="1" s="192" frq="11302" l="0"/>
 		<S i="32d5" n="HITRADIO OE3" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="334e" n="FM4" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3350" n="U1 Tirol" t="45b" on="1" s="192" frq="12662" l="0"/>
@@ -1634,7 +1619,7 @@
 		<S i="23ee" n="BEUR FM" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="2395" n="SUD RADIO" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="2396" n="12363V SID 0x2396" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="2397" n="BFM BUSINESS" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="2397" n="12363V SID 0x2397" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b4" n="FUN RADIO" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b5" n="12363V SID 0x23b5" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b6" n="BBCW SERVICE" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1650,7 +1635,7 @@
 		<S i="23cc" n="RADIO CLASSIQUE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23cd" n="RTL" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23ce" n="EUROPE 1" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="23cf" n="RMC" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23cf" n="12363V SID 0x23cf" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d0" n="RIRE &amp; CHANSONS" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d7" n="TSF JAZZ" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d8" n="OUI FM" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1667,19 +1652,18 @@
 		<S i="23e3" n="SKYROCK" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23ea" n="RADIO NOTRE DAME" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23eb" n="12363V SID 0x23eb" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23b8" n="MELODY" t="44a" on="1" s="192" frq="12363" l="0"/>
 	</Bouquet>
 	<Bouquet name="TV Vlaanderen" hidden="0" locked="0">
 		<S i="1012" n="Nostalgie" t="451" on="35" s="192" frq="12515" l="0"/>
 	</Bouquet>
+	<Bouquet name="Globecast" hidden="0" locked="0">
+		<S i="18f2" n="RADIO GALEGA" t="3f4" on="1" s="192" frq="11376" l="0"/>
+		<S i="18f3" n="RADIO GALEGA MUSICA" t="3f4" on="1" s="192" frq="11376" l="0"/>
+	</Bouquet>
 	<Bouquet name="Astra_Radio" hidden="0" locked="0">
 		<S i="13fc" n="TSR Turkce" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="238e" n="AUDIO PRIMO" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="113b" n="RNE RADIO 1" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113c" n="RNE RADIO 3" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113d" n="RNE RADIO 4" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113e" n="RNE RADIO 5 TODO NOTICIAS" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113f" n="RNE RADIO CLASICA" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="1140" n="RNE RADIO EXTERIOR DE ESPAÑA" t="404" on="1" s="192" frq="11626" l="0"/>
 		<S i="7599" n="10847V SID 0x7599" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="101a" n="VRT Radio1" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="101b" n="VRT Radio2" t="451" on="35" s="192" frq="12515" l="0"/>