diff --git a/dvb-s/Astra-28.2E b/dvb-s/Astra-28.2E
index c9588daa..ea06c56b 100644
--- a/dvb-s/Astra-28.2E
+++ b/dvb-s/Astra-28.2E
@@ -1,32 +1,25 @@
 # Astra 28.2E SDT info service transponder
 # freq pol sr fec
 
-## Astra 2A
+## Astra 2E
 # Transponder 1
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11720000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11719500
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 29500000
 	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-# Transponder 2
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 3
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11758000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 4
@@ -36,15 +29,17 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 5
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11798000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 29500000
 	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 6
@@ -54,6 +49,7 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 7
@@ -62,16 +58,18 @@
 	FREQUENCY = 11836000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 8
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11856000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 9
@@ -81,6 +79,7 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 10
@@ -90,6 +89,7 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 11
@@ -98,7 +98,8 @@
 	FREQUENCY = 11914000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 12
@@ -107,7 +108,8 @@
 	FREQUENCY = 11934000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 13
@@ -117,107 +119,17 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 18
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12051000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 22
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12129000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 23
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 24
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12168000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 27
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12226000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 28
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12246000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 37
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12422000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 40
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12480000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-
-## Astra 2B
-# Transponder 14
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11973000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 15
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11992000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 16
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12012000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 17
@@ -227,6 +139,17 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 18
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12051000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 19
@@ -235,16 +158,18 @@
 	FREQUENCY = 12070000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 20
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12090000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 21
@@ -253,7 +178,39 @@
 	FREQUENCY = 12110000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 22
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12129000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+## Astra 2F
+# Transponder 23
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12148000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 24
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12168000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 25
@@ -262,7 +219,8 @@
 	FREQUENCY = 12188000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 26
@@ -271,108 +229,112 @@
 	FREQUENCY = 12207000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
+# Transponder 27
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12226500
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 28
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12246000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+## Astra 2E
 # Transponder 29
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12266000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 30
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12285000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 31
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12304000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 32
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12324000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 29500000
 	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 33
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12344000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 29500000
 	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 34
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12363000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 29500000
 	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder 35
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12382000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder 36
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12402000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
+## Astra 2F
 # Transponder 38
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12441000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 39
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12460000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
 	INVERSION = AUTO
 
+## Astra 2E
+# Transponder 40
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12480000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
 
-## Astra 2D
+## Astra 2E
 # Transponder 41
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10714000
+	FREQUENCY = 10714250
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 42
@@ -382,6 +344,7 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 43
@@ -391,6 +354,7 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 44
@@ -400,6 +364,7 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 45
@@ -409,6 +374,7 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 46
@@ -418,6 +384,7 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 47
@@ -427,6 +394,7 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 48
@@ -436,42 +404,37 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 49
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10832000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
-	INNER_FEC = 5/6
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
 	INVERSION = AUTO
 
 # Transponder 50
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10847000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
-	INNER_FEC = 5/6
-	INVERSION = AUTO
-
-# Transponder 51
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10862000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22000000
-	INNER_FEC = 5/6
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
 	INVERSION = AUTO
 
 # Transponder 52
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10876000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
-	INNER_FEC = 5/6
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
 	INVERSION = AUTO
 
 # Transponder 53
@@ -481,6 +444,7 @@
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 54
@@ -490,313 +454,368 @@
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
-	INVERSION = AUTO
-
-# Transponder 55
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10921000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22000000
-	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
 # Transponder 56
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10936000
 	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+## Astra 2G
+# Transponder 57
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10964000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 59
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10994000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 61
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11024000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 63
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11052750
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 64
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11068000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 65
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11081000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 66
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11097000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 67
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11112000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 68
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11127000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 69
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11141250
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 71
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11170750
+	POLARIZATION = HORIZONTAL 
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 89
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11464250
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 90
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11479000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
 	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-
-## Eurobird 1
-# Transponder C1
+# Transponder 92
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11222170
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder C2
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11223670
+	FREQUENCY = 11508500
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C2
+# Transponder 93
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11259000
+	FREQUENCY = 11508500
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C1
+# Transponder 94
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11538000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 95
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11261000
+	FREQUENCY = 11552750
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C3
+# Transponder 96
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11567500
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 97
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11582250
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 98
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11597000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 99
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11611750
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 23000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+# Transponder 103
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11671750
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 104
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11685500
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+## Astra 2F
+# Transponder 109
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11307000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C4
+# Transponder 110
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11307000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C4
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11343000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder C3
+# Transponder 111
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11344000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C5
+# Transponder 112
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11390000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder C6
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11390000
+	FREQUENCY = 11344500
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C5
+## Astra 2E
+# Transponder 113
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11426000
+	FREQUENCY = 11385000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder C6
+# Transponder 114
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11385000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 115
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11425000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+# Transponder 116
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11426000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder D1
+# Transponder C1
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11469000
+	FREQUENCY = 11225000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder D2S
+# Transponder C2
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11488000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11225000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 23000000
 	INNER_FEC = 2/3
+	MODULATION = PSK/8
 	INVERSION = AUTO
 
-# Transponder D3S
+# Transponder C1
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11508000
+	FREQUENCY = 11265000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
 
-# Transponder D4S
+# Transponder C2
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11527000
+	FREQUENCY = 11265000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	MODULATION = QPSK
 	INVERSION = AUTO
-
-# Transponder D5
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11546000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D6
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11565000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D7
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11585000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D8
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11603850
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D9
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11623000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D10
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11642000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D11
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11661540
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder D12
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11680770
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F1
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12524000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F2
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12524000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F1
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12560000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F2
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12560000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F4
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12596000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	INVERSION = AUTO
-
-# Transponder F3
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12607000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-# Transponder F4
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12629000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-# Transponder F5
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12692000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19532000
-	INNER_FEC = 1/2
-	INVERSION = AUTO
-