Index: ipk/source.sh4/swapemus_oscam_7819/CONTROL/control
===================================================================
--- ipk/source.sh4/swapemus_oscam_7209/CONTROL/control	(revision 18760)
+++ ipk/source.sh4/swapemus_oscam_7819/CONTROL/control	(revision 18797)
@@ -1,10 +1,10 @@
-Package: enigma2-plugin-swapemus-oscam.7209
+Package: enigma2-plugin-swapemus-oscam.7819
 Version: 1.0
-Description: Oscam Build 7209 and Configs, v13 Intern_Lower Slot! SWAPSTICK IS NEEDED!
+Description: Oscam Build 7819 SWAP
 Section: swapemus
 Priority: optional
 Maintainer: AAF Forum
 Architecture: sh4
-OE: Oscam Build 7209 for Swapstick
+OE: Oscam Build 7819 for Swapstick
 Homepage: http://www.aaf-digital.info
 Depends:
Index: ipk/source.sh4/swapemus_oscam_7819/CONTROL/preinst
===================================================================
--- ipk/source.sh4/swapemus_oscam_7209/CONTROL/preinst	(revision 18760)
+++ ipk/source.sh4/swapemus_oscam_7819/CONTROL/preinst	(revision 18797)
@@ -29,5 +29,5 @@
 	SPACE=`df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
 	FREE=`expr $SPACE - 100`
-	SIZE=798
+	SIZE=898
 	echo "checking freespace"
 	echo packege size $SIZE kb
Index: ipk/source.sh4/swapemus_oscam_7819/var/swap/etc/oscam_7209_swap.emu
===================================================================
--- ipk/source.sh4/swapemus_oscam_7209/var/swap/etc/oscam_7209_swap.emu	(revision 18760)
+++ 	(revision )
@@ -1,4 +1,0 @@
-emuname  =Oscam 7209 Swap
-binname  =oscam_7209_swap
-startcam =/var/swap/bin/oscam_7209_swap -c /var/swap/keys &
-stopcam  =killall -9 oscam_7209_swap
Index: ipk/source.sh4/swapemus_oscam_7819/var/swap/etc/oscam_7819_swap.emu
===================================================================
--- ipk/source.sh4/swapemus_oscam_7819/var/swap/etc/oscam_7819_swap.emu	(revision 18797)
+++ ipk/source.sh4/swapemus_oscam_7819/var/swap/etc/oscam_7819_swap.emu	(revision 18797)
@@ -0,0 +1,4 @@
+emuname  =Oscam 7819 Swap
+binname  =oscam_7819_swap
+startcam =/var/swap/bin/oscam_7819_swap -c /var/swap/keys &
+stopcam  =killall -9 oscam_7819_swap
Index: ipk/source.sh4/swapemus_oscam_7819/var/swap/keys/oscam.server.oscam
===================================================================
--- ipk/source.sh4/swapemus_oscam_7209/var/swap/keys/oscam.server.oscam	(revision 18760)
+++ ipk/source.sh4/swapemus_oscam_7819/var/swap/keys/oscam.server.oscam	(revision 18797)
@@ -7,36 +7,7 @@
 ############################################################################
 
-
-######################### Internal Readers   ###############################
-# Default Config should work with Seca, Conax, Cryptoworks, Viaccess, NDS  #
-#                                                                          #
-# 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                                              #
-############################################################################
-
-[reader]
-enable = 1
-label =  swap_skyde V13
-protocol = internal
-device = /dev/sci0
-caid = 09C4
-boxid = 12345678
-detect = cd
-mhz = 357
-cardmhz = 357
-group = 1
-emmcache = 1,3,2
-lb_weight = 100
-ins7e11 = 11
-ndsversion = 2
-
-[reader]
-enable = 0
-Label = swap_HD plus HD02
+[reader]
+enable = 0
+Label = HD+ (Kartenschacht) (schwarze Karte)
 Protocol = internal
 device = /dev/sci0
@@ -52,5 +23,5 @@
 [reader]
 enable = 0
-Label = swap_HD plus HD01
+Label = HD+ (Kartenschacht) (weisse Karte)
 Protocol = internal
 device = /dev/sci0
@@ -66,7 +37,7 @@
 [reader]
 enable = 0
-label    = swap_Sky S02
-protocol = internal
-device   = /dev/sci1
+label    = SKY-DE S02 (Kartenschacht)
+protocol = internal
+device   = /dev/sci0
 emmcache = 1,1,2
 detect   = CD
@@ -77,6 +48,22 @@
 
 [reader]
-enable=0
-Label = swap_MTV
+enable = 0
+label =  SKY-DE V13 (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+caid = 09C4
+boxid = 12345678
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,3,2
+lb_weight = 100
+ins7e11 = 11
+ndsversion = 2
+
+[reader]
+enable=0
+Label = MTV (Kartenschacht)
 protocol = internal
 detect = CD
@@ -89,10 +76,158 @@
 cardmhz  = 368
 
-
-[reader]
-enable=0
-Label = swap_FreeXTV
-protocol = internal
-device = /dev/sci0
+[reader]
+enable=0
+Label = FreeXTV (Kartenschacht)
+protocol = internal
+device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+services = srg
+caid = 0500
+mhz = 357
+cardmhz = 368
+
+[reader]
+enable=0
+Label = KabelDeutschland (Kartenschacht)
+Protocol = internal
+Device = /dev/sci0
+emmcache = 1,1,2
+detect = CD
+group = 1
+mhz = 600
+cardmhz=600
+CAID = 1722,1834
+
+
+[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 (Kartenschacht)
+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 = HD+ (externer Kartenleser) (weisse Karte)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1830
+cardmhz = 357
+mhz = 357
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+
+[reader]
+enable = 0
+label = HD+ (externer Kartenleser) (schwarze Karte)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+smargopatch = 1
+caid = 1843
+rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
+boxkey = A7642F57BC96D37C
+#mhz = 357
+#cardmhz = 357
+
+[reader]
+enable = 0
+label = SKY-DE S02 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+caid = 1702
+#mhz = 600
+#cardmhz = 600
+
+[reader]
+enable = 0
+label = SKY-DE V13 (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+caid = 09C4
+boxid = 12345678
+detect = cd
+mhz = 357
+cardmhz = 357
+group = 1
+emmcache = 1,3,2
+lb_weight = 100
+ins7e11 = 11
+ndsversion = 2
+
+[reader]
+enable=0
+label = ORF (externer Kartenleser)
+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 = KabelDeutschland (externer Kartenleser)
+protocol = mouse
+device = /dev/ttyUSB0
+emmcache = 1,1,2
+detect = CD
+group = 1
+mhz = 600
+cardmhz=600
+CAID = 1722,1834
+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
@@ -103,179 +238,7 @@
 cardmhz = 368
 
-
-[reader]
-enable=0
-Label = swap_KabelDeutschland
-Protocol = internal
-Device = /dev/sci0
-emmcache = 1,1,2
-detect = CD
-group = 1
-mhz = 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
-
-
-####################    External Readers / SMARGO   ########################
-# Important !!!!      Use SMARGO Firmware 1.4 or 1.5                       #
-# With regard to your Smartcard set up the Reader/Smargo as follows:       #
-#                                                                          #
-# For Seca, Conax, Cryptoworks, Viaccess, NDS, Nagra                       #
-# Frequency Fixed 3,69 Mhz / Normal / T=0 / EGT = 0                        #
-#                                                                          #
-# For Irdeto, Betacrypt                                                    #
-# Frequency Fixed 6,0Mhz / Normal / T=1 / EGT = 0                          #
-#                                                                          #
-# If SMARGO ist in Autoswitch mode, than activate fitting mhz/cardmhz-     #
-# Entries in the reader-Section                                            #
-#                                                                          #                                                                         #
-# For Nagra activate and complete the "rsakey = " and "boxkey = "  and     #
-# and remove the # in the smargopatch = 1 line                             #
-# example for HDplus is included                                           #
-#                                                                          #
-# for specific Smartcards such as TIGER or Viaccess with AES-Key           #
-# see the OSCAM documentation                                              #
-############################################################################
-
-[reader]
-enable = 0
-label = swap_Extern_HD plus HD01
-protocol = mouse
-device = /dev/ttyUSB0
-emmcache = 1,1,2
-detect = CD
-group = 1
-caid = 1830
-cardmhz = 357
-mhz = 357
-rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
-boxkey = A7642F57BC96D37C
-
-[reader]
-enable = 0
-label = swap_Extern_HD plus HD02
-protocol = mouse
-device = /dev/ttyUSB0
-emmcache = 1,1,2
-detect = CD
-group = 1
-smargopatch = 1
-caid = 1843
-rsakey = BF358B5461863130686FC933FB541FFCED682F3680F09DBC1A23829FB3B2F766B9DD1BF3B3ECC9AD6661B753DCC3A9624156F9EB64E8168EF09E4D9C5CCA4DD5
-boxkey = A7642F57BC96D37C
-#mhz = 357
-#cardmhz = 357
-
-[reader]
-enable = 0
-label = swap_Extern_Sky S02
-protocol = mouse
-device = /dev/ttyUSB1
-emmcache = 1,1,2
-detect = CD
-group = 1
-caid = 1702
-#mhz = 600
-#cardmhz = 600
-
-[reader]
-enable = 0
-label = swap_Extern_skyde V13
-protocol = mouse
-device = /dev/ttyUSB1
-caid = 09C4
-boxid = 12345678
-detect = cd
-mhz = 357
-cardmhz = 357
-group = 1
-emmcache = 1,3,2
-lb_weight = 100
-ins7e11 = 11
-ndsversion = 2
-
-[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
-emmcache = 1,1,2
-detect = CD
-group = 1
-mhz = 600
-cardmhz=600
-CAID = 1722,1834
-smargopatch=1
-
-[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
+[reader]
+enable=0
+Label = MTV (externer Kartenleser)
 protocol = mouse
 device = /dev/ttyUSB0
@@ -296,7 +259,8 @@
 # For further details see the OSCAM documentation                          #
 ############################################################################
-[reader]
-enable = 0
-label        = cccam-reader
+
+[reader]
+enable = 0
+label        = cccam (Cardsharing)
 protocol     = cccam
 device       = IP/dyndns,PORT
@@ -310,5 +274,5 @@
 [reader]
 enable = 0
-label    = camd35-reader
+label    = camd35 (Cardsharing)
 protocol = camd35
 device   = IP/dyndns,PORT
@@ -320,5 +284,5 @@
 [reader]
 enable = 0
-label    = newcamd-reader
+label    = newcamd (Cardsharing)
 protocol = newcamd
 key     = 0102030405060708091011121314