Index: ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/control
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/control	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/control	(revision 24533)
@@ -1,6 +1,6 @@
-Package: titan-plugin-emus-oscamOSEmu.8933
+Package: titan-plugin-emus-oscam.OSEmu
 Version: 1.00
 Architecture: sh4
 Section: emus
-Description: Nightly Version of oscamOSEmu 8933 2xSlot intern
-Showname: oscamOSEmu 8933 
+Description: Nightly Version of oscamOSEmu 2xSlot intern + Smargo
+Showname: oscamOSEmu 
Index: ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/postinst
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/postinst	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/postinst	(revision 24533)
@@ -13,64 +13,64 @@
 
 if [ ! -e "$INSTDIR/keys/oscam.conf" ]; then
-	echo "use ipk config file: oscam.conf"
+	echo "use tpk config file: oscam.conf"
 	echo "rename $INSTDIR/keys/oscam.conf.oscam > $INSTDIR/keys/oscam.conf"
 	mv "$INSTDIR/keys/oscam.conf.oscam" "$INSTDIR/keys/oscam.conf"
 else
 	echo "found user config file: oscam.conf"
-	echo "skip ipk config file: oscam.conf.oscam"
+	echo "skip tpk config file: oscam.conf.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.provid" ]; then
-	echo "use ipk config file: oscam.provid"
+	echo "use tpk config file: oscam.provid"
 	echo "rename $INSTDIR/keys/oscam.provid.oscam > $INSTDIR/keys/oscam.provid"
 	mv "$INSTDIR/keys/oscam.provid.oscam" "$INSTDIR/keys/oscam.provid"
 else
 	echo "found user config file: oscam.provid"
-	echo "skip ipk config file: oscam.provid.oscam"
+	echo "skip tpk config file: oscam.provid.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.srvid" ]; then
-	echo "use ipk config file: oscam.srvid"
+	echo "use tpk config file: oscam.srvid"
 	echo "rename $INSTDIR/keys/oscam.srvid.oscam > $INSTDIR/keys/oscam.srvid"
 	mv "$INSTDIR/keys/oscam.srvid.oscam" "$INSTDIR/keys/oscam.srvid"
 else
 	echo "found user config file: oscam.srvid"
-	echo "skip ipk config file: oscam.srvid.oscam"
+	echo "skip tpk config file: oscam.srvid.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.server" ]; then
-	echo "use ipk config file: oscam.server"
+	echo "use tpk config file: oscam.server"
 	echo "rename $INSTDIR/keys/oscam.server.oscam > $INSTDIR/keys/oscam.server"
 	mv "$INSTDIR/keys/oscam.server.oscam" "$INSTDIR/keys/oscam.server"
 else
 	echo "found user config file: oscam.server"
-	echo "skip ipk config file: oscam.server.oscam"
+	echo "skip tpk config file: oscam.server.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.user" ]; then
-	echo "use ipk config file: oscam.user"
+	echo "use tpk config file: oscam.user"
 	echo "rename $INSTDIR/keys/oscam.user.oscam > $INSTDIR/keys/oscam.user"
 	mv "$INSTDIR/keys/oscam.user.oscam" "$INSTDIR/keys/oscam.user"
 else
 	echo "found user config file: oscam.user"
-	echo "skip ipk config file: oscam.user.oscam"
+	echo "skip tpk config file: oscam.user.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.services" ]; then
-	echo "use ipk config file: oscam.services"
+	echo "use tpk config file: oscam.services"
 	echo "rename $INSTDIR/keys/oscam.services.oscam > $INSTDIR/keys/oscam.services"
 	mv "$INSTDIR/keys/oscam.services.oscam" "$INSTDIR/keys/oscam.services"
 else
 	echo "found user config file: oscam.services"
-	echo "skip ipk config file: oscam.services.oscam"
+	echo "skip tpk config file: oscam.services.oscam"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.dvbapi" ]; then
-	echo "use ipk config file: oscam.dvbapi"
+	echo "use tpk config file: oscam.dvbapi"
 	echo "rename $INSTDIR/keys/oscam.dvbapi.oscam > $INSTDIR/keys/oscam.dvbapi"
 	mv "$INSTDIR/keys/oscam.dvbapi.oscam" "$INSTDIR/keys/oscam.dvbapi"
 else
 	echo "found user config file: oscam.dvbapi"
-	echo "skip ipk config file: oscam.dvbapi.oscam"
+	echo "skip tpk config file: oscam.dvbapi.oscam"
 fi
 
Index: ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/prerm
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/prerm	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/CONTROL/prerm	(revision 24533)
@@ -3,35 +3,35 @@
 
 if [ ! -e "$INSTDIR/keys/oscam.conf.oscam" ]; then
-	echo "remove ipk oscam.conf"
+	echo "remove tpk oscam.conf"
 	rm "$INSTDIR/keys/oscam.conf"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.provid.oscam" ]; then
