Update satellite channel lists from Lyngsat

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

54 files changed, 2326 insertions, 1882 deletions

diff --git a/dvb-s/ABS-2-75.0E b/dvb-s/ABS-2-75.0E
index 7d7f2956..54a4e3fd 100644
--- a/dvb-s/ABS-2-75.0E
+++ b/dvb-s/ABS-2-75.0E
@@ -1,14 +1,6 @@
 # Channel table for ABS 2 at 75.0°E
 # Source: http://www.lyngsat.com/ABS-2.html
 
-[Avenues Khabar]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3590000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3590000
@@ -17,7 +9,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Nepalese mux]
+[AP1 TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3606000
 	POLARIZATION = VERTICAL
@@ -52,37 +44,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Radio 5]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 256000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Clouds Plus]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4008000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arise & Shine TV]
+[Rabbi TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4014000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tanzanian mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4019000
+	FREQUENCY = 4002000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2850000
+	SYMBOL_RATE = 1250000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -123,19 +89,20 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[IQ Sat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4074000
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4077000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
+	SYMBOL_RATE = 4488000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[TAP DMV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4077000
+	FREQUENCY = 4093000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4488000
+	SYMBOL_RATE = 15000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -221,23 +188,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12133000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12684000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kirkuk TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12318000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12326000
@@ -247,24 +197,6 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12422000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12431000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12524000
 	POLARIZATION = HORIZONTAL
@@ -274,7 +206,7 @@
 
 [BFBS]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12726000
+	FREQUENCY = 12730000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 23330000
 	MODULATION = QPSK
diff --git a/dvb-s/ABS-22A-75.0E b/dvb-s/ABS-22A-75.0E
index 61525025..67a8c467 100644
--- a/dvb-s/ABS-22A-75.0E
+++ b/dvb-s/ABS-22A-75.0E
@@ -1,14 +1,6 @@
 # Channel table for ABS 2/2A at 75.0°E
 # Source: http://www.lyngsat.com/ABS-2-2A.html
 
-[Avenues Khabar]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3590000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3590000
@@ -17,7 +9,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Nepalese mux]
+[AP1 TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3606000
 	POLARIZATION = VERTICAL
@@ -52,37 +44,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Radio 5]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 256000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Clouds Plus]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4008000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arise & Shine TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4014000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tanzanian mux]
+[Rabbi TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4019000
+	FREQUENCY = 4002000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2850000
+	SYMBOL_RATE = 1250000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -123,19 +89,20 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[IQ Sat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4074000
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4077000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
+	SYMBOL_RATE = 4488000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[TAP DMV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4077000
+	FREQUENCY = 4093000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4488000
+	SYMBOL_RATE = 15000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -203,11 +170,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[STV]
+[WellSat]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11045000
+	FREQUENCY = 11040000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 35007000
+	SYMBOL_RATE = 35010000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -248,18 +215,20 @@
 	INVERSION = AUTO
 
 [GeoTelecommunications]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11531000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [GeoTelecommunications]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11559000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -360,15 +329,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12133000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12684000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [MTS TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12160000
@@ -438,7 +398,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[STV]
+[WellSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12653000
 	POLARIZATION = VERTICAL
@@ -449,7 +409,7 @@
 
 [BFBS]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12726000
+	FREQUENCY = 12730000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 23330000
 	MODULATION = QPSK
diff --git a/dvb-s/ABS-2A-75.0E b/dvb-s/ABS-2A-75.0E
index 5813288f..a558f1f9 100644
--- a/dvb-s/ABS-2A-75.0E
+++ b/dvb-s/ABS-2A-75.0E
@@ -10,11 +10,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[STV]
+[WellSat]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11045000
+	FREQUENCY = 11040000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 35007000
+	SYMBOL_RATE = 35010000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -46,18 +46,20 @@
 	INVERSION = AUTO
 
 [GeoTelecommunications]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11531000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [GeoTelecommunications]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11559000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 22000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -158,6 +160,32 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Kirkuk TV]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12318000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12422000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12431000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12533000
@@ -167,7 +195,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[STV]
+[WellSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12653000
 	POLARIZATION = VERTICAL
diff --git a/dvb-s/ABS-3A-3.0W b/dvb-s/ABS-3A-3.0W
index 2e29125f..e91c3c06 100644
--- a/dvb-s/ABS-3A-3.0W
+++ b/dvb-s/ABS-3A-3.0W
@@ -1,15 +1,6 @@
 # Channel table for ABS 3A at 3.0°W
 # Source: http://www.lyngsat.com/ABS-3A.html
 
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3698000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Channels TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3882000
@@ -19,20 +10,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TV Difusora São Luís]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3953000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3250000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [TV Verdes Campos Sat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3958000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 1666000
-	MODULATION = PSK/8
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -62,11 +45,39 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Rede TV! Sul]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2917000
+[IMPD TV Worldwide]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3982000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[IMPD TV Rondônia]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3987000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[IMPD TV Goiânia]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3991000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3250000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[IMPD TV Espírito Santo]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3995000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3330000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -74,7 +85,7 @@
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 4000000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
+	SYMBOL_RATE = 2440000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -96,7 +107,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TV Em Tempo]
+[TV Norte Amazonas]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4020000
 	POLARIZATION = HORIZONTAL
@@ -114,6 +125,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[IMPD TV Belo Horizonte]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4072000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [IMPD TV Worldwide]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4114000
@@ -123,6 +143,24 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Sama TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10715000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1666000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Alikhbaria Syria]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10718000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2916000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10956000
@@ -134,6 +172,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10962000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10963000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 16180000
@@ -161,18 +208,36 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10983000
+	FREQUENCY = 10975000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10996000
+	FREQUENCY = 10981000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10993000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10999000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -197,9 +262,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11021000
+	FREQUENCY = 11019000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 12500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -215,9 +280,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11051000
+	FREQUENCY = 11049000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11056000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -233,9 +307,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11063000
+	FREQUENCY = 11061000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11067000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -251,9 +334,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
+	FREQUENCY = 11073000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11079000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -268,6 +360,15 @@
 	INVERSION = AUTO
 
 [various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11085000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11090000
 	POLARIZATION = VERTICAL
@@ -277,9 +378,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11102000
+	FREQUENCY = 11097000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -302,29 +403,65 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Guyanan mux]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11132000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11136000
+	FREQUENCY = 11132000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7402000
-	MODULATION = QPSK
+	SYMBOL_RATE = 9600000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11145000
+	FREQUENCY = 11139000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7402000
+	SYMBOL_RATE = 2500000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11156000
+	FREQUENCY = 11146000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9704000
+	SYMBOL_RATE = 7200000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11155000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7200000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11164000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7200000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Guyanan mux]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11168000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -340,25 +477,34 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11171000
+	FREQUENCY = 11170000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 5000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[ABS promo]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11185000
+	FREQUENCY = 11176000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10887000
+	SYMBOL_RATE = 5000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11182000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [RASD TV]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11463000
+	FREQUENCY = 11468000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 1666000
 	INNER_FEC = AUTO
@@ -366,18 +512,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11471000
+	FREQUENCY = 11468000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7120000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11483000
+	FREQUENCY = 11474000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7120000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11480000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -411,9 +566,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11530000
+	FREQUENCY = 11534000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	SYMBOL_RATE = 4440000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -490,36 +645,36 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11637000
+	FREQUENCY = 11642000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 10000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11652000
+	FREQUENCY = 11653000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 14808000
-	MODULATION = QPSK
+	SYMBOL_RATE = 10000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11670000
+	FREQUENCY = 11665000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 14808000
-	MODULATION = QPSK
+	SYMBOL_RATE = 10000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11694000
+	FREQUENCY = 11689000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 10000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/AMC-11-131.0W b/dvb-s/AMC-11-131.0W
index 50b5d8af..1acb0483 100644
--- a/dvb-s/AMC-11-131.0W
+++ b/dvb-s/AMC-11-131.0W
@@ -81,6 +81,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4140000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 34280000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Univisión]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4160000
diff --git a/dvb-s/AMC-15-&-EchoStar-105SES-11-105.0W b/dvb-s/AMC-15-&-EchoStar-105SES-11-105.0W
index 45b27f74..dd55d9cc 100644
--- a/dvb-s/AMC-15-&-EchoStar-105SES-11-105.0W
+++ b/dvb-s/AMC-15-&-EchoStar-105SES-11-105.0W
@@ -10,15 +10,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Telemax]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3730000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4053000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [HITS Quantum]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3740000
@@ -30,18 +21,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3748000
+	FREQUENCY = 3772000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9560000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
+	SYMBOL_RATE = 8000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -100,15 +82,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Telemundo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3940000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [HITS Quantum]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3980000
@@ -190,11 +163,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[HITS Quantum]
+[Pursuit Channel]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
+	FREQUENCY = 4162000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -358,14 +331,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[[EchoStar test card]]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12035000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12036000
diff --git a/dvb-s/AMC-21-&-Galaxy-30-125.0W b/dvb-s/AMC-21-&-Galaxy-30-125.0W
index 0d46da92..0b9dd3b4 100644
--- a/dvb-s/AMC-21-&-Galaxy-30-125.0W
+++ b/dvb-s/AMC-21-&-Galaxy-30-125.0W
@@ -1,48 +1,6 @@
 # Channel table for AMC 21 & Galaxy 30 at 125.0°W
 # Source: http://www.lyngsat.com/AMC-21-and-Galaxy-30.html
 
