Index: /ipk/source.sh4/swapemus_oscam_7209/CONTROL/control
===================================================================
--- /ipk/source.sh4/swapemus_oscam_7209/CONTROL/control	(revision 19126)
+++ /ipk/source.sh4/swapemus_oscam_7209/CONTROL/control	(revision 19127)
@@ -1,5 +1,5 @@
 Package: enigma2-plugin-swapemus-oscam.7209
 Version: 1.0
-Description: Oscam Build 7209 and Configs, v13 Intern_Lower Slot! SWAPSTICK IS NEEDED!
+Description: Oscam Build 7209 and Configs! SWAPSTICK IS NEEDED!
 Section: swapemus
 Priority: optional
Index: /ipk/source.sh4/swapemus_oscam_7209/var/swap/keys/oscam.server.oscam
===================================================================
--- /ipk/source.sh4/swapemus_oscam_7209/var/swap/keys/oscam.server.oscam	(revision 19126)
+++ /ipk/source.sh4/swapemus_oscam_7209/var/swap/keys/oscam.server.oscam	(revision 19127)
@@ -1,3 +1,3 @@
-###############   General Instruction  -  oscam.server   ###################
+ ###############   General Instruction  -  oscam.server   ###################
 # To activate/deactivate the reader set enable = 1/0                       #
 #                                                                          #
@@ -13,14 +13,54 @@
 # For Irdeto, Betacrypt just activate "cardmhz=600" by removing the "#"    #
 #                                                                          #
-# For Nagra activate and set the correct "rsakey = " and "boxkey = " en    #
-# examples for HDplus HD02 and Sky S02 are included                                           #
-#                                                                          #
-# for specific Smartcards such as TIGER or Viaccess with AES-Key           #
-# see the OSCAM documentation                                              #
+# For Nagra activate and set the correct "rsakey = " and "boxkey = "       #
+# examples for HDplus HD02 and Sky S02 are included                        #
+#                                                                          #
+# for other Smartcards see the OSCAM documentation                         #
 ############################################################################
 