-	echo "remove ipk oscam.provid"
+	echo "remove tpk oscam.provid"
 	rm "$INSTDIR/keys/oscam.provid"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.srvid.oscam" ]; then
-	echo "remove ipk oscam.srvid"
+	echo "remove tpk oscam.srvid"
 	rm "$INSTDIR/keys/oscam.srvid"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.server.oscam" ]; then
-	echo "remove ipk oscam.server"
+	echo "remove tpk oscam.server"
 	rm "$INSTDIR/keys/oscam.server"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.user.oscam" ]; then
-	echo "remove ipk oscam.user"
+	echo "remove tpk oscam.user"
 	rm "$INSTDIR/keys/oscam.user"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.services.oscam" ]; then
-	echo "remove ipk oscam.services"
+	echo "remove tpk oscam.services"
 	rm "$INSTDIR/keys/oscam.services"
 fi
 
 if [ ! -e "$INSTDIR/keys/oscam.dvbapi.oscam" ]; then
-	echo "remove ipk oscam.dvbapi"
+	echo "remove tpk oscam.dvbapi"
 	rm "$INSTDIR/keys/oscam.dvbapi"
 fi
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/etc/oscamOSEmu_8933.emu
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/etc/oscamOSEmu_8933.emu	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/etc/oscamOSEmu_8933.emu	(revision 24533)
@@ -1,4 +1,4 @@
-emuname  =Oscam OSEmu 8933 _type_
-binname  =oscamOSEmu_8933
-startcam =_path_/bin/OSEmu -a emu:emu -p 54321 -b; _path_/bin/oscamOSEmu_8933 -c _path_/keys &
-stopcam  =killall -9 oscamOSEmu_8933
+emuname  =Oscam OSEmu _type_
+binname  =oscam
+startcam =_path_/bin/OSEmu -a emu:emu -p 54321 -b; _path_/bin/oscam -c _path_/keys &
+stopcam  =killall -9 oscam
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.conf.oscam
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.conf.oscam	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.conf.oscam	(revision 24533)
@@ -1,19 +1,19 @@
 [global]
 nice = -1
-logfile = /var/swap/logs/oscam.log
-pidfile = /var/swap/logs/oscam.pid
+logfile = /var/swap/keys/oscam.log
+pidfile = /var/swap/keys/oscam.pid
 #ecmfmt = 
-loghistorysize = 2048
+loghistorysize = 4096
 #CACHE EXCHANGE LOGGING =
-maxlogsize = 1024
-logduplicatelines = 1
-disablelog = 0
+maxlogsize = 2048
+logduplicatelines = 0
+disablelog = 1
 #cwlogdir =
-emmlogdir = /var/swap/logs/emm.log
-usrfile = /var/swap/logs/users.log
-disableuserfile = 0
+emmlogdir = /var/swap/keys/
+usrfile = /var/swap/keys/users.log
+disableuserfile = 1
 usrfileflag = 0
 disablemail = 1
-mailfile = /var/swap/logs/NDSmail.log
+mailfile = /var/swap/keys/NDSmail.log
 waitforcards = 1
 waitforcards_extra_delay = 250
@@ -47,5 +47,5 @@
 lb_reopen_seconds = 900
 lb_retrylimit = 1200
-lb_savepath = /var/swap/logs/lbstats.log
+lb_savepath = /var/swap/keys/lbstats.log
 lb_stat_cleanup = 3600
 lb_retrylimits =
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.dvbapi.oscam
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.dvbapi.oscam	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.dvbapi.oscam	(revision 24533)
@@ -29,4 +29,4 @@
 P: 183D
 P: 09AF
-
+P: 0B02
 I: 0
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.server.oscam
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.server.oscam	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.server.oscam	(revision 24533)
@@ -7,5 +7,5 @@
 [reader]
 enable = 0
-Label = SKY S02 de (Kartenschacht unten)
+Label = SKY-S02(Kartenschacht-unten)
 device = dev/sci0
 protocol = internal
@@ -20,5 +20,5 @@
 [reader]
 enable = 0
-Label = SKY V13 (Kartenschacht unten) 
+Label = SKY-V13(Kartenschacht-unten) 
 device = /dev/sci0
 protocol = internal
@@ -37,5 +37,5 @@
 [reader]
 enable = 0