-[Trinity Broadcasting]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26667000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ShopHQ]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 19886000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC Universal]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3790000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3820000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [ABC Cable Networks]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3840000
@@ -61,21 +19,21 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[ESPN]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
+	FREQUENCY = 3900000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29079000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29079000
-	MODULATION = PSK/8
+	FREQUENCY = 3920000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 34286000
+	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -87,16 +45,16 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[ESPN]
+[C-SPAN]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3980000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
+	SYMBOL_RATE = 16300000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[HBO The Works]
+[Turner]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4000000
 	POLARIZATION = HORIZONTAL
@@ -141,6 +99,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Turner]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4100000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 34283000
+	MODULATION = APSK/16
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [A&E Networks]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4120000
@@ -204,18 +171,20 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12163000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4444000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12169000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4444000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/AMC-21-124.9W b/dvb-s/AMC-21-124.9W
index 3cec3d4b..03aeb405 100644
--- a/dvb-s/AMC-21-124.9W
+++ b/dvb-s/AMC-21-124.9W
@@ -29,18 +29,20 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12163000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4444000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12169000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4444000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/AMC-6-139.0W b/dvb-s/AMC-6-139.0W
new file mode 100644
index 00000000..30dbcd6c
--- /dev/null
+++ b/dvb-s/AMC-6-139.0W
@@ -0,0 +1,11 @@
+# Channel table for AMC 6 at 139.0°W
+# Source: http://www.lyngsat.com/AMC-6.html
+
+[Alaskan mux]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4056000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13250000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/Africasat-1a-46.0E b/dvb-s/Africasat-1a-46.0E
index 91c68587..84aed2e7 100644
--- a/dvb-s/Africasat-1a-46.0E
+++ b/dvb-s/Africasat-1a-46.0E
@@ -19,6 +19,24 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[MFM TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3897000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1268000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[NCBN]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3899000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2083000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Salt TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3902000
@@ -57,13 +75,31 @@
 
 [Silverbird TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3961000
+	FREQUENCY = 3962000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1777000
+	SYMBOL_RATE = 2339000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Plus TV Africa]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3993000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1667000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Cam 10]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3999000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1666000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [MFM TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4016000
@@ -198,12 +234,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ark TV]
+[Clouds TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4133000
+	FREQUENCY = 4132000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1055000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 1843000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -224,15 +260,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Plus TV Africa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4145000
@@ -306,26 +333,26 @@
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10987000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10992000
+	FREQUENCY = 10987000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2726000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Persiana Media Group]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10998000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
+	FREQUENCY = 10992000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2726000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -348,15 +375,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Al Nujaba TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11003000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11007000
@@ -368,43 +386,36 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11021000
+	FREQUENCY = 11024000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
+	SYMBOL_RATE = 16500000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [ARB Media Qrup]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11024000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 12700000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7455000
+	FREQUENCY = 11037000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11041000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
+	FREQUENCY = 11042000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -412,9 +423,9 @@
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11042000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -429,18 +440,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11049000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
+	FREQUENCY = 11046000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
+	FREQUENCY = 11049000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -456,9 +467,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11059000
+	FREQUENCY = 11054000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -474,19 +485,19 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11071000
+	FREQUENCY = 11068000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11080000
+	FREQUENCY = 11077000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
+	SYMBOL_RATE = 2222000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -517,11 +528,39 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Teleradio]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11134000
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11120000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11130000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11138000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11147000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -535,10 +574,11 @@
 	INVERSION = AUTO
 
 [Teleradio]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11175000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Al-Yah-1-52.5E b/dvb-s/Al-Yah-1-52.5E
index a7a4acb8..151fa43b 100644
--- a/dvb-s/Al-Yah-1-52.5E
+++ b/dvb-s/Al-Yah-1-52.5E
@@ -125,7 +125,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12149000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
+	SYMBOL_RATE = 27500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Amazonas-2-61.0W b/dvb-s/Amazonas-2-61.0W
index 1390f0e5..02737d5a 100644
--- a/dvb-s/Amazonas-2-61.0W
+++ b/dvb-s/Amazonas-2-61.0W
@@ -56,7 +56,7 @@
 [Movistar]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10888000
-	POLARIZATION = VERTICAL
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 28888000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -85,15 +85,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Vivo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11222000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Movistar]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11262000
@@ -107,7 +98,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11262000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
+	SYMBOL_RATE = 31000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -128,15 +119,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Vivo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11342000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Movistar]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11382000
@@ -154,6 +136,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Vivo]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11422000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 31000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12132000
diff --git a/dvb-s/Amazonas-3-61.0W b/dvb-s/Amazonas-3-61.0W
index 9816da31..b04121ca 100644
--- a/dvb-s/Amazonas-3-61.0W
+++ b/dvb-s/Amazonas-3-61.0W
@@ -17,15 +17,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Rede VTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3918000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4780000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SBT Rio Grande]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3942000
@@ -56,7 +47,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3970000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8750000
+	SYMBOL_RATE = 9875000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -197,14 +188,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11738000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 40000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Vivo]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11851000
@@ -234,14 +217,6 @@
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11972000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28888000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11972000
-	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -250,7 +225,7 @@
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12012000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28888000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -258,7 +233,7 @@
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12052000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28888000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -270,37 +245,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Claro Americas Sur]
+[Vivo]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12092000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12132000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12172000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12172000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
+	SYMBOL_RATE = 28888000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Amazonas-5-61.0W b/dvb-s/Amazonas-5-61.0W
index 2a6f0a08..bcbc3c33 100644
--- a/dvb-s/Amazonas-5-61.0W
+++ b/dvb-s/Amazonas-5-61.0W
@@ -1,12 +1,19 @@
 # Channel table for Amazonas 5 at 61.0°W
 # Source: http://www.lyngsat.com/Amazonas-5.html
 
-[Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS2
+[various]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12230000
 	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 31300000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12230000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -19,46 +26,68 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TVD]
-	DELIVERY_SYSTEM = DVBS2
+[Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12270000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Claro Americas Sur]
-	DELIVERY_SYSTEM = DVBS2
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12310000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12350000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TVD]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12310000
+[Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12350000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12390000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Claro Americas Sur]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12430000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12350000
+	FREQUENCY = 12510000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Claro Americas Sur]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12430000
-	POLARIZATION = VERTICAL
+	FREQUENCY = 12550000
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
diff --git a/dvb-s/Amos-17-17.0E b/dvb-s/Amos-17-17.0E
index 3a413413..34a0f420 100644
--- a/dvb-s/Amos-17-17.0E
+++ b/dvb-s/Amos-17-17.0E
@@ -1,6 +1,15 @@
 # Channel table for Amos 17 at 17.0°E
 # Source: http://www.lyngsat.com/Amos-17.html
 