-[reader]
-enable = 1
-label =  swap_skyde V13
+
+[reader]
+enable = 0
+Label = HD+ (Kartenschacht) (schwarze Karte)
+Protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1843
+cardmhz = 368
+mhz = 368
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+
+[reader]
+enable = 0
+Label = HD+ (Kartenschacht) (weisse Karte)
+Protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1830
+cardmhz = 357
+mhz = 357
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+
+[reader]
+enable = 0
+label = SKY-DE S02 (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1702
+cardmhz = 600
+mhz = 600
+
+[reader]
+enable = 0
+label = SKY-DE V13 (Kartenschacht)
 protocol = internal
 device = /dev/sci0
@@ -28,6 +68,6 @@
 boxid = 12345678
 detect = cd
-mhz = 359
-cardmhz = 359
+mhz = 357
+cardmhz = 357
 group = 1
 emmcache = 1,3,2
@@ -38,45 +78,5 @@
 [reader]
 enable = 0
-Label = swap_HD plus HD02
-Protocol = internal
-device = /dev/sci0
-emmcache = 1,1,2
-detect = CD
-group = 1
-caid = 1843
-cardmhz = 368
-mhz = 368
-rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
-boxkey = A7642F57BC96D37C
-
-[reader]
-enable = 0
-Label = swap_HD plus HD01
-Protocol = internal
-device = /dev/sci0
-emmcache = 1,1,2
-detect = CD
-group = 1
-caid = 1830
-cardmhz = 357
-mhz = 357
-rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
-boxkey = A7642F57BC96D37C
-
-[reader]
-enable = 0
-label    = swap_Sky S02
-protocol = internal
-device   = /dev/sci1
-emmcache = 1,1,2
-detect   = CD
-group    = 1
-caid = 1702
-cardmhz = 600
-mhz = 600
-
-[reader]
-enable=0
-Label = swap_MTV
+Label = MTV (Kartenschacht)
 protocol = internal
 detect = CD
@@ -86,11 +86,10 @@
 services = mtv
 caid = 0B00
-Mhz      = 368
-cardmhz  = 368
-
-
-[reader]
-enable=0
-Label = swap_FreeXTV
+Mhz = 368
+cardmhz = 368
+
+[reader]
+enable = 0
+Label = FreeXTV (Kartenschacht)
 protocol = internal
 device = /dev/sci0
@@ -100,11 +99,78 @@
 services = srg
 caid = 0500
-mhz  = 357
-cardmhz = 368
-
-
-[reader]
-enable=0
-Label = swap_KabelDeutschland
+mhz = 357
+cardmhz = 368
+
+[reader]
+enable = 0
+label = SRG (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+Group = 1
+mhz = 357
+cardmhz = 357
+CAID = 0500
+deprecated = 1
+
+[reader]
+enable = 0
+Label = ORF ice (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 0648
+force_irdeto = 1
+rsakey = DF57B08C0F13E67BD17AD37EAAF4EAA25393F8A0EFE8ACE6708AAF97C985CBA8A6C13826963BD3092EB9FC72F773A430724706AA5E1D14E1747842D32069A12D
+boxkey = 1122334455667788
+mhz = 600
+cardmhz = 600
+#deprecated = 1
+
+[reader]
+enable = 0
+Label = ORF alt (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 0D05 
+#ident = OD05:000000,000004,00000C,000008,000010
+mhz = 368
+cardmhz = 368
+
+[reader]
+enable = 0
+label = skyitalia (Kartenschacht)
+protocol  = internal
+device = /dev/sci0
+caid = 09CD
+boxid = 1412F60A
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
+
+[reader]
+enable = 0
+label  = tivusat (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+caid = 183D
+rsakey = A92DA72FEEACF2947B003ED652153B189E4043B0138C368BDF6B9ED77DDAD6C0761A2198AEB3FC97A19C9D01CA769B3FFFE4F6E70FA4E0696A8980E18D8C58E11D817121346E3E66457FDD84CFA72589B25B538EFC304361B54845F39E9EFA52D805E5FD86B595B366C35716ABC91FA3DC159C9F4D8164B5
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
+
+[reader]
+enable = 0
+Label = KabelDeutschland (Kartenschacht)
 Protocol = internal
 Device = /dev/sci0
@@ -113,52 +179,66 @@
 group = 1
 mhz = 600
-cardmhz=600
+cardmhz = 600
 CAID = 1722,1834
 
-
-[reader]
-enable=0
-label = swap_SRG
-protocol = internal
-device = /dev/sci0
-emmcache = 1,1,2
-detect = CD
-Group = 1
-mhz = 357
-cardmhz = 357
-CAID = 0500
-deprecated = 1
-
- [reader]
-enable=0
-Label = swap_ORF
-protocol = internal
-device = /dev/sci0
-emmcache = 1,1,2
-detect = CD
-group = 1
-services = orf
-caid = 0D95,0D05
-mhz                           = 368
-cardmhz                       = 368
-
-[reader]
-enable          = 0
-label           = swap_cyfraplus
-protocol        = internal
-device          = /dev/sci0
-group           = 1
-emmcache        = 1,1,2
-caid            = 0100
-
-
-[reader]
-enable          = 0
-label           = swap_tnk
-protocol        = internal
-device          = /dev/sci0
-group           = 1
-emmcache        = 1,1,2
-caid            = 0b00
+[reader]
+enable = 0
+label = Unitymedia UM02 (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1838
+cardmhz = 357
+mhz = 357
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A 23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156 F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+
+[reader]
+enable = 0
+label = Unitymedia I12  (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1722
+cardmhz = 600
+mhz = 600 
+
+[reader]
+enable = 0
+label = Kabel BW   (Kartenschacht)
+protocol = internal
+device = /dev/sci1
+caid = 098E
+detect = cd
+boxid = 12345678
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
+
+[reader]
+enable = 0
+label = cyfraplus  (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+caid = 0100
+group = 1
+emmcache = 1,1,2
+mhz = 357
+cardmhz = 357
+
+
+[reader]
+enable = 0
+label = tnk   (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+caid = 0b00
+group = 1
+emmcache = 1,1,2
 
 ####################    External Readers / SMARGO   ########################
@@ -185,5 +265,5 @@
 [reader]
 enable = 0
-label = swap_Extern_HD plus HD01
+label = HD+ (externer Kartenleser) (weisse Karte)
 protocol = mouse
 device = /dev/ttyUSB0
@@ -199,5 +279,5 @@
 [reader]
 enable = 0
-label = swap_Extern_HD plus HD02
+label = HD+ (externer Kartenleser) (schwarze Karte)
 protocol = mouse
 device = /dev/ttyUSB0
@@ -214,7 +294,7 @@
 [reader]
 enable = 0
-label = swap_Extern_Sky S02
-protocol = mouse
-device = /dev/ttyUSB1
+label = SKY-DE S02 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
 emmcache = 1,1,2
 detect = CD
@@ -226,12 +306,12 @@
 [reader]
 enable = 0
-label = swap_Extern_skyde V13
-protocol = mouse
-device = /dev/ttyUSB1
+label = SKY-DE V13 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
 caid = 09C4
 boxid = 12345678
 detect = cd
-mhz = 359
-cardmhz = 359
+mhz = 357
+cardmhz = 357
 group = 1
 emmcache = 1,3,2
@@ -241,21 +321,124 @@
 
 [reader]
+enable = 0
+label = ORF ice (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 0648
+force_irdeto   = 1
+rsakey = DF57B08C0F13E67BD17AD37EAAF4EAA25393F8A0EFE8ACE6708AAF97C985CBA8A6C13826963BD3092EB9FC72F773A430724706AA5E1D14E1747842D32069A12D
+boxkey = 1122334455667788
+mhz = 600
+cardmhz = 600
+#deprecated = 1
+smargopatch = 1
+	
+[reader]
+enable = 0
+label = ORF alt (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 0D05 
+#ident = OD05:000000,000004,00000C,000008,000010
+mhz = 368
+cardmhz = 368
+smargopatch = 1
+
+[reader]
+enable = 0
+label = SRG (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+Group = 1
+mhz = 357
+cardmhz = 357
+CAID = 0500
+deprecated = 1
+smargopatch = 1
+
+[reader]
+enable = 0
+Label = FreeXTV (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+services = srg
+caid = 0500
+mhz  = 357
+cardmhz = 368
+
+[reader]
+enable = 0
+Label = MTV (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+detect = CD
+group = 1
+emmcache = 1,1,2
+caid = 0B00
+Mhz = 368
+cardmhz = 368
+
+[reader]
+enable = 0
+label = skyitalia (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+caid  = 09CD
+boxid = 1412F60A
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
+
+[reader]
+enable = 0
+label = tivusat (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+caid = 183D
+rsakey  = A92DA72FEEACF2947B003ED652153B189E4043B0138C368BDF6B9ED77DDAD6C0761A2198AEB3FC97A19C9D01CA769B3FFFE4F6E70FA4E0696A8980E18D8C58E11D817121346E3E66457FDD84CFA72589B25B538EFC304361B54845F39E9EFA52D805E5FD86B595B366C35716ABC91FA3DC159C9F4D8164B5
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
+
+[reader]
+enable = 0
+label = cyfraplus (externer Kartenleser)      
+protocol = mouse
+device = /dev/ttyUSB0
+caid = 0100       
+group = 1
+emmcache = 1,1,2
+detect = CD
+
+[reader]
+enable = 0
+label = tnk (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0 
+caid = 0b00     
+group = 1
+emmcache = 1,1,2
+detect = CD
+
+[reader]
 enable=0
-label = swap_Extern_ORF
-protocol = mouse
-device = /dev/ttyUSB0
-emmcache = 1,1,2
-detect = CD
-Group = 1
-mhz = 357
-cardmhz = 357
-CAID = 0D05,0D95
-smargopatch=1
-
-[reader]
-enable=0
-label = swap_Extern_Kabel D
-protocol = mouse
-device = /dev/ttyUSB1
+label = KabelDeutschland (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
 emmcache = 1,1,2
 detect = CD
@@ -267,60 +450,41 @@
 
 [reader]
-enable=0
-label = swap_Extern_SRG
-protocol = mouse
-device = /dev/ttyUSB0
-emmcache = 1,1,2
-detect = CD
-Group = 1
-mhz = 357
-cardmhz = 357
-CAID = 0500
-deprecated = 1
-smargopatch=1
-
-[reader]
-enable=0
-Label = swap_Extern_FreeXTV
-protocol = mouse
-device = /dev/ttyUSB0
-emmcache = 1,1,2
-detect = CD
-group = 1
-services = srg
-caid = 0500
-mhz  = 357
-cardmhz = 368
-
-[reader]
-enable=0
-Label = swap_Extern_MTV
-protocol = mouse
-device = /dev/ttyUSB0
-detect = CD
-group = 1
-emmcache = 1,1,2
-services = mtv
-caid = 0B00
-Mhz      = 368
-cardmhz  = 368
-
-[reader]
-enable          = 0
-label         = swap_Extern_cyfraplus       
-protocol        = mouse
-device          = /dev/ttyUSB0       
-group           = 1
-emmcache        = 1,1,2
-caid            = 0100
-
-[reader]
-enable          = 0
-label           = swap_Extern_tnk
-protocol        = mouse
-device          = /dev/ttyUSB0      
-group           = 1
-emmcache        = 1,1,2
-caid            = 0b00
+enable = 0
+label = Unitymedia UM02 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1838
+cardmhz = 357
+mhz = 357
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A 23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156 F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+
+[reader]
+enable = 0
+label = Unitymedia I12 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1722
+cardmhz = 600
+mhz = 600 
+
+[reader]
+enable = 0
+label = Kabel BW (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+caid = 098E
+detect = cd
+boxid = 12345678
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,1,2
 
 #########################   Remote Readers    ##############################
@@ -331,12 +495,13 @@
 # For further details see the OSCAM documentation                          #
 ############################################################################
-[reader]
-enable = 0
-label        = cccam-reader
-protocol     = cccam
-device       = IP/dyndns,PORT
-user         = USER
-password     = PASS
-group        = 1
+
+[reader]
+enable = 0
+label = cccam-reader (Cardsharing) 
+protocol = cccam
+device = IP/dyndns,PORT
+user = USER
+password = PASS
+group = 1
 emmcache = 1,1,2
 cccmaxhop = 5
@@ -345,21 +510,10 @@
 [reader]
 enable = 0
-label    = camd35-reader
+label = camd35-reader (Cardsharing) 
 protocol = camd35
-device   = IP/dyndns,PORT
-user         = USER
-password     = PASS
-group    = 1
-emmcache = 1,1,2
-
-[reader]
-enable = 0
-label    = newcamd-reader
-protocol = newcamd
-key     = 0102030405060708091011121314
-device   = IP/dyndns,PORT
-user         = USER
-password     = PASS
-group    = 1
+device = IP/dyndns,PORT
+user = USER
+password = PASS
+group = 1
 emmcache = 1,1,2