-Label = SKY V14  (Kartenschacht unten)
+Label = SKY-V14(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -54,5 +54,5 @@
 [reader]
 enable = 0
-Label = hdplus weiße Karte (Kartenschacht unten) 
+Label = hdplus-weiße-Karte(Kartenschacht-unten) 
 device = /dev/sci0
 protocol = internal
@@ -70,5 +70,5 @@
 [reader]
 enable = 0
-Label = hdplus schwarze Karte (Kartenschacht unten)
+Label = hdplus-schwarze-Karte(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -86,5 +86,5 @@
 [reader]
 enable = 0
-Label = D02 KabelD (Kartenschacht unten)
+Label = D02-Kabel-D(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -99,5 +99,5 @@
 [reader]
 enable = 0
-Label = G09 KabelD (Kartenschacht unten)
+Label = G09-Kabel-D(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -113,5 +113,5 @@
 [reader]
 enable = 0
-Label = D09 KabelD (Kartenschacht unten)
+Label = D09-Kabel-D(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -130,5 +130,5 @@
 [reader]
 enable = 0
-Label = KabelBW V23 (Kartenschacht unten)
+Label = Kabel-BW-V23(Kartenschacht-unten)
 device = /dev/sci1
 protocol = internal
@@ -144,5 +144,5 @@
 [reader]
 enable = 0
-Label = UM01 (Kartenschacht unten)
+Label = UM01(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -161,5 +161,5 @@
 [reader]
 enable = 0
-Label = UM02 (Kartenschacht unten)
+Label = UM02(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -178,5 +178,5 @@
 [reader]
 enable = 0
-Label = I12beta (Kartenschacht unten)
+Label = I12beta(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -191,5 +191,5 @@
 [reader]
 enable = 0
-Label = ORF ice (Kartenschacht unten)
+Label = ORF-ice(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -204,5 +204,5 @@
 [reader]
 enable = 0
-Label = ORF CW (Kartenschacht unten)
+Label = ORF-cryptoworks(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -217,5 +217,5 @@
 [reader]
 enable = 0
-Label = ORF ice irdeto (Kartenschacht unten)
+Label = ORF-ice-irdeto(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -233,5 +233,5 @@
 [reader]
 enable = 0
-Label = MTV (Kartenschacht unten)
+Label = MTV(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -246,5 +246,5 @@
 [reader]
 enable = 0
-Label = Free XTV (Kartenschacht unten)
+Label = Free-XTV(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -259,5 +259,5 @@
 [reader]
 enable = 0
-Label = SRG Swiss (Kartenschacht unten)
+Label = SRG-Swiss(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -273,5 +273,5 @@
 [reader]
 enable = 0
-Label = SKY Italia (Kartenschacht unten)
+Label = SKY-Italia(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -287,5 +287,5 @@
 [reader]
 enable = 0
-Label = tivusat (Kartenschacht unten)
+Label = tivusat(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -301,5 +301,5 @@
 [reader]
 enable = 0
-Label = Telecolumbus (Kartenschacht unten)
+Label = Telecolumbus(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -315,5 +315,5 @@
 [reader]
 enable = 0
-Label = SRG V4 (Kartenschacht unten)
+Label = SRG-V4(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -330,5 +330,5 @@
 [reader]
 enable = 0
-Label = SRG V5 (Kartenschacht unten)
+Label = SRG-V5(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -344,5 +344,5 @@
 [reader]
 enable = 0
-Label = Canal Digitaal (Kartenschacht unten)
+Label = Canal-Digitaal(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -363,5 +363,5 @@
 [reader]
 enable = 0
-Label = Redlight Elite (Kartenschacht unten)
+Label = Redlight-Elite(Kartenschacht-unten)
 device = /dev/sci0
 protocol = internal
@@ -374,4 +374,19 @@
 emmcache = 1,1,2
 blockemm-unknown = 1
+
+#Hallo TV 
+[reader]
+enable = 0
+label = hallo-tv(Kartenschacht-unten)
+device = /dev/sci0
+protocol = internal
+caid = 0B02
+boxid = 12345678
+detect = cd
+mhz = 600
+ident = 0B02:000000
+group = 6
+emmcache = 1,1,2
+auprovid = 000001
 
 #################################################
@@ -384,5 +399,5 @@
 [reader]
 enable = 0
-Label = SKY S02 (Kartenschacht oben)
+Label = SKY-S02(Kartenschacht-oben)
 device = dev/sci1
 protocol = internal
@@ -397,5 +412,5 @@
 [reader]
 enable = 0
-Label = SKY V13 (Kartenschacht oben)
+Label = SKY-V13(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -414,5 +429,5 @@
 [reader]
 enable = 0
-Label = SKY V14 (Kartenschacht oben)
+Label = SKY-V14(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -431,5 +446,5 @@
 [reader]
 enable = 0
-Label = hdplus weisse Karte (Kartenschacht oben)
+Label = hdplus-weisse-Karte(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -447,5 +462,5 @@
 [reader]
 enable = 0
-Label = hdplus schwarze Karte (Kartenschacht oben)
+Label = hdplus-schwarze-Karte(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -463,5 +478,5 @@
 [reader]
 enable = 0
-Label = D02 KabelD (Kartenschacht oben)
+Label = D02-Kabel-D(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -476,5 +491,5 @@
 [reader]
 enable = 0
-Label = G09 KabelD (Kartenschacht oben)
+Label = G09-Kabel-D(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -490,5 +505,5 @@
 [reader]
 enable = 0
-Label = D09 KabelD (Kartenschacht oben)
+Label = D09-Kabel-D(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -507,5 +522,5 @@
 [reader]
 enable = 0
-Label = KabelBW (Kartenschacht oben)
+Label = Kabel-BW(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -521,5 +536,5 @@
 [reader]
 enable = 0
-Label = UM01 (Kartenschacht oben)
+Label = UM01(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -538,5 +553,5 @@
 [reader]
 enable = 0
-Label = UM02 (Kartenschacht oben)
+Label = UM02(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -555,5 +570,5 @@
 [reader]
 enable = 0
-Label = I12beta (Kartenschacht oben)
+Label = I12beta(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -568,5 +583,5 @@
 [reader]
 enable = 0
-Label = ORF ice (Kartenschacht oben)
+Label = ORF-ice(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -581,5 +596,5 @@
 [reader]
 enable = 0
-Label = ORF CW (Kartenschacht oben)
+Label = ORF-cryptoworks(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -594,5 +609,5 @@
 [reader]
 enable = 0
-Label = ORF ice irdeto (Kartenschacht oben)
+Label = ORF-ice-irdeto(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -610,5 +625,5 @@
 [reader]
 enable = 0
-Label = MTV (Kartenschacht oben)
+Label = MTV(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -623,5 +638,5 @@
 [reader]
 enable = 0
-Label = Free XTV (Kartenschacht oben)
+Label = Free-XTV(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -636,5 +651,5 @@
 [reader]
 enable = 0
-Label = SRG Swiss (Kartenschacht oben)
+Label = SRG-Swiss(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -650,5 +665,5 @@
 [reader]
 enable = 0
-Label = SKY Italia (Kartenschacht oben)
+Label = SKY-Italia(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -664,5 +679,5 @@
 [reader]
 enable = 0
-Label = tivusat (Kartenschacht oben)
+Label = tivusat(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -678,5 +693,5 @@
 [reader]
 enable = 0
-Label = Telecolumbus (Kartenschacht oben)
+Label = Telecolumbus(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -692,5 +707,5 @@
 [reader]
 enable = 0
-Label = SRG v4 (Kartenschacht oben)
+Label = SRG-V4(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -704,8 +719,8 @@
 auprovid = 040810
 
-# SRG Swiss V5 im oberen internen Schacht
-[reader]
-enable = 0
-Label = SRG V5 (Kartenschacht oben)
+# SRG Swiss-V5 im oberen internen Schacht
+[reader]
+enable = 0
+Label = SRG-V5(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -721,5 +736,5 @@
 [reader]
 enable = 0
-Label = Canal Digitaal (Kartenschacht oben)
+Label = Canal-Digitaal(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -740,5 +755,5 @@
 [reader]
 enable = 0
-Label = Redlight Elite (Kartenschacht oben)
+Label = Redlight-Elite(Kartenschacht-oben)
 device = /dev/sci1
 protocol = internal
@@ -751,4 +766,19 @@
 emmcache = 1,1,2
 blockemm-unknown = 1
+
+#Hallo TV 
+[reader]
+enable = 0
+label = hallo-tv(Kartenschacht-oben)
+device = /dev/sci1
+protocol = internal
+caid = 0B02
+boxid = 12345678
+detect = cd
+mhz = 600
+ident = 0B02:000000
+group = 6
+emmcache = 1,1,2
+auprovid = 000001
 
 #################################################
@@ -761,5 +791,5 @@
 [reader]
 enable = 0
-Label = SKY S02 (Smargo)
+Label = SKY-S02(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -775,5 +805,5 @@
 [reader]
 enable = 0
-Label = SKY V13 (Smargo)
+Label = SKY-V13(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -791,5 +821,5 @@
 [reader]
 enable = 0
-Label = SKY V14 (Smargo)
+Label = SKY-V14(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -808,5 +838,5 @@
 [reader]
 enable = 0
-Label = hdplus weiss (Smargo)
+Label = hdplus-weiss(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -825,5 +855,5 @@
 [reader]
 enable = 0
-Label = hdplus schwarz (Smargo)
+Label = hdplus-schwarz(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -842,5 +872,5 @@
 [reader]
 enable = 0
-Label = D02 KabelD (Smargo)
+Label = D02-Kabel-D(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -856,5 +886,5 @@
 [reader]
 enable = 0
-Label = G09 KabelD (Smargo)
+Label = G09-Kabel-D(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -871,5 +901,5 @@
 [reader]
 enable = 0
-Label = D09 KabelD (Smargo)
+Label = D09-Kabel-D(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -889,5 +919,5 @@
 [reader]
 enable = 0
-Label = KabelBW V23 (Smargo)
+Label = Kabel-BW-V23(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -904,5 +934,5 @@
 [reader]
 enable = 0
-Label = UM01 (Smargo)
+Label = UM01(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -922,5 +952,5 @@
 [reader]
 enable = 0
-Label = UM02 (Smargo)
+Label = UM02(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -940,5 +970,5 @@
 [reader]
 enable = 0
-Label = I12 betacrypt (Smargo)
+Label = I12 betacrypt(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -954,5 +984,5 @@
 [reader]
 enable = 0
-Label = ORF ice (Smargo)
+Label = ORF-ice(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -968,5 +998,5 @@
 [reader]
 enable = 0
-Label = ORF CW (Smargo)
+Label = ORF-cryptoworks(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -982,5 +1012,5 @@
 [reader]
 enable = 0
-Label = ORF ice irdeto (Smargo)
+Label = ORF-ice-irdeto(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -999,5 +1029,5 @@
 [reader]
 enable = 0
-Label = MTV (Smargo)
+Label = MTV(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1013,5 +1043,5 @@
 [reader]
 enable = 0
-Label = Free XTV (Smargo)
+Label = Free-XTV(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1027,5 +1057,5 @@
 [reader]
 enable = 0
-Label = SRG (Smargo)
+Label = SRG-Swiss(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1042,5 +1072,5 @@
 [reader]
 enable = 0
-Label = SKY Italia (Smargo)
+Label = SKY-Italia(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1057,5 +1087,5 @@
 [reader]
 enable = 0
-Label = tivusat (Smargo)
+Label = tivusat(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1072,5 +1102,5 @@
 [reader]
 enable = 0
-Label = Telecolumbus (Smargo)
+Label = Telecolumbus(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1087,5 +1117,5 @@
 [reader]
 enable = 0
-Label = SRG V4 (Smargo)
+Label = SRG-V4(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1103,5 +1133,5 @@
 [reader]
 enable = 0
-Label = SRG V5 (Smargo)
+Label = SRG-V5(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1118,5 +1148,5 @@
 [reader]
 enable = 0
-Label = Canal Digitaal (Smargo)
+Label = Canal-Digitaal(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1138,5 +1168,5 @@
 [reader]
 enable = 0
-Label = Redlight Elite (Smargo)
+Label = Redlight-Elite(Smargo)
 device = /dev/ttyUSB0
 protocol = mouse
@@ -1169,5 +1199,5 @@
 [reader]
 enable = 0
-Label = cccam-reader (Cardsharing) 
+Label = cccam-reader(Cardsharing) 
 device = HOST.dyndns.org:PORT
 protocol = cccam
@@ -1186,5 +1216,5 @@
 [reader]
 enable = 0
-Label = camd35-reader (Cardsharing) 
+Label = camd35-reader(Cardsharing) 
 device = HOST.dyndns.org,PORT
 protocol = camd35
@@ -1196,5 +1226,5 @@
 [reader]
 enable = 0
-label = newcamd-reader (Cardsharing) 
+label = newcamd-reader(Cardsharing) 
 protocol = newcamd
 key = 0102030405060708091011121314
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.services.oscam
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.services.oscam	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.services.oscam	(revision 24533)
@@ -102,2 +102,18 @@
 caid=0963
 srvid=0f3a,0f39,0f38,12dc,12de,12dd,133e,cb87,2ee0,5302,1e1e,1e1f,1e23,1e24,1523,1524,1525,1526,1527,1528,152d,152e,152f,1530,1531,1532,1533,1534,1535,05ab,155f,1560,1561,1562,1563,1564,1565,1566,1567,1569,156a,156b,156c,156d,0edd,0ee1,0efd,0efe,0f04,0f0f,1068,1210,1293,18f6,18f7,1b21,1b82,1c3f,1c44,20d0,232e,27f1,512c,c4d1,cba0,cbcf,c4cd,d071,d8e5,d8cc,cb8f,d397,d852,d84e,d84f,d850,c6b2,d15b,d7e8,d80b,d7bc,d3cc,1979,d338,1dce,0f45,c7a3,183a,ccb5,0f41,0f36,0f37,d337,cf9d,c4ef,cd37,d101,d74b,12c4,d7a1,2463,cba6,cba7,d7a7,15bc,d363,18d9,2842,18cf,2841,189d,1947,2879,1b1f,1929,2874,22c5,1915,193d,2871,2872,2847,22cf,18c5,283d,1933,283f,189e,287a,1916,2848,288f,1917,193c,18ac,1946,2876,1b1d,2843,1932,1942,1934,288c,2890,288d,288e,1901,1940,2895,2893,2892,2896,2894,286f,1b1c,2891,d377,d3cf,d360,c78a,c789,cb3c,1c52,cd41,122f,cbc8,d039,cd46,120b,d808,1bbe,1bbd,d809,d744,c4be,c4bd,cb2e,c5e4,c5e5,d44e,c4c8,c4c7,c5ea,c5e9,d057,2441,2558,d748,1bc5,1591,0f1f,1f73,1fc8,1fca,1f45,1bbc,2870,18ae,cb27,c6d7,d01b,cb86,d3c8,d155,178f,178a,23fb,2400,23ff,2f03,23fd,23fe,23fc,207c,2078,207b,2079,2f08,207a,2077,52d0,1e15,1e18,1e14,1e17,1e16,0f12,1e28,cb8b,d32e,d075,d043,cb2d,d7c0,179a,138f,d335,254d,c7b1,12c2,cbc9,0f30,2757,2562,d158,d749,c6c2,cd64,1be4,1bbf,cd28,0f10,c78c,1798,c78f,1537,c78e,c78b,c78d,1291,cc0a,d805,c53a,196a,1dc4,0f3e,1dc8,cb8e,105e,11ee,1252,1572,d848,d844,d7ce,183f,ccd3,ccba,183e,1841,d458,1842,1839,183c,0f4c,ccd8,2329,232f,0f23,0f21,232c,2332,2333,2330,0f1e,ccbf,ccc4,d3cb,197a,cfdf,cfd0,0f44,2071,23f8,2f12,0f24,206c,2f0d,1966,1dba,0f1c,d7e7,1038,1f6c,c4cc,c5f8,0f01,d031,18a2,1907,2851,2883,d7f0,1797,1391,0f4e,0edc,cba9,cba8,d15d,cb70,d333,1f4f,2404,2409,d395,d034,d00c,d016,158b,151a,0eef,12c1,cd5a,1fd2,1fb6,1fb3,1fc0,1fcc,2000,1fd7,1f5f,1fce,1f7e,1f8a,1f7f,1fad,1fe6,1fe9,1fbc,1f44,1fea,200f,1fcd,2005,1fcb,cb8a,d746,c4e5,cd19,cd14,cb28,d39a,d3c2,2559,1968,1de7,1db5,196c,1dca,0f1b,d7ec,d421,0ed9,cb3e,d747,cb5c,d02a,1f7c,d73e,d740,122d,138b,0f2e,d7c4,1965,1840,cce2,1db0,cb22,cb89,d37c,ccb0,ccca,cc09,cc08,105d,cfee,d843,cb97,d326,1f69,1fc6,1f55,d10b,1f67,274c,27d8,2792,2738,27a6,50dd,279c,2760,2f58,27b0,2774,272e,276a,2f45,2f6c,50dc,2f4e,5109,50ff,2f85,50eb,27a1,280f,2819,2747,27ab,278d,2756,0f5c,27b5,2814,0f5d,2815,2758,0f5e,271f,2788,0f0c,2710,2f62,0f0b,275f,2724,d851,cf7e,d110,cb26,d386,d35a,d84b,2eef,255b,d32c,c6a8,2eea,d066,d07a,cb66,c530,1fd0,cb3d,cb3f,d84d,cc01,d355,1fa4,d3c3,d7a4,c7b0,d7ed,c6ac,cb61,d41c,d35e,0edf,2efe,2094,240e,0f4f,c495,c7ae,c7ac,cc29,cc2e,cb9b,1b81,1b62,1b59,1b5d,1b5f,1b60,1b66,0f40,1b5e,c6c5,0ede,1b64,1b5b,1b6d,cb75,c4a9,d7ae,12c5,12c6,0ef8,12c7,0f2d,d8d1,d7ab,c7aa,cf9b,15b8,c793,15b9,0f1d,c790,c792,15bb,c791,15ba,d7e9,d3c9,d745,cb52,d3cd,d80e,cb88,cba4,c4e0,157c,c6be,d32f,d330,1f42,128f,13f3,1299,1ff8,d74a,2567,1209,d15c,d157,d05c,d070,c7a9,c7ab,cd1e,d7cd,1f54,d7e6,d7ba,d8e0,c6c3,d80c,2457,1843,ccce,1c3e,d361,1c43,d807,c4c2,d849,d449,197b,c6c6,253f,d7c3,d7c7,d7c8,d15e,d154,d156,d357,cb9f,d7a9,253d,c69f,258c,2586,258e,2581,258b,258d,2582,2588,cf9c,14bc,1bf8,d80d,2540,0f27,d03e,c7a7,c7a8,d020,d02f,d025,d810,1199,0ee7,125d,125f,128e,057b,2331,0f15,13f4,1290,0f0e,0516,10ce,0ee6,1f95,1f64,11fc,0f17,1324,0f4a,1268,1325,0585,0f0d,1f6d,1f7d,1f47,15b2,10e6,10e7,10e8,12db,12da,1278,1279,127a,10ea,114a,11ae,11af,11b0,114e,114d,114b,114c,1277,1276,15ae,15af,15b0,14ab,13a5,132a,10e9,15b1,15b4,1214,1215,1216,1212,11b2,15b5,11b1,15b3,1213,1799,13f2,10cf,0eeb,1fbf,10d4,0f3c,157e,0ee8,1133,0eea,1fab,0c1d,11a3,138c,11ad,1ffc,1794,178c,1788,1793,0f1a,178e,1789,1612,1260,1262,201a,0f0a,1225,12c3,1135,1134,0eed,0ee9,10d0,10d2,0f3d,11fa,1f5a,0f47,0f49,0f26,0f46,0f4d,0f13,1332,1076,1078,1203,107d,0f25,0fa3,0eda,107b,119f,1205,11a1,0ef0,0eee,0fa1,1202,151c,1519,153a,0fa4,0ef3,0ef2,051b,051a,1070,2462,107e,1581,0efc,0efb,132b,132d,132e,1136,0f16,1f4e,c6c9,2ef4,c6c7,1292,d853,1f8b,cbca,cd23,c7ad,c7af,d35b,cb25,d435,1cfc,d368,132c,1fff,1f7a,cb48,d84a,cb91,cb90,d7aa,cb8c,0fc9,d7a2,1f48,d106,d007,d43a,d430,d45d,27ed,27ec,27e2,254c,cb2a,1f82,d3c4,cc1a,cc38,0f22,d7ad,27fe,cb9c,1796,1592,0f42,d7bf,2583,cb8d,d822,2541,2ee5,cc0b,d7d2,d7c6,d43f,d06b,d052,d061,1859,ccde,0f43,1bc4,1224,cb84,d356,d42b,d084,d07f,d048,d04d,2585,cd5f,d7eb,1f49,1f4c,253b,d7cc,d845,2551,2552,2550,d758,cb21,254f,120a,cb24,d3ca,cc1f,cc24,cbfc,0f28,27f6,c4f9,1fef,1f6a,1fe2,1f5e,1fa7,20cf,1f70,1f43,1f71,c6c4,1b5a,120c,d3ce,1b61,c6c8,1f88,1978,c6c0,1dbf,0f3f,d332,d841,2557,d7d0,1207,1208,2489,d806,1969,1de2,d84c,c521,c517,c52b,c51c,c526
+
+[kabelD]
+caid=1722,1834
+srvid=C351,C352,C353,C354,C357,C356,C355,C358,C361,C364,C366,C35F,C362,C359,C363,C35A,C365,C3BB,D03E,C480,D036,D09C,C617,C615,C483,C3B8,C482,D0A1,C357,C3BF,D035,CF70,D0A4,C3BC,C613,C60F,C60D,C610,C356,C614,C611,C3B9,CF73,D0A5,D0A3,C481,D099,C47D,C355,D16B,C3BA,C358,C619,C618,C352,C47F,C351,C3B7,C47E,C3BD,C419,C41A,C41C,C41E,C41F,C420,C423,C424,C425,C427,C42B,C42D,C42E,C42F,C430,C432,C433,C437,C438,C439,C43A,C43B,C43C,C43F,C441,C442,C443,C445,C446,C447,C3BE,D177,D16E,CF77,D038,D16C,CF09,D043,D09B,CF0C,D046,D045,D10A,D16D,D168,D165,CF76,D171,D178,D10B,D179,CFDD,CFDB,D167,CF12,D049,D10D,D03F,D10E,D10F,D040,D17E,D172,D039,D047,D173,CF17,D176,D044,D042,CF0D,D17B,CF0E,D166,D041,C3B5,D03A,D175,D170,D163,D161,D04D,CF7F,D17A,D174,D16F,D162,CF0A,D03B,CF7E,CFE3,D04A,CF0F,D04B,D04C,D03D,D169,D164,C60C
+
+[kabelbw]
+caid=098E
+srvid=0412,4AAC,6211,4AAB,3335,5271,6210,3B00,3719,3B07,620F,4AAA,371C,3AFD,371E,3AFE,6606,3337,332E,3338,526E,3333,3B04,371D,6212,D35D,3AFF,5272,3B05,3330,75A3,AC49,372B,0403,2B65,0405,001D,3339,3334,3718,3B0C,6217,040C,0024,371F,041A,0032,372C,3B08,526D,000E,0404,03F5,526F,D35C,6DCE,621A,6DCF,759C,7980,0464,007C,94D6,7D67,75A4,94D8,0458,0070,AC48,94D5,7D66,797F,94D7,814D,B415,814F,7D65,7D68,621B,4E96,42DA,8150,69EA,5274,0463,007B,814E,046A,0082,0074,006F,0084,0071,AC4B,6DD0,0076,B416,B7FD,006E,0083,006B,0081,0072,0069,006C,00F2,4E95,CF6E,65FA,CF76,CF6F,CF75,B038,7596,B41F,3716,3717,6222,6220,2B67,6DC9,6DC8,6DCA,D355,6DCB,B039,759E,759F,6605,565B,565C,565A,CF70,CF72,D358,D357,65FD,6224,6225,65FF,65FC,5657,5A46,759D,6215,CF6D,5660,5656,5A42,5A44,5A45,CF73,5A3E,5A43,5A47,5A3D,5A41,5A40,5658,71AF,5659,CF71,6213,6214,565D,565E,65FB,71B1,71B3,65FE,2B73,2B8D,2B8E,2B88,3345,372A,D35E,334B,2B80,2B8F,3346,2B90,2B86,2B76,2B84,3344,2B87,3348,334A,3342,334D,2B74,6601,334F,2B85,2B75,2B71,2B72,6603,3349,2B82,2B77,6602,334C,CF91,CF92,CF8C,6DCD,5A4A,5E35,5669,334E,2B89,2B78,2B8B,3341,2B7C,3350,3347,3343,2B7D,2B79,2B7E,2B8C,2B7A,2B8A,2B7F,2B81,2B7B,2B83,CF74,0015,0201,0159,0163,016D,0018,03F6,0022,0019,0404,001C,002A,001A,0010,0206,0016,0013,00A8,000C,001B,0017,0011,0034,0203,0009,000A,000B,002B,0008,0014,0029,0204,00DF,00DD,00DE,0107,0111,001E,0075,00FB,014B,0137,0141,0119,012D,0123
+
+[Unitymedia]
+caid=1722,1831,1835,1838,1850
+srvid=5A49,75A1,B417,7980,7D67,7D66,7D69,814D,814E,8151,7D65,7D68,4E96,8150,814F,002A,4AAC,3335,6210,3B07,000E,0010,332E,3338,3333,2F50,000D,75A3,001B,0024,371F,0032,6219,B417,7980,007C,7D67,75A4,0070,7D66,94D5,7D69,814D,94D7,814E,8151,7D65,7D68,4E96,8150,69EA,5274,007B,814F,002A,4AAC,6211,4AAB,3335,5270,5271,6210,3719,3B00,3B07,620F,4AAA,000E,3B03,3AFD,371E,3AFE,3B02,0010,6606,3337,332E,3338,526E,3333,3B04,371D,2F50,6212,000D,3AFF,5272,526F,001D,AC49,3B05,3330,75A3,372B,001B,2B65,3339,3718,6217,3B0C,371C,3334,0024,371F,0032,372C,3B08,526D,6219,621A,6DCF,759C,B417,0082,7980,007C,94D6,7D67,75A4,94D8,6DD0,0070,B416,AC48,7D66,94D5,7D69,797F,814D,94D7,B415,814E,8151,7D65,7D68,621B,4E96,42DA,8150,69EA,5274,007B,814F,4AA7,4AA6,4AA5,4AA4,4AA3,4AA2,3EEA,3EE9,3EE8,3EE7,3EE6,3EE5,42CD,42CE,42CF,42D0,42D1,42D2,42D3,42D4,4E88,7595,372A,3729,3717,6DC9,6DC8,6DCA,6DCB,6DCE,69E4,71AF,71B1,6DCD,71AD,71B2,6600,71AE,2B73,2B8D,2B8E,2B88,3345,334B,2B80,2B8F,3346,2B90,2B86,2B76,2B84,3344,2B87,3348,334A,3342,334D,2B74,334F,2B85,2B75,2B71,2B72,3349,2B82,2B77,334E,2B89,2B78,334C,3341,2B8B,2B7C,3350,3347,3343,2B7D,2B79,2B7E,2B8C,2B7A,2B8A,2B7F,2B81,2B7B,2B83,7595,7596,65FA,65FE,6600,759E,5A3F,759F,6605,6DCD,5669,565A,565B,565C,65F6,65F7,65FA,6601,65FB,6600,5657,5E34,5A46,759D,6215,5660,5656,71B1,5A42,5A44,5A45,65FA,65FD,65FF,65FC,6602,6600,5A3E,71AD,5A43,5A47,6604,5A3D,5A41,5A40,5658,71AF,6603,71B3,6213,5E35,5A4A,6214,565D,565F,71AE,002A,0015,0201,0018,000E,0022,001A,001C,0010,0206,0016,0013,00A8,000C,000D,001D,001B,0017,0011,0034,0024,0032,002A,0015,0201,0018,000E,0082,0022,0074,001A,001C,0084,0010,007C,0206,0016,0013,00A8,000C,0076,000D,0070,001D,001B,0017,0011,006C,0034,0024,0032,007B,0019,0203,0009,000A,000B,002B,0008,0014,0029,0204,00DD,00DE,0107,0111,011B,0125,012F,0139,0143,014D,00FD,001E,0081,0072,010C,010e,0118,0112,0116,0120,00DF,0106,0110,011A,0124,012E,0138,0142,014C,00FC,0069,010B,0115,011F,00FB,0105,010F,0119,0123,012D,0137,0141,014B,00FE,014E,0159,0163,016D
+
+[hallotv]
+caid=0B02
+srvid=32D7,32D8,32D9
Index: ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.user.oscam
===================================================================
--- ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.user.oscam	(revision 24532)
+++ ipk/source.sh4/emus_oscamOSEmu_8933/_path_/keys/oscam.user.oscam	(revision 24533)
@@ -7,6 +7,4 @@
 au = 1
 uniq = 0
-group = 1,2,3,4,5,6,7,8,9
-#betatunnel = 1833.FFFF:1702
-#betatunnel = 1834.FFFF:1722
-#betatunnel = 1835.FFFF:1722
+group = 1,2,3,4,5,6,7,8,9,10
+betatunnel = 1833.FFFF:1702,1834.FFFF:1722,1835.FFFF:1722