+[Signet]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3846000
+	POLARIZATION = RIGHT
+	SYMBOL_RATE = 6730000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [ViewMedia]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11717000
@@ -30,6 +39,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12050000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 0
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12217000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
@@ -73,3 +91,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[TV Centrafricaine]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12706000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 0
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/Amos-3-4.0W b/dvb-s/Amos-3-4.0W
index 734f6a87..822b4e83 100644
--- a/dvb-s/Amos-3-4.0W
+++ b/dvb-s/Amos-3-4.0W
@@ -10,6 +10,14 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10722000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [T-Home]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10758000
@@ -36,6 +44,14 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10806000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [T-Home]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10842000
@@ -46,6 +62,23 @@
 	INVERSION = AUTO
 
 [Yes]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10842000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10890000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Yes]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10926000
 	POLARIZATION = VERTICAL
@@ -53,7 +86,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11140000
 	POLARIZATION = HORIZONTAL
@@ -61,7 +94,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11175000
 	POLARIZATION = HORIZONTAL
diff --git a/dvb-s/Amos-37-4.0W b/dvb-s/Amos-37-4.0W
index 426dda39..8b940499 100644
--- a/dvb-s/Amos-37-4.0W
+++ b/dvb-s/Amos-37-4.0W
@@ -10,6 +10,14 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10722000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [T-Home]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10758000
@@ -36,6 +44,14 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10806000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [T-Home]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10842000
@@ -46,6 +62,23 @@
 	INVERSION = AUTO
 
 [Yes]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10842000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Yes]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 10890000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Yes]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10926000
 	POLARIZATION = VERTICAL
@@ -63,11 +96,10 @@
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS2
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10998000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 13750000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -79,28 +111,30 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[KAN]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11034000
+	FREQUENCY = 11035000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	MODULATION = QPSK
+	SYMBOL_RATE = 6083000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Rashut 2]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11052000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11047000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8518000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11058000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13750000
+	SYMBOL_RATE = 15000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -122,10 +156,11 @@
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11079000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9547000
+	SYMBOL_RATE = 10416000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -138,15 +173,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[KAN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11113000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8518000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11140000
 	POLARIZATION = HORIZONTAL
@@ -154,7 +181,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11175000
 	POLARIZATION = HORIZONTAL
@@ -241,28 +268,12 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11525000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11542000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 3703000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Yes]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11553000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11571000
@@ -281,51 +292,50 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11594000
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11595000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 3200000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11600000
+	FREQUENCY = 11602000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11609000
+	FREQUENCY = 11645000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3700000
+	SYMBOL_RATE = 4609000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11645000
+	FREQUENCY = 11653000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4609000
+	SYMBOL_RATE = 3000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11655000
+	FREQUENCY = 11657000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6545000
+	SYMBOL_RATE = 3272000
 	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12297000
 	POLARIZATION = HORIZONTAL
@@ -351,35 +361,51 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Rada]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12358000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12382000
+	FREQUENCY = 12369000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4610000
+	SYMBOL_RATE = 8333000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12394000
+	FREQUENCY = 12375000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
+	SYMBOL_RATE = 3333000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12380000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4230000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ukrkosmos]
+[various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12410000
+	FREQUENCY = 12391000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20833000
+	SYMBOL_RATE = 3200000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[RASD TV]
+[various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12515000
+	FREQUENCY = 12396000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1666000
+	SYMBOL_RATE = 3200000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Amos-7-3.9W b/dvb-s/Amos-7-3.9W
index a4564c0d..f2576325 100644
--- a/dvb-s/Amos-7-3.9W
+++ b/dvb-s/Amos-7-3.9W
@@ -11,11 +11,10 @@
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS2
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10998000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 13750000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -27,28 +26,30 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[KAN]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11034000
+	FREQUENCY = 11035000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	MODULATION = QPSK
+	SYMBOL_RATE = 6083000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Rashut 2]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11052000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11047000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8518000
+	SYMBOL_RATE = 5000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11058000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13750000
+	SYMBOL_RATE = 15000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -70,10 +71,11 @@
 	INVERSION = AUTO
 
 [Yes]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11079000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9547000
+	SYMBOL_RATE = 10416000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -86,14 +88,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[KAN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11113000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8518000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Yes]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11474000
@@ -112,28 +106,12 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11525000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11542000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 3703000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Yes]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11553000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11571000
@@ -152,51 +130,50 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11594000
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11595000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 3200000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11600000
+	FREQUENCY = 11602000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11609000
+	FREQUENCY = 11645000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3700000
+	SYMBOL_RATE = 4609000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11645000
+	FREQUENCY = 11653000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4609000
+	SYMBOL_RATE = 3000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11655000
+	FREQUENCY = 11657000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6545000
+	SYMBOL_RATE = 3272000
 	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[StarLightMedia]
+[StarLight Media]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12297000
 	POLARIZATION = HORIZONTAL
@@ -222,35 +199,51 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Rada]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12358000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12382000
+	FREQUENCY = 12369000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4610000
+	SYMBOL_RATE = 8333000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12394000
+	FREQUENCY = 12375000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
+	SYMBOL_RATE = 3333000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ukrkosmos]
+[various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12410000
+	FREQUENCY = 12380000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20833000
+	SYMBOL_RATE = 4230000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[RASD TV]
+[various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12515000
+	FREQUENCY = 12391000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1666000
+	SYMBOL_RATE = 3200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12396000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3200000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Anik-F1R-107.3W b/dvb-s/Anik-F1R-107.3W
index e2c69a9a..8b8950a0 100644
--- a/dvb-s/Anik-F1R-107.3W
+++ b/dvb-s/Anik-F1R-107.3W
@@ -1,38 +1,6 @@
 # Channel table for Anik F1R at 107.3°W
 # Source: http://www.lyngsat.com/Anik-F1R.html
 
-[Educational Media Foundation]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3732000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Legislative Assembly of the Northwest Territories]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3807000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Legislative Assembly TV Nunavut]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[House of Assembly Newfoundland and Labrador]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3927000
@@ -41,37 +9,20 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[CTV]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Radio France Internationale]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28346000
+	FREQUENCY = 4111000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 15000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Legislative Assembly TV Nunavut]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4100000
+	FREQUENCY = 4164000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28346000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 1936000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Anik-F1RG1-107.3W b/dvb-s/Anik-F1RG1-107.3W
index c658af5b..8679bb10 100644
--- a/dvb-s/Anik-F1RG1-107.3W
+++ b/dvb-s/Anik-F1RG1-107.3W
@@ -1,38 +1,6 @@
 # Channel table for Anik F1R/G1 at 107.3°W
 # Source: http://www.lyngsat.com/Anik-F1R-G1.html
 
-[Educational Media Foundation]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3732000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Legislative Assembly of the Northwest Territories]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3807000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Legislative Assembly TV Nunavut]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[House of Assembly Newfoundland and Labrador]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3927000
@@ -41,37 +9,29 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[CTV]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Radio France Internationale]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28346000
+	FREQUENCY = 4111000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 15000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Legislative Assembly TV Nunavut]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4100000
+	FREQUENCY = 4164000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28346000
+	SYMBOL_RATE = 1936000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[MinEdu Channel 1]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
+	FREQUENCY = 12017000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Anik-F3-&-T8-&-EchoStar-14-119.0W b/dvb-s/Anik-F3-&-T8-&-EchoStar-14-119.0W
index 00a572b2..4067382b 100644
--- a/dvb-s/Anik-F3-&-T8-&-EchoStar-14-119.0W
+++ b/dvb-s/Anik-F3-&-T8-&-EchoStar-14-119.0W
@@ -1,6 +1,48 @@
 # Channel table for Anik F3 & T8 & EchoStar 14 at 119.0°W
 # Source: http://www.lyngsat.com/Anik-F3-and-T8-and-EchoStar-14.html
 
+[CTV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4096000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Legislative Assembly of Ontario]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4116000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3399000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4144000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 21000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Educational Media Foundation]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4196000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Dish USA]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11715000
diff --git a/dvb-s/Anik-F3-118.8W b/dvb-s/Anik-F3-118.8W
index 856cf345..544a3872 100644
--- a/dvb-s/Anik-F3-118.8W
+++ b/dvb-s/Anik-F3-118.8W
@@ -1,6 +1,48 @@
 # Channel table for Anik F3 at 118.8°W
 # Source: http://www.lyngsat.com/Anik-F3.html
 
+[CTV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4096000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 23800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Legislative Assembly of Ontario]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4116000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3399000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4144000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 21000000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Educational Media Foundation]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4196000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Dish USA]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11715000
diff --git a/dvb-s/Anik-G1-107.3W b/dvb-s/Anik-G1-107.3W
new file mode 100644
index 00000000..28ecb664
--- /dev/null
+++ b/dvb-s/Anik-G1-107.3W
@@ -0,0 +1,12 @@
+# Channel table for Anik G1 at 107.3°W
+# Source: http://www.lyngsat.com/Anik-G1.html
+
+[MinEdu Channel 1]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12017000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/Apstar-7-76.5E b/dvb-s/Apstar-7-76.5E
index 51723e32..6169cce8 100644
--- a/dvb-s/Apstar-7-76.5E
+++ b/dvb-s/Apstar-7-76.5E
@@ -12,37 +12,55 @@
 
 [Image Channel]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3639000
+	FREQUENCY = 3642000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
+	SYMBOL_RATE = 3200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Janata TV]
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3695000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4700000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[NTV Itahari]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3690000
+	FREQUENCY = 3705000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 4166000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[NTV Kohalpur]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3695000
+	FREQUENCY = 3710000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4700000
-	MODULATION = QPSK
+	SYMBOL_RATE = 4166000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Madani Channel Bangla]
+[Nepal TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3749000
+	FREQUENCY = 3720000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3070000
-	MODULATION = QPSK
+	SYMBOL_RATE = 12500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[TeleNest]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3732000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 16000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -63,14 +81,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Joyjatra TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3799000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4280000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3832000
@@ -106,15 +116,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Walt Disney TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3914000
@@ -158,33 +159,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Din News HD]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4022000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NTV Itahari]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4024000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NTV Kohalpur]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4030000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Capital TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4030000
@@ -196,42 +170,6 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4035000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nepal TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bol]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4047000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kantipur TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4056000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4058000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 9600000
@@ -257,6 +195,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[STAR TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Zee Network]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4087000
@@ -353,15 +300,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Sky Net]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11167000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 45000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11458000
diff --git a/dvb-s/Arabsat-5A-30.5E b/dvb-s/Arabsat-5A-30.5E
index b546b0d0..54cb9e94 100644
--- a/dvb-s/Arabsat-5A-30.5E
+++ b/dvb-s/Arabsat-5A-30.5E
@@ -121,7 +121,7 @@
 
 [Quran TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10796000
+	FREQUENCY = 10794000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
@@ -139,19 +139,10 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10807000
+	FREQUENCY = 10813000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10817000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 3000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -187,6 +178,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10942000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3124000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Alazm Radio]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10946000
@@ -195,19 +195,21 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12505000
+[LBC International]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12507000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2380000
+	SYMBOL_RATE = 2800000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12509000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12510000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2220000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -216,7 +218,16 @@
 	FREQUENCY = 12513000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2380000
-	MODULATION = PSK/8
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Oman TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12517000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4900000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -228,29 +239,39 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Medi 1 TV]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12520000
+	FREQUENCY = 12522000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12523000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8800000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 4440000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iraqia General]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12521000
+	FREQUENCY = 12525000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2100000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 1600000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
+[Télé Liban]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12527000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1800000
+	SYMBOL_RATE = 1660000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -264,7 +285,23 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12534000
+	FREQUENCY = 12531000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12533000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12536000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2200000
 	INNER_FEC = AUTO
@@ -279,20 +316,29 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ashorooq TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12544000
+[Diwan TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12543000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
+	SYMBOL_RATE = 1400000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[LBC International]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12545000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1300000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12575000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 2220000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -515,18 +561,20 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12707000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12704000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
+	SYMBOL_RATE = 1640000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12710000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12707000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
+	SYMBOL_RATE = 2960000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -538,15 +586,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Sudania 24 TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12713000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Sudan TV]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12719000
@@ -581,17 +620,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12728000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12733000
+	FREQUENCY = 12732000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
+	SYMBOL_RATE = 2950000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Arabsat-5A6A-30.5E b/dvb-s/Arabsat-5A6A-30.5E
index aea64551..500060c3 100644
--- a/dvb-s/Arabsat-5A6A-30.5E
+++ b/dvb-s/Arabsat-5A6A-30.5E
@@ -121,7 +121,7 @@
 
 [Quran TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10796000
+	FREQUENCY = 10794000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
@@ -139,19 +139,10 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10807000
+	FREQUENCY = 10813000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10817000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 3000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -187,6 +178,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10942000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3124000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Alazm Radio]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10946000
@@ -197,62 +197,54 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11000000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al Jadeed]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2143000
+	FREQUENCY = 10958000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[NBN]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
+	FREQUENCY = 11000000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1667000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11035000
+	FREQUENCY = 11068000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3541000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Blue Nile Channel]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11040000
+	FREQUENCY = 11075000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[LBC International]
+[[LBC International test card]]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11074000
+	FREQUENCY = 11091000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
+	SYMBOL_RATE = 7000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[LBC International]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
+	FREQUENCY = 11103000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1300000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -293,11 +285,37 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11126000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [OTV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11122000
+	FREQUENCY = 11130000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Al Jadeed]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11134000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2140000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[NBN]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11136000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1666000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -356,19 +374,30 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12505000
+[Sudania 24 TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11565000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2380000
+	SYMBOL_RATE = 3600000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[LBC International]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12507000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2800000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12509000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12510000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2220000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -377,7 +406,16 @@
 	FREQUENCY = 12513000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2380000
-	MODULATION = PSK/8
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Oman TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12517000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4900000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -389,29 +427,39 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Medi 1 TV]
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12522000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12520000
+	FREQUENCY = 12523000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8800000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 4440000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iraqia General]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12521000
+	FREQUENCY = 12525000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2100000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 1600000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
+[Télé Liban]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12527000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1800000
+	SYMBOL_RATE = 1660000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -425,7 +473,23 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12534000
+	FREQUENCY = 12531000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12533000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12536000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2200000
 	INNER_FEC = AUTO
@@ -440,20 +504,29 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ashorooq TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12544000
+[Diwan TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12543000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
+	SYMBOL_RATE = 1400000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[LBC International]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12545000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1300000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12575000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	MODULATION = QPSK
+	SYMBOL_RATE = 2220000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -676,18 +749,20 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12707000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12704000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
+	SYMBOL_RATE = 1640000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12710000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12707000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
+	SYMBOL_RATE = 2960000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -699,15 +774,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Sudania 24 TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12713000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Sudan TV]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12719000
@@ -742,17 +808,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12728000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12733000
+	FREQUENCY = 12732000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
+	SYMBOL_RATE = 2950000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Arabsat-5C-20.0E b/dvb-s/Arabsat-5C-20.0E
index 28ff4a05..f76ce378 100644
--- a/dvb-s/Arabsat-5C-20.0E
+++ b/dvb-s/Arabsat-5C-20.0E
@@ -11,10 +11,11 @@
 	INVERSION = AUTO
 
 [Somali Region TV]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3796000
 	POLARIZATION = LEFT
 	SYMBOL_RATE = 1850000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -36,6 +37,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Vision 4]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3851000
+	POLARIZATION = LEFT
+	SYMBOL_RATE = 1261000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Espace TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3853000
diff --git a/dvb-s/Arabsat-6A-30.5E b/dvb-s/Arabsat-6A-30.5E
index 1dfc1ba8..1be39d0a 100644
--- a/dvb-s/Arabsat-6A-30.5E
+++ b/dvb-s/Arabsat-6A-30.5E
@@ -3,62 +3,54 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11000000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al Jadeed]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2143000
+	FREQUENCY = 10958000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[NBN]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
+	FREQUENCY = 11000000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1667000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11035000
+	FREQUENCY = 11068000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3541000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Blue Nile Channel]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11040000
+	FREQUENCY = 11075000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[LBC International]
+[[LBC International test card]]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11074000
+	FREQUENCY = 11091000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
+	SYMBOL_RATE = 7000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[LBC International]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
+	FREQUENCY = 11103000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1300000
+	SYMBOL_RATE = 2500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -99,11 +91,37 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11126000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [OTV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11122000
+	FREQUENCY = 11130000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Al Jadeed]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11134000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2140000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[NBN]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11136000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1666000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -162,3 +180,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Sudania 24 TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11565000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3600000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/Arsat-1-71.8W b/dvb-s/Arsat-1-71.8W
index 1c6ea3cd..1bca2192 100644
--- a/dvb-s/Arsat-1-71.8W
+++ b/dvb-s/Arsat-1-71.8W
@@ -97,7 +97,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Arsat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11590000
 	POLARIZATION = VERTICAL
@@ -123,10 +123,20 @@
 	INVERSION = AUTO
 
 [Telediario TV]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11614000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2200000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[T5 Satelital]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11618000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1400000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -275,10 +285,20 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11746000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1666000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11752000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2373000
+	SYMBOL_RATE = 1666000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -308,6 +328,24 @@
 	INVERSION = AUTO
 
 [various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11782000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11785000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11794000
 	POLARIZATION = VERTICAL
@@ -349,6 +387,33 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11836000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2400000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11843000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11848000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11851000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3350000
@@ -462,7 +527,43 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[5R TV]
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11995000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12001000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3400000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12022000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12031000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Santa Fe Canal]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12046000
 	POLARIZATION = VERTICAL
@@ -488,27 +589,28 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Multivisión]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12056000
+	FREQUENCY = 12055000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12063000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7400000
+[Canal 7 Chubut]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12062000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4170000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Canal 7 Chubut]
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12063000
-	POLARIZATION = VERTICAL
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 4170000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -522,44 +624,47 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12067000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12066000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
+	SYMBOL_RATE = 3000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12074000
+[C5N]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12071000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2400000
+	SYMBOL_RATE = 2420000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[El 10 TV]
+[Canal Trece]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12075000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1660000
-	MODULATION = PSK/8
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4600000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Chaco TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	FREQUENCY = 12079000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2850000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Chaco TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12083000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2850000
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -572,10 +677,11 @@
 	INVERSION = AUTO
 
 [Canal Tres La Pampa]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12096000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3333000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -595,6 +701,24 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12104000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12112000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3330000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Lapacho TV Canal 11]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12112000
@@ -604,3 +728,136 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12115000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3330000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12118000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3330000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12130000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2800000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Red]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12131000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[TV Pública Fueguina]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12136000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3750000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12143000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12148000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12151000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12157000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12160000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12166000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12169000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3200000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12178000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[TV Canal 9]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12187000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Misiones Cuatro]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12192000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/Arsat-2-81.0W b/dvb-s/Arsat-2-81.0W
index 9eb6c16b..788804ad 100644
--- a/dvb-s/Arsat-2-81.0W
+++ b/dvb-s/Arsat-2-81.0W
@@ -10,7 +10,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[UCL]
+[INTV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11599000
 	POLARIZATION = HORIZONTAL
@@ -46,20 +46,30 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Canal 13]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11796000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11738000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7200000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Canal 10 Entre Ríos]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11866000
+	FREQUENCY = 11746000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7600000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 3710000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11750000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3710000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/AsiaSat-5-100.5E b/dvb-s/AsiaSat-5-100.5E
index fdeb657e..a93adebf 100644
--- a/dvb-s/AsiaSat-5-100.5E
+++ b/dvb-s/AsiaSat-5-100.5E
@@ -3,9 +3,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3636000
+	FREQUENCY = 3635000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
+	SYMBOL_RATE = 8000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -30,9 +30,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3676000
+	FREQUENCY = 3666000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -182,25 +182,16 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3866000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3878000
+	FREQUENCY = 3867000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 8000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3884000
+	FREQUENCY = 3876000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7120000
 	MODULATION = PSK/8
@@ -208,14 +199,6 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3886000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3895000
 	POLARIZATION = HORIZONTAL
@@ -235,15 +218,6 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3905000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3909000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7120000
@@ -280,17 +254,17 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3935000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
+	FREQUENCY = 3927000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 9875000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[Ukraïna 24]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3936000
-	POLARIZATION = VERTICAL
+	FREQUENCY = 3934000
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -298,9 +272,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3944000
+	FREQUENCY = 3939000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7120000
+	SYMBOL_RATE = 9875000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -395,19 +369,19 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[BBC World Service]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4147000
+	FREQUENCY = 4132000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 10587000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4148000
-	POLARIZATION = VERTICAL
+	FREQUENCY = 4147000
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -415,8 +389,8 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4155000
-	POLARIZATION = HORIZONTAL
+	FREQUENCY = 4148000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -532,15 +506,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[7 News HD]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12400000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12403000
@@ -553,7 +518,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12427000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 0
+	SYMBOL_RATE = 2916000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/AsiaSat-7-105.5E b/dvb-s/AsiaSat-7-105.5E
index 87ffcd2e..dff5f6d1 100644
--- a/dvb-s/AsiaSat-7-105.5E
+++ b/dvb-s/AsiaSat-7-105.5E
@@ -10,6 +10,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Janata TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3652000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Sahara Samay]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3652000
@@ -18,21 +27,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3653000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3667000
+[Avenues Khabar]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3656000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 2222000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -46,19 +45,19 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
+	FREQUENCY = 3675000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3712000
+	FREQUENCY = 3709000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
+	SYMBOL_RATE = 15000000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -88,15 +87,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Zee Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3732000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [CNA]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3734000
@@ -141,15 +131,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [STAR TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3860000
@@ -176,11 +157,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Fox Sports Networks Asia]
+[Zee Network]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29720000
+	FREQUENCY = 3902000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7250000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -212,7 +193,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Fox Networks Group]
+[STAR TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4000000
 	POLARIZATION = HORIZONTAL
@@ -230,6 +211,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[{}]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4050000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 14400000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [ARY Digital Network]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 4060000
@@ -238,11 +228,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[SS Creative Solutions]
+[Thainess TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4065000
+	FREQUENCY = 4080000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4296000
+	SYMBOL_RATE = 29720000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -290,6 +280,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[ABP News India]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4176000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3167000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Sony Pictures Networks India]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4180000
diff --git a/dvb-s/AsiaSat-9-122.0E b/dvb-s/AsiaSat-9-122.0E
index c91774fb..f7aa0b5c 100644
--- a/dvb-s/AsiaSat-9-122.0E
+++ b/dvb-s/AsiaSat-9-122.0E
@@ -10,24 +10,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[SETN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3831000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13910000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[4KUniverse]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3861000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3866000
@@ -59,11 +41,20 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3934000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1131000
+	SYMBOL_RATE = 1300000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Chunghwa Telecom]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3971000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 15650000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3998000
@@ -99,11 +90,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[4KUniverse]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4132000
+	FREQUENCY = 4140000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
+	SYMBOL_RATE = 29720000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -143,7 +134,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ninmedia]
+[KugoSky]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12415000
 	POLARIZATION = VERTICAL
@@ -152,7 +143,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ninmedia]
+[KugoSky]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12655000
 	POLARIZATION = VERTICAL
diff --git a/dvb-s/Astra-1KR-19.2E b/dvb-s/Astra-1KR-19.2E
index f6f00ce2..7added27 100644
--- a/dvb-s/Astra-1KR-19.2E
+++ b/dvb-s/Astra-1KR-19.2E
@@ -1,15 +1,6 @@
 # Channel table for Astra 1KR at 19.2°E
 # Source: http://www.lyngsat.com/Astra-1KR.html
 
-[SES]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10714000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Movistar+]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10729000
@@ -46,15 +37,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[{}]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10862000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Movistar+]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10906000
diff --git a/dvb-s/Astra-1L-19.2E b/dvb-s/Astra-1L-19.2E
index 8bd81889..6b9c6eb8 100644
--- a/dvb-s/Astra-1L-19.2E
+++ b/dvb-s/Astra-1L-19.2E
@@ -69,7 +69,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[SES]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11112000
 	POLARIZATION = HORIZONTAL
@@ -105,15 +105,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[{}]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11406000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Globecast]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11509000
@@ -201,7 +192,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12728000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
+	SYMBOL_RATE = 23500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -471,7 +462,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 18767000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3110000
+	SYMBOL_RATE = 2385000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Astra-1M-19.2E b/dvb-s/Astra-1M-19.2E
index f0a75298..3bc4918b 100644
--- a/dvb-s/Astra-1M-19.2E
+++ b/dvb-s/Astra-1M-19.2E
@@ -94,7 +94,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[SES]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11778000
 	POLARIZATION = VERTICAL
@@ -191,14 +191,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[ARD Digital]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12266000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SES]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12344000
diff --git a/dvb-s/Astra-1N-19.2E b/dvb-s/Astra-1N-19.2E
index afd6f04a..34845208 100644
--- a/dvb-s/Astra-1N-19.2E
+++ b/dvb-s/Astra-1N-19.2E
@@ -45,7 +45,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TA 2 Europe]
+[TrendSports]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11656000
 	POLARIZATION = VERTICAL
@@ -149,15 +149,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Canal + France]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12246000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Orange France]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12285000
@@ -203,6 +194,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Globecast]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12522000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 22000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [SES]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12552000
diff --git a/dvb-s/Astra-2E-28.5E b/dvb-s/Astra-2E-28.5E
index fe3ded6b..ec07d975 100644
--- a/dvb-s/Astra-2E-28.5E
+++ b/dvb-s/Astra-2E-28.5E
@@ -9,7 +9,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Freesat]
+[{}]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 10758000
 	POLARIZATION = VERTICAL
@@ -126,11 +126,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Sky UK]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11778000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
+[{}]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11798000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Astra-2F-28.2E b/dvb-s/Astra-2F-28.2E
index 1874d876..d7e4cbad 100644
--- a/dvb-s/Astra-2F-28.2E
+++ b/dvb-s/Astra-2F-28.2E
@@ -1,7 +1,7 @@
 # Channel table for Astra 2F at 28.2°E
 # Source: http://www.lyngsat.com/Astra-2F.html
 
-[Sky UK]
+[Freeview]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11306000
 	POLARIZATION = HORIZONTAL
@@ -73,7 +73,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11675000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 0
+	SYMBOL_RATE = 30000000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -184,9 +184,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12507000
+	FREQUENCY = 12503000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 2400000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12506000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2400000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12509000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2400000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -204,7 +222,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12523000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 4812000
 	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -220,18 +238,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12533000
+	FREQUENCY = 12534000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12537000
+	FREQUENCY = 12540000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -247,15 +265,6 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12541000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12544000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3400000
@@ -265,18 +274,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12548000
+	FREQUENCY = 12546000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 4812000
+	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12552000
+	FREQUENCY = 12555000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
+	SYMBOL_RATE = 4150000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -310,9 +319,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12571000
+	FREQUENCY = 12570000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -337,9 +346,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12580000
+	FREQUENCY = 12576000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -355,6 +364,24 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12582000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12588000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12592000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 3630000
@@ -393,7 +420,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12605000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 0
+	SYMBOL_RATE = 30000000
 	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -427,27 +454,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12625000
+	FREQUENCY = 12624000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12632000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	FREQUENCY = 12633000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12634000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	FREQUENCY = 12635000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -455,18 +482,27 @@
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12640000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12640000
+	FREQUENCY = 12642000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4812000
+	MODULATION = APSK/16
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Ghana DTT]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12645000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 173000
+	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -474,7 +510,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12647000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -578,38 +614,38 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[HD+ Ghana]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12689000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
+	FREQUENCY = 12685000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
+	FREQUENCY = 12687000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2400000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12694000
+	FREQUENCY = 12691000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
+	SYMBOL_RATE = 9600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12698000
+	FREQUENCY = 12692000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -625,18 +661,45 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12703000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7500000
+	MODULATION = APSK/16
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12710000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3630000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 3750000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12721000
+	FREQUENCY = 12718000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4610000
+	SYMBOL_RATE = 4812000
+	MODULATION = APSK/16
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[HD+ Ghana]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12725000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12730000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Astra-2G-28.2E b/dvb-s/Astra-2G-28.2E
index 783b68d8..3f1d9394 100644
--- a/dvb-s/Astra-2G-28.2E
+++ b/dvb-s/Astra-2G-28.2E
@@ -9,24 +9,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[TNT Sat Africa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 0
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TNT Sat Africa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 0
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Freesat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11023000
diff --git a/dvb-s/Astra-3B-23.5E b/dvb-s/Astra-3B-23.5E
index 3d42f0ec..08cf2185 100644
--- a/dvb-s/Astra-3B-23.5E
+++ b/dvb-s/Astra-3B-23.5E
@@ -12,9 +12,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11462000
+	FREQUENCY = 11460000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4937000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11466000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4937000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -30,35 +39,35 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11472000
+	FREQUENCY = 11473000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = APSK/16
+	SYMBOL_RATE = 3550000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11479000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11477000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4937000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS2
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11479000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4444000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11486000
+	FREQUENCY = 11483000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 4937000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -74,9 +83,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11499000
+	FREQUENCY = 11498000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4937000
+	SYMBOL_RATE = 3750000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -92,27 +101,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11505000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4937000
+	FREQUENCY = 11507000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11510000
+	FREQUENCY = 11512000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11512000
+	FREQUENCY = 11515000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4937000
+	SYMBOL_RATE = 9600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -121,34 +130,25 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11518000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4937000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11520000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7350000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11526000
+	FREQUENCY = 11523000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11527000
+	FREQUENCY = 11529000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -157,16 +157,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11531000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3650000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11532000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 4936000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -234,6 +225,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11619000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3750000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11620000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7200000
@@ -245,8 +245,8 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11626000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = APSK/16
+	SYMBOL_RATE = 4800000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -260,6 +260,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11631000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11636000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 3630000
@@ -276,20 +285,20 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Grupa Radiowa Time]
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11642000
+	FREQUENCY = 11641000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6000000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 5000000
+	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11644000
+	FREQUENCY = 11646000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
+	SYMBOL_RATE = 9600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -305,18 +314,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11650000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11660000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 4812000
 	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -330,12 +330,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[RMF FM]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11665000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3187000
-	MODULATION = APSK/16
+	SYMBOL_RATE = 2880000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -393,6 +393,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Tuba]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11681000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1497000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11686000
@@ -404,14 +413,23 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11688000
+	FREQUENCY = 11687000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iris TV]
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11691000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[M:Sat TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11720000
 	POLARIZATION = HORIZONTAL
@@ -447,7 +465,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iris TV]
+[M:Sat TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11798000
 	POLARIZATION = HORIZONTAL
@@ -456,7 +474,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iris TV]
+[M:Sat TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11817000
 	POLARIZATION = VERTICAL
@@ -465,15 +483,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[@ Astra Connect]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11836000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31430000
-	MODULATION = APSK/32
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [M7 Group]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11856000
@@ -492,7 +501,16 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iris TV]
+[M:Sat TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11895000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[M:Sat TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11914000
 	POLARIZATION = HORIZONTAL
@@ -581,15 +599,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[@ Astra Connect]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SES]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12168000
@@ -598,7 +607,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[M7 Group]
+[Canal Digitaal]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12188000
 	POLARIZATION = HORIZONTAL
@@ -634,7 +643,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Iris TV]
+[M:Sat TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12402000
 	POLARIZATION = VERTICAL
@@ -654,45 +663,45 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12515000
+	FREQUENCY = 12513000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12521000
+	FREQUENCY = 12518000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 3600000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12528000
+	FREQUENCY = 12522000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12533000
+	FREQUENCY = 12529000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12539000
+	FREQUENCY = 12537000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -719,25 +728,25 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12563000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 3166000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12569000
+	FREQUENCY = 12568000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
+	SYMBOL_RATE = 3166000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12577000
+	FREQUENCY = 12571000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 2400000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -745,52 +754,34 @@
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12589000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12592000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9874000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12593000
+	FREQUENCY = 12590000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12600000
+	FREQUENCY = 12595000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12602000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12608000
-	POLARIZATION = VERTICAL
+	FREQUENCY = 12599000
+	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -798,72 +789,72 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12609000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
+	FREQUENCY = 12601000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12612000
+	FREQUENCY = 12608000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12615000
+	FREQUENCY = 12608000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12620000
+	FREQUENCY = 12613000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
+	SYMBOL_RATE = 4936000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12621000
+	FREQUENCY = 12617000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4936000
+	SYMBOL_RATE = 7200000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12629000
+	FREQUENCY = 12632000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 9874000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12637000
+	FREQUENCY = 12636000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1666000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 1900000
+	MODULATION = APSK/16
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12647000
+	FREQUENCY = 12644000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 9874000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -881,7 +872,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12653000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
+	SYMBOL_RATE = 9600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -897,18 +888,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12668000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1900000
+	MODULATION = APSK/16
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12669000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
+	SYMBOL_RATE = 5000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12670000
+	FREQUENCY = 12675000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -924,27 +924,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12682000
+	FREQUENCY = 12681000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12684000
+	FREQUENCY = 12685000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
+	SYMBOL_RATE = 2400000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12688000
+	FREQUENCY = 12687000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -960,6 +960,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12693000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4800000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12696000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 4800000
@@ -987,9 +996,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12711000
+	FREQUENCY = 12710000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -1005,18 +1014,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12718000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
+	FREQUENCY = 12716000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12722000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
+	FREQUENCY = 12718000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3333000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -1032,6 +1041,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12728000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4800000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12729000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 9600000
diff --git a/dvb-s/Astra-4A-&-SES-5-4.9E b/dvb-s/Astra-4A-&-SES-5-4.9E
index b5e2e9e0..ddc0b30d 100644
--- a/dvb-s/Astra-4A-&-SES-5-4.9E
+++ b/dvb-s/Astra-4A-&-SES-5-4.9E
@@ -1,6 +1,15 @@
 # Channel table for Astra 4A & SES 5 at 4.9°E
 # Source: http://www.lyngsat.com/Astra-4A-and-SES-5.html
 
+[Dove TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3654000
+	POLARIZATION = LEFT
+	SYMBOL_RATE = 8287000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [various]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3657000
@@ -37,24 +46,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Dove TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3693000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3454000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Wap TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3697000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 1517000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [TV Continental]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3701000
@@ -102,7 +93,7 @@
 
 [American Forces Network]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3800000
+	FREQUENCY = 3818000
 	POLARIZATION = LEFT
 	SYMBOL_RATE = 27500000
 	MODULATION = PSK/8
@@ -136,33 +127,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Quest TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3851000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Label TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3854000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1291000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Galaxy TV Lagos]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3857000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1520000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [BBC World Service]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4000000
@@ -199,84 +163,29 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11265000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11265000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11305000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11305000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11345000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
+[Wap TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11345000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
+	FREQUENCY = 4094000
+	POLARIZATION = LEFT
+	SYMBOL_RATE = 1551000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
+[Zuku]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11385000
+	FREQUENCY = 11727000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11385000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
+	SYMBOL_RATE = 27500000
+	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Zuku]
-	DELIVERY_SYSTEM = DVBS2
+[NEP Connect]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11727000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
-	MODULATION = QPSK
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -311,7 +220,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11766000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -352,15 +261,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11823000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [StarSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11862000
@@ -379,15 +279,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11881000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Zuku]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11900000
@@ -405,15 +296,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11919000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [StarSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11938000
@@ -459,7 +341,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11996000
 	POLARIZATION = HORIZONTAL
@@ -475,15 +357,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12015000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SES]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12034000
@@ -535,14 +408,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[NEP Connect]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12149000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Viasat Ukraina]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12207000
@@ -595,15 +460,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Discovery Networks Europe]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12322000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [StarSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12341000
@@ -613,24 +469,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[ZeonBud]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12341000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12360000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [StarSat]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12380000
@@ -665,7 +503,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[SES Ukraine]
+[Inter Media Grup]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
 	POLARIZATION = VERTICAL
@@ -730,18 +568,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12542000
+	FREQUENCY = 12543000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3750000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12546000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 3650000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12544000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4480000
+	FREQUENCY = 12550000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3650000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -757,6 +604,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12557000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12560000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7200000
@@ -775,6 +631,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12567000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12569000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7500000
@@ -791,29 +656,38 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[1+1 International]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12592000
+	FREQUENCY = 12591000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12592000
+	FREQUENCY = 12594000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 9874000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12601000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	FREQUENCY = 12603000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12609000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -830,19 +704,36 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12615000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12615000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2531000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12620000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 6111000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12621000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [MBC]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12621000
@@ -853,44 +744,60 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12654000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
+	FREQUENCY = 12627000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12633000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12639000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12655000
+	FREQUENCY = 12646000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12669000
+	FREQUENCY = 12654000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
+	FREQUENCY = 12658000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12681000
-	POLARIZATION = HORIZONTAL
+	FREQUENCY = 12670000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -898,18 +805,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12681000
+	FREQUENCY = 12679000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 7200000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12681000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12690000
+	FREQUENCY = 12688000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -934,9 +850,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12703000
+	FREQUENCY = 12701000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
+	SYMBOL_RATE = 7100000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Astra-4A-4.8E b/dvb-s/Astra-4A-4.8E
index 63e7fa02..cdcee561 100644
--- a/dvb-s/Astra-4A-4.8E
+++ b/dvb-s/Astra-4A-4.8E
@@ -1,6 +1,14 @@
 # Channel table for Astra 4A at 4.8°E
 # Source: http://www.lyngsat.com/Astra-4A.html
 
+[NEP Connect]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 11727000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [SES Ukraine]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11747000
@@ -14,7 +22,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11766000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -28,33 +36,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11823000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11881000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11919000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Home 3]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11938000
@@ -73,7 +54,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11996000
 	POLARIZATION = HORIZONTAL
@@ -81,15 +62,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Allente]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12015000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SES Ukraine]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12073000
@@ -115,14 +87,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[NEP Connect]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12149000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Viasat Ukraina]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12207000
@@ -157,33 +121,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Discovery Networks Europe]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12322000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ZeonBud]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12341000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12360000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [SES]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12380000
@@ -200,7 +137,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[SES Ukraine]
+[Inter Media Grup]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
 	POLARIZATION = VERTICAL
@@ -265,18 +202,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12542000
+	FREQUENCY = 12543000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3750000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12546000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 3650000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12544000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4480000
+	FREQUENCY = 12550000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3650000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -292,6 +238,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12557000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12560000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7200000
@@ -310,6 +265,15 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12567000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12569000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7500000
@@ -326,29 +290,38 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[various]
+[1+1 International]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12592000
+	FREQUENCY = 12591000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 2000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12592000
+	FREQUENCY = 12594000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 9874000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12601000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
+	FREQUENCY = 12603000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12609000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -365,19 +338,36 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12615000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12615000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2531000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12620000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 6111000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12621000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [MBC]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12621000
@@ -388,44 +378,60 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12654000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
+	FREQUENCY = 12627000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12633000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12639000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12655000
+	FREQUENCY = 12646000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
+	SYMBOL_RATE = 4610000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12669000
+	FREQUENCY = 12654000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 3600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
+	FREQUENCY = 12658000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4600000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12681000
-	POLARIZATION = HORIZONTAL
+	FREQUENCY = 12670000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -433,18 +439,27 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12681000
+	FREQUENCY = 12679000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 7200000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12681000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12690000
+	FREQUENCY = 12688000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
+	SYMBOL_RATE = 7500000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -469,9 +484,9 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12703000
+	FREQUENCY = 12701000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
+	SYMBOL_RATE = 7100000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Astra-5B-31.5E b/dvb-s/Astra-5B-31.5E
index f8bacefc..5294315a 100644
--- a/dvb-s/Astra-5B-31.5E
+++ b/dvb-s/Astra-5B-31.5E
@@ -9,16 +9,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[MagtiSat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11954000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MagtiSat]
+[Magti]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11973000
 	POLARIZATION = VERTICAL
@@ -72,15 +63,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[MagtiSat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12207000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Orange România]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12246000
@@ -90,15 +72,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[MagtiSat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12266000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Orange România]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12324000
diff --git a/dvb-s/Badr-4-26.0E b/dvb-s/Badr-4-26.0E
index a30b1d4b..29ef8bb8 100644
--- a/dvb-s/Badr-4-26.0E
+++ b/dvb-s/Badr-4-26.0E
@@ -146,9 +146,18 @@
 
 [various]
 	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 12558000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2220000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12563000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
+	SYMBOL_RATE = 4440000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -187,18 +196,19 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12586000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [various]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12587000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
+	FREQUENCY = 12586000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2220000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -328,6 +338,15 @@
 	INVERSION = AUTO
 
 [various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12669000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4440000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12672000
 	POLARIZATION = HORIZONTAL
@@ -339,7 +358,7 @@
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12676000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2100000
+	SYMBOL_RATE = 3330000
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -433,10 +452,11 @@
 	INVERSION = AUTO
 
 [various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12739000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12738000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
+	SYMBOL_RATE = 2500000
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
diff --git a/dvb-s/Badr-5-26.0E b/dvb-s/Badr-5-26.0E
index 5e4812b0..0a85dab6 100644
--- a/dvb-s/Badr-5-26.0E
+++ b/dvb-s/Badr-5-26.0E
@@ -18,7 +18,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My HD]
+[GOBX]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11919000
 	POLARIZATION = HORIZONTAL
@@ -70,7 +70,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[IRIB UHD]
+[IRIB]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12322000
 	POLARIZATION = VERTICAL
diff --git a/dvb-s/Badr-6-26.0E b/dvb-s/Badr-6-26.0E
index da6b8f0d..ea8cf203 100644
--- a/dvb-s/Badr-6-26.0E
+++ b/dvb-s/Badr-6-26.0E
@@ -26,7 +26,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My HD]
+[GOBX]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11766000
 	POLARIZATION = HORIZONTAL
@@ -51,7 +51,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My HD]
+[GMA Network]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11823000
 	POLARIZATION = VERTICAL
@@ -85,7 +85,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My HD]
+[GOBX]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12399000
 	POLARIZATION = VERTICAL
@@ -94,6 +94,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[SSC]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12418000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [IEN Doros]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
diff --git a/dvb-s/Badr-7-26.0E b/dvb-s/Badr-7-26.0E
index d24aafd2..d47bb0e2 100644
--- a/dvb-s/Badr-7-26.0E
+++ b/dvb-s/Badr-7-26.0E
@@ -10,12 +10,21 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Ghanian mux]
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10960000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3300000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[RCS]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10970000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	MODULATION = QPSK
+	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
@@ -45,7 +54,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My HD]
+[GOBX]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11230000
 	POLARIZATION = VERTICAL
diff --git a/dvb-s/Bangabandhu-1-119.1E b/dvb-s/Bangabandhu-1-119.1E
index cc8b56b4..74ef6d76 100644
--- a/dvb-s/Bangabandhu-1-119.1E
+++ b/dvb-s/Bangabandhu-1-119.1E
@@ -109,15 +109,6 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Bangladesh TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4825000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
 [Akash DTH]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 10725000
@@ -165,6 +156,15 @@
 
 [Bangladesh TV]
 	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11385000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 17500000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Bangladesh TV]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11725000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 17500000
diff --git a/dvb-s/Belintersat-1-51.5E b/dvb-s/Belintersat-1-51.5E
index 94f6a3b4..9f34d97b 100644
--- a/dvb-s/Belintersat-1-51.5E
+++ b/dvb-s/Belintersat-1-51.5E
@@ -1,6 +1,14 @@
 # Channel table for Belintersat 1 at 51.5°E
 # Source: http://www.lyngsat.com/Belintersat-1.html
 
+[OBN Gaammee]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3614000
+	POLARIZATION = RIGHT
+	SYMBOL_RATE = 2607000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [OBN]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3624000
@@ -17,6 +25,24 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Tigrai TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3638000
+	POLARIZATION = RIGHT
+	SYMBOL_RATE = 2275000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[Tigrai TV]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3641000
+	POLARIZATION = RIGHT
+	SYMBOL_RATE = 1819000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Debub TV]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 3645000
@@ -51,6 +77,15 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[TSTV Africa]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 10970000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [Panbetting]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11010000
@@ -60,27 +95,27 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[My TV]
+[Moreplex TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = HORIZONTAL
+	FREQUENCY = 11010000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 8000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[MTV Alloubnaniya]
+[TSTV Africa]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 0
+	FREQUENCY = 11050000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
 [Star Light TV]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11102000
+	FREQUENCY = 11098000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 8000
 	MODULATION = PSK/8
@@ -98,8 +133,8 @@
 
 [TSTV Africa]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = HORIZONTAL
+	FREQUENCY = 11130000
+	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
@@ -123,7 +158,7 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Belintersat]
+[Belarus mux]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11350000
 	POLARIZATION = HORIZONTAL
diff --git a/dvb-s/BulgariaSat-1-1.9E b/dvb-s/BulgariaSat-1-1.9E
index 3969f0ef..107c74df 100644
--- a/dvb-s/BulgariaSat-1-1.9E
+++ b/dvb-s/BulgariaSat-1-1.9E
@@ -23,7 +23,7 @@
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12149000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000
+	SYMBOL_RATE = 30000000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
@@ -145,3 +145,12 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12513000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	MODULATION = PSK/8
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
diff --git a/dvb-s/ChinaSat-10-110.5E b/dvb-s/ChinaSat-10-110.5E
index a3291732..01e58ca2 100644
--- a/dvb-s/ChinaSat-10-110.5E
+++ b/dvb-s/ChinaSat-10-110.5E
@@ -46,6 +46,14 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[Sichuan TV 1]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3832000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 9900000
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
 [LaLiga TV]
 	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 4076000
diff --git a/dvb-s/ChinaSat-11-98.0E b/dvb-s/ChinaSat-11-98.0E
index 511435a8..cd49bce0 100644
--- a/dvb-s/ChinaSat-11-98.0E
+++ b/dvb-s/ChinaSat-11-98.0E
@@ -3,15 +3,6 @@
 
 [Medianet]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3920000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Medianet]
-	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 3975000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 34284000
@@ -19,11 +10,11 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
-[Avision Network Solutions]
+[Medianet]
 	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11493000
+	FREQUENCY = 3975000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2600000
+	SYMBOL_RATE = 34284000
 	MODULATION = PSK/8
 	INNER_FEC = AUTO
 	INVERSION = AUTO
diff --git a/dvb-s/Intelsat-38-45.1E b/dvb-s/Intelsat-38-45.1E
index 62c29551..954af9d5 100644
--- a/dvb-s/Intelsat-38-45.1E
+++ b/dvb-s/Intelsat-38-45.1E
@@ -113,3 +113,21 @@
 	INNER_FEC = AUTO
 	INVERSION = AUTO
 
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12689000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5000000
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+
+[various]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12710000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 0
+	MODULATION = QPSK
+	INNER_FEC = AUTO
+	INVERSION = AUTO